From e3e638a8b36b8648c78aceefad1148308a57d082 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 19 Jul 2021 14:22:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update:sql=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index f0371de6..ea52ac6e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -15,7 +15,7 @@ a.ID IN #{item} - From 8ce15424ac3d2e4f6ce2be09acecdef69d6672eb Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Tue, 20 Jul 2021 13:36:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update:=E4=BF=AE=E5=A4=8D=E6=B8=85=E5=8D=95?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 ++-- .../entity/LawsDto.java | 24 +++++++++++++++++++ .../SarLawsDetailedListController.java | 3 ++- .../entity/AddDetailedDto.java | 9 +------ .../entity/DetailedUpDto.java | 3 +-- .../entity/SarLawsDetailedList.java | 2 +- .../impl/SarLawsDetailedListServiceImpl.java | 5 ++++ .../impl/SarStandItemsServiceImpl.java | 10 ++++---- 8 files changed, 41 insertions(+), 19 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 07469001..77e9adad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -96,7 +96,7 @@ public class SarLawsAttrDetailedListController extends BaseController page1=new Page<>(); From 409fa79bdc84807a08708c8ae4f878de3b7147d2 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Tue, 20 Jul 2021 15:12:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?add:=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=20=E8=B0=83=E5=8F=96=20=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 109 +++++++++++-- .../dao/SarStandProjectLibraryDao.java | 4 +- .../entity/SarStandProjectLibrary.java | 30 ++++ .../entity/StandAttrInfoDto.java | 56 +++++++ .../entity/StandAttrInfoExcelDto.java | 20 +++ .../entity/StandProjectRelationDto.java | 18 +++ .../SarStandProjectLibraryService.java | 11 +- .../SarStandProjectLibraryServiceImpl.java | 149 +++++++++++++++++- .../SarStandProjectLibraryMapper.xml | 29 +++- 9 files changed, 398 insertions(+), 28 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java 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 461fd1da..29a332d0 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,26 +1,20 @@ 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.SarStandProjectLibraryDto; -import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; -import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; import java.util.*; /** @@ -37,7 +31,6 @@ import java.util.*; public class SarStandProjectLibraryController extends BaseController { @Resource private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService; - /** * * @param Page @@ -71,7 +64,14 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryById(id); return Result.success("200",list); } - + /** + * + * @param current + * @param pageSize + * @return + * @author zj + * date 2021-07-13 + **/ @GetMapping("/queryProjectManager") @ApiOperation("查询产品线项目经理") public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize){ @@ -89,6 +89,89 @@ 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); + } + /** + * + * @param id + * @return + * @author zj + * date 2021-07-15 + **/ + @PostMapping("/deleteByIds") + @ApiOperation("批量删除标准") + public ResponseMessage deleteByIds(String id){ + String[] ids = id.split(","); + List list = Arrays.asList(ids); + sarStandProjectLibraryService.deleteByIds(list); + return Result.success("200","删除成功"); + } + /** + * + * @param list + * @return + * @author zj + * date 2021-07-15 + **/ + @PostMapping("/batchInsert") + @ApiOperation("调取标准") + public ResponseMessage batchInsert(@RequestBody List list){ + sarStandProjectLibraryService.batchInsert(list); + return Result.success("200","新增成功",list); + } + /** + * + * @param standAttrInfoExcelDto + * @param response + * @return + * @author zj + * date 2021-07-16 + **/ + @ApiOperation("导出Excel表") + @GetMapping(value = "/exportStandAttrInfoExcel") + public void exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto, HttpServletResponse response) throws Exception { + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if(standAttrInfoExcelDto.getExportName()==null){ + standAttrInfoExcelDto.setExportName("车型项目详情"); + } + String fileName = URLEncoder.encode(standAttrInfoExcelDto.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto); + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(data); + } catch (Exception e) { + System.out.println(e); + // 重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSON.toJSONString(Result.error())); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index e8a6ce92..7316507a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -17,5 +18,6 @@ import java.util.List; */ public interface SarStandProjectLibraryDao extends BaseMapper { // List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); - + void deleteByIds(@Param("ids") List ids); + void batchInsert(@Param("list") List list); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index 6f0e9dd2..d3897c61 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -68,8 +68,38 @@ public class SarStandProjectLibrary extends BaseEntity { private String projectManager; @ApiModelProperty(value = "项目经理名称") + @TableField(exist = false) private String uName; + //标准编号 + @TableField(exist = false) + private String standId; + //中文名称 + @TableField(exist = false) + private String standName; + //英文名称 + @TableField(exist = false) + private String standEnName; + //标准实施日期 + @TableField(exist = false) + private String ssrq; + //新车型实施日期 + @TableField(exist = false) + private String XCXSSRQGJ; + //在产车实施日期 + @TableField(exist = false) + private String ZCCSSRQGJ; + //责任部门 + @TableField(exist = false) + private String ZRBM; + //关联模块-VPPS + @TableField(exist = false) + private String CYCVPPSBM; + //关联模块-中文名称 + @TableField(exist = false) + private String CYCVPPSCN; + + } 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 new file mode 100644 index 00000000..fe780ba0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +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 添加类/接口功能描述 + * + * @author zhangjin + * @date 2021-07-13 + */ +@Data +@HeadRowHeight(35) +@ColumnWidth(30) +public class StandAttrInfoDto { + + //标准编号 + @ExcelProperty("标准编号") + private String standId; + //中文名称 + @ExcelProperty("中文名称") + private String standName; + //英文名称 + @ExcelProperty("英文名称") + private String standEnName; + //标准实施日期 + @ExcelProperty("标准实施日期") + private String SSRQ; + //新车型实施日期 + @ExcelProperty("新车型实施日期") + private String XCXSSRQGJ; + //在产车实施日期 + @ExcelProperty("在产车实施日期") + private String ZCCSSRQGJ; + //责任部门 + @ExcelProperty("责任部门") + private String ZRBM; + //关联模块--卡车VPPS编码 + @ExcelProperty("关联模块--卡车VPPS编码") + private String KCCVPPSBM; + //关联模块--卡车vpps中文名称 + @ExcelProperty("关联模块--卡车vpps中文名称") + private String KCCVPPSCN; + //关联模块--乘用车VPPS编码 + @ExcelProperty("关联模块--乘用车VPPS编码") + private String CYCVPPSBM; + //关联模块--乘用车vpps中文名称 + @ExcelProperty("关联模块--乘用车vpps中文名称") + private String CYCVPPSCN; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java new file mode 100644 index 00000000..e13d44c2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * //TODO 添加类/接口功能描述 + * + * @author zhangjin + * @date 2021-07-15 + */ +@Data +public class StandAttrInfoExcelDto { + + String exportName; + + List ids; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java new file mode 100644 index 00000000..42dffe91 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java @@ -0,0 +1,18 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +/** + * //TODO 添加类/接口功能描述 + * + * @author zhangjin + * @date 2021-07-13 + */ +@Data +public class StandProjectRelationDto { + + private String projectId; + + private String standId; + +} 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 e7753bd9..589b0437 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 @@ -1,9 +1,8 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; -import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,4 +12,10 @@ public interface SarStandProjectLibraryService { List queryById(String id); IPage queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); + List queryStandId(String standId); + IPage queryStandInfo(int current, int pageSize, String standId); + void deleteByIds(List ids); + void batchInsert(@Param("ids") List list); + List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto); + } 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 f14b36b1..6f861693 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,10 +1,13 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; -import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; + +import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; +import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -15,6 +18,8 @@ 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; /** @@ -30,6 +35,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandId(String standId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("stand_id"); + wrapper.last("INNER JOIN sar_stand_project_relation r ON sar_stand_project_library.id = r.project_id"); + List 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.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.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.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()); + } + } + list.add(p); + System.out.println(list); + } + IPage userIPage = new Page<>(); + userIPage.setRecords(list); + userIPage.setTotal(userIPage1.getTotal()); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } + + @Override + public void deleteByIds(List ids) { + sarStandProjectLibraryDao.deleteByIds(ids); + } + + @Override + public void batchInsert(List list) { + sarStandProjectLibraryDao.batchInsert(list); + } + + @Override + public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto) { + 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 +")"); + 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()); + } + } + 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); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 4904402c..6e5cdb19 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -1,14 +1,27 @@ + + insert into sar_stand_project_relation(project_id,stand_id) VALUES + + (#{list.projectId,jdbcType=VARCHAR},#{list.standId,jdbcType=VARCHAR}) + + - - - - - - - - + + + + + + + + + + delete from sar_stand_project_relation where stand_id in ( + + #{list} + + ) + From 3af52f37f427024632674f8ab23e0ce780cba88c Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Tue, 20 Jul 2021 16:39:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update:=E7=BC=A9=E7=9F=AD=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsDetailedListServiceImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 6c86a540..87cabef6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -137,13 +137,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1:arr) { - if (map1.get("value").equals(list1.getCountryArea())){ - list1.setCountryArea(map1.get("label")); - break; - } - } } } userIPage.setRecords(list);