检验检测待办开发调试

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

@@ -187,5 +187,5 @@ public class JyjcInspectionApplication extends BaseEntity {
     private String nextTaskId;
 
     @TableField(value = "next_execute_user_ids")
-    private String nextExcuteUserIds;
+    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/model/JyjcInspectionApplicationModel.java

@@ -115,38 +115,6 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "内部人员代码")
     private String innerPersonCode;
 
-    @ApiModelProperty(value = "告知书")
-    private List<Map<String, Object>> gzs;
-    @ApiModelProperty(value = "产品质量证明书")
-    private List<Map<String, Object>> cpzl;
-    @ApiModelProperty(value = "施工自行检查报告")
-    private List<Map<String, Object>> sgzxbg;
-    @ApiModelProperty(value = "施工合同或证明")
-    private List<Map<String, Object>> sght;
-    @ApiModelProperty(value = "施工方案/施工设计文件")
-    private List<Map<String, Object>> sgfa;
-    @ApiModelProperty(value = "施工单位许可证书")
-    private List<Map<String, Object>> sgdwxk;
-    @ApiModelProperty(value = "型式试验证书")
-    private List<Map<String, Object>> xssy;
-    @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
-    private List<Map<String, Object>> xsqts;
-    @ApiModelProperty(value = "土建声明")
-    private List<Map<String, Object>> tjsm;
-    @ApiModelProperty(value = "质量保证手册和程序文件")
-    private List<Map<String, Object>> zlbz;
-    @ApiModelProperty(value = "施工作业文件")
-    private List<Map<String, Object>> sgzy;
-    @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
-    private List<Map<String, Object>> sgry;
-    @ApiModelProperty(value = "产品技术文件")
-    private List<Map<String, Object>> cpjs;
-    @ApiModelProperty(value = "施工设计文件")
-    private List<Map<String, Object>> sgsj;
-    @ApiModelProperty(value = "施工分包方目录")
-    private List<Map<String, Object>> sgfb;
-    @ApiModelProperty(value = "分包方评价资料")
-    private List<Map<String, Object>> fbspj;
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private List<Map<String, Object>> equip;
 

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

@@ -60,4 +60,9 @@ public class TaskMessageDto {
     String equipId;
 
     String processKey;
+
+    String processInstanceId;
+
+    String inspectionUnitCode;
+    String bizType;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/CommonController.java

@@ -54,6 +54,9 @@ public class CommonController extends BaseController {
     @PostMapping(value = "/getUserPhonesByPersonCode")
     @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员联系电话", notes = "根据公司的unitCode获取检测检验人员联系电话")
     public ResponseModel<Map<String,Object>> getUserPhonesByPersonCode(@RequestParam String unitCode) {
+        if (unitCode.contains("_")) {
+            unitCode = unitCode.split("_")[0];
+        }
         List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
         if (CollectionUtils.isEmpty(userPhones)){
             return null;
@@ -70,6 +73,9 @@ public class CommonController extends BaseController {
     @PostMapping(value = "/getInnerPersonCodeByPersonCode")
     @ApiOperation(httpMethod = "POST", value = "根据公司的unitCode获取检测检验人员内部编号", notes = "根据公司的unitCode获取检测检验人员内部编号")
     public ResponseModel<Map<String,Object>> getInnerPersonCodeByPersonCode(@RequestParam String unitCode) {
+        if (unitCode.contains("_")) {
+            unitCode = unitCode.split("_")[0];
+        }
         List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
         if (CollectionUtils.isEmpty(userPhones)){
             return null;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -24,9 +26,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author system_generator
@@ -55,7 +55,7 @@ public class JyjcInspectionApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JyjcInspectionApplicationModel> save(@RequestBody JSONObject model) {
+	public ResponseModel<List<JyjcInspectionApplicationModel>> save(@RequestBody JSONObject model) {
     	if (model.containsKey(basic)) {
 			JSONObject finallyJson = new JSONObject();
 			Map<String, Object> basicObj = (Map<String, Object>) model.get(basic);
@@ -76,7 +76,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 					return CommonResponseUtil.failure("未选择报检设备时不可提交");
 			}
 		}
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.save(model));
+		return ResponseHelper.buildResponse(Collections.singletonList(jyjcInspectionApplicationServiceImpl.save(model)));
     }
 
 

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

@@ -69,6 +69,9 @@ public class TaskModelServiceImpl {
             if (flag){
                 List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
                 if (CollectionUtil.isNotEmpty(result) && result.size() > 0){
+                    TaskV2Model taskV2Model = result.get(0);
+                    taskV2Model.setTaskContent(obj.getTaskContent());
+                    Systemctl.taskV2Client.update(taskV2Model,taskV2Model.getSequenceNbr());
                     break;
                 }
             }
@@ -129,6 +132,15 @@ public class TaskModelServiceImpl {
     }
 
 
+    public void updateTaskContentById(Map<String, Object> params){
+        List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
+        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(collect)) {
+            collect.get(0).setTaskContent(params.getOrDefault("taskContent", "").toString());
+            Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
+        }
+    }
+
     /**
      * 待办编辑接口
      * 参数

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

 [ {
-  "type":"supervise",
+  "type":"115",
   "pageType": "draft",
   "url": "/mixuap?appId=1742358052905971713&id=1734576595978448898&roleIds={roleIds}&userId={userId}&pageType=edit"
 },  {
-  "type":"firstinspect",
+  "type":"116",
   "pageType": "draft",
   "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
 },  {
-  "type":"detection",
+  "type":"117",
   "pageType": "draft",
   "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
 },
   {
-    "type":"supervise",
+    "type":"115",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
-    "type":"firstinspect",
+    "type":"116",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
-    "type":"detection",
+    "type":"117",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
-    "type":"supervise",
+    "type":"115",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
-    "type":"firstinspect",
+    "type":"116",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
-    "type":"detection",
+    "type":"117",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
   "type":"114",
   "pageType": "draft",