diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java index 5af267c8..478f2e20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java @@ -60,6 +60,7 @@ public class TsInstitution extends BaseEntity { private String hasChild; + @TableField(exist = false) @ApiModelProperty("用户") private TsUserVO tsUserVO; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index ef3e5e5a..b5a9a254 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -64,5 +64,16 @@ public class SarPublicIdeaController extends BaseController { return Result.success(publicList); } + @ApiOperation(value = "发起标准征求意见流程后自动公开征求意见") + @PostMapping("/addSarPublicIdea") + public ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea){ + try{ + sarPublicIdeaService.save(sarPublicIdea); + }catch(Exception e){ + return Result.error(); + } + return Result.success(); + } + } 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..432017a5 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 @@ -109,14 +109,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); } /** * @@ -156,7 +156,7 @@ 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); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index fe780ba0..fa6a01be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -1,5 +1,6 @@ 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; import com.alibaba.excel.annotation.write.style.HeadRowHeight; @@ -18,11 +19,13 @@ import java.time.LocalDateTime; @Data @HeadRowHeight(35) @ColumnWidth(30) +@ExcelIgnoreUnannotated public class StandAttrInfoDto { - //标准编号 - @ExcelProperty("标准编号") private String standId; + //标准编号 + @ExcelProperty("标准号") + private String standNumber; //中文名称 @ExcelProperty("中文名称") private String standName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 589b0437..6c8745fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -16,6 +16,6 @@ public interface SarStandProjectLibraryService { IPage 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..7599a4cd 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 @@ -165,7 +165,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl 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_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); @@ -186,6 +186,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage = new Page<>(); userIPage.setRecords(list); @@ -222,60 +222,37 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl 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()); - } - } - 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 +")"); + 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","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 +")"); + 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.setStandId(s.getId()); + 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()); - p.setSSRQ(a.getSsrq()); - p.setXCXSSRQGJ(a.getXcxssrqgj()); - p.setZCCSSRQGJ(a.getZccssrqgj()); + if (a.getSsrq()!=null){ + p.setSSRQ(a.getSsrq().substring(0,10)); + } + if (a.getXcxssrqgj()!=null){ + p.setXCXSSRQGJ(a.getXcxssrqgj().substring(0,10)); + } + if (a.getZccssrqgj()!=null){ + p.setZCCSSRQGJ(a.getZccssrqgj().substring(0,10)); + } p.setKCCVPPSBM(a.getKccvppsbm()); p.setKCCVPPSCN(a.getKccvppscn()); p.setZRBM(a.getZrbm()); @@ -283,7 +260,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl