refact(检验开通)：需求变更

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/BaseEnterpriseCert.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_base_enterprise_cert")
-public class BaseEnterpriseCert extends BaseLogicEntity {
+public class BaseEnterpriseCert extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -68,9 +68,11 @@ public class JyjcOpeningApplicationController extends BaseController {
         }
         if (jsonObject.containsKey("buniessInfo") && jsonObject.getJSONObject("buniessInfo") != null) {
             JSONObject businessInfo = jsonObject.getJSONObject("buniessInfo");
-            List<BaseEnterpriseCertDto> baseUnitLicences = businessInfo.getJSONArray("baseUnitLicences")
-                    .toJavaList(BaseEnterpriseCertDto.class);
-            jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences);
+            if(businessInfo.containsKey("baseUnitLicences") && businessInfo.getJSONObject("baseUnitLicences") != null) {
+                List<BaseEnterpriseCertDto> baseUnitLicences = businessInfo.getJSONArray("baseUnitLicences")
+                        .toJavaList(BaseEnterpriseCertDto.class);
+                jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences);
+            }
         }
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdate(jyjcOpeningApplicationModel, getCompanyCode()));
     }
@@ -88,9 +90,11 @@ public class JyjcOpeningApplicationController extends BaseController {
         }
         if (jsonObject.containsKey("buniessInfo") && jsonObject.getJSONObject("buniessInfo") != null) {
             JSONObject businessInfo = jsonObject.getJSONObject("buniessInfo"); // 注意拼写修正
-            List<BaseEnterpriseCertDto> baseUnitLicences = businessInfo.getJSONArray("baseUnitLicences")
-                    .toJavaList(BaseEnterpriseCertDto.class);
-            model.setBaseUnitLicences(baseUnitLicences);
+            if(businessInfo.containsKey("baseUnitLicences")  && businessInfo.getJSONObject("baseUnitLicences") != null){
+                List<BaseEnterpriseCertDto> baseUnitLicences = businessInfo.getJSONArray("baseUnitLicences")
+                        .toJavaList(BaseEnterpriseCertDto.class);
+                model.setBaseUnitLicences(baseUnitLicences);
+            }
         }
         model.setSequenceNbr(sequenceNbr);
         JyjcOpeningApplicationModel data = jyjcOpeningApplicationServiceImpl.submitApplication(model, getCompanyCode());

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

@@ -34,13 +34,11 @@ public class OpenApplicationTimingDiscardJob {
     @SchedulerLock(name = "timingDiscard", lockAtMostFor = "PT1H")
     @Scheduled(cron = "0 0 0 * * ?")
     public void timingDiscard() {
-
         List<Long> longs = jyjcOpeningApplicationServiceImpl.selectOverdueData();
-
         if (CollectionUtils.isNotEmpty(longs)) {
+            String remark = "许可到期，系统自动作废";
             for (Long aLong : longs) {
-                String remark = "许可到期，系统自动作废";
-                jyjcOpeningApplicationServiceImpl.doDiscard(aLong, remark);
+                jyjcOpeningApplicationServiceImpl.doDiscardAndOverdueLicense(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

@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import com.yeejoin.amos.boot.biz.common.entity.BaseLogicEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.enums.LicenceStateEnum;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -374,7 +373,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         JyjcInspectionHistory history = inspectionHistoryService.getBySSeq(jyjcOpeningApplication.getSequenceNbr());
         JSONObject hisData = history.getHistoryData();
         List<BaseEnterpriseCertDto> certDtos = hisData.getJSONArray(BizCommonConstant.UNIT_LICENCE_KEY).toJavaList(BaseEnterpriseCertDto.class);
-        // 手工作废删除之前审批完成的证书、资质信息
+        // 逻辑删除之前审批完成的证书、资质信息
         this.deleteHisCert(certDtos, jyjcOpeningApplication);
         // 单据修改为作废状态
         UpdateWrapper<JyjcOpeningApplication> updateWrapper = new UpdateWrapper<>();
@@ -409,7 +408,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             List<Long> allergists = getCertFromHisData(jyjcOpeningApplication, certDto);
             if (!allergists.isEmpty()) {
                 baseUnitLicenceMapper.update(null, new LambdaUpdateWrapper<BaseUnitLicence>().in(BaseUnitLicence::getEnterpriseCertSeq, allergists).set(BaseUnitLicence::getLicenceState, LicenceStateEnum.overdue.getValue()));
-                enterpriseCertService.update(new LambdaUpdateWrapper<BaseEnterpriseCert>().in(BaseLogicEntity::getSequenceNbr, allergists).set(BaseEnterpriseCert::getCertState, LicenceStateEnum.overdue.getValue()));
+                enterpriseCertService.update(new LambdaUpdateWrapper<BaseEnterpriseCert>().in(BaseEntity::getSequenceNbr, allergists).set(BaseEnterpriseCert::getCertState, LicenceStateEnum.overdue.getValue()));
             }
         });
     }
@@ -917,6 +916,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                         licence.setItemCodeName(item.getName());
                         licence.setDictSeq(item.getSequenceNbr());
                         licence.setRecDate(new Date());
+                        licence.setRecUserId(RequestContext.getExeUserId());
                         licence.setLicenceState(LicenceStateEnum.enabled.getValue());
                         // 改成联想输入，直接存名称，approvedOrganName, approvedOrgan不再需要
                         // licence.setApprovedOrgan(commonService.getDictName(Collections.singletonList("DJJG"), licence.getApprovedOrganCode()));
@@ -944,14 +944,22 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         certDtos.forEach(certDto -> {
             List<Long> allCertSeqs = getCertFromHisData(jyjcOpeningApplication, certDto);
             if (!allCertSeqs.isEmpty()) {
-                // 逻辑删除，怕影响范围大，没加注解 @TableLogic，通过update实现
-                baseUnitLicenceMapper.update(null, new LambdaUpdateWrapper<BaseUnitLicence>().in(BaseUnitLicence::getEnterpriseCertSeq, allCertSeqs).set(BaseEntity::getIsDelete, false));
-                // 逻辑删除，注解 @TableLogic实现
-                enterpriseCertService.deleteBatchSeq(allCertSeqs);
+                // 逻辑删除
+                baseUnitLicenceMapper.update(null, new LambdaUpdateWrapper<BaseUnitLicence>()
+                        .in(BaseUnitLicence::getEnterpriseCertSeq, allCertSeqs)
+                        .set(BaseEntity::getIsDelete, true)
+                        .set(BaseEntity::getRecDate, new Date())
+                        .set(BaseEntity::getRecUserId, RequestContext.getExeUserId()));
+                // 逻辑删除
+                enterpriseCertService.update(new LambdaUpdateWrapper<BaseEnterpriseCert>()
+                        .in(BaseEntity::getSequenceNbr, allCertSeqs)
+                        .set(BaseEntity::getIsDelete, true)
+                        .set(BaseEntity::getRecDate, new Date())
+                        .set(BaseEntity::getRecUserId, RequestContext.getExeUserId()));
             }
         });
     }
-    
+
     private void executeOneStep(JyjcOpeningApplicationModel openingApplication, String operate) {
         String instanceId = openingApplication.getWorkflowProstanceId();
         String nextTaskId = openingApplication.getNextTaskId();