fix(jg):设备移交代码提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -86,6 +86,7 @@
             </if>
             <if test="type == 'installUnit'">
                 AND jet.install_unit_credit_code = #{companyCode}
+                AND jet.instance_id  is not null
             </if>
         </where>
         ORDER BY jet.apply_date DESC

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/JgEquipTransferServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -154,10 +153,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setApplyDate(new Date());
-            dto.setNextExecuteIds(String.join(",", roleListSecond));
-            dto.setInstanceStatus(String.join(",", roleListFirst));
-            dto.setPromoter(reginParams.getUserModel().getUserId());
-            dto.setApplyStatus(taskName[0]);
+
+            if(SUBMIT_TYPE_FLOW.equals(submitType)) {
+                dto.setNextExecuteIds(String.join(",", roleListSecond));
+                dto.setInstanceStatus(String.join(",", roleListFirst));
+                dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setApplyStatus(taskName[0]);
+            }
+
             jgEquipTransferEq.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgEquipTransferEq.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(instanceIdList)) {
@@ -194,27 +197,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         }
     }
 
-    public Map<String, Object> getNextWorkflowNode(String instanceId) {
-        String role = "";
-        String taskName = "流程结束";
-        ArrayList<String> roleList = new ArrayList<>();
-        AjaxResult taskNoAuth = Workflow.taskClient.getTaskNoAuth(instanceId);
-        if (!org.springframework.util.ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-            String nextTaskId = nextTask.getString("id");
-            taskName = nextTask.getString("name");
-            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-            for (Object datum : data) {
-                if (((Map) datum).containsKey("groupId")) {
-                    roleList.add(((Map) datum).get("groupId").toString());
-                }
-            }
-        }
-        role = String.join(",", roleList);
-        return MapBuilder.<String, Object>create().put("taskName", taskName).put("role", role).build();
-    }
-
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
         AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
@@ -281,7 +263,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             return null;
         }
 
-        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
+        Map<String, Object> equipTransferInfo = new HashMap<>();
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
@@ -293,8 +275,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         handleJsonArrayFields(equipmentInfos.get(0), fields);
 
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.putAll(equipmentInfos.get(0));
         resultMap.putAll(equipTransferInfo);
+        resultMap.putAll(equipmentInfos.get(0));
+        resultMap.putAll(createEquipTransferInfo(equipTransfer));
         return  resultMap;
     }
 
@@ -387,6 +370,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         JgEquipTransfer equipTransfer = this.baseMapper.selectById(equipTransferInfo.getSequenceNbr());
         if (ajaxResult.getStatus() == 200) {
             equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            equipTransfer.setPromoter("");
             this.baseMapper.updateById(equipTransfer);
         }
     }