diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 39d3810c..97c677f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -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.*; - /** *

* 前端控制器 @@ -33,14 +30,14 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryStandId(id); - List list1 = new ArrayList(); - for(SarStandProjectLibrary s:list){ - list1.add(s.getStandId()); - } - System.out.println(list1); - IPage list2 = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); - return Result.success("200",list2); +// List list = sarStandProjectLibraryService.queryStandId(id); +// List list1 = new ArrayList(); +// for(SarStandProjectLibrary s:list){ +// list1.add(s.getStandId()); +// } +// System.out.println(list1); + IPage list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); + return Result.success("200",list); } /** - * + * * @param id - * @return - * @author zj - * date 2021-07-15 - **/ + * @return + * @author zj + * date 2021-07-15 + **/ @PostMapping("/deleteByIds") @ApiOperation("批量删除标准") public ResponseMessage deleteByIds(String id){ @@ -134,12 +131,12 @@ public class SarStandProjectLibraryController extends BaseController list){ @@ -147,16 +144,16 @@ public class SarStandProjectLibraryController extends BaseController data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto); + List data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto,id); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).useDefaultStyle(false).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(data); } catch (Exception e) { System.out.println(e); @@ -179,6 +176,4 @@ public class SarStandProjectLibraryController extends BaseController queryStandInfo(int current, int pageSize, String standId); void deleteByIds(List ids); void batchInsert(@Param("ids") List list); - List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto); + List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index f88e9faa..3c4b7dc6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -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; - /** *

* 服务实现类 @@ -32,15 +28,12 @@ import java.util.List; */ @Service public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements SarStandProjectLibraryService { - @Resource private SarStandProjectLibraryDao sarStandProjectLibraryDao; @Resource private SarStandardsInfoDao SarStandardsInfoDao; @Resource private SarStandAttrInfoDao sarStandAttrInfoDao; - - @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); @@ -82,7 +75,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); @@ -124,7 +116,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryById(String id) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -132,7 +123,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper); return list; } - @Override public IPage queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -144,7 +134,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryByProductLine(String productLine) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -152,7 +141,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper); return list; } - @Override public List queryStandId(String standId) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -161,47 +149,46 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper); return list; } - @Override public IPage queryStandInfo(int current, int pageSize, String standId) { QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","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 page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); System.out.println("总条数"+userIPage1.getTotal()); System.out.println("总页数"+userIPage1.getPages()); - QueryWrapper 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 page2 = new Page<>(current, pageSize); IPage userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2); System.out.println("总条数"+userIPage2.getTotal()); System.out.println("总页数"+userIPage2.getPages()); - List list = new ArrayList<>(); List list1 = userIPage1.getRecords(); List list2 = userIPage2.getRecords(); for(SarStandardsInfo s:list1){ 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){ - if(s.getId().equals(a.getStandId())){ - p.setCYCVPPSBM(a.getCycvppsbm()); - p.setCYCVPPSCN(a.getCycvppscn()); - p.setSSRQ(a.getSsrq()); - p.setXCXSSRQGJ(a.getXcxssrqgj()); - p.setZCCSSRQGJ(a.getZccssrqgj()); - p.setKCCVPPSBM(a.getKccvppsbm()); - p.setKCCVPPSCN(a.getKccvppscn()); - p.setZRBM(a.getZrbm()); - } + if(s.getId().equals(a.getStandId())){ + p.setCYCVPPSBM(a.getCycvppsbm()); + p.setCYCVPPSCN(a.getCycvppscn()); + p.setSSRQ(a.getSsrq()); + p.setXCXSSRQGJ(a.getXcxssrq()); + p.setZCCSSRQGJ(a.getZccssrq()); + p.setKCCVPPSBM(a.getKccvppsbm()); + p.setKCCVPPSCN(a.getKccvppscn()); + p.setZRBM(a.getZrbm()); + } } list.add(p); - System.out.println(list); } IPage userIPage = new Page<>(); userIPage.setRecords(list); @@ -210,83 +197,55 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl ids) { sarStandProjectLibraryDao.deleteByIds(ids); } - @Override public void batchInsert(List list) { sarStandProjectLibraryDao.batchInsert(list); } - @Override - public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto) { + public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) { List ids = standAttrInfoExcelDto.getIds(); List list = new ArrayList<>(); - if (ids==null||ids.size()==0){ - QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); - wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID"); - List userList1 = SarStandardsInfoDao.selectList(wrapper1); - QueryWrapper wrapper2 = new QueryWrapper<>(); - wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); - wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID"); - List userList2 = sarStandAttrInfoDao.selectList(wrapper2); - for(SarStandardsInfo s:userList1){ - StandAttrInfoDto p =new StandAttrInfoDto(); - p.setStandId(s.getId()); - p.setStandName(s.getStandName()); - p.setStandEnName(s.getStandEnName()); - for (SarStandAttrInfo a:userList2){ - if(s.getId().equals(a.getStandId())){ - p.setCYCVPPSBM(a.getCycvppsbm()); - p.setCYCVPPSCN(a.getCycvppscn()); - p.setSSRQ(a.getSsrq()); - p.setXCXSSRQGJ(a.getXcxssrqgj()); - p.setZCCSSRQGJ(a.getZccssrqgj()); - p.setKCCVPPSBM(a.getKccvppsbm()); - p.setKCCVPPSCN(a.getKccvppscn()); - p.setZRBM(a.getZrbm()); + String idmis=String.join(",",ids); + System.out.println(idmis); + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME"); + 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 userList1 = SarStandardsInfoDao.selectList(wrapper1); + QueryWrapper wrapper2 = new QueryWrapper<>(); + 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 userList2 = sarStandAttrInfoDao.selectList(wrapper2); + for(SarStandardsInfo s:userList1){ + StandAttrInfoDto p =new StandAttrInfoDto(); + p.setStandNumber(s.getStandNumber()); + p.setStandName(s.getStandName()); + p.setStandEnName(s.getStandEnName()); + for (SarStandAttrInfo a:userList2){ + if(s.getId().equals(a.getStandId())){ + p.setCYCVPPSBM(a.getCycvppsbm()); + p.setCYCVPPSCN(a.getCycvppscn()); + if (a.getSsrq()!=null){ + p.setSSRQ(a.getSsrq().substring(0,10)); } - } - list.add(p); - } - }else { - String idmis=String.join(",",ids); - System.out.println(idmis); - QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); - wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +")"); - List userList1 = SarStandardsInfoDao.selectList(wrapper1); - QueryWrapper wrapper2 = new QueryWrapper<>(); - wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","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 +")"); - List userList2 = sarStandAttrInfoDao.selectList(wrapper2); - for(SarStandardsInfo s:userList1){ - StandAttrInfoDto p =new StandAttrInfoDto(); - p.setStandId(s.getId()); - p.setStandName(s.getStandName()); - p.setStandEnName(s.getStandEnName()); - for (SarStandAttrInfo a:userList2){ - if(s.getId().equals(a.getStandId())){ - p.setCYCVPPSBM(a.getCycvppsbm()); - p.setCYCVPPSCN(a.getCycvppscn()); - p.setSSRQ(a.getSsrq()); - p.setXCXSSRQGJ(a.getXcxssrqgj()); - p.setZCCSSRQGJ(a.getZccssrqgj()); - p.setKCCVPPSBM(a.getKccvppsbm()); - p.setKCCVPPSCN(a.getKccvppscn()); - p.setZRBM(a.getZrbm()); + if (a.getXcxssrqgj()!=null){ + p.setXCXSSRQGJ(a.getXcxssrq().substring(0,10)); } + if (a.getZccssrqgj()!=null){ + p.setZCCSSRQGJ(a.getZccssrq().substring(0,10)); + } + p.setKCCVPPSBM(a.getKccvppsbm()); + p.setKCCVPPSCN(a.getKccvppscn()); + p.setZRBM(a.getZrbm()); } - list.add(p); } + list.add(p); } return list; } - private IPage getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) { Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); @@ -294,4 +253,4 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl