Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java

@@ -133,4 +133,10 @@ public class QualFilingController {
         return qualFilingApi.checkItem(id);
     }
 
+    @ApiOperation("查看是否能新增资质")
+    @GetMapping("/checkNewQual")
+    public SingleResponse<Boolean> checkNewQual() {
+        return qualFilingApi.checkNewQual();
+    }
+
 }

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java

@@ -116,6 +116,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
         domainQuery.setInstrumentType(query.getInstrumentType());
         domainQuery.setDeviceType(query.getDeviceType());
         domainQuery.setEnableFlag(query.getEnableFlag());
+        domainQuery.setIndustryCode(query.getIndustryCode());
 
         PageResult<OrgEquipmentEntity> pageResult = orgEquipmentDomainService.page(domainQuery);
 

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java

@@ -304,6 +304,14 @@ public class QualFilingExecutor implements QualFilingApi {
         return SingleResponse.success(ComplianceCheckUtil.complianceCheck(cmdSync, false));
     }
 
+    @Override
+    public SingleResponse<Boolean> checkNewQual() {
+        boolean exists = qualFilingMapper.exists(new LambdaQueryWrapper<QualFilingDO>()
+                .eq(QualFilingDO::getOrgId, ThreadLocalUserInfoAdapter.getOrgId())
+                .eq(QualFilingDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()));
+        return SingleResponse.success(!exists);
+    }
+
     private QualFilingCO toLegacyCO(QualFilingEntity entity) {
         if (entity == null) {
             return null;

safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java

@@ -50,4 +50,6 @@ public interface QualFilingApi {
     SingleResponse<QualFilingStatisticsCO> qualificationMonitoringPageStatistics();
 
     SingleResponse<List<QualFilingComplianceCheckResultCO>> checkItem(Long id);
+
+    SingleResponse<Boolean> checkNewQual();
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java

@@ -27,4 +27,7 @@ public class OrgEquipmentPageQuery extends BasePageQuery {
 
     @ApiModelProperty(value = "启用标识(1启用2禁用)")
     private Long enableFlag;
+
+    @ApiModelProperty(value = "行业code")
+    private String industryCode;
 }

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgEquipmentQuery.java

@@ -1,5 +1,6 @@
 package org.qinan.safetyeval.domain.query;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -33,4 +34,7 @@ public class OrgEquipmentQuery {
 
     /** 设备状态 */
     private Long enableFlag;
+
+    @ApiModelProperty(value = "行业code")
+    private String industryCode;
 }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java

@@ -45,8 +45,8 @@ public class QualFilingDO extends BaseDO {
     private Long originFilingId;
     private String rejectReason;
     private Long filingReviewId;
-    private java.time.LocalDateTime submitTime;
-    private java.time.LocalDateTime approveTime;
+    private LocalDateTime submitTime;
+    private LocalDateTime approveTime;
     private Integer filingStatusCode;
     private String filingStatusName;
     private Integer applyTypeCode;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java

@@ -82,6 +82,9 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway {
         if (query.getEnableFlag() != null) {
             wrapper.eq(OrgEquipmentDO::getEnableFlag, query.getEnableFlag());
         }
+        if (StringUtils.hasText(query.getIndustryCode())) {
+            wrapper.eq(OrgEquipmentDO::getIndustryCode, query.getIndustryCode());
+        }
 
         Page<OrgEquipmentDO> page = new Page<>(query.getPageNum(), query.getPageSize());
         IPage<OrgEquipmentDO> result = orgEquipmentMapper.selectPage(page, wrapper);