1.检验检测资质时间以开通有限期为准

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/action/RuleActionHandler.java

@@ -77,8 +77,8 @@ public class RuleActionHandler {
         return baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>()
                 .select(TzBaseUnitLicence::getUnitCode)
                 .eq(TzBaseUnitLicence::getLicenceType, LicenceTypeEnum.JY_JC.getCode())
-                .in(TzBaseUnitLicence::getItemCode, Arrays.asList(itemCode.split(",")))
-                .ge(TzBaseUnitLicence::getExpiryDate, LocalDate.now()));
+                .in(TzBaseUnitLicence::getItemCode, Arrays.asList(itemCode.split(","))));
+//                .ge(TzBaseUnitLicence::getExpiryDate, LocalDate.now()));
     }
 
     public List<TzBaseEnterpriseInfoDto> getInspectionUnitList(List<TzBaseUnitLicence> unitLicenceList, Boolean isMatchArea, String record, String openBizType) {

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.*;
+import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
@@ -31,6 +32,7 @@ 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.EquipmentCategoryMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -128,6 +130,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     RedissonClient redissonClient;
 
+    @Autowired
+    JyjcBaseMapper jyjcBaseMapper;
+
     @Transactional(rollbackFor = Exception.class)
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
@@ -141,9 +146,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
         ArrayList<String> roleListAll = new ArrayList<>();
         ArrayList<String> roleListNext = new ArrayList<>();
-        if (!model.getOperationType().equals("2")) {
+        if (!"2".equals(model.getOperationType())) {
             String taskName = "";
-            if (model.getOperationType().equals("0")) {  // 工作台提交逻辑、详情页面保存并提交逻辑
+            if ("0".equals(model.getOperationType())) {  // 工作台提交逻辑、详情页面保存并提交逻辑
                 List<ProcessTaskDTO> processTasks = new ArrayList<>();
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -157,6 +162,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 if (inspectionUnit.length == 2) {
                     model.setInspectionUnitCode(inspectionUnit[0]);
                     model.setInspectionUnitName(inspectionUnit[1]);
+                } else {
+                    this.setInspectionUnitNameAfterSave(model);
                 }
                 dto.setNextExecuteUserCompanyCode(model.getInspectionUnitCode());
                 processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -181,11 +188,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 model.setNextExecuteUserIds(nextUserIds);
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
                 commonService.saveExecuteFlowData2Redis(model.getProcessInstanceId(), this.buildInstanceRuntimeData(model));
-            } else if (model.getOperationType().equals("1")) {  //  工作台暂存、详情保存逻辑
+            } else if ("1".equals(model.getOperationType())) {  //  工作台暂存、详情保存逻辑
                 String[] inspectionUnit = model.getInspectionUnitCode().split("_");
                 if (inspectionUnit.length == 2) {
                     model.setInspectionUnitCode(inspectionUnit[0]);
                     model.setInspectionUnitName(inspectionUnit[1]);
+                }else {
+                    this.setInspectionUnitNameAfterSave(model);
                 }
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
@@ -201,9 +210,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
 
-            List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
-
-            model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
             model.setPromoter(reginParams.getUserModel().getUserId());
             model.setApplicationUnitName(reginParams.getCompany().getCompanyName());
@@ -227,6 +233,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             model.setCreateUserId(reginParams.getUserModel().getUserId());
             model.setNumberOfEquip(equipInfos.size());
             if (null == model.getSequenceNbr()) {
+                List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
+                model.setApplicationNo(codes.get(0));
                 model = this.createWithModel(model);
                 if (StringUtils.isNotBlank(model.getProcessInstanceId())) {
                     this.createdTaskModel(model);
@@ -296,6 +304,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     model.setDockingUnitCode(jyjcOpeningApplications.get(0).getDockingUnitCode());
                 }
             }
+            this.setInspectionUnitNameAfterSave(model);
 
             //更新报检装备监管码
             jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
@@ -375,6 +384,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         return this.buildRedundancyField(model);
     }
 
+    private void setInspectionUnitNameAfterSave(JyjcInspectionApplicationModel model) {
+        CompanyModel companyModel = jyjcBaseMapper.selectOneCompanyByCode(model.getInspectionUnitCode());
+        if(companyModel != null){
+            model.setInspectionUnitName(companyModel.getCompanyName());
+        }
+    }
+
     private JyjcInspectionApplicationModel buildRedundancyField(JyjcInspectionApplicationModel model) {
         // 冗余前端显示检验检测类型名称
         if (StringUtils.isNotEmpty(model.getInspectionType())) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -177,6 +177,7 @@
 			info.sequence_nbr,
 			info.use_code,
 			info.use_unit,
+		    concat(info.use_code,'_',info.use_unit) as useCodeAndName,
 			info.use_contact,
 			info.contact_phone
 		FROM