12.1bug修复

2021-12-01 17:59:17 +08:00
parent bc4529bf03
commit 455fc2ba0e
16 changed files with 361 additions and 4 deletions
@@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import oracle.ucp.proxy.annotation.Post;
 import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +59,7 @@ public class SarStandardComplianceAssessResultController {
        if (eo.getStandApplicationType() == 1) {
            QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
            IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-            queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
+            queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE");
            if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                queryWrapper.like("STAND_NAME", eo.getStandName().trim());
            }
@@ -175,6 +174,46 @@ public class SarStandardComplianceAssessResultController {
        return Result.success(page);
    }

+
+    @ApiOperation(value = "标准涉及项目复合性详情")
+    @GetMapping("/productNewDetail")
+    public ResponseMessage<Map<String,IPage<SarStandardComplianceProductAssess>>> selectProductDetail(SarStandardComplianceProductAssessEO eo) throws Exception {
+        IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+        Map<String,IPage<SarStandardComplianceProductAssess>> map=new HashMap<>();
+        QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("STAND_ID", eo.getStandId());
+        queryWrapper.eq("product_id", eo.getProductId());
+        queryWrapper.isNotNull("research_completion_time");
+        queryWrapper.orderByAsc("product_name");
+        queryWrapper.orderByAsc("standard_item");
+        Page p1=new Page();
+        IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
+        BeanUtils.copyProperties(page,p1);
+        p1.setRecords(page.getRecords());
+        p1.setTotal(page.getTotal());
+        map.put("unfit",p1);
+        QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper.eq("STAND_ID", eo.getStandId());
+        queryWrapper.eq("product_id", eo.getProductId());
+        queryWrapper1.ne("research_compliance","");
+        queryWrapper1.orderByAsc("product_name");
+        queryWrapper1.orderByAsc("standard_item");
+        IPage<SarStandardComplianceProductAssess> page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1);
+        map.put("fit",page1);
+        return Result.success(map);
+    }
+
+    @ApiOperation(value = "标准涉及项目复合性")
+    @GetMapping("/productNew")
+    public ResponseMessage<IPage<unCountDTO>> selectProduct(unCountDTO eo) throws Exception {
+        Page iPage = new Page<>();
+        iPage.setCurrent(eo.getCurrent());
+        iPage.setSize(eo.getSize());
+
+        IPage<unCountDTO> page = iSarStandardComplianceProductAssessService.selectPages(iPage, eo);
+        return Result.success(page);
+    }
+
    @ApiOperation(value = "插入标准涉及项目符合性清单")
    @PostMapping("/add")
    public ResponseMessage insertProduct(@RequestBody List<SarStandardComplianceProductAssess> eo) throws Exception {
@@ -1,7 +1,14 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;

 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;

 /**
 * <p>
@@ -13,4 +20,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface SarStandardComplianceProductAssessDao extends BaseMapper<SarStandardComplianceProductAssess> {

+    List<unCountDTO> selectPages(@Param("page")Long page,@Param("pageSize")Long size,@Param("product") unCountDTO productAssess);
+
+    List<Integer> selectPagesCount(@Param("product")unCountDTO productAssess);
+
 }
@@ -1,7 +1,6 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;

 import com.adc.da.base.entity.BaseEntity;
-import java.time.LocalDateTime;
 import java.util.Date;

 import com.baomidou.mybatisplus.annotation.TableField;
@@ -121,7 +120,23 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
    @TableField("type")
    private String type;

+    @ApiModelProperty(value = "评估时间")
+    @TableField("evaluation_time")
+    private String evaluationTime;
+
+    @ApiModelProperty(value = "评估人")
+    @TableField("evaluation_people")
+    private String evaluationPeople;
+
+    @ApiModelProperty(value = "评估人")
+    @TableField("evaluation_people_name")
+    private String evaluationPeopleName;
+

    private String id;

+    @ApiModelProperty(value = "符合不符合")
+    @TableField(exist = false)
+    private String bfh;
+
 }
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import lombok.Data;
+
+@Data
+public class unCountDTO {
+
+    private String standId;
+
+    private String productName;
+
+    private String productId;
+
+    private String productNumber;
+
+    private String productLine;
+
+    private String projectGroup;
+
+    private String projectManager;
+
+    private String uName;
+
+    private String unCount;
+
+    private Long current;
+
+    private Long size;
+
+    //项目编号
+    private String sarId;
+
+    private String type;
+
+}
@@ -1,7 +1,12 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service;

 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+

 /**
 * <p>
@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ISarStandardComplianceProductAssessService extends IService<SarStandardComplianceProductAssess> {

+    IPage<unCountDTO> selectPages(Page page, @Param("product") unCountDTO productAssess);
+
 }
@@ -2,10 +2,17 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;

 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import java.util.List;
+
 /**
 * <p>
 *  服务实现类
@@ -17,4 +24,25 @@ import org.springframework.stereotype.Service;
@Service
 public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl<SarStandardComplianceProductAssessDao, SarStandardComplianceProductAssess> implements ISarStandardComplianceProductAssessService {

+    @Autowired
+    SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao;
+
+
+    @Override
+    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());
+        unCountDTO.setType(productAssess.getType());});
+        productAssessIPage.setRecords(res);
+        List<Integer> a=sarStandardComplianceProductAssessDao.selectPagesCount(productAssess);
+        if (null!=a) {
+            productAssessIPage.setTotal(a.size());
+        }else {
+            productAssessIPage.setTotal(0);
+        }
+        productAssessIPage.setCurrent(pages.getCurrent());
+        productAssessIPage.setSize(pages.getSize());
+        return productAssessIPage;
+    }
 }