Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -501,8 +501,8 @@
                bvm.driveFormValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               bvm.marketSegments,
-               bvm.department,
+               bvm.marketSegmentsValue as marketSegments,
+               bvm.departmentValue as department,
                bvm.emissionStandardValue,
                bvm.engineTypeValue,
                bvm.announcementModel,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -41,7 +41,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.JPushServer;
 import com.yxt.common.base.utils.PagerUtil;
@@ -376,7 +375,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送信息
-//            messageJpush(ufVo.getTaskDefKey(), businessSid, orgSidPath);
+//            messageJpush(businessSid, ufVo.getNextNodeUserSids());
             return voResultBean;
         }
         if (r == 2) {
@@ -393,37 +392,33 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return rb;
     }
 
-    public void messageJpush(String taskDefKey, String businessSid, String orgSidPath) {
+    public void messageJpush(String businessSid, String nextSid) {
         BusVehicleApply busVehicleApply = fetchBySid(businessSid);
-        GetNodeQuery getNodeQuery = new GetNodeQuery();
-        getNodeQuery.setTaskDefKey(taskDefKey);
-        getNodeQuery.setBusinessSid(businessSid);
-        ResultBean<List<GetNodeVo>> nodeVoList = getNextNodesForSubmit(getNodeQuery);
-        //根据组织架构、角色两个参数取相关符合条件的用户信息
-        UserQuery userQuery = new UserQuery();
-        userQuery.setRoleSid(nodeVoList.getData().get(0).getCandidateGroups().get(0));
-        userQuery.setOrgSidPath(orgSidPath);
-        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
-        StringBuilder nextNodeUserSids = new StringBuilder();
-        List<String> stringList = new ArrayList<>();
-        for (SysUserVo su : sysUserVos) {
-            stringList.add(su.getSid());
-//            nextNodeUserSids.append(su.getSid()).append(",");
-        }
-        //符合条件的用户的sid,拼接的字符串
-//        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        List<String> stringList = Arrays.asList(nextSid.split(","));
+        //根据用户的sid查询用户的id
+        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(stringList);
+        List<String> stringList2 = Arrays.asList(stringList1.getData().split(","));
         //标题、内容、消息类别key、消息类别名称、
-        JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "系统消息", stringList.toArray(new String[stringList.size()]));
+        String msgSid = getMessage(stringList);
+        for (int i = 0; i < stringList2.size(); i++) {
+            JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "审批中心", stringList2.get(i));
+        }
+
+
     }
 
     public String getMessage(List<String> list) {
+        //1、buttons:int[]{3,4,5}、taskId、taskName、procInsId、taskDefKey
+        //根据taskDefKey、流程标识、以及
+
+
         // 1、保存消息体
         AppMessageDto messageDto = new AppMessageDto();
         ResultBean<List<MessageTypeVo>> messageBean = messageTypeFeign.selectAppMsgTypeList("0002");
         if (messageBean.getSuccess() && messageBean.getData() != null) {
             List<MessageTypeVo> typeVoList = messageBean.getData();
             for (MessageTypeVo message : typeVoList) {
-                if (message.getMsgType().equals("系统消息")) {
+                if (message.getMsgType().equals("审批中心")) {
                     messageDto.setMsgTypeSid(message.getMsgTypeSid());
                     messageDto.setMsgType(message.getMsgType());
                 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1317,7 +1317,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busSalesOrderModel.setBrandName(crmVehicleDemandOrderVo.getBrandName());
                         busSalesOrderModel.setModelSid(crmVehicleDemandOrderVo.getModelSid());
                         busSalesOrderModel.setModelConfigSid(crmVehicleDemandOrderVo.getComonConfigSid());
-                        busSalesOrderModel.setModelConfig(crmVehicleDemandOrderVo.getSketChconfiguration());
+                        busSalesOrderModel.setConfig(crmVehicleDemandOrderVo.getSketChconfiguration());
                         busSalesOrderModel.setGuildPrice(new BigDecimal(crmVehicleDemandOrderVo.getSaleReferencePrice()));
                         busSalesOrderModel.setMoreConfig(crmVehicleDemandOrderVo.getOtherConfig());
                         busSalesOrderModel.setSpecialConfig(crmVehicleDemandOrderVo.getChangeOptions());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -21,7 +21,7 @@ public enum ProcDefEnum {
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
     SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:495004"),//TODO
-    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:497508"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:5:382504"), //TODO
     FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -196,4 +196,8 @@ public interface SysUserFeign {
     @ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名")
     @GetMapping(value = "getUserByOrgSid")
     ResultBean<List<Map<String, String>>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid);
+
+    @ApiOperation(value = "根据用户sid获取用户id")
+    @PostMapping(value = "selectIdBySid")
+    ResultBean<String> selectIdBySid(@RequestBody List<String> stringList);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -184,4 +184,9 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selectIdBySid(List<String> stringList) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -179,4 +179,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     int updateAppIdAll();
+
+    String selectIdBySid(@Param("list") List<String> stringList);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -5,59 +5,59 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         SELECT DISTINCT user.staffSid,
-        user.isEnable,
-        (
-        SELECT GROUP_CONCAT(org.name)
-        FROM sys_staff_org staffOrg
-        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-        WHERE staffOrg.staffSid = user.staffSid
-        ) departmentName,
-        (
-        SELECT GROUP_CONCAT(org.sid)
-        FROM sys_staff_org staffOrg
-        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-        WHERE staffOrg.staffSid = user.staffSid
-        ) departmentSid,
-        (
-        SELECT GROUP_CONCAT(post.name)
-        FROM sys_staff_post staffPost
-        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-        WHERE staffPost.staffSid = user.staffSid
-        ) postName,
-        (
-        SELECT GROUP_CONCAT(post.sid)
-        FROM sys_staff_post staffPost
-        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-        WHERE staffPost.staffSid = user.staffSid
-        ) postSid,
-        user.userName,
-        user.sid sid,
-        staff.name,
-        (
-        SELECT GROUP_CONCAT(role.name)
-        FROM sys_user_role user_role
-        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-        WHERE user_role.userSid = USER.sid
-        ) roleName,
-        dict.dictValue userType,
-        user.userType userTypeKey
+                        user.isEnable,
+                        (
+                            SELECT GROUP_CONCAT(org.name)
+                            FROM sys_staff_org staffOrg
+                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                            WHERE staffOrg.staffSid = user.staffSid
+                        )              departmentName,
+                        (
+                            SELECT GROUP_CONCAT(org.sid)
+                            FROM sys_staff_org staffOrg
+                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                            WHERE staffOrg.staffSid = user.staffSid
+                        )              departmentSid,
+                        (
+                            SELECT GROUP_CONCAT(post.name)
+                            FROM sys_staff_post staffPost
+                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+                            WHERE staffPost.staffSid = user.staffSid
+                        )              postName,
+                        (
+                            SELECT GROUP_CONCAT(post.sid)
+                            FROM sys_staff_post staffPost
+                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+                            WHERE staffPost.staffSid = user.staffSid
+                        )              postSid,
+                        user.userName,
+                        user.sid       sid,
+                        staff.name,
+                        (
+                            SELECT GROUP_CONCAT(role.name)
+                            FROM sys_user_role user_role
+                                     LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+                            WHERE user_role.userSid = USER.sid
+                        )              roleName,
+                        dict.dictValue userType,
+                        user.userType  userTypeKey
         FROM sys_user USER
-        LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
-        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-        LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
-        LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
+                 LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
+                 LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+                 LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
+                 LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
         <where>
             ${ew.sqlSegment}
             <if test="orgName != null and orgName != ''">
                 AND (SELECT GROUP_CONCAT(org.name)
-                FROM sys_staff_org staffOrg
-                LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                WHERE staffOrg.staffSid = user.staffSid)
-                LIKE concat('%',
-                #{orgName}
-                ,
-                '%'
-                )
+                     FROM sys_staff_org staffOrg
+                              LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                     WHERE staffOrg.staffSid = user.staffSid)
+                    LIKE concat('%',
+                    #{orgName}
+                    ,
+                    '%'
+                    )
             </if>
         </where>
     </select>
@@ -146,7 +146,7 @@
     <select id="selectByStaffsid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         SELECT *
         FROM sys_user su
-                     LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
+                 LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
         WHERE su.staffSid = #{staffSid}
           AND su.isDelete = 0
     </select>
@@ -154,21 +154,23 @@
     <select id="getUserOrgInfoByUserSid" resultType="com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo">
         SELECT su.staffSid, ss.name staffName, sso.orgSid, sso.orgName, sso.orgSidPath, so.orgCode
         FROM sys_user su
-                     LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
-                     LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
-                     LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+                 LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
+                 LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+                 LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id LIMIT 1
+        ORDER BY sso.id
+        LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
     <select id="selectUserInfoByUserSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
         SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
         FROM sys_user su
-                     LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
-                     LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
-                     LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+                 LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
+                 LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+                 LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id LIMIT 1
+        ORDER BY sso.id
+        LIMIT 1
     </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
@@ -201,19 +203,19 @@
     <select id="getUsersByRoleSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         SELECT su.sid, ss.name, sso.orgNamePath departmentName
         FROM `sys_user` su
-                     LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid
-                     LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid
-                     LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid
-                     LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid
+                 LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid
+                 LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid
+                 LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid
+                 LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid
         WHERE sr.sid = #{roleSid}
     </select>
 
     <select id="getUserByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select si.name, su.sid, su.staffSid
         from sys_user_role sr
-                     left join sys_user su on sr.userSid = su.sid
-                     left join sys_staffinfo si on si.sid = su.staffSid
-                     left join sys_staff_org so on so.staffSid = si.sid
+                 left join sys_user su on sr.userSid = su.sid
+                 left join sys_staffinfo si on si.sid = su.staffSid
+                 left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
           and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
     </select>
@@ -224,14 +226,14 @@
                sso.orgName,
                sp.name as postName
         FROM sys_user su
-                     LEFT JOIN sys_staffinfo st
-                ON su.`staffSid` = st.`sid`
-                     LEFT JOIN sys_staff_org sso
-                ON st.`sid` = sso.`staffSid`
-                     LEFT JOIN sys_staff_post ssp
-                ON st.sid = ssp.`staffSid`
-                     LEFT JOIN sys_post sp
-                ON ssp.`postSid` = sp.`sid`
+                 LEFT JOIN sys_staffinfo st
+                           ON su.`staffSid` = st.`sid`
+                 LEFT JOIN sys_staff_org sso
+                           ON st.`sid` = sso.`staffSid`
+                 LEFT JOIN sys_staff_post ssp
+                           ON st.sid = ssp.`staffSid`
+                 LEFT JOIN sys_post sp
+                           ON ssp.`postSid` = sp.`sid`
         WHERE su.sid != #{userSid}
           AND sso.`orgSidPath` LIKE concat('%'
             , #{orgSid}
@@ -241,7 +243,7 @@
     <select id="fetchBySids" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select su.*, ss.name
         from sys_user su
-        left join sys_staffinfo ss on su.staffSid = ss.sid
+                 left join sys_staffinfo ss on su.staffSid = ss.sid
         where su.sid in
         <foreach collection="sids" index="index" item="item" open="(" separator="," close=")">
             #{item}
@@ -251,16 +253,27 @@
     <select id="getUserByRoleSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select si.name, su.sid, su.staffSid
         from sys_user_role sr
-                     left join sys_user su on sr.userSid = su.sid
-                     left join sys_staffinfo si on si.sid = su.staffSid
+                 left join sys_user su on sr.userSid = su.sid
+                 left join sys_staffinfo si on si.sid = su.staffSid
         where sr.roleSid = #{roleSid}
     </select>
 
     <update id="updateAppIdByMobile">
-        update sys_user set appId = NULL where mobile = #{mobile}
+        update sys_user
+        set appId = NULL
+        where mobile = #{mobile}
     </update>
 
     <update id="updateAppIdAll">
-        update sys_user set appId = NULL
+        update sys_user
+        set appId = NULL
     </update>
+
+    <select id="selectIdBySid" resultType="java.lang.String">
+        select group_concat(id) as ids
+        from sys_user where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -589,4 +589,9 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
         return sysUserService.getUserByOrgSid(orgSid, userSid);
     }
+
+    @Override
+    public ResultBean<String> selectIdBySid(List<String> stringList) {
+        return sysUserService.selectIdBySid(stringList);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -531,7 +531,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         SysUser user = baseMapper.selectByUserName(mobile);
         if (user == null) {
             user = baseMapper.selectByMobile(mobile);
-            if(user == null){
+            if (user == null) {
                 return ResultBean.fireFail().setMsg("该手机号暂时还未注册，请先注册");
             }
 
@@ -860,27 +860,27 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean getUsersByRoleSid(String roleSid) {
         List<SysUserVo> users = baseMapper.getUsersByRoleSid(roleSid);
-        List<String> l=new ArrayList<>();
-        for(SysUserVo s:users){
-            l.add(s.getDepartmentName()==null?"":s.getDepartmentName());
+        List<String> l = new ArrayList<>();
+        for (SysUserVo s : users) {
+            l.add(s.getDepartmentName() == null ? "" : s.getDepartmentName());
         }
         HashSet set = new HashSet(l);
         //把List集合所有元素清空
         l.clear();
         //把HashSet对象添加至List集合
         l.addAll(set);
-        List<Map<String,Object>> r=new ArrayList<>();
-        for(String s:l){
-            if(StringUtils.isNotBlank(s)){
-                Map<String,Object> m=new HashMap<>();
-                List<SysUserVo> us=new ArrayList<>();
-                for(SysUserVo su:users){
-                    if(s!=null&&s.equals(su.getDepartmentName())){
+        List<Map<String, Object>> r = new ArrayList<>();
+        for (String s : l) {
+            if (StringUtils.isNotBlank(s)) {
+                Map<String, Object> m = new HashMap<>();
+                List<SysUserVo> us = new ArrayList<>();
+                for (SysUserVo su : users) {
+                    if (s != null && s.equals(su.getDepartmentName())) {
                         us.add(su);
                     }
                 }
-                m.put("dept",s);
-                m.put("users",us);
+                m.put("dept", s);
+                m.put("users", us);
                 r.add(m);
             }
         }
@@ -895,11 +895,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
         if (StringUtils.isNotBlank(levelTypeKey)) {
             String orgSidPath = query.getOrgSidPath();
-            if(StringUtils.isBlank(orgSidPath)){
+            if (StringUtils.isBlank(orgSidPath)) {
                 sysUserVoList = baseMapper.getUserByRoleSid(query.getRoleSid());
 
-            }else{
-                if(query.getOrgSidPath().split("/").length>=Integer.parseInt(levelTypeKey)-1){
+            } else {
+                if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) {
                     String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
                     sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
                 }
@@ -914,14 +914,14 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<Map<String, String>> user = baseMapper.getUserByOrgSid(orgSid,userSid);
+        List<Map<String, String>> user = baseMapper.getUserByOrgSid(orgSid, userSid);
         for (Map<String, String> map : user) {
             StringBuilder namePath = new StringBuilder();
             String name = map.get("name");
             String orgName = map.get("orgName");
             String postName = map.get("postName");
             namePath.append(name).append("(").append(orgName).append(" ").append(postName).append(")");
-            map.put("namePath",namePath.toString());
+            map.put("namePath", namePath.toString());
         }
         /*List<Map<String, String>> user = new ArrayList<>();
         for (Map<String, String> map : userByOrgSid) {
@@ -943,11 +943,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean updateAppIdByMobile(String mobile) {
         ResultBean rb = ResultBean.fireFail();
-        if(StringUtils.isNotBlank(mobile)){
+        if (StringUtils.isNotBlank(mobile)) {
             baseMapper.updateAppIdByMobile(mobile);
-        }else{
+        } else {
             baseMapper.updateAppIdAll();
         }
         return rb.success().setMsg("解绑成功");
     }
+
+    public ResultBean<String> selectIdBySid(List<String> stringList) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String ids = baseMapper.selectIdBySid(stringList);
+        return rb.success().setData(ids);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java

@@ -18,4 +18,10 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto {
     @ApiModelProperty("保存车辆移库现场照片")
     private List<String> images;
 
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("经纬度")
+    private String locationCode;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java

@@ -94,6 +94,10 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
     private List<String> policyImage;
     @ApiModelProperty("现场照片")
     private List<String> image;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("经纬度")
+    private String locationCode;
 
     @ApiModelProperty("任务id")
     private String taskId;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java

@@ -90,6 +90,10 @@ public class ScmVehicleGression extends BaseEntity {
     private String applicantName; // 申请人
     @ApiModelProperty("申请日期")
     private String applicantDate; // 申请日期
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("经纬度")
+    private String locationCode;
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java

@@ -32,4 +32,6 @@ public class AppScmVehiclePatroVo implements Vo {
     private List<String> images;
     @ApiModelProperty(value = "sid")
     private String sid;
+    @ApiModelProperty(value = "定位地址")
+    private String address;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -482,17 +482,23 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String s1 = "";
         scmFileService.deleteByLinkSidAndType(dto.getSid(), type);
         List<String> images = dto.getImages();
-        for (String s : images) {
-            if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+        if (images.size() > 0) {
+            for (String s : images) {
+                if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile = new ScmFile();
+                scmFile.setAttachType(type);
+                scmFile.setFileName("车辆移库现场照片");
+                scmFile.setFilePath(s1);
+                scmFile.setLinkSid(dto.getSid());
+                scmFileService.save(scmFile);
             }
-            ScmFile scmFile = new ScmFile();
-            scmFile.setAttachType(type);
-            scmFile.setFileName("车辆移库现场照片");
-            scmFile.setFilePath(s1);
-            scmFile.setLinkSid(dto.getSid());
-            scmFileService.save(scmFile);
         }
+        ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid());
+        scmVehicleGression.setAddress(dto.getAddress());
+        scmVehicleGression.setLocationCode(dto.getLocationCode());
+        updateById(scmVehicleGression);
         return rb.success().setMsg("保存成功");
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -48,7 +48,8 @@
                svss.situationExplain,
                svss.problemsAndResults,
                svss.model,
-               svss.sid
+               svss.sid,
+               svss.address
         from scm_vehicle_patrolinspection svp
                  left join scm_vehicle_patrolinspectionsheet svss on svss.patrolInspectionSid = svp.sid
         where svp.sid = #{recordSid}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java

@@ -1,20 +1,19 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
 
-import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppGetNodeQuery;
-import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppGetNodeVo;
-import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -138,4 +137,9 @@ public interface AppBusMainDepositFeign {
     @ResponseBody
     public ResultBean breakProcess(@Valid @RequestBody ScmVirtualOrderTaskQuery query);
 
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap GressionQuery query);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java

@@ -38,6 +38,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -149,6 +150,11 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<String> getFlowOperateTitle(GressionQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<VinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
@@ -50,8 +50,8 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "收款确认表")
 @FeignClient(
-        contextId = "anrui-fin-FinCollectionConfirmation",
-        name = "anrui-fin",
+        contextId = "anrui-terminal-AppFinCollectionConfirmationFeign",
+        name = "anrui-terminal",
         path = "finance/v1/collectionConfirm",
         fallback = AppFinCollectionConfirmationFeignFallback.class)
 public interface AppFinCollectionConfirmationFeign {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.common.core.dto.Dto;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationInitVo.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.common.core.vo.Vo;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageQuery.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageVo.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ReceivablesPaymentDetailsQuery.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/UncollectedReceivablesDetailedVo.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.terminal.api.finance;
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java

@@ -18,6 +18,7 @@ public class AppScmVehiclePatrolinVo implements Vo {
     @ApiModelProperty("车架号")
     @JsonProperty("vin")
     private String mainSid;
+
     @ApiModelProperty("车型")
     @JsonProperty("model")
     private String model;
@@ -41,6 +42,10 @@ public class AppScmVehiclePatrolinVo implements Vo {
     @ApiModelProperty("存在的问题及处理结果")
     @JsonProperty("result")
     private String problemsAndResults;
+
     @ApiModelProperty("相关附件")
     private List<String> images;
+
+    @ApiModelProperty(value = "定位地址")
+    private String address;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java

@@ -17,4 +17,10 @@ public class AppCarTransferSiteImageDto implements Dto {
 
     @ApiModelProperty("保存车辆移库现场照片")
     private List<String> images;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("经纬度")
+    private String locationCode;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java

@@ -84,6 +84,12 @@ public class AppGressionDetailsVo implements Vo {
     @ApiModelProperty("保单照片")
     private List<String> policyImage;
 
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("经纬度")
+    private String locationCode;
+
     @ApiModelProperty("临牌")
     @JsonProperty("proCard")
     private String temporaryCard;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java

@@ -40,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -294,5 +295,10 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign {
         return appBusMainDepositService.breakProcess(query);
     }
 
+    @Override
+    public ResultBean<String> getFlowOperateTitle(GressionQuery query) {
+        return appBusMainDepositService.getFlowOperateTitle(query);
+    }
+
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@@ -43,6 +43,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -52,6 +53,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -418,4 +420,33 @@ public class AppBusMainDepositService {
         ResultBean resultBean = busMainDepositFeign.breakProcess(appScmVirtualOrderTaskQuery);
         return resultBean;
     }
+
+    public ResultBean<String> getFlowOperateTitle(GressionQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        AppGetNodeQuery getNodeQuery = new AppGetNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<AppGetNodeVo>> getPreviousNodesForReject = busMainDepositFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<AppGetNodeVo>> getNextNodesForSubmit = busMainDepositFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -23,11 +23,11 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.biz.finance;
+package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
-import com.yxt.anrui.terminal.api.finance.*;
+import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -23,21 +23,16 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.biz.finance;
+package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanQuery;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
-import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
-import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
-import com.yxt.anrui.terminal.api.finance.*;
-import com.yxt.anrui.terminal.api.supplychain.inspection.PatrolinspectionInfoVo;
-import com.yxt.anrui.terminal.api.supplychain.inspection.PatrolinspectionPageVo;
-import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo;
+import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationDto;
+import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationInitVo;
+import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationPageQuery;
+import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationPageVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;