项目合规评估 入库 操作

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -184,6 +184,7 @@ public class SarStandardComplianceAssessResultController {
         QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("STAND_ID", eo.getStandId());
         queryWrapper.eq("product_id", eo.getProductId());
+        queryWrapper.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.eq("no_involve","").or().isNull("no_involve"));
         queryWrapper.isNotNull("research_completion_time");
         queryWrapper.orderByAsc("product_name");
         queryWrapper.orderByAsc("standard_item");
@@ -196,11 +197,23 @@ public class SarStandardComplianceAssessResultController {
         QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("STAND_ID", eo.getStandId());
         queryWrapper1.eq("product_id", eo.getProductId());
-        queryWrapper1.ne("research_compliance","");
+        queryWrapper1.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("research_compliance","").or().isNotNull("research_compliance"));
         queryWrapper1.orderByAsc("product_name");
         queryWrapper1.orderByAsc("standard_item");
         IPage<SarStandardComplianceProductAssess> page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1);
-        map.put("fit",page1);
+        Page p2=new Page();
+        BeanUtils.copyProperties(page1,p2);
+        p2.setRecords(page1.getRecords());
+        p2.setTotal(page1.getTotal());
+        map.put("fit",p2);
+        QueryWrapper<SarStandardComplianceProductAssess> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("STAND_ID", eo.getStandId());
+        queryWrapper2.eq("product_id", eo.getProductId());
+        queryWrapper2.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("no_involve","").and(sarStandardComplianceProductAssessQueryWrapper1 -> sarStandardComplianceProductAssessQueryWrapper1.isNotNull("no_involve")));
+        queryWrapper2.orderByAsc("product_name");
+        queryWrapper2.orderByAsc("standard_item");
+        IPage<SarStandardComplianceProductAssess> page2 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper2);
+        map.put("noFit",page2);
         return Result.success(map);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java

@@ -132,6 +132,9 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @TableField("evaluation_people_name")
     private String evaluationPeopleName;
 
+    @ApiModelProperty(value = "不涉及理由")
+    @TableField("no_involve")
+    private String noInvolve;
 
     private String id;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java

@@ -23,6 +23,10 @@ public class unCountDTO {
 
     private String unCount;
 
+    private String unCounts;
+
+    private String allCounts;
+
     private Long current;
 
     private Long size;
@@ -32,4 +36,6 @@ public class unCountDTO {
 
     private String type;
 
+    private String noInvolveReason;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java

@@ -32,8 +32,13 @@ public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl<S
     public IPage<unCountDTO> selectPages(Page pages, unCountDTO productAssess) {
         IPage<unCountDTO> productAssessIPage= new Page<>();
         List<unCountDTO> res=sarStandardComplianceProductAssessDao.selectPages(pages.getCurrent(),pages.getSize(),productAssess);
-        res.forEach(unCountDTO -> {unCountDTO.setStandId(productAssess.getStandId());
+        res.forEach(unCountDTO -> {
-        unCountDTO.setType(productAssess.getType());});
+            unCountDTO.setStandId(productAssess.getStandId());
+            unCountDTO.setType(productAssess.getType());
+            if (unCountDTO.getAllCounts().equals(unCountDTO.getUnCounts())){
+                unCountDTO.setUnCount("-1");
+            }
+        });
         productAssessIPage.setRecords(res);
         List<Integer> a=sarStandardComplianceProductAssessDao.selectPagesCount(productAssess);
         if (null!=a) {

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml

@@ -5,26 +5,27 @@
 
     <select id="selectPages"
             resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO">
-        select PRODUCT_NAME as productName,sar_stand_project_library.project_group as projectGroup,
+        select sar_stand_project_library.project_name as productName,sar_stand_project_library.project_group as projectGroup,
         sar_stand_project_library.id as sarId,
         sar_stand_project_library.product_line as productLine,sar_stand_project_library.project_number as productId,
         sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName,
-        (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId}) unCount
+        (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId} AND CLOSE_STATE = '1' ) unCount,
+        (SELECT count(*) FROM sar_standard_compliance_product_assess sspa  WHERE sspa.STAND_ID=#{product.standId} and sspa.no_involve is not null ) unCounts,
+        (SELECT count(*) FROM sar_standard_compliance_product_assess sspa  WHERE sspa.STAND_ID=#{product.standId} ) allCounts
         FROM
         sar_stand_project_library
         LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number
         LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager
         WHERE
         sar_stand_project_library.project_number in ( SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId})
-        AND CLOSE_STATE = '1'
         <if test="null != product.productName and ''!= product.productName">
-            and  product_name like concat(concat('%',#{product.productName}),'%')
+            and  sar_stand_project_library.project_name like concat(concat('%',#{product.productName}),'%')
         </if>
         <if test="null != product.productId and ''!= product.productId">
-            and  project_number like concat(concat('%',#{product.productId}),'%')
+            and  sar_stand_project_library.project_number like concat(concat('%',#{product.productId}),'%')
         </if>
         group by
-        PRODUCT_NAME,
+        sar_stand_project_library.project_name,
         sar_stand_project_library.project_group,
         sar_stand_project_library.product_line,
         sar_stand_project_library.project_manager,
@@ -32,7 +33,7 @@
         sar_stand_project_library.id,
         ts_user.UNAME
         ORDER BY
-        PRODUCT_NAME ASC
+        sar_stand_project_library.project_name ASC
         limit ${(page-1)*pageSize},${pageSize}
     </select>
 
@@ -45,15 +46,14 @@
         LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager
         WHERE
         sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId})
-        AND CLOSE_STATE = '1'
         <if test="null != product.productName and ''!= product.productName">
-            and  product_name like concat(concat('%',#{product.productName}),'%')
+            and  sar_stand_project_library.project_name like concat(concat('%',#{product.productName}),'%')
         </if>
         <if test="null != product.productId and ''!= product.productId">
             and  project_number like concat(concat('%',#{product.productId}),'%')
         </if>
         group by
-        PRODUCT_NAME,
+        sar_stand_project_library.project_name,
         sar_stand_project_library.project_group,
         sar_stand_project_library.product_line,
         sar_stand_project_library.project_manager,
@@ -61,6 +61,6 @@
         sar_stand_project_library.id,
         ts_user.UNAME
         ORDER BY
-        PRODUCT_NAME ASC
+        sar_stand_project_library.project_name ASC
     </select>
 </mapper>