Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java

@@ -182,4 +182,10 @@ public class JyjcInspectionApplication extends BaseEntity {
 
     @TableField(value = "create_user_id")
     private String createUserId;
+
+    @TableField(value = "next_task_id")
+    private String nextTaskId;
+
+    @TableField(value = "next_execute_user_ids")
+    private String nextExcuteUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -126,4 +126,10 @@ public class JyjcOpeningApplication extends BaseEntity {
 
     @TableField(value = "create_user_id")
     private String createUserId;
+
+    @TableField(value = "next_task_id")
+    private String nextTaskId;
+
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BizTypeEnum.java

@@ -21,7 +21,8 @@ public enum BizTypeEnum {
 
     SUPERVISE("supervise", "监督检验"),
     FIRST_INSPECTION("firstinspect", "定检"),
-    DETECTION("detection", "检测");
+    DETECTION("detection", "检测"),
+    BUSINESS_OPEN("businessOpen", "开通");
 
     private String code;
     private String name;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -161,6 +161,19 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "创建人ID")
     private String createUserId;
 
+    @ApiModelProperty(value = "下一步任务id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一步执行人Ids")
+    private String nextExcuteUserIds;
+
+    @ApiModelProperty(value = "下一步任务名称")
+    private String nextTaskName;
+    @ApiModelProperty(value = "设备分类")
+    private String equList;
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
+
 
     private String instanceId;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -114,4 +114,11 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty ("企业营业执照")
     private List<AttachmentDto> unitBusinessLicense;
+
+
+    @ApiModelProperty ("下个任务id")
+    private String nextTaskId;
+
+    @ApiModelProperty ("下个任务执行人ids")
+    private String nextExecuteUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/TaskModelServiceImpl.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -34,6 +35,8 @@ import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
+@Service
 public class TaskModelServiceImpl {
     @Autowired
     private RedisUtils redisUtils;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/bizTypeInfo.json

@@ -23,5 +23,17 @@
     "type":"detection",
     "pageType": "edit",
     "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
-  }
+  },  {
+  "type":"businessOpen",
+  "pageType": "draft",
+  "url": "/mixuap?appId=1742358052905971713&id=1734569644833927170&roleIds={roleIds}&userId={userId}&pageType=edit"
+},  {
+  "type":"businessOpen",
+  "pageType": "look",
+  "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit"
+},  {
+  "type":"businessOpen",
+  "pageType": "edit",
+  "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit"
+}
 ]
\ No newline at end of file