修改单位变更

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

@@ -142,4 +142,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "监管码")
     private  String supervisoryCode;
 
+  @ApiModelProperty(value = "分类")
+  private  String equList;
+
 }

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

@@ -217,6 +217,9 @@ public class JgChangeRegistrationUnit extends BaseEntity {
 
     @TableField(exist = false)
     private String supervisoryCode;
+
+    @TableField(exist = false)
+    private String equList;
     /**
      *工作流下一节点任务id
      */

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -504,7 +505,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
             dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setUnitChangeRegistrationId(applyNo);
             if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
@@ -542,7 +543,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setFlowCreateDate(new Date());
                 dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
                 dto.setFlowCode(obj.getNextTaskId());
-                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 dto.setTaskCode(obj.getApplyNo());
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
                 dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
@@ -564,7 +565,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 //行数据
                 dto.setModel(obj);
                 //摘要 按原有规则组装
-                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 //申请单号
                 dto.setTaskCode(obj.getApplyNo());
                 //业务类型枚举code值
@@ -762,9 +763,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
         task.setComment("");
-        task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,dto));
+        task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,jgChangeRegistrationUnit));
 
-        task.setNextExecuteUserCompanyCode(dto.getReceiveOrgCode());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         if (!ObjectUtils.isEmpty(jgChangeRegistrationUnit.getInstanceStatus()) &&
@@ -984,7 +984,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
 
     private String buildTaskContent(JgChangeRegistrationUnit obj) {
-        return "来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
+        return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
     }
 
 
@@ -1120,7 +1120,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    private String getNextUserOrgCode(String operate, JgChangeRegistrationUnitDto jgChangeRegistrationName) {
+    private String getNextUserOrgCode(String operate, JgChangeRegistrationUnit jgChangeRegistrationName) {
         if("0".equals(operate)){
             // 执行通过节点，单位code为接收机构单位信息
             return jgChangeRegistrationName.getReceiveOrgCode();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquipmentClassifityEnum.java

@@ -39,4 +39,14 @@ public enum EquipmentClassifityEnum {
         }
 
     }
+
+
+    public static String getNameByCode(String code){
+        for (EquipmentClassifityEnum value : EquipmentClassifityEnum.values()) {
+            if (value.getCode().equals(code)){
+                return value.getName();
+            }
+        }
+        return "";
+    }
 }