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/dto/TaskModelDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -9,6 +12,9 @@ import java.util.Date;
  * @author Administrator
  */
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TaskModelDto {
         /**
          * 工作流创建时间

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

@@ -150,4 +150,7 @@ public class JgEquipTransfer extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
 }

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

@@ -631,7 +631,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             model.setFlowStatus(obj.getTaskStatus());
             model.setFlowCode(obj.getTaskStatusLabel());
-            model.setTaskType("0");
+            model.setTaskStatus(0);
             model.setFlowInstanceId(model.getRelationId());
             model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
             model.setTaskSource("workFlow");

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

@@ -224,6 +224,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get("EQU_LIST").toString());
 
             if (!ValidationUtil.isEmpty(equipParamsMap)) {
+                // 给技术参数中添加设备种类，标记技术参数属于那个设备
+                equipParamsMap.put("EQU_LIST",equIpClassMap.get("EQU_LIST").toString());
                 resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
             }
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -75,13 +75,13 @@
     "type": "107",
     "pageType": "look",
     "name": "使用登记",
-    "url": "url:/mixuap?appId=1742358052905971713&id=1735202405437435906&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "107",
     "pageType": "edit",
     "name": "使用登记",
-    "url": "url:/mixuap?appId=1742358052905971713&id=1735202405437435906&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "108",
@@ -123,13 +123,13 @@
     "type": "111",
     "name": "改造变更登记",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=look&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&nextExecuteIds={userId}&pageType=look"
   },
   {
     "type": "111",
     "pageType": "edit",
     "name": "改造变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&nextExecuteIds={userId}&pageType=edit"
   },
   {
     "type": "112",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/UseInfo.java

@@ -186,12 +186,12 @@ public class UseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"IS_NOT_ES\"")
     private Integer isNotEs;
 
-    @TableField(value = "NEXT_INSPECT_DATE")
+    @TableField(value = "\"NEXT_INSPECT_DATE\"")
     private Date nextInspectDate;
 
-    @TableField(value = "LAST_INSPECT_REPORT_NO")
+    @TableField(value = "\"LAST_INSPECT_REPORT_NO\"")
     private String lastInspectReportNo;
 
-    @TableField(value = "LAST_INSPECT_TYPE")
+    @TableField(value = "\"LAST_INSPECT_TYPE\"")
     private String lastInspectType;
 }