Merge remote-tracking branch 'origin/develop_1' into develop_master

# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
2021-07-29 09:42:14 +08:00
parent 5366e15b4b cacc66d5e7
commit cabdf7a712
4 changed files with 101 additions and 116 deletions
@@ -1,5 +1,4 @@
 package com.adc.da.slrs.sarStandProjectLibrary.controller;
-
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
@@ -12,12 +11,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
 import java.util.*;
-
 /**
 * <p>
 *  前端控制器
@@ -179,6 +176,4 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
            response.getWriter().println(JSON.toJSONString(Result.error()));
        }
    }
-
 }
-
@@ -1,5 +1,4 @@
 package com.adc.da.slrs.sarStandProjectLibrary.entity;
-
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -7,9 +6,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.time.LocalDateTime;
-
 /**
 * //TODO 添加类/接口功能描述
 *
@@ -21,11 +18,15 @@ import java.time.LocalDateTime;
@ColumnWidth(30)
@ExcelIgnoreUnannotated
 public class StandAttrInfoDto {
-
+    //主键
    private String standId;
    //标准编号
    @ExcelProperty("标准号")
    private String standNumber;
+    //标准类别
+    private  String standSort;
+    //标准年份
+    private String standYear;
    //中文名称
    @ExcelProperty("中文名称")
    private String standName;
@@ -1,6 +1,4 @@
 package com.adc.da.slrs.sarStandProjectLibrary.service.impl;
-
-
 import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
@@ -14,14 +12,12 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 /**
 * <p>
 *  服务实现类
@@ -32,15 +28,12 @@ import java.util.List;
 */
@Service
 public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProjectLibraryDao, SarStandProjectLibrary> implements SarStandProjectLibraryService {
-
    @Resource
    private SarStandProjectLibraryDao sarStandProjectLibraryDao;
    @Resource
    private SarStandardsInfoDao SarStandardsInfoDao;
    @Resource
    private SarStandAttrInfoDao sarStandAttrInfoDao;
-
-
    @Override
    public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
        SarStandProjectLibrary sar = new SarStandProjectLibrary();
@@ -82,7 +75,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate());
        return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
    }
-
    @Override
    public IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
        SarStandProjectLibrary sar = new SarStandProjectLibrary();
@@ -124,7 +116,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate());
        return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
    }
-
    @Override
    public List<SarStandProjectLibrary> queryById(String id) {
        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
@@ -132,7 +123,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
        return list;
    }
-
    @Override
    public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
@@ -144,7 +134,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
        System.out.println("总页数"+userIPage.getPages());
        return userIPage;
    }
-
    @Override
    public List<SarStandProjectLibrary> queryByProductLine(String productLine) {
        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
@@ -152,7 +141,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
        return list;
    }
-
    @Override
    public List<SarStandProjectLibrary> queryStandId(String standId) {
        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
@@ -161,25 +149,22 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
        return list;
    }
-
    @Override
    public IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId) {
        QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME");
+        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME");
        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='"+ standId+"'");
        Page<SarStandardsInfo> page1 = new Page<>(current, pageSize);
        IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
        System.out.println("总条数"+userIPage1.getTotal());
        System.out.println("总页数"+userIPage1.getPages());
-
        QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
-        wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
+        wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
        wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='"+ standId+"'");
        Page<SarStandAttrInfo> page2 = new Page<>(current, pageSize);
        IPage<SarStandAttrInfo> userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2);
        System.out.println("总条数"+userIPage2.getTotal());
        System.out.println("总页数"+userIPage2.getPages());
-
        List<StandAttrInfoDto> list = new ArrayList<>();
        List<SarStandardsInfo> list1 = userIPage1.getRecords();
        List<SarStandAttrInfo> list2 = userIPage2.getRecords();
@@ -187,6 +172,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
            StandAttrInfoDto p =new StandAttrInfoDto();
            p.setStandId(s.getId());
            p.setStandNumber(s.getStandNumber());
+            p.setStandSort(s.getStandSort());
+            p.setStandYear(s.getStandYear());
            p.setStandName(s.getStandName());
            p.setStandEnName(s.getStandEnName());
            for (SarStandAttrInfo a:list2){
@@ -194,8 +181,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                    p.setCYCVPPSBM(a.getCycvppsbm());
                    p.setCYCVPPSCN(a.getCycvppscn());
                    p.setSSRQ(a.getSsrq());
-                   p.setXCXSSRQGJ(a.getXcxssrqgj());
-                   p.setZCCSSRQGJ(a.getZccssrqgj());
+                    p.setXCXSSRQGJ(a.getXcxssrq());
+                    p.setZCCSSRQGJ(a.getZccssrq());
                    p.setKCCVPPSBM(a.getKccvppsbm());
                    p.setKCCVPPSCN(a.getKccvppscn());
                    p.setZRBM(a.getZrbm());
@@ -210,17 +197,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
        System.out.println("总页数"+userIPage.getPages());
        return userIPage;
    }
-
    @Override
    public void deleteByIds(List<String> ids) {
        sarStandProjectLibraryDao.deleteByIds(ids);
    }
-
    @Override
    public void batchInsert(List<StandProjectRelationDto> list) {
        sarStandProjectLibraryDao.batchInsert(list);
    }
-
    @Override
    public List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) {
        List<String> ids = standAttrInfoExcelDto.getIds();
@@ -232,7 +216,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
        wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
        List<SarStandardsInfo> userList1 = SarStandardsInfoDao.selectList(wrapper1);
        QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
-            wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
+        wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
        wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
        List<SarStandAttrInfo> userList2 = sarStandAttrInfoDao.selectList(wrapper2);
        for(SarStandardsInfo s:userList1){
@@ -248,10 +232,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                        p.setSSRQ(a.getSsrq().substring(0,10));
                    }
                    if (a.getXcxssrqgj()!=null){
-                            p.setXCXSSRQGJ(a.getXcxssrqgj().substring(0,10));
+                        p.setXCXSSRQGJ(a.getXcxssrq().substring(0,10));
                    }
                    if (a.getZccssrqgj()!=null){
-                            p.setZCCSSRQGJ(a.getZccssrqgj().substring(0,10));
+                        p.setZCCSSRQGJ(a.getZccssrq().substring(0,10));
                    }
                    p.setKCCVPPSBM(a.getKccvppsbm());
                    p.setKCCVPPSCN(a.getKccvppscn());
@@ -41,12 +41,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
    @Override
    public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper
-                    .like("stand_id",sarStandUnqualifiedPage.getStandId())
-                    .like("stand_name",sarStandUnqualifiedPage.getStandId());
+        if(sarStandUnqualifiedPage.getStandId()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
        }
+        if (sarStandUnqualifiedPage.getStandName()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+        }
        //仅查询未关闭的
        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
        if(sarStandUnqualifiedPage.getProductName()!=null){
@@ -72,11 +73,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
    @Override
    public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
-                    .like("stand_name",sarStandUnqualifiedPage.getStandId());
+        if(sarStandUnqualifiedPage.getStandId()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
        }
+        if (sarStandUnqualifiedPage.getStandName()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+        }

        //仅查询关闭的
        sarStandUnqualifiedQueryWrapper.eq("close_state",2);
@@ -125,7 +128,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
        if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
            sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
        }
-        return sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+               List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+        List<SarStandUnqualified> a = stand;
+        return a;
    }

    private boolean closeSarStandUnqualified(String standUnqualifiedId){