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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -103,4 +104,6 @@ public class JgUseRegistrationDto  extends BaseDto {
     private  String dataType  ;
 
     private String unitCode;
+
+    private String isXixian;
 }

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

@@ -183,4 +183,7 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField(value = "next_execute_user_ids")
     private String nextExecuteUserIds;
+
+    @TableField(value = "is_xixian")
+    private String isXixian;
 }

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

@@ -929,6 +929,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+        meBuilder.should(QueryBuilders.matchQuery("STATUS", "已认领"));
         meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
         meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
         meBuilder.minimumShouldMatch(1);

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

@@ -26,19 +26,10 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -74,7 +65,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
     @Autowired
-    private OtherInfoMapper otherInfoMapper;
+    private IdxBizJgOtherInfoMapper otherInfoMapper;
     @Autowired
     private JgUseRegistrationEqMapper jgRelationEquipMapper;
     @Autowired
@@ -129,6 +120,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
         // 更新设备使用登记证
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
+        // 更新es
+        createCode(String.valueOf(map.get("equipId")), map);
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
@@ -159,9 +152,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
         jgUseRegistration.setRegDate(new Date());
-        LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
-        otherLambda.eq(OtherInfo::getRecord, map.get("equipId"));
-        OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+        LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+        otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
+        IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
         String supervisoryCode = otherInfo.getSupervisoryCode();
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
@@ -182,6 +175,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
             jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
         }
+        // 是否西咸
+        if (!ObjectUtils.isEmpty(map.get("isXixian"))){
+            jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
+        }
 
 
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
@@ -648,4 +645,51 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         //调用生成使用登记证
         commonService.generateCertificateReport(exportParamsMap, response);
     }
+
+    /**
+     * 生成监管码、96333码
+     *
+     * @param record
+     */
+    public void createCode(String record, JSONObject dataMap) {
+        // 其他信息
+        LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+        lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
+        IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
+        if (ObjectUtils.isEmpty(otherInfo.getCode96333()) || ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
+            // 使用信息
+            LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
+            lambda.eq(UseInfo::getRecord, record);
+            UseInfo useInfo = useInfoMapper.selectOne(lambda);
+            // 注册信息
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
+            IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
+            // 生成监管码、96333码
+            Map<String, Object> map = new HashMap<>();
+            map.put("cityCode", useInfo.getCity());
+            map.put("countyCode", useInfo.getCounty());
+            map.put("equCategory", registerInfo.getEquCategory());
+            map.put("isXiXian", dataMap.get("isXixian"));
+            ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
+            Map<String, Object> result = code.getResult();
+            if (!ObjectUtils.isEmpty(result)) {
+                otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
+                otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
+                otherInfo.setClaimStatus("已认领");
+                otherInfoMapper.updateById(otherInfo);
+            }
+        }
+        // 更新es
+        HashMap<String, Map<String, Object>> objMap = new HashMap<>();
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
+        param.put("CODE96333", otherInfo.getCode96333());
+        param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
+        param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
+        param.put("CITY", dataMap.get("city"));
+        param.put("COUNTY", dataMap.get("county"));
+        objMap.put(record, param);
+        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+    }
 }
\ No newline at end of file

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

@@ -29,6 +29,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("inspection_unit_code")
     private String inspectionUnitCode;
 
+	@TableField("inspection_unit_name")
+    private String inspectionUnitName;
+
     /**
      * 检验检测类型
      */
@@ -83,6 +86,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("inspection_charge_person")
     private String inspectionChargePerson;
 
+	@TableField("inspection_charge_person_name")
+    private String inspectionChargePersonName;
+
     /**
      * 项目负责人联系电话（检验员联系电话）
      */
@@ -113,6 +119,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("application_unit_code")
     private String applicationUnitCode;
 
+	@TableField("application_unit_name")
+    private String applicationUnitName;
+
 	/**
      * 内部人员代码
      * */
@@ -187,5 +196,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

@@ -57,6 +57,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "项目负责人(检验员)")
     private String inspectionChargePerson;
+    @ApiModelProperty(value = "项目负责人(检验员)")
+    private String inspectionChargePersonName;
 
     @ApiModelProperty(value = "项目负责人联系电话（检验员联系电话）")
     private String inspectionChargePhone;
@@ -115,38 +117,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;
 
@@ -176,6 +146,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String supervisoryCode;
 
 
+
+
     private String instanceId;
 
     public String getInstanceId() {

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/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -695,7 +695,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         dto.setStartUserId(reginParams.getUserModel().getUserId());
         dto.setStartUser(reginParams.getUserModel().getRealName());
-        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyCode());
+        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
         dto.setStartDate(new Date());
         model.setWorkflowProstanceId(workflowResultDto.getInstanceId());
         model.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());

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",