Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -219,4 +219,9 @@ public class JgTransferNoticeDto extends BaseDto {
     //下一步任务ID
     private String nextTaskId;
 
+    private String supervisoryCode;
+
+
+    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/JgChangeRegistrationReform.java

@@ -231,5 +231,10 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "create_user_company_name")
     private String createUserCompanyName;
+    /**
+     *
+     */
+    @TableField(value = "equip_list_name")
+    private String equipListName;
 
 }

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

@@ -305,4 +305,12 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "\"next_taskId\"")
     private String nextTaskId;
 
+
+    @TableField(exist = false)
+    private String supervisoryCode;
+
+
+    @TableField(exist = false)
+    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/mapper/JgChangeRegistrationReformMapper.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -29,4 +30,7 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
     Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
 
     void updatePromoter(@Param("id")Long id);
+
+    @Select("select name from tz_equipment_category  where code=#{code}")
+    String getEquiplistNameByEquiplist(String code);
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -200,6 +198,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 //                updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
             } else {
                 // 如果是新启动的流程开启自动访问
+                String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
+                jgChangeRegistrationReform.setEquipListName(equipListName);
+                jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
                 jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
                 ProcessTaskDTO processTaskDTO = startByVariable();
@@ -615,7 +616,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result,"电梯", jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
+        return String.format(result,jgChangeRegistrationReform.getEquipListName(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
     }
 
     public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) {

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

@@ -402,6 +402,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
             }
+            dto.setEquList(obj.get("EQU_LIST").toString());
+            dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -457,6 +459,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);