Merge branch 'develop_tzs_register' of…

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

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

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

@@ -625,7 +625,7 @@ public class CommonServiceImpl implements ICommonService {
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()).replace("{userId}", RequestContext.getExeUserId()) + urlParams);
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams);
                     break;
                 }
             }

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/resources/json/urlInfo.json

@@ -15,7 +15,7 @@
     "type": "102",
     "pageType": "edit",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=edit&noticeStatus=%s&userId={userId}&instanceId=%s"
   },
   {
     "type": "103",
@@ -57,13 +57,13 @@
     "type": "106",
     "pageType": "look",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1734191433109237761&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&applyStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1734191433109237761&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&applyStatus=%s&userId={userId}&instanceId=%s"
   },
   {
     "type": "106",
     "pageType": "edit",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&applyStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&applyStatus=%s&userId={userId}&instanceId=%s"
   },
   {
     "type": "107",
@@ -111,7 +111,7 @@
     "type": "110",
     "pageType": "edit",
     "name": "移装变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&auditStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&auditStatus=%s&userId={userId}&instanceId=%s"
   },
   {
     "type": "111",
@@ -147,6 +147,6 @@
     "type": "113",
     "pageType": "edit",
     "name": "设备注销",
-    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=edit&noticeStatus=%s&userId={userId}&instanceId=%s"
   }
 ]
\ No newline at end of file