Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -309,13 +309,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         }
 
         //发起流程
-        if (!ObjectUtils.isEmpty(map.get("submit"))) {
+        if ("1".equals(submitType)) {
             String instanceId = "";
             if (map.containsKey("instanceId")) {
                 instanceId = map.get("instanceId").toString();
             } else {
                 // 如果是新启动的流程开启自动访问
-                String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
+                String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(tableData.get("equList").toString()).orElse(" "));
                 oldTransfer.setEquipListName(equipListName);
                 oldTransfer.setCreateUserId(reginParams.getUserModel().getUserId());
                 oldTransfer.setCreateUserName(reginParams.getUserModel().getRealName());
@@ -466,7 +466,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     public Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, String equipId) {
         Map<String, Map<String, Object>> pageDataMap = new HashMap<>();
         Map<String, Object> resultDataMap = new HashMap<>();
-        String record = "";
+
+        //查询设备详情
+        if (!ValidationUtil.isEmpty(equipId)) {
+            Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+            resultDataMap.putAll(equipDetailMap);
+        }
 
         //移装变更详情
         JgChangeRegistrationTransfer transferById = this.getById(sequenceNbr);
@@ -482,7 +487,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             JgRegistrationHistory historyData = jgRegistrationHistoryService.getDteailByRecord(equipId, transferById.getApplyNo());
             if (!ValidationUtil.isEmpty(historyData)) {
                 JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
-                record = newPosition.getString("record");
+                String record = newPosition.getString("record");
                 String receiveOrgCode = newPosition.getString("receiveOrgCode");
                 String equCode = newPosition.getString("equCode");
                 String province = newPosition.getString("province");
@@ -529,7 +534,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
             if (!ValidationUtil.isEmpty(useInfoByRecord)) {
                 Map<String, Object> useInfoToMap = Bean.BeantoMap(useInfoByRecord);
-                record = useInfoByRecord.getRecord();
+                String record = useInfoByRecord.getRecord();
                 resultDataMap.put("record", record);
                 resultDataMap.putAll(useInfoToMap);
                 // 省市区街道字段
@@ -547,11 +552,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
             resultDataMap.put("receiveOrgCode", transferById.getReceiveOrgCode() + "_" + transferById.getReceiveOrgName());
         }
-        //查询设备详情
-        if (!ValidationUtil.isEmpty(record)) {
-            Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);
-            resultDataMap.putAll(equipDetailMap);
-        }
+
         if (!resultDataMap.isEmpty()) {
             pageDataMap.put(TABLE_PAGE_ID, resultDataMap);
         }
@@ -1059,6 +1060,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setStartUser(transfer.getCreateUserName());
                 toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());
                 toDoTask.setStartDate(new Date());
+                toDoTask.setNextExecuteUser(transfer.getNextExecutorIds());
                 toDoTasklist.add(toDoTask);
             }
             commonService.buildTaskModel(toDoTasklist);