检验检测：

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/OpenApplicationTimingDiscardJob.java

@@ -39,7 +39,7 @@ public class OpenApplicationTimingDiscardJob {
 
         if (CollectionUtils.isNotEmpty(longs)) {
             for (Long aLong : longs) {
-                String remark = "到期作废";
+                String remark = "许可到期，系统自动作废";
                 jyjcOpeningApplicationServiceImpl.doDiscard(aLong, remark);
 
             }

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

@@ -316,7 +316,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         LambdaUpdateWrapper<JyjcOpeningApplication> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_DISCARD.getCode())
                 .set(JyjcOpeningApplication::getStatusName, FlowStatusEnum.TO_BE_DISCARD.getName())
-                .set(JyjcOpeningApplication::getRemark, "到期作废")
+                .set(JyjcOpeningApplication::getRemark, "新开通申请生效，原有开通申请自动作废")
                 .in(org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity::getSequenceNbr, ids);
         this.update(updateWrapper);
     }
@@ -453,18 +453,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     private void setBaseUnitLicences(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) {
-        List<BaseUnitLicence> baseUnitLicences = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode).in(BaseUnitLicence::getCertTypeCode, Arrays.asList(jyCertTypeCode, jcCertTypeCode)));
-        List<TzBaseUnitLicenceDto> baseUnitLicencesDtos = baseUnitLicences.stream().map(l -> {
+        List<BaseUnitLicence> baseUnitLicences = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, unitCode)
+                .gt(BaseUnitLicence::getExpiryDate , new Date())
+                .in(BaseUnitLicence::getCertTypeCode, Arrays.asList(jyCertTypeCode, jcCertTypeCode)));
+        List<TzBaseUnitLicenceDto> licences = baseUnitLicences.stream().map(l -> {
             TzBaseUnitLicenceDto licenceDto = new TzBaseUnitLicenceDto();
             BeanUtil.copyProperties(l, licenceDto);
             licenceDto.setCertTypeCode(this.castCode2Str(l.getCertTypeCode()));
             return licenceDto;
         }).collect(Collectors.toList());
         if (isNeedFilter) {
-            baseUnitLicencesDtos = baseUnitLicencesDtos.stream().filter(u -> u.getCertTypeCode().equals(jyjcOpeningApplicationModel.getOpenBizType())).collect(Collectors.toList());
-            jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicencesDtos);
+            licences = licences.stream().filter(u -> u.getCertTypeCode().equals(jyjcOpeningApplicationModel.getOpenBizType())).collect(Collectors.toList());
+            jyjcOpeningApplicationModel.setBaseUnitLicences(licences);
         } else {
-            jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicencesDtos);
+            jyjcOpeningApplicationModel.setBaseUnitLicences(licences);
         }
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -67,4 +67,6 @@ inspection.rule.enabled.AZJDJY=true
 #改造监督检验是否启用规则：true-启用，false-不启用
 inspection.rule.enabled.GZJDJY=true
 #维修监督检验是否启用规则：true-启用，false-不启用
-inspection.rule.enabled.WXJDJY=true
+inspection.rule.enabled.WXJDJY=true
\ No newline at end of file
+#电梯检测是否启用规则：true-启用，false-不启用
+inspection.rule.enabled.DTJC=true
\ No newline at end of file