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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

@@ -110,4 +110,7 @@ public class JgEquipTransferDto  extends BaseDto {
 
     @ApiModelProperty(value = "设备地址")
     private String concatenatedAddress;
+
+    @ApiModelProperty(value = "流程建议")
+    private String processAdvice;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipTransfer.java

@@ -163,4 +163,6 @@ public class JgEquipTransfer extends BaseEntity {
     @TableField(exist = false)
     private String concatenatedAddress;
 
+    @TableField(exist = false)
+    private String processAdvice;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferByWorkFlowController.java

@@ -39,7 +39,14 @@ public class JgEquipTransferByWorkFlowController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/accept")
     @ApiOperation(httpMethod = "POST", value = "设备移交受理", notes = "设备移交受理")
-    public ResponseModel<JgEquipTransferDto> accept(@RequestBody JgEquipTransferDto jgEquipTransferDto, String op) {
+    public ResponseModel<JgEquipTransferDto> accept(@RequestBody Map<String, Object> model, String op) {
+        LinkedHashMap equipTransferInfo = (LinkedHashMap)model.get("model");
+        String opinion = (String)model.get("opinion");
+        if (Objects.isNull(equipTransferInfo)) {
+            throw new IllegalArgumentException("参数equipTransferInfo不能为空");
+        }
+        JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(equipTransferInfo), JgEquipTransferDto.class);
+        jgEquipTransferDto.setProcessAdvice(opinion);
         jgEquipTransferServiceImpl.accept(jgEquipTransferDto,op);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -31,7 +31,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -52,8 +51,7 @@ import java.util.stream.Collectors;
 @Service
 public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
 
-    @Value("${workflow.process-definition-key.equip-transfer:}")
-    private String equipTransferProcessKey;
+    private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
     private static final String SUBMIT_TYPE_FLOW = "1";
 
     @Autowired
@@ -98,7 +96,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             for (int i = 0; i<deviceList.size() ; i++
             ) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(equipTransferProcessKey);
+                dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
                 dto.setBusinessKey(String.valueOf(i));
                 list.add(dto);
             }
@@ -242,7 +240,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
     public String startFlow(String businessKey) throws Exception {
         // 重新开启工作流
         ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-        dto.setProcessDefinitionKey(equipTransferProcessKey);
+        dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
         dto.setBusinessKey(StringUtils.defaultString(businessKey, "1"));
 
         AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
@@ -295,9 +293,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         handleJsonArrayFields(equipmentInfos.get(0), fields);
 
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("transferInfo", equipmentInfos.get(0));
-
-        equipTransferInfo.forEach((key, value) -> resultMap.computeIfAbsent(key, k -> value));
+        resultMap.putAll(equipmentInfos.get(0));
+        resultMap.putAll(equipTransferInfo);
         return  resultMap;
     }
 
@@ -309,8 +306,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
 
     private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
         Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
-        //equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
-        //equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
+        equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
         return equipTransferInfo;
     }
 
@@ -324,6 +320,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         String[] taskName = new String[]{"流程结束"};
         String userId = RequestContext.getExeUserId();
         JgEquipTransfer jgEquipTransfer = this.baseMapper.selectById(jgEquipTransferDto.getSequenceNbr());
+        jgEquipTransfer.setProcessAdvice(jgEquipTransferDto.getProcessAdvice());
         // 组装设备注册代码
         StringBuffer stringBuffer = new StringBuffer();
         String ym = null;
@@ -343,7 +340,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
                 if(roleList.isEmpty()) {
                     jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     jgEquipTransfer.setPromoter("");
-                    //TODO
                 } else {
                     jgEquipTransfer.setNextExecuteIds(String.join(",", roleList));
                     if (!ObjectUtils.isEmpty(jgEquipTransfer.getInstanceStatus())) {
@@ -357,8 +353,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             } else {
                 //驳回
                 jgEquipTransfer.setPromoter("");
-                jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-                jgEquipTransfer.setInstanceStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+                jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
             updateById(jgEquipTransfer);
         }
@@ -411,7 +406,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             // 发起流程
             if (!org.springframework.util.StringUtils.hasText(equipTransferDto.getInstanceId())) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(equipTransferProcessKey);
+                dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
                 dto.setBusinessKey("1");
                 try {
                     ajaxResult = Workflow.taskClient.startByVariable(dto);