Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -538,6 +538,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             scBuilder.minimumShouldMatch(1);
             boolMust.must(scBuilder);
         }
+        //设备种类编码
+        if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
+            BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_LIST_CODE"));
+            elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
+            boolMust.must(elcBuilder);
+        }
+        //设备种类名称
+        if (!ObjectUtils.isEmpty(map.getString("EQU_LIST"))) {
+            BoolQueryBuilder elBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_LIST"));
+            elBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST", "*" + test + "*"));
+            boolMust.must(elBuilder);
+        }
+
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import cn.hutool.core.bean.BeanUtil;
@@ -21,6 +22,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
+import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
@@ -93,6 +95,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     OtherInfoMapper tzsJgOtherInfoMapper;
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
+    @Autowired
+    SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
 
 
@@ -574,7 +578,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         if(ajaxResult.getStatus() == 200) {
             jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.ROBACK.getCode()));
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }
     }
@@ -603,6 +606,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         queryWrapper2.eq(RegistrationInfo::getRecord,jgRelationEquip.getEquId());
         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
 
+
+
         stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getCity()).append(ym);
         String equCode = stringBuffer.toString();
         String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
@@ -615,6 +620,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
         mapCode = code.getResult();
 
+        LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
+        queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode,mapCode.get("superviseCode").toString());
+        SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
+        supervisoryCodeInfo.setStatus("1");
+        supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
+
 
         boolean submit = submit(jgInstallationNotice, op);
         if(submit) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -18,7 +18,7 @@ import java.util.Map;
 public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspectionApplication> {
 
 
-   public Page<JyjcInspectionApplication> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
+   public Page<JyjcInspectionApplicationModel> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
 
    Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -3,26 +3,34 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper">
 
     <select id="queryForDataList"
-            resultType="com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication">
-        select
+            resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
         tzjia.sequence_nbr,
         tzjia.process_instance_id,
         tzjia.workflow_node,
         tzjia.biz_type,
         tzjia.application_no,
         tzjia.inspection_type,
-        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.inspection_classify and cb_data_dictionary.type = 'JYJCLB') as inspectionClassify,
+        cdd1.NAME AS inspectionClassify,
         tzjia.inspection_unit_code,
-        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.equip_classify and cb_data_dictionary.type = 'BJSBZL') as equipClassify,
+        cdd.NAME AS equipClassify,
         tzjia.number_of_equip,
         tzjia.inspection_unit_code,
         tzjia.application_date,
         tzjia.accept_date,
         tzjia.inspection_charge_phone,
         tzjia.inspection_charge_person,
-        tzjia.status
-        from
-        tz_jyjc_inspection_application as tzjia
+        tzjia.status,
+        tbei1.use_unit AS applicationUnitName,
+        tbei.use_unit AS inspectionUnitName,
+        cdd.NAME AS status
+        FROM
+        tz_jyjc_inspection_application AS tzjia
+        LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
+        LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
+        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify
+        LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
+        LEFT JOIN cb_data_dictionary cdd2 ON cdd1.code = tzjia.status
         <where>
 
         <if test=" applicationNo != null and applicationNo != ''">

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

@@ -124,7 +124,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/pageByInstitution")
 	@ApiOperation(httpMethod = "GET",value = "分页查询（检验机构）",  notes = "分页查询（检验机构）")
-	public ResponseModel<Page<JyjcInspectionApplication>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,@RequestParam(required = false) String applicationNo,
 											  @RequestParam(required = false) String inspectionClassify,
 											  @RequestParam(required = false) String applicationUnitCode,
@@ -149,7 +149,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 		@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/pageByCompany")
 	@ApiOperation(httpMethod = "GET",value = "分页查询（报检单位）",  notes = "分页查询（报检单位）")
-	public ResponseModel<Page<JyjcInspectionApplication>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam
 			(value = "size") int size,@RequestParam(required = false) String applicationNo,
 																				@RequestParam(required = false) String inspectionClassify,
 																				@RequestParam(required = false) String applicationUnitCode,

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

@@ -97,14 +97,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey( model.getProcessKey());
                 dto.setBusinessKey(buildOrderNo());
-           //     dto.setCompleteFirstTask(true);
-           //     JSONObject body = new JSONObject();
-           //     String businessKey = buildOrderNo();
-           //     body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
-           //     body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
-           //     body.put("completeFirstTask", Boolean.TRUE);
-           // dto.setCompleteFirstTask(true);
-
                 try {
                     FeignClientResult ajaxResult = Workflow.taskV2Client.startByVariable(dto);
                     String id = ((Map) ajaxResult.getResult()).get("id").toString();
@@ -114,16 +106,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-
-//                JSONObject body = new JSONObject();
-//                String businessKey = buildOrderNo();
-//                body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
-//                body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
-//                JSONObject jsonObject = workflowFeignService.startByVariable(body);
-//                String processId = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("data"))).getString("id");
-                model.setStatus("已提交");
+             model.setStatus(String.valueOf(FlowStatusEnum.SUBMITTED.getCode()));
             } else if (model.getOperationType().equals("1")) {
-                model.setStatus("草稿");
+                model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
 
             LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.HAVE_PROCESSED.getCode());
@@ -214,7 +199,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
                 }
             }
-            model.setStatus("已提交");
+            model.setStatus(String.valueOf(FlowStatusEnum.SUBMITTED.getCode()));
             execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getProcessInstanceId()).put("comments", "").build());
             Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
             String role = (String) nextNodeInfo.get("role");
@@ -255,7 +240,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
 
-    public Page<JyjcInspectionApplication> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplication> page,
+    public Page<JyjcInspectionApplicationModel> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplication> page,
                                                                                  String applicationNo,
                                                                                  String inspectionClassify,
                                                                                  String applicationUnitCode,
@@ -327,7 +312,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         String type = (String) params.get("type");
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
-        params.put("status", FlowStatusEnum.SUBMITTED.getCode() + "");
+        params.put("status", FlowStatusEnum.TO_BE_FINISHED.getCode() + "");
         updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), params);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {