From 55a47c6973b90e4d235067302167b180e971da80 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 12 Jul 2021 17:30:40 +0800 Subject: [PATCH 01/34] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0ProjectManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 11 ++--------- .../dao/SarStandProjectLibraryDao.java | 2 +- .../entity/productLineDto.java | 2 ++ .../impl/SarStandProjectLibraryServiceImpl.java | 13 +++++++------ .../SarStandProjectLibraryMapper.xml | 16 ++++++++-------- 5 files changed, 20 insertions(+), 24 deletions(-) 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 deebf41d..461fd1da 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 @@ -72,7 +72,6 @@ public class SarStandProjectLibraryController extends BaseController list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine()); p.setSarStandProjectLibraries(list2); listTemp.add(p); } - IPage iPage = new Page<>(); - iPage.setRecords(listTemp); - iPage.setCurrent(list1.getCurrent()); - iPage.setSize(list1.getSize()); - iPage.setTotal(list1.getTotal()); - iPage.setPages(list1.getPages()); - - return Result.success("200",iPage); + return Result.success("200",listTemp); } } 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 df0262b0..e8a6ce92 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 @@ -16,6 +16,6 @@ import java.util.List; * @since 2021-06-15 */ public interface SarStandProjectLibraryDao extends BaseMapper { - List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); +// List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java index ed59c174..f5f47d70 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java @@ -11,5 +11,7 @@ public class productLineDto { private String productLine; + private String projectManager; + private List sarStandProjectLibraries; } 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 5408a66e..f14b36b1 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 @@ -4,7 +4,6 @@ import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlPr import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; -import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -128,11 +127,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.groupBy("product_line"); - IPage list = sarStandProjectLibraryDao.selectPage(new Page<>(current,pageSize),wrapper); - List libraryIPage=sarStandProjectLibraryDao.queryProjectManagerPage((current-1)*pageSize,current*pageSize); - list.setRecords(libraryIPage); - return list; + wrapper.select("product_line","project_manager","uName"); + wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid group by sar_stand_project_library.product_line"); + Page page = new Page<>(current, pageSize); + IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; } @Override 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 7102efbc..4904402c 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 @@ -3,12 +3,12 @@ - + + + + + + + + From 2e0f6e79344e9e238aec404778791d76dbe26bb6 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Wed, 14 Jul 2021 13:51:40 +0800 Subject: [PATCH 02/34] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsDetailedListController.java | 5 -- .../SarPublicIdeaAllController.java | 55 ++++++++++++--- .../slrs/sarStandIdea/entity/GetExcelDto.java | 35 ++++++++++ .../service/ISarPublicIdeaAllService.java | 2 - .../Impl/SarPublicIdeaAllServiceImpl.java | 70 ------------------- 5 files changed, 82 insertions(+), 85 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 5f0d7846..fc15c816 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -86,11 +86,6 @@ public class SarLawsDetailedListController extends BaseController publicList = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, countryArea, projectName, detailedList, detailedListName); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 9e1e323a..2c37c5fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -3,11 +3,17 @@ package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; +import com.adc.da.slrs.sarStandIdea.entity.GetExcelDto; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -18,6 +24,10 @@ import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; /** *

@@ -34,6 +44,8 @@ public class SarPublicIdeaAllController extends BaseController @Autowired private SarPublicIdeaAllServiceImpl sarPublicIdeaAllImpl; + @Autowired + private SarPublicIdeaAllDao sarPublicIdeaAllDao; @ApiOperation(value = "查询全部意见") @@ -59,7 +71,6 @@ public class SarPublicIdeaAllController extends BaseController return Result.success("200",src); } - @ApiOperation(value = "修改意见") @PostMapping("/updateStand") public ResponseMessage updateStand(SarPublicIdeaAll sarPublicIdeaAll,String autUserId){ @@ -67,14 +78,42 @@ public class SarPublicIdeaAllController extends BaseController return Result.success("200",src); } - - - @ApiOperation(value = "导出全部意见") @GetMapping("/tuallStand") - public ResponseMessage getAllStand(HttpServletResponse response,String cid){ - String src=sarPublicIdeaAllImpl.stuListExcel(response,cid); - return Result.success("200",src); - } + public void getAllStand(HttpServletResponse response,String cid){ + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + String fileName = URLEncoder.encode("意见详情", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List data=new ArrayList<>(); + if (!StringUtils.isEmpty(cid)){ + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(SarPublicIdeaAll.CID,cid); + data=sarPublicIdeaAllDao.selectList(wrapper); + } + List standExcel=new ArrayList<>(); + for (SarPublicIdeaAll sarPublicIdeaAll:data){ + GetExcelDto getExcelDto=GetExcelDto.builder() + .partCode(sarPublicIdeaAll.getPartCode()) + .content(sarPublicIdeaAll.getContent()) + .userName(sarPublicIdeaAll.getUserName()) + .deptName(sarPublicIdeaAll.getDeptName()) + .build(); + standExcel.add(getExcelDto); + } + EasyExcel.write(response.getOutputStream(),GetExcelDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel); + } catch (Exception e) { + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + try { + response.getWriter().println(JSON.toJSONString(Result.error())); + } catch (IOException ioException) { + ioException.printStackTrace(); + } + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java new file mode 100644 index 00000000..86c3cdb7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * //用于导出 + * + * @author ZhangZhiYuan + * @date 2021-07-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@HeadRowHeight(20) +@ColumnWidth(15) +public class GetExcelDto { + + @ExcelProperty("章节编号") + private String partCode; + @ExcelProperty("内容") + private String content; + @ExcelProperty("提出人") + private String userName; + @ExcelProperty("所在部门") + private String deptName; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java index 87d08d5a..09540db3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java @@ -25,6 +25,4 @@ public interface ISarPublicIdeaAllService extends IService { String updateById(SarPublicIdeaAll sarPublicIdeaAll, String autUserid); String delete(DelStandDto delStandDto); String del(String id); - String stuListExcel(HttpServletResponse response,String cid); - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 3b37c14e..6b9f78a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -88,74 +88,4 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq(SarPublicIdeaAll.CID,cid); - List data=sarPublicIdeaAllDao.selectList(wrapper); - SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd hhmmss"); - Workbook wb = new XSSFWorkbook(); - //标题行抽出字段 - String[] title = {"", "标准或政策编号","章节编号", "内容","提出人","所在部门"}; - //设置sheet名称，并创建新的sheet对象 - String sheetName = "意见信息"; - Sheet stuSheet = wb.createSheet(sheetName); - //获取表头行 - Row titleRow = stuSheet.createRow(0); - //创建单元格，设置style居中，字体，单元格大小等 - CellStyle style = wb.createCellStyle(); - Cell cell; - //把已经写好的标题行写入excel文件中 - for (int i = 1; i < title.length; i++) { - cell = titleRow.createCell(i); - cell.setCellValue(title[i]); - cell.setCellStyle(style); - } - //把从数据库中取得的数据一一写入excel文件中 - Row row = null; - for (int i = 0; i < data.size(); i++) { - //创建list.size()行数据 - row = stuSheet.createRow(i + 1); - //把值一一写进单元格里 - //设置第一列为自动递增的序号 - row.createCell(0).setCellValue(i + 1); - row.createCell(1).setCellValue(data.get(i).getCid()); - row.createCell(2).setCellValue(data.get(i).getPartCode()); - row.createCell(3).setCellValue(data.get(i).getContent()); - row.createCell(4).setCellValue(data.get(i).getUserName()); - row.createCell(5).setCellValue(data.get(i).getDeptName()); - } - //设置单元格宽度自适应，在此基础上把宽度调至1.5倍 - for (int i = 0; i < title.length; i++) { - stuSheet.autoSizeColumn(i, true); - stuSheet.setColumnWidth(i, stuSheet.getColumnWidth(i) * 15 / 10); - } - - - response.setContentType("application/octet-stream; charset=iso-8859-1"); - StringBuffer contentDisposition = new StringBuffer("attachment; filename=\""); - String fileName = new String("Reply-content.xlsx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); - contentDisposition.append(fileName).append("\""); - response.setHeader("Content-disposition", contentDisposition.toString()); - ServletOutputStream out = null; - try { - out = response.getOutputStream(); - } catch (IOException e) { - e.printStackTrace(); - } - try { - wb.write(out); - } catch (IOException e) { - e.printStackTrace(); - } - try { - out.flush(); - out.close(); - } catch (IOException e) { - e.printStackTrace(); - } - return "下载成功"; - } } From 369e1532bc7e89459645adf70592a2687c974560 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 15 Jul 2021 16:41:37 +0800 Subject: [PATCH 03/34] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20add=EF=BC=9A=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 28 ++----- .../dao/SarLawsAttrDetailedListDao.java | 7 +- .../entity/LawsDto.java | 30 +++++-- .../entity/LittleLawsDto.java | 26 ------ .../entity/StandExcelDto.java | 35 ++++---- .../SarLawsAttrDetailedListServiceImpl.java | 25 ++---- .../controller/SarStandItemsController.java | 8 ++ .../sarStandItems/dao/SarStandItemsDao.java | 5 ++ .../sarStandItems/entity/SarItemsTime.java | 58 +++++++++++++ .../sarStandItems/entity/StandsTimeDto.java | 33 ++++++++ .../service/ISarStandItemsService.java | 3 +- .../impl/SarStandItemsServiceImpl.java | 82 +++++++++++++++++++ .../SarStandItems/SarStandItemsMapper.xml | 9 ++ .../SarLawsAttrDetailedListMapper.xml | 25 +++--- 14 files changed, 273 insertions(+), 101 deletions(-) delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LittleLawsDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java 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 0fdb4d3f..76a7b537 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 @@ -3,11 +3,16 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.controller; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import io.swagger.annotations.ApiOperation; @@ -57,7 +62,7 @@ public class SarLawsAttrDetailedListController extends BaseController laws = iSarLawsAttrDetailedList.selectLaws(id,Page-1,Size,standName); return Result.success("200",laws); } @@ -104,7 +109,7 @@ public class SarLawsAttrDetailedListController extends BaseController data = new ArrayList<>(); + List data = new ArrayList<>(); if (CollectionUtils.isEmpty(standExcelVo.getIds())){ List list= sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId()); if (CollectionUtils.isEmpty(list)) return; @@ -112,23 +117,8 @@ public class SarLawsAttrDetailedListController extends BaseController standExcel=new ArrayList<>(); - for (LittleLawsDto littleLawsDto:data){ - StandExcelDto standExcelDto=StandExcelDto.builder() - .standNumber(littleLawsDto.getStandNumber()) - .standName(littleLawsDto.getStandName()) - .standEnName(littleLawsDto.getStandEnName()) - .responseUnit("责任部门") - .newCarTime("无字段") - .nowCarTime("无字段") - .typeApplicable("无字段") - .issueTime(littleLawsDto.getIssueTime()) - .textStatus(littleLawsDto.getTextStatus()) - .build(); - standExcel.add(standExcelDto); - } - EasyExcel.write(response.getOutputStream(), StandExcelDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") - .doWrite(standExcel); + EasyExcel.write(response.getOutputStream(), LawsDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(data); } catch (Exception e) { response.reset(); response.setContentType("application/json"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index d74c7fa0..7fb3570b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -1,8 +1,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.dao; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,7 +22,9 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 - List selectLawsById(@Param("param1") List LawsIds,@Param("standName") String standName); + List selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); + //查询适用车型 + List selectTypeApplicable(@Param("param1") String LawsId); List selectLawsId2(String standId); Boolean insertList(@Param("sarLawsAttrDetailedLists") List sarLawsAttrDetailedLists); Boolean deleteByStandId(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 550a9cc0..8ff2ad4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -2,8 +2,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * //Dto,用于从标准主表中查询和检索信息 @@ -14,6 +16,8 @@ import lombok.Data; */ @Builder @Data +@NoArgsConstructor +@AllArgsConstructor public class LawsDto { @ApiModelProperty(value = "主键") private String id; @@ -23,16 +27,26 @@ public class LawsDto { private String standName; @ApiModelProperty(value = "英文名称") private String standEnName; - @ApiModelProperty(value = "责任部门") - private String responseUnit; + @ApiModelProperty(value = "适用车型") + private String typeApplicable; + @ApiModelProperty(value = "能源类型") + private String NYLX; + @ApiModelProperty(value = "标准实施日期") + private String putTime; @ApiModelProperty(value = "新车型实施日期") private String newCarTime; @ApiModelProperty(value = "在产车实施日期") private String nowCarTime; - @ApiModelProperty(value = "适用车辆类型") - private String typeApplicable; - @ApiModelProperty(value = "发布日期") - private String issueTime; - @ApiModelProperty(value = "文本状态") - private String textStatus; + @ApiModelProperty(value = "责任部门") + private String ZRBM; + @ApiModelProperty(value = "适用产品线") + private String SYCPX; + @ApiModelProperty(value = "乘用车VPPS编码") + private String CYCVPPSBM; + @ApiModelProperty(value = "乘用车vpps中文名称") + private String CYCVPPSCN; + @ApiModelProperty(value = "卡车VPPS编码") + private String KCCVPPSBM; + @ApiModelProperty(value = "卡车vpps中文名称") + private String KCCVPPSCN; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LittleLawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LittleLawsDto.java deleted file mode 100644 index 75a2b2d7..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LittleLawsDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.adc.da.slrs.sarLawsAttrDetailedList.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * //TODO 添加类、接口描述 - * 能从主表中查出的LawsDto所需要的数据 - * @author ZhangZhiYuan - * date 2021-06-22 - */ -@Data -public class LittleLawsDto { - @ApiModelProperty(value = "主键") - private String id; - @ApiModelProperty(value = "标准编号") - private String standNumber; - @ApiModelProperty(value = "中文名称") - private String standName; - @ApiModelProperty(value = "英文名称") - private String standEnName; - @ApiModelProperty(value = "发布日期") - private String issueTime; - @ApiModelProperty(value = "文本状态") - private String textStatus; -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 5bf06dd4..6c0992e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -15,31 +15,32 @@ import lombok.Data; @Data @Builder public class StandExcelDto { - @ExcelProperty("标准编号") @ApiModelProperty(value = "标准编号") private String standNumber; - @ExcelProperty("中文名称") @ApiModelProperty(value = "中文名称") private String standName; - @ExcelProperty("英文名称") @ApiModelProperty(value = "英文名称") private String standEnName; - @ExcelProperty("责任部门") - @ApiModelProperty(value = "责任部门") - private String responseUnit; - @ExcelProperty("新车型实施日期") + @ApiModelProperty(value = "适用车型") + private String[] typeApplicable; + @ApiModelProperty(value = "能源类型") + private String NYLX; + @ApiModelProperty(value = "标准实施日期") + private String putTime; @ApiModelProperty(value = "新车型实施日期") private String newCarTime; - @ExcelProperty("在产车实施日期") @ApiModelProperty(value = "在产车实施日期") private String nowCarTime; - @ExcelProperty("适用车辆类型") - @ApiModelProperty(value = "适用车辆类型") - private String typeApplicable; - @ExcelProperty("发布日期") - @ApiModelProperty(value = "发布日期") - private String issueTime; - @ExcelProperty("文本状态") - @ApiModelProperty(value = "文本状态") - private String textStatus; + @ApiModelProperty(value = "责任部门") + private String ZRBM; + @ApiModelProperty(value = "适用产品线") + private String SYCPX; + @ApiModelProperty(value = "乘用车VPPS编码") + private String CYCVPPSBM; + @ApiModelProperty(value = "乘用车vpps中文名称") + private String CYCVPPSCN; + @ApiModelProperty(value = "卡车VPPS编码") + private String KCCVPPSBM; + @ApiModelProperty(value = "卡车vpps中文名称") + private String KCCVPPSCN; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index a6534f01..c754777f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -2,17 +2,17 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelVo; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; + import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -31,6 +31,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectLaws(String standId, Integer Page, Integer Size,String standName) { @@ -38,19 +39,11 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl lawsDtoList = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName); - List list = new ArrayList<>(); - for (LittleLawsDto laws:lawsDtoList){ - LawsDto lawsDto = LawsDto.builder() - .id(laws.getId()) - .standNumber(laws.getStandNumber()) - .standName(laws.getStandName()) - .standEnName(laws.getStandEnName()) - .issueTime(laws.getIssueTime()) - .textStatus(laws.getTextStatus()) - .build(); - list.add(lawsDto); - + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName); + for (LawsDto lawsDto:list){ + if (StringUtils.isNoneBlank(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString())){ + lawsDto.setTypeApplicable(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString()); + } } return list; } @@ -58,7 +51,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl attrDetailedLists = new ArrayList<>(); int a=0; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index be282111..d16e3518 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandItems.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import io.swagger.annotations.ApiOperation; @@ -50,4 +51,11 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "分解单查询(带时间)") + @GetMapping("/findAllItemsTimes") + public List findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){ + List sarItemsTimes = ServiceImpl.findItemsTime(type,ids); + return sarItemsTimes; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 99539e9c..c5048813 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandItems.dao; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; +import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -54,4 +55,8 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsSvpps(SarStandItems sarStandItemsEO); List selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids); + + StandsTimeDto selectStandTime(String standId); + + List selectStandTimeAll(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java new file mode 100644 index 00000000..3b71d80a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java @@ -0,0 +1,58 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SarItemsTime { + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准ID") + private String standId; + + @ApiModelProperty(value = "条目编号") + private String itemsNum; + + @ApiModelProperty(value = "内容") + private String itemsName; + + @ApiModelProperty(value = "责任部门") + private String responsibleUnit; + + @ApiModelProperty(value = "新车型实施日期") + @TableField("XCXSSRQ") + private String XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @TableField("ZCCSSRQ") + private String ZCCSSRQ; + + @ApiModelProperty(value = "SVPPS") + private String svpps; + + + @ApiModelProperty(value = "适用车型") + private String applyArctic; + + + @ApiModelProperty(value = "要求类型") + private String claimType; + + @ApiModelProperty(value = "覆盖关系") + private String busStandCover; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java new file mode 100644 index 00000000..a5ea5d3f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java @@ -0,0 +1,33 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StandsTimeDto { + + @ApiModelProperty(value = "标准ID") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "新车型实施日期") + @TableField("XCXSSRQ") + private String XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @TableField("ZCCSSRQ") + private String ZCCSSRQ; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index 680b6a18..2f0ef4c0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -1,11 +1,11 @@ package com.adc.da.slrs.sarStandItems.service; +import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.ArrayList; import java.util.List; /** @@ -19,4 +19,5 @@ import java.util.List; public interface ISarStandItemsService extends IService { List queryItemsByList(SarStandItemsEOPage page, String resType); + List findItemsTime(String type,String ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 9f4c2df3..58de1994 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -1,13 +1,17 @@ package com.adc.da.slrs.sarStandItems.service.impl; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; +import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,6 +62,84 @@ public class SarStandItemsServiceImpl extends ServiceImpl findItemsTime(String type, String ids) { + StandsTimeDto standsTimeDto=new StandsTimeDto(); + List sarItemsTime = new ArrayList<>(); + if (!StringUtils.isEmpty(ids) && ids.contains(",")){ + String[] strings=new String[1]; + String[] Sids=ids.split(","); + for (String id : Sids){ + strings[0]=id; + List ItemDto = dao.selectAllItemsByIds(type,strings); + standsTimeDto=dao.selectStandTime(id); + for (SarStandItemsDto sarStandItemsDto:ItemDto){ + SarItemsTime itemsTime = SarItemsTime.builder() + .id(sarStandItemsDto.getId()) + .standId(sarStandItemsDto.getStandId()) + .itemsName(sarStandItemsDto.getItemsName()) + .itemsNum(sarStandItemsDto.getItemsNum()) + .responsibleUnit(sarStandItemsDto.getResponsibleUnit()) + .XCXSSRQ(standsTimeDto.getXCXSSRQ()) + .ZCCSSRQ(standsTimeDto.getZCCSSRQ()) + .svpps(sarStandItemsDto.getSvpps()) + .applyArctic(sarStandItemsDto.getApplyArctic()) + .claimType(sarStandItemsDto.getClaimType()) + .busStandCover(sarStandItemsDto.getBusStandCover()) + .build(); + sarItemsTime.add(itemsTime); + } + + } + }else if (!StringUtils.isEmpty(ids)){ + String[] Sids=new String[1]; + Sids[0]=ids; + List ItemDto = dao.selectAllItemsByIds(type,Sids); + standsTimeDto=dao.selectStandTime(ids); + for (SarStandItemsDto sarStandItemsDto:ItemDto){ + SarItemsTime itemsTime = SarItemsTime.builder() + .id(sarStandItemsDto.getId()) + .standId(sarStandItemsDto.getStandId()) + .itemsName(sarStandItemsDto.getItemsName()) + .itemsNum(sarStandItemsDto.getItemsNum()) + .responsibleUnit(sarStandItemsDto.getResponsibleUnit()) + .XCXSSRQ(standsTimeDto.getXCXSSRQ()) + .ZCCSSRQ(standsTimeDto.getZCCSSRQ()) + .svpps(sarStandItemsDto.getSvpps()) + .applyArctic(sarStandItemsDto.getApplyArctic()) + .claimType(sarStandItemsDto.getClaimType()) + .busStandCover(sarStandItemsDto.getBusStandCover()) + .build(); + sarItemsTime.add(itemsTime); + } + }else { + List ItemDto = dao.selectAllItemsByIds(type,null); + List standsTimeDtos = dao.selectStandTimeAll(); + for (SarStandItemsDto sarStandItemsDto:ItemDto){ + for (StandsTimeDto standsTimeDto1:standsTimeDtos){ + if (sarStandItemsDto.getStandId().equals(standsTimeDto1.getStandId())){ + SarItemsTime itemsTime = SarItemsTime.builder() + .id(sarStandItemsDto.getId()) + .standId(sarStandItemsDto.getStandId()) + .itemsName(sarStandItemsDto.getItemsName()) + .itemsNum(sarStandItemsDto.getItemsNum()) + .responsibleUnit(sarStandItemsDto.getResponsibleUnit()) + .XCXSSRQ(standsTimeDto1.getXCXSSRQ()) + .ZCCSSRQ(standsTimeDto1.getZCCSSRQ()) + .svpps(sarStandItemsDto.getSvpps()) + .applyArctic(sarStandItemsDto.getApplyArctic()) + .claimType(sarStandItemsDto.getClaimType()) + .busStandCover(sarStandItemsDto.getBusStandCover()) + .build(); + sarItemsTime.add(itemsTime); + } + } + } + } + + return sarItemsTime; + } + public List findAllItems(String type,String[] ids){ return dao.selectAllItemsByIds(type,ids); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index aa242f0a..113ae730 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -654,6 +654,15 @@ + + 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 740f798e..63373f6f 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 @@ -2,24 +2,21 @@ - + SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN + FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on + a.ID = b.STAND_ID - (STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') - or STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')) + (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') + or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')) and - ID IN + a.ID IN #{item} - order by field(ID, - - #{item} - - ) + @@ -45,6 +42,12 @@ order by number + + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES From 7751c75ccf738ed94c2c4e9c5e88b52ae33ef834 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Thu, 15 Jul 2021 17:16:21 +0800 Subject: [PATCH 04/34] feat --- ...ndardComplianceAssessResultController.java | 105 +++++++++++++++++- 1 file changed, 102 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index b637499d..d3a8822d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import cn.hutool.core.map.MapUtil; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -16,12 +17,17 @@ 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; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** *

@@ -98,6 +104,55 @@ public class SarStandardComplianceAssessResultController { } } } + + private static class InsertEntity{ + List entityList; + T eo; + } + + @ApiOperation(value="（插入/更新）标准清单") + @PostMapping("/standard") + public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { + + SarStandardsInfoEO eo = insertEntity.eo; + + if (eo.getStandApplicationType() == 1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); + + }else { + if(eo.getPosition()==1){ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + + }else{ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + } + + + return Result.success(); + } + @ApiOperation(value = "条件查询标准涉及项目符合性清单") @GetMapping("/product") public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { @@ -114,6 +169,17 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } + @ApiOperation(value = "插入标准涉及项目符合性清单") + @PostMapping("/product") + public ResponseMessage insertProduct(List eo) throws Exception { + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + + + return Result.success(); + } + + @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { @@ -137,4 +203,37 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } } + + + @ApiOperation(value = "插入技术审核符合性清单") + @PostMapping("/interpretation") + public ResponseMessage insertInterpretation(InsertEntity insertEntity) throws Exception { + + InterpretationEO eo = insertEntity.eo; + + if (eo.getPosition()==1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + } else { + + + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + + return Result.success(); + } } From 12fa95cea9bf5fa61d44a85bf894d7e4f53bfd00 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 15 Jul 2021 17:43:19 +0800 Subject: [PATCH 05/34] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 33 +++++++++++++++---- .../entity/LawsDto.java | 4 +-- .../entity/StandExcelDto.java | 6 +++- 3 files changed, 34 insertions(+), 9 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 76a7b537..07469001 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 @@ -9,16 +9,13 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; -import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; -import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; -import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -99,7 +96,7 @@ public class SarLawsAttrDetailedListController extends BaseController standExcelDtos = new ArrayList<>(); + for (LawsDto lawsDto:data){ + StandExcelDto standExcelDto = StandExcelDto.builder() + .standNumber(lawsDto.getStandNumber()) + .standName(lawsDto.getStandName()) + .standEnName(lawsDto.getStandEnName()) + .typeApplicable(lawsDto.getTypeApplicable()) + .NYLX(lawsDto.getNYLX()) + .putTime(lawsDto.getPutTime()) + .newCarTime(lawsDto.getXCXSSRQGJ()) + .nowCarTime(lawsDto.getZCCSSRQGJ()) + .ZRBM(lawsDto.getZRBM()) + .SYCPX(lawsDto.getSYCPX()) + .CYCVPPSBM(lawsDto.getCYCVPPSBM()) + .CYCVPPSCN(lawsDto.getCYCVPPSCN()) + .KCCVPPSBM(lawsDto.getKCCVPPSBM()) + .KCCVPPSCN(lawsDto.getKCCVPPSCN()) + .build(); + } EasyExcel.write(response.getOutputStream(), LawsDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(data); } catch (Exception e) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 8ff2ad4e..f5cd3c3f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -34,9 +34,9 @@ public class LawsDto { @ApiModelProperty(value = "标准实施日期") private String putTime; @ApiModelProperty(value = "新车型实施日期") - private String newCarTime; + private String XCXSSRQGJ; @ApiModelProperty(value = "在产车实施日期") - private String nowCarTime; + private String ZCCSSRQGJ; @ApiModelProperty(value = "责任部门") private String ZRBM; @ApiModelProperty(value = "适用产品线") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 6c0992e4..fb9f6787 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -2,8 +2,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * //TODO 添加类、接口描述 @@ -14,6 +16,8 @@ import lombok.Data; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class StandExcelDto { @ApiModelProperty(value = "标准编号") private String standNumber; @@ -22,7 +26,7 @@ public class StandExcelDto { @ApiModelProperty(value = "英文名称") private String standEnName; @ApiModelProperty(value = "适用车型") - private String[] typeApplicable; + private String typeApplicable; @ApiModelProperty(value = "能源类型") private String NYLX; @ApiModelProperty(value = "标准实施日期") From 59b8ee7e19d96587726f5bf3001bdc5394926821 Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 16 Jul 2021 03:10:09 +0000 Subject: [PATCH 06/34] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d10482d6..23fac18c 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ #============================================== # 邮箱配置1 From 06c616a68274655b653a8a7951b0b9023c3b9e84 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 16 Jul 2021 14:08:16 +0800 Subject: [PATCH 07/34] =?UTF-8?q?add=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListServiceImpl.java | 5 +++-- .../controller/SarStandItemsController.java | 8 ++++++++ .../sarStandItems/dao/SarStandItemsDao.java | 2 ++ .../service/ISarStandItemsService.java | 2 ++ .../service/impl/SarStandItemsServiceImpl.java | 18 +++++++++++++++++- .../SarStandItems/SarStandItemsMapper.xml | 5 +++++ 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index c754777f..9b3f4cc5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -41,8 +41,9 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName); for (LawsDto lawsDto:list){ - if (StringUtils.isNoneBlank(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString())){ - lawsDto.setTypeApplicable(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString()); + if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){ + lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); + System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); } } return list; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index d16e3518..58f829bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandItems.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; @@ -58,4 +59,11 @@ public class SarStandItemsController extends BaseController { return sarItemsTimes; } + @ApiOperation(value = "标准查询") + @PostMapping("/findStand") + public List findStand(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "size",defaultValue = "10") int size){ + List sarItems = ServiceImpl.selectLawDto(page,size); + return sarItems; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index c5048813..7da923fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -59,4 +59,6 @@ public interface SarStandItemsDao extends BaseMapper { StandsTimeDto selectStandTime(String standId); List selectStandTimeAll(); + + List selectStandId(@Param("page")int page,@Param("size")int size); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index 2f0ef4c0..441ccefe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandItems.service; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; @@ -20,4 +21,5 @@ public interface ISarStandItemsService extends IService { List queryItemsByList(SarStandItemsEOPage page, String resType); List findItemsTime(String type,String ids); + List selectLawDto(int page,int size); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 58de1994..c718629c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarStandItems.service.impl; import com.adc.da.http.Result; +import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; @@ -34,7 +36,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl queryItemsByList(SarStandItemsEOPage page, String resType){ List itemsEOList = dao.queryItemsByList(page); @@ -140,6 +143,19 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectLawDto(int page,int size) { + List standId = dao.selectStandId(page-1,size); + List list = sarLawsAttrDetailedListDao.selectLawsById(standId,null); + for (LawsDto lawsDto:list){ + if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){ + lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); + System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); + } + } + return list; + } + public List findAllItems(String type,String[] ids){ return dao.selectAllItemsByIds(type,ids); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 113ae730..bdfce6c0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -663,6 +663,11 @@ select STAND_ID,XCXSSRQ,ZCCSSRQ from sar_stand_attr_info + From be34548613ed97dbb1491236cb5498770ba4d003 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 16 Jul 2021 16:05:20 +0800 Subject: [PATCH 08/34] =?UTF-8?q?update:=E5=B0=81=E8=A3=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 5 ++-- .../sarStandItems/dao/SarStandItemsDao.java | 4 +++- .../service/ISarStandItemsService.java | 3 ++- .../impl/SarStandItemsServiceImpl.java | 9 +++++-- .../SarStandItems/SarStandItemsMapper.xml | 24 +++++++++++++++---- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 58f829bf..b3ce9159 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -8,6 +8,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -61,8 +62,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "标准查询") @PostMapping("/findStand") - public List findStand(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "size",defaultValue = "10") int size){ - List sarItems = ServiceImpl.selectLawDto(page,size); + public IPage findStand(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size){ + IPage sarItems = ServiceImpl.selectLawDto(page,size); return sarItems; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 7da923fb..0f5aa0d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -60,5 +60,7 @@ public interface SarStandItemsDao extends BaseMapper { List selectStandTimeAll(); - List selectStandId(@Param("page")int page,@Param("size")int size); + List selectStandId(@Param("page")int page, @Param("size")int size); + + int selectToken(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index 441ccefe..ae927b3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -21,5 +22,5 @@ public interface ISarStandItemsService extends IService { List queryItemsByList(SarStandItemsEOPage page, String resType); List findItemsTime(String type,String ids); - List selectLawDto(int page,int size); + IPage selectLawDto(int page, int size); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c718629c..ccae3bca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -12,6 +12,8 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -144,7 +146,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectLawDto(int page,int size) { + public IPage selectLawDto(int page, int size) { List standId = dao.selectStandId(page-1,size); List list = sarLawsAttrDetailedListDao.selectLawsById(standId,null); for (LawsDto lawsDto:list){ @@ -153,7 +155,10 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); + page1.setRecords(list); + page1.setTotal(dao.selectToken()); + return page1; } public List findAllItems(String type,String[] ids){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index bdfce6c0..c4f8461e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -663,11 +663,25 @@ select STAND_ID,XCXSSRQ,ZCCSSRQ from sar_stand_attr_info - + SELECT + a.STAND_ID + FROM + sar_stand_items a + LEFT JOIN sar_standards_info b + on a.STAND_ID=b.ID + WHERE b.VALID_FLAG = 0 + GROUP BY + a.STAND_ID + limit #{page},#{size} + + - From ee7358191220b6873943a779b3e0a6489989fe8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Fri, 16 Jul 2021 08:27:45 +0000 Subject: [PATCH 09/34] Update application.properties --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6b97ffad..5b30f553 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 From eca5c9ae331a2c72dcc9dee2d26f98ec02bf6b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Fri, 16 Jul 2021 08:50:12 +0000 Subject: [PATCH 10/34] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 23fac18c..d10482d6 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 From a2be968da5c056e097b616c12ba7371c61ef2c46 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Mon, 19 Jul 2021 09:32:23 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6-=E6=A0=B9=E6=8D=AE=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86=E7=AD=9B=E9=80=89=20=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AAbug=EF=BC=8C=E6=8B=86?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E9=94=99=E5=90=8E=E4=B8=8D=E8=AE=A9=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 34 ++++++++++++++++++- .../controller/SarStandFileEOController.java | 4 +++ .../standardSplit/entity/SarStandFileEO.java | 10 ++++++ .../impl/SarFileSplitInfoEOServiceImpl.java | 7 ++-- .../SarFileSplitInfoEOMapper.xml | 3 ++ .../standardSplit/SarStandFileEOMapper.xml | 3 +- 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index a724e332..8d9ef5de 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -88,8 +88,40 @@ public class ActSarItemsEOService { @Value("${elas.flag}") private boolean elasflag; + /** + * 标准解读流程入库" + * @param standJson + * @throws Exception + */ + public void createStandardRead(String standJson) throws Exception{ + JSONObject object = JSONObject.parseObject(standJson); + String fileName = object.getString("fileName"); + String fileType = object.getString("fileType"); + String creationTime = object.getString("creationTime"); + String creationUser = object.getString("creationUser"); + String standId = object.getString("standId"); + //数组去重 + JSONArray responUserList1 = object.getJSONArray("itemList"); + for (Object obj:responUserList1) { + JSONObject object1 = (JSONObject) obj; + JSONArray preResponUserList = object1.getJSONArray("zxUserId"); + String oldNumber = object1.getString("oldNumber"); + String itemsNum = object1.getString("itemsNum"); + String itemsName = object1.getString("itemsName"); + String itemsTitle = object1.getString("itemsTitle"); + String applyArcticId = object1.getString("applyArcticId"); + String applyArctic = object1.getString("applyArctic"); + String changePoint = object1.getString("changePoint"); + String technicalRequir = object1.getString("technicalRequir"); + String onlineData = object1.getString("onlineData"); + String newData = object1.getString("newData"); + String complianceRequir = object1.getString("complianceRequir"); + String complianceState = object1.getString("complianceState"); + } + } + /*** - * @Description: 标准入库流程数据保存 + * @Description: 标准解读流程入库" * @Author: yangxuenan * @Date: 2020/12/7 13:48 * @Param: [standJson] diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index c671b63c..825a91d6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; @@ -118,6 +119,9 @@ public class SarStandFileEOController extends BaseController { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + for (SarStandFileEO one:rows) { + one.setAttId(one.getAttId1()); + } if (rows != null && !rows.isEmpty()) { for (SarStandFileEO sarStandFileEO : rows) { List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java index b45d23b3..6e8ef33a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java @@ -21,6 +21,16 @@ public class SarStandFileEO extends BaseEntity { private String validFlag; private String useModel; private String attId; + + public String getAttId1() { + return attId1; + } + + public void setAttId1(String attId1) { + this.attId1 = attId1; + } + + private String attId1; private String resId; private String standId; private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d49d5d84..ad78a58f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -37,9 +37,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.dao.PersonCollectEODao; +import org.springframework.transaction.interceptor.TransactionAspectSupport; @Service -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); @@ -104,6 +104,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } @Override + @Transactional public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){ // 拆分文件主表中插入数据 sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); @@ -135,7 +136,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); - String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is); @@ -317,6 +319,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } catch (Exception e) { e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return -1; } if(treeList.size()>0 && messageList.size() > 0){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml index 5f560a34..491246ff 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -263,6 +263,9 @@ and SAR_FILE_SPLIT_INFO.stand_id = #{standId} + + and SAR_TYPE = #{sarType} + and SAR_FILE_SPLIT_INFO.id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index 471e17c1..8a7744c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -20,6 +20,7 @@ + @@ -278,7 +279,7 @@ CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) ) ) AS standNumber, SAR_STANDARDS_INFO.stand_name as standName, - SAR_STAND_FILE.att_id AS attId, + SAR_STAND_FILE.att_id AS attId1, SAR_STANDARDS_INFO.STAND_TYPE as sarType FROM SAR_STAND_FILE From ff3547f05e20b671c4a760bc19095934804a28a1 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 19 Jul 2021 14:13:41 +0800 Subject: [PATCH 12/34] =?UTF-8?q?update:=E6=A3=80=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 2 ++ .../controller/SarStandItemsController.java | 5 +++-- .../sarStandItems/entity/FindStandDto.java | 17 ++++++++++++++ .../service/ISarStandItemsService.java | 3 ++- .../impl/SarStandItemsServiceImpl.java | 16 ++++++++------ .../SarStandItems/SarStandItemsMapper.xml | 1 + .../SarLawsAttrDetailedListMapper.xml | 22 +++++++++++++++++-- 7 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 7fb3570b..b4f72493 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -23,6 +23,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); + //根据标准id查出数据 + List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); //查询适用车型 List selectTypeApplicable(@Param("param1") String LawsId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index b3ce9159..993de484 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarStandItems.entity.FindStandDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; @@ -62,8 +63,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "标准查询") @PostMapping("/findStand") - public IPage findStand(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size){ - IPage sarItems = ServiceImpl.selectLawDto(page,size); + public IPage findStand(FindStandDto findStandDto){ + IPage sarItems = ServiceImpl.selectLawDto(findStandDto); return sarItems; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java new file mode 100644 index 00000000..dfbbe661 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-19 + */ +@Data +public class FindStandDto { + private int page; + private int size; + private String standName; + private String standType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index ae927b3b..6c18080a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandItems.service; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarStandItems.entity.FindStandDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; @@ -22,5 +23,5 @@ public interface ISarStandItemsService extends IService { List queryItemsByList(SarStandItemsEOPage page, String resType); List findItemsTime(String type,String ids); - IPage selectLawDto(int page, int size); + IPage selectLawDto(FindStandDto findStandDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index ccae3bca..14e15752 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -3,11 +3,8 @@ package com.adc.da.slrs.sarStandItems.service.impl; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; -import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; @@ -146,9 +143,14 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectLawDto(int page, int size) { - List standId = dao.selectStandId(page-1,size); - List list = sarLawsAttrDetailedListDao.selectLawsById(standId,null); + public IPage selectLawDto(FindStandDto findStandDto) { + List standId = dao.selectStandId((findStandDto.getPage())-1, findStandDto.getSize()); + List list=new ArrayList<>(); + if (standId==null || standId.size()==0){ + list = null; + }else { + list = sarLawsAttrDetailedListDao.selectLawsByIdC(standId,findStandDto.getStandName(), findStandDto.getStandType()); + } for (LawsDto lawsDto:list){ if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){ lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index c4f8461e..f42fb7ba 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -671,6 +671,7 @@ LEFT JOIN sar_standards_info b on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 + and a.FILE_TYPE ='FBGBJBD' GROUP BY a.STAND_ID limit #{page},#{size} 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 63373f6f..f0371de6 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,8 +15,7 @@ a.ID IN #{item} - - + @@ -47,6 +46,25 @@ FROM sar_stand_items WHERE ID =#{param1,jdbcType=VARCHAR} + 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 13/34] =?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 14/34] =?UTF-8?q?update:=E4=BF=AE=E5=A4=8D=E6=B8=85?= =?UTF-8?q?=E5=8D=95bug?= 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 15/34] =?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 16/34] =?UTF-8?q?update:=E7=BC=A9=E7=9F=AD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=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); From 7d890e7fcd53d7d78f5b2b6acf5708b13032ded1 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 21 Jul 2021 10:52:22 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 2 +- .../entity/LawsDto.java | 3 ++ .../impl/SarLawsDetailedListServiceImpl.java | 14 ++++--- .../sarStandItems/entity/SarStandItems.java | 4 ++ .../entity/SarStandItemsDto.java | 2 +- .../SarStandProjectLibraryController.java | 8 +++- .../SarStandUnqualifiedController.java | 14 +++++++ .../dao/SarStandUnqualifiedDao.java | 9 +++- .../entity/SarStandUnqualified.java | 20 +++++++-- .../service/ISarStandUnqualifiedService.java | 1 + .../impl/SarStandUnqualifiedServiceImpl.java | 41 ++++++++++--------- ...ndardComplianceAssessResultController.java | 15 ++++--- .../SarStandardComplianceProductAssess.java | 2 + .../SarStandItems/SarStandItemsMapper.xml | 2 +- .../SarLawsAttrDetailedListMapper.xml | 4 +- .../SarStandProjectLibraryMapper.xml | 16 ++++---- .../SarStandUnqualifiedMapper.xml | 27 ++++++++++++ 17 files changed, 134 insertions(+), 50 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 8d9ef5de..670dde45 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -141,7 +141,7 @@ public class ActSarItemsEOService { // String resId = standMap.get("standId").toString(); // //此处说明是带入的形式 // sarStandardsInfoEO.setId(resId); -// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.getAssessInfoByResId(resId); +// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId); // if (assessInfoByResId != null) { // assessInfoByResId.setProcessState("2"); // sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index f5cd3c3f..4697d6ff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -49,4 +50,6 @@ public class LawsDto { private String KCCVPPSBM; @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; + @ApiModelProperty(value = "责任工程师") + private String responsibleEngineer; } 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 f6223f44..1f010567 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 @@ -99,7 +99,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer pages, Integer size, String sortKey, + public IPage AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea,String projectName, String detailedList,String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -115,8 +115,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl page = new Page<>(pages, size); - IPage userIPage = sarLawsDetailedListDao.selectPage(page, wrapper); + Page pageRes = new Page<>(page, pageSize); + IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); if ("1".equals(sortKey)){ Map map= iDicTypeEOService.getDicTypeListCode(); List list= userIPage.getRecords(); @@ -196,9 +196,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl pageres=new Page(); + pageres.setRecords(listTemp); + pageres.setPages(list1.getPages()); + pageres.setTotal(list1.getTotal()); + pageres.setCurrent(list1.getCurrent()); + pageres.setSize(list1.getSize()); + return Result.success("200",pageres); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index 61b9e5c7..91ead351 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -34,7 +34,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.net.URLEncoder; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -55,6 +57,18 @@ public class SarStandUnqualifiedController extends BaseController add(@RequestBody List sarStandUnqualified){ + sarStandUnqualified.forEach(sarStandUnqualified1 -> sarStandUnqualified1.setCreateTime(new Date())); + if (sarStandUnqualifiedService.saveBatch(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index d91792c6..9ed080b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; /** *

@@ -12,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2021-06-15 */ public interface SarStandUnqualifiedDao extends BaseMapper { - + IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 2dd65a21..f45817e6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -3,11 +3,13 @@ package com.adc.da.slrs.sarStandUnqualified.entity; import com.adc.da.base.entity.BaseEntity; import java.sql.Timestamp; +import java.util.Date; import com.adc.da.slrs.sarStandUnqualified.utils.ProductTypeConverter; import com.adc.da.slrs.sarStandUnqualified.utils.TimestampConverter; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -84,7 +86,7 @@ public class SarStandUnqualified extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("CREATE_TIME") - private Timestamp createTime; + private Date createTime; @ExcelIgnore @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）") @@ -96,14 +98,14 @@ public class SarStandUnqualified extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ACTUAL_CLOSE_TIME") - private Timestamp actualCloseTime; + private Date actualCloseTime; @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") - private Timestamp planCloseTime; + private Date planCloseTime; @ApiModelProperty(value = "未符合原因") @TableField("REASON") @@ -133,8 +135,18 @@ public class SarStandUnqualified extends BaseEntity { @ExcelIgnore @ApiModelProperty(value = "主键") - @TableId("ID") + @TableId(type = IdType.UUID) private String id; + @ApiModelProperty(value = "质量工程师") + private String qaEngineerName; + + @ApiModelProperty(value = "认证工程师") + private String authEngineerName; + + @ApiModelProperty(value = "责任工程师") + private String dutyEngineerName; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java index 4d7873ca..df5fa169 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java @@ -46,4 +46,5 @@ public interface ISarStandUnqualifiedService extends IService */ List getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index bfa7a494..11e9a2dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -40,25 +40,28 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { - QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); -// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); - } - //仅查询未关闭的 - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); - } - if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ - sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); - } - Page standUnqualifiedPage=new Page<>(); - //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ - standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// if(sarStandUnqualifiedPage.getStandId()!=null){ +// sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); +//// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); +// } +// //仅查询未关闭的 +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// if(sarStandUnqualifiedPage.getProductName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); +// } +// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); +// } +// Page standUnqualifiedPage=new Page<>(); +// //判断前端是否提供页码和每页条数 +// if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ +// standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); +// } + Page pag = new Page(); + pag.setCurrent(sarStandUnqualifiedPage.getCurrent()).setSize(sarStandUnqualifiedPage.getSize()); + + return sarStandUnqualifiedDao.getAllDatasByPage(pag,sarStandUnqualifiedPage); } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d3a8822d..8ec23ad6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -12,6 +12,7 @@ import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretat import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,9 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -170,10 +169,14 @@ public class SarStandardComplianceAssessResultController { } @ApiOperation(value = "插入标准涉及项目符合性清单") - @PostMapping("/product") - public ResponseMessage insertProduct(List eo) throws Exception { + @PostMapping("/add") + public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { - iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + eo.forEach(sarStandardComplianceProductAssess -> { + sarStandardComplianceProductAssess.setId(UUIDUtils.randomUUID(32)); + sarStandardComplianceProductAssess.setInterpretationTime(new Date()); + }); + iSarStandardComplianceProductAssessService.saveBatch(eo); return Result.success(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index bfaa990b..706bde15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -109,4 +109,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { private Date interpretationTime; + private String id; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index f42fb7ba..a77962cc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -643,7 +643,7 @@ @@ -47,7 +47,7 @@ WHERE ID =#{param1,jdbcType=VARCHAR} + select s.product_line,t.UNAME as uName ,s.project_manager as projectManager + from sar_stand_project_library s + INNER JOIN ts_user t + ON s.project_manager=t.USID + GROUP BY s.product_line + limit #{current},#{pageSize} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index b90da545..da1eb9a9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -2,4 +2,31 @@ + + From 1ad63eff70576f0413b190fabf0fa12af95861ac Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Wed, 21 Jul 2021 16:02:50 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../src/main/resources/application-dev.properties | 10 +++++----- .../src/main/resources/application-prod.properties | 10 +++++----- .../src/main/resources/application-test.properties | 14 +++++++++----- .../src/main/resources/application.properties | 4 ++-- .../dao/SarStandUnqualifiedDao.java | 2 ++ .../impl/SarStandUnqualifiedServiceImpl.java | 12 +++++++++--- 7 files changed, 33 insertions(+), 21 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ca2d6fdd..c9b1fd24 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-wh") //@FeignClient(value = "shan") public interface workFlowFeignClient { diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d10482d6..930a5c60 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://10.96.10.171 :3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -11,14 +11,14 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem +spring.application.name=BAT-WKFLOW-WH application.code=20200101 application.center=1 #============================================== #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ #============================================== # 邮箱配置1 @@ -43,7 +43,7 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=192.168.10.248 +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 spring.rabbitmq.username=ca spring.rabbitmq.password=cs986432 @@ -65,4 +65,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.times=20 -OCR.convertType=BOTH \ No newline at end of file +OCR.convertType=BOTH diff --git a/adc-da-main/src/main/resources/application-prod.properties b/adc-da-main/src/main/resources/application-prod.properties index 203e71c7..dd9b39be 100644 --- a/adc-da-main/src/main/resources/application-prod.properties +++ b/adc-da-main/src/main/resources/application-prod.properties @@ -25,14 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +# +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ diff --git a/adc-da-main/src/main/resources/application-test.properties b/adc-da-main/src/main/resources/application-test.properties index 55f14c4b..bf84333a 100644 --- a/adc-da-main/src/main/resources/application-test.properties +++ b/adc-da-main/src/main/resources/application-test.properties @@ -25,14 +25,18 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 +#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +#spring.rabbitmq.port=5672 +#spring.rabbitmq.virtual-host=uat_pcms +#spring.rabbitmq.username=uat_pcms +#spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 5b30f553..f1e79d41 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -146,4 +146,4 @@ elasticsearch.clustername=elasticsearch elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 -elas.flag=true \ No newline at end of file +elas.flag=true diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index d91792c6..8c35c794 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author super_liu * @since 2021-06-15 */ +@Mapper public interface SarStandUnqualifiedDao extends BaseMapper { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index bfa7a494..fb3e1461 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -10,10 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; @@ -42,13 +43,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); + sarStandUnqualifiedQueryWrapper + .and(wrapper->wrapper + .like("stand_id",sarStandUnqualifiedPage.getStandId()) + .or() + .like("stand_name",sarStandUnqualifiedPage.getStandId()) + .eq("close_state",1)); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } //仅查询未关闭的 sarStandUnqualifiedQueryWrapper.eq("close_state",1); if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); + sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); } if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); From 3595ea2aa3f2c16b6df158ed2ada046363f692e6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 21 Jul 2021 16:41:37 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandProjectLibraryController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 68a455c5..39d3810c 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 @@ -7,6 +7,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibrar import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; 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.*; import io.swagger.annotations.Api; @@ -87,7 +88,7 @@ public class SarStandProjectLibraryController extends BaseController pageres=new Page(); + IPage pageres=new Page<>(); pageres.setRecords(listTemp); pageres.setPages(list1.getPages()); pageres.setTotal(list1.getTotal()); From eaa96812693ba58241eba0d72b3325711efff517 Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Wed, 21 Jul 2021 18:04:48 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandUnqualifiedServiceImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index fb3e1461..1c73a0d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -44,11 +44,8 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ sarStandUnqualifiedQueryWrapper - .and(wrapper->wrapper - .like("stand_id",sarStandUnqualifiedPage.getStandId()) - .or() - .like("stand_name",sarStandUnqualifiedPage.getStandId()) - .eq("close_state",1)); + .like("stand_id",sarStandUnqualifiedPage.getStandId()) + .like("stand_name",sarStandUnqualifiedPage.getStandId()); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } //仅查询未关闭的 @@ -61,7 +58,8 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ + if(sarStandUnqualifiedPage.getCurrent()!=null + && sarStandUnqualifiedPage.getSize()!=null){ standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); } return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); @@ -76,14 +74,14 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); + sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name",sarStandUnqualifiedPage.getStandId())); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } //仅查询关闭的 sarStandUnqualifiedQueryWrapper.eq("close_state",2); if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); + sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); } if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); From 462068b90a4cf1dd6be0bd0f9d4a999387c97f50 Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Wed, 21 Jul 2021 18:17:09 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java | 1 + .../service/impl/SarStandUnqualifiedServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index 8c35c794..c63ef3a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SarStandUnqualifiedDao extends BaseMapper { + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 1c73a0d7..bcf5128c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -144,3 +144,4 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl Date: Thu, 22 Jul 2021 10:26:09 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=96=B0=E5=A2=9Ebug?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/common/ActDefineStartMap.java | 1 + .../adc/da/slrs/sarUrl/controller/TsUrlController.java | 8 ++++++-- .../main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java | 2 +- .../com/adc/da/slrs/sarUrl/service/ITsUrlService.java | 2 +- .../adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 7fede944..a229d7d1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -19,6 +19,7 @@ public class ActDefineStartMap { map.put("3","standardCommentProcessWorkFlow"); map.put("4","standardregulatoryinventory"); map.put("5","projectEvaluationProcess"); + map.put("6","Projectcomplianceassessment"); map.put("8","nonConformanceRectificationKey"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index 6289f618..11a87b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -51,8 +51,12 @@ public class TsUrlController{ @ApiOperation(value="第三方链接-添加", notes="第三方链接-添加") @PostMapping(value = "/add") public ResponseMessage add(@RequestBody TsUrl tsUrl) { - int orderBy=tsUrlService.getMaxOrderBy(); - tsUrl.setOrderBy(orderBy+1); + String orderBy=tsUrlService.getMaxOrderBy(); + if (null!=orderBy) { + tsUrl.setOrderBy(Integer.valueOf(orderBy) + 1); + }else { + tsUrl.setOrderBy(1); + } tsUrlService.save(tsUrl); return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java index ab94703f..e3ecaf62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java @@ -18,5 +18,5 @@ public interface TsUrlDao extends BaseMapper { * @return int */ @Select("select max(order_by) from ts_url") - int getMaxOrderBy(); + String getMaxOrderBy(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java index bfe81d66..ab1bf403 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java @@ -20,7 +20,7 @@ public interface ITsUrlService extends IService { * 获取最大排序号 * @return int */ - int getMaxOrderBy(); + String getMaxOrderBy(); /** * 排序 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java index 0480a39b..f4ac3d98 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java @@ -31,7 +31,7 @@ public class TsUrlServiceImpl extends ServiceImpl implements IT * @return int */ @Override - public int getMaxOrderBy() { + public String getMaxOrderBy() { return tsUrlDao.getMaxOrderBy(); } From 91c4dea4db6e67623498d38ae2600404e58cc03b Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 22 Jul 2021 16:10:53 +0800 Subject: [PATCH 23/34] =?UTF-8?q?update:=E6=B8=85=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 163 +++++++++++++++--- .../dao/SarLawsAttrDetailedListDao.java | 5 +- .../entity/LawsDto.java | 9 +- .../entity/SarFindDto.java | 31 ++++ .../entity/SarLawsAttrDetailedList.java | 11 ++ .../entity/StandRegionalTimeDto.java | 22 +++ .../entity/StandTimeDto.java | 20 +++ .../ISarLawsAttrDetailedListService.java | 14 +- .../SarLawsAttrDetailedListServiceImpl.java | 149 ++++++++++++++-- .../SarLawsDetailedListController.java | 2 +- .../entity/AddDetailedDto.java | 11 +- .../entity/DetailedUpDto.java | 10 ++ .../sarLawsDetailedList/entity/IdListDto.java | 2 +- .../sarLawsDetailedList/entity/TimeDto.java | 28 +++ .../impl/SarLawsDetailedListServiceImpl.java | 76 +++++++- .../impl/SarStandItemsServiceImpl.java | 6 - .../SarLawsAttrDetailedListMapper.xml | 26 ++- 17 files changed, 511 insertions(+), 74 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java 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 77e9adad..75296465 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 @@ -3,15 +3,14 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.controller; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; -import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.sys.service.IDicTypeEOService; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +24,7 @@ import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -46,6 +46,8 @@ public class SarLawsAttrDetailedListController extends BaseController laws = iSarLawsAttrDetailedList.selectLaws(id,Page-1,Size,standName); + public ResponseMessage selectLawsById(SarFindDto sarFindDto){ + List laws = iSarLawsAttrDetailedList.selectLaws(sarFindDto); return Result.success("200",laws); } @@ -85,6 +87,26 @@ public class SarLawsAttrDetailedListController extends BaseController> map = iSarLawsAttrDetailedList.selectTimes(id); + return Result.success("200",map); + } /** @@ -114,29 +136,120 @@ public class SarLawsAttrDetailedListController extends BaseController map= iDicTypeEOService.getDicTypeListCode(); + List> typeApplicable = (List>)map.get("ENERGYTYPES"); + for (LawsDto list1:data){ + if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")){ + String[] split = list1.getTypeApplicable().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:typeApplicable) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setTypeApplicable(completedString); + }else { + for (Map map1 : typeApplicable) { + if (map1.get("value").equals(list1.getTypeApplicable())) { + list1.setTypeApplicable(map1.get("label")); + break; + } + } } } - List standExcelDtos = new ArrayList<>(); - for (LawsDto lawsDto:data){ - StandExcelDto standExcelDto = StandExcelDto.builder() - .standNumber(lawsDto.getStandNumber()) - .standName(lawsDto.getStandName()) - .standEnName(lawsDto.getStandEnName()) - .typeApplicable(lawsDto.getTypeApplicable()) - .NYLX(lawsDto.getNYLX()) - .putTime(lawsDto.getPutTime()) - .newCarTime(lawsDto.getXCXSSRQGJ()) - .nowCarTime(lawsDto.getZCCSSRQGJ()) - .ZRBM(lawsDto.getZRBM()) - .SYCPX(lawsDto.getSYCPX()) - .CYCVPPSBM(lawsDto.getCYCVPPSBM()) - .CYCVPPSCN(lawsDto.getCYCVPPSCN()) - .KCCVPPSBM(lawsDto.getKCCVPPSBM()) - .KCCVPPSCN(lawsDto.getKCCVPPSCN()) - .build(); + //能源类型 + List> nylx = (List>)map.get("NYLXCLASS"); + for (LawsDto list1:data){ + if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")){ + String[] split = list1.getNYLX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:nylx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setNYLX(completedString); + }else { + for (Map map1 : nylx) { + if (map1.get("value").equals(list1.getNYLX())) { + list1.setNYLX(map1.get("label")); + break; + } + } + } + } + //责任部门 + List> zrbn = (List>)map.get("ZRBMCLASS"); + for (LawsDto list1:data){ + if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")){ + String[] split = list1.getZRBM().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:zrbn) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setZRBM(completedString); + }else { + for (Map map1 : zrbn) { + if (map1.get("value").equals(list1.getZRBM())) { + list1.setZRBM(map1.get("label")); + break; + } + } + } + } + //产品线 + List> sycpx = (List>)map.get("SYCPXCLASS"); + for (LawsDto list1:data){ + if (list1.getPutTime()!=null){ + list1.setPutTime(list1.getPutTime().substring(0,10)); + } + if (list1.getZCCSSRQGJ()!=null){ + list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); + } + if (list1.getXCXSSRQGJ()!=null){ + list1.setXCXSSRQGJ(list1.getXCXSSRQGJ().substring(0,10)); + } + + if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){ + String[] split = list1.getSYCPX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:sycpx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setSYCPX(completedString); + }else { + for (Map map1 : sycpx) { + if (map1.get("value").equals(list1.getSYCPX())) { + list1.setSYCPX(map1.get("label")); + break; + } + } + } } EasyExcel.write(response.getOutputStream(), LawsDto.class).useDefaultStyle(false).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(data); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index b4f72493..ed36ebde 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.dao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,8 +26,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); //根据标准id查出数据 List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); - //查询适用车型 - List selectTypeApplicable(@Param("param1") String LawsId); + //查询时间 + List selectTimes(String standId); List selectLawsId2(String standId); Boolean insertList(@Param("sarLawsAttrDetailedLists") List sarLawsAttrDetailedLists); Boolean deleteByStandId(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index da5b5a5f..17e132b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -1,7 +1,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -11,7 +14,7 @@ import lombok.NoArgsConstructor; /** * //Dto,用于从标准主表中查询和检索信息 - * 主表还未完善需修改 + * * * @author ZhangZhiYuan * date 2021-06-16 @@ -20,6 +23,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor +@ExcelIgnoreUnannotated public class LawsDto { @ApiModelProperty(value = "主键") private String id; @@ -41,14 +45,17 @@ public class LawsDto { @ColumnWidth(16) @ExcelProperty(value = "标准实施日期", index = 5) @ApiModelProperty(value = "标准实施日期") + @DateTimeFormat("yyyy年MM月dd日") private String putTime; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 6) @ApiModelProperty(value = "新车型实施日期") + @DateTimeFormat("yyyy年MM月dd日") private String XCXSSRQGJ; @ColumnWidth(16) @ExcelProperty(value = "在产车实施日期", index = 7) @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat("yyyy年MM月dd日") private String ZCCSSRQGJ; @ExcelProperty(value = "责任部门", index = 8) @ApiModelProperty(value = "责任部门") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java new file mode 100644 index 00000000..1b1af5f2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.sarLawsAttrDetailedList.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 高级检索 + * + * @author ZhangZhiYuan + * @date 2021-07-22 + */ +@Data +public class SarFindDto { + private int Page; + private int Size; + private String id; + private String standName; + private String standNumber; + private String standEnName; + private String typeApplicable; + private String NYLX; + private String putTime; + private String XCXSSRQGJ; + private String ZCCSSRQGJ; + private String ZRBM; + private String SYCPX; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index f3546b89..45dc5441 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -43,5 +43,16 @@ public class SarLawsAttrDetailedList extends BaseEntity { @TableField(value = "number") private String number; + @ApiModelProperty(value = "标准实施日期") + @TableField(value = "putTime") + private String putTime; + + @ApiModelProperty(value = "新车型实施日期") + @TableField(value = "xcxssrq") + private String xcxssrq; + + @ApiModelProperty(value = "在产车实施日期") + @TableField(value = "zccssrq") + private String zccssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java new file mode 100644 index 00000000..9bdae697 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.sarLawsAttrDetailedList.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-21 + */ +@Data +public class StandRegionalTimeDto { + @ApiModelProperty(value = "国家") + private String country; + @ApiModelProperty(value = "实施日期") + private String putTime; + @ApiModelProperty(value = "在产车实施日期") + private String zccssrq; + @ApiModelProperty(value = "新车型实施日期") + private String xcxssrq; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java new file mode 100644 index 00000000..9d3d62fe --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarLawsAttrDetailedList.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-21 + */ +@Data +public class StandTimeDto { + @ApiModelProperty(value = "实施日期") + private String putTime; + @ApiModelProperty(value = "在产车实施日期") + private String zccssrq; + @ApiModelProperty(value = "新车型实施日期") + private String xcxssrq; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index 4edd0d76..fa891d9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -1,12 +1,12 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelVo; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; +import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** *

@@ -18,8 +18,10 @@ import java.util.List; */ public interface ISarLawsAttrDetailedListService extends IService { - List selectLaws(String standId, Integer Page, Integer Size,String standName); - Boolean insertDetailedList(String id,String[] lawsIds); - Boolean updateDetailedLaws(String id,String[] lawsIds); + List selectLaws(SarFindDto sarFindDto); + Boolean insertDetailedList(String id,List timeDto); + Boolean updateDetailedLaws(String id,List timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); + int setTimes(SarLawsAttrDetailedList sarLawsAttrDetailedList); + Map> selectTimes(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 9b3f4cc5..6dfd5fbf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -1,10 +1,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelVo; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +16,9 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -31,19 +33,107 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectLaws(String standId, Integer Page, Integer Size,String standName) { - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(standId,Page,Size); + public List selectLaws(SarFindDto sarFindDto) { + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; } - List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto.getStandName()); for (LawsDto lawsDto:list){ - if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){ - lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); - System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stand_id",lawsDto.getId()) + .eq("detailed_list_id",sarFindDto.getId()); + List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ + lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } + } + //适用车型 + Map map= iDicTypeEOService.getDicTypeListCode(); + List> typeApplicable = (List>)map.get("ENERGYTYPES"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")){ + String[] split = list1.getTypeApplicable().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:typeApplicable) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setTypeApplicable(completedString); + } + } + //能源类型 + List> nylx = (List>)map.get("NYLXCLASS"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")){ + String[] split = list1.getNYLX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:nylx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setNYLX(completedString); + } + } + //责任部门 + List> zrbn = (List>)map.get("ZRBMCLASS"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")){ + String[] split = list1.getZRBM().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:zrbn) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setZRBM(completedString); + } + } + //产品线 + List> sycpx = (List>)map.get("SYCPXCLASS"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){ + String[] split = list1.getSYCPX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:sycpx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setSYCPX(completedString); } } return list; @@ -51,17 +141,20 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl timeDto) { + if (null !=timeDto && !timeDto.isEmpty()){ try { List attrDetailedLists = new ArrayList<>(); int a=0; - for (String lawsId:lawsIds){ + for (TimeDto timeDto1:timeDto){ SarLawsAttrDetailedList sarLawsAttrDetailedList = SarLawsAttrDetailedList.builder() .id(UUIDUtils.randomUUID20()) - .standId(lawsId) + .standId(timeDto1.getStandId()) .detailedListId(standId) .number(String.valueOf(a)) + .putTime(timeDto1.getPutTime()) + .xcxssrq(timeDto1.getXcxssrqgj()) + .zccssrq(timeDto1.getZccssrqgj()) .build(); attrDetailedLists.add(sarLawsAttrDetailedList); a++; @@ -77,12 +170,12 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl timeDto) { try { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("detailed_list_id",id); sarLawsAttrDetailedListDao.delete(wrapper); - insertDetailedList(id,lawsIds); + insertDetailedList(id,timeDto); return true; } catch (Exception e) { return false; @@ -94,5 +187,31 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { + List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); + Map> mapList = new HashMap>(); + for (StandRegionalTimeDto s:standRegionalTimeDto){ + List list; + if (mapList.containsKey(s.getCountry())){ + list = mapList.get(s.getCountry()); + }else { + list = new ArrayList<>(); + } + StandTimeDto standTimeDto = new StandTimeDto(); + standTimeDto.setPutTime(s.getPutTime()); + standTimeDto.setXcxssrq(s.getXcxssrq()); + standTimeDto.setZccssrq(s.getZccssrq()); + list.add(standTimeDto); + mapList.put(s.getCountry(),list); + } + return mapList; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index e4867a6a..eeaa8d2c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -65,7 +65,7 @@ public class SarLawsDetailedListController extends BaseController Ids; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java new file mode 100644 index 00000000..e7660013 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-21 + */ +@Data +public class TimeDto { + @ApiModelProperty(value = "标准id") + private String standId; + + @ApiModelProperty(value = "实施日期") + private String putTime; + + @ApiModelProperty(value = "在产车实施日期") + private String zccssrqgj; + + @ApiModelProperty(value = "新车型实施日期") + private String xcxssrqgj; + +} 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 87cabef6..737da1a3 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 @@ -8,6 +8,7 @@ import com.adc.da.slrs.sarLawsDetailedList.dao.SarLawsDetailedListDao; import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; @@ -89,8 +90,42 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); + if (addDetailedDto.getInforlist().indexOf(",") >= 0){ + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a =0;a< id.length;a++){ + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])){ + dto.setPutTime(null); + }else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])){ + dto.setXcxssrqgj(null); + }else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])){ + dto.setZccssrqgj(null); + }else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + + service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); } catch (Exception e) { e.printStackTrace(); @@ -195,8 +230,41 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); + if (detailedUpDto.getInforlist().indexOf(",") >= 0){ + String[] id = detailedUpDto.getInforlist().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] zcc = detailedUpDto.getInforlist2().split(","); + String[] xcx = detailedUpDto.getInforlist3().split(","); + for (int a =0;a< id.length;a++){ + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])){ + dto.setPutTime(null); + }else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])){ + dto.setXcxssrqgj(null); + }else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])){ + dto.setZccssrqgj(null); + }else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(detailedUpDto.getInforlist()); + dto.setPutTime(detailedUpDto.getInforlist1()); + dto.setXcxssrqgj(detailedUpDto.getInforlist2()); + dto.setZccssrqgj(detailedUpDto.getInforlist3()); + timeDto.add(dto); + } + service.updateDetailedLaws(detailedUpDto.getId(), timeDto); return "修改成功"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c4e545c4..25152da2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -150,12 +150,6 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); page1.setRecords(list); 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 ea52ac6e..94a6c5b1 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 @@ -3,7 +3,7 @@ - + - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES - (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR}) + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR}) From c4e563081a8f11e2dcdb54f3074ffe1e27e61673 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 22 Jul 2021 17:04:55 +0800 Subject: [PATCH 24/34] =?UTF-8?q?update=EF=BC=9A=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../src/main/resources/application-dev.properties | 13 ++++++------- .../src/main/resources/application-prod.properties | 10 +++++----- .../src/main/resources/application-test.properties | 14 +++++--------- .../src/main/resources/application.properties | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index c9b1fd24..ca2d6fdd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow-wh") +@FeignClient(value = "bat-wkflow") //@FeignClient(value = "shan") public interface workFlowFeignClient { diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 930a5c60..e3445661 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,22 +3,21 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://10.96.10.171 :3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root - - #============================================== # 应用设置 -spring.application.name=BAT-WKFLOW-WH +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 @@ -43,7 +42,7 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=192.168.1.109 +spring.rabbitmq.host=192.168.10.248 spring.rabbitmq.port=5672 spring.rabbitmq.username=ca spring.rabbitmq.password=cs986432 @@ -65,4 +64,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.times=20 -OCR.convertType=BOTH +OCR.convertType=BOTH \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-prod.properties b/adc-da-main/src/main/resources/application-prod.properties index dd9b39be..203e71c7 100644 --- a/adc-da-main/src/main/resources/application-prod.properties +++ b/adc-da-main/src/main/resources/application-prod.properties @@ -25,14 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -# -spring.rabbitmq.host=192.168.1.109 +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc spring.rabbitmq.port=5672 -spring.rabbitmq.username=ca -spring.rabbitmq.password=cs986432 +spring.rabbitmq.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-test.properties b/adc-da-main/src/main/resources/application-test.properties index bf84333a..55f14c4b 100644 --- a/adc-da-main/src/main/resources/application-test.properties +++ b/adc-da-main/src/main/resources/application-test.properties @@ -25,18 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=192.168.1.109 +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc spring.rabbitmq.port=5672 -spring.rabbitmq.username=ca -spring.rabbitmq.password=cs986432 -#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc -#spring.rabbitmq.port=5672 -#spring.rabbitmq.virtual-host=uat_pcms -#spring.rabbitmq.username=uat_pcms -#spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index f1e79d41..fb339ca5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 From 8d1280d484185ec084f97f243c777541f3fe8377 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 23 Jul 2021 12:51:27 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 169 +++++++++--------- .../entity/SarStandUnqualified.java | 3 + 2 files changed, 90 insertions(+), 82 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 e9e145da..73648498 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 @@ -24,9 +24,10 @@ import org.springframework.stereotype.Service; import java.util.*; import static com.adc.da.login.util.UserUtils.getUserName; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author szc @@ -49,8 +50,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { QueryWrapper wrapper = new QueryWrapper<>(); - for (String id:idList){ - wrapper.eq("detailed_list_id",id); + for (String id : idList) { + wrapper.eq("detailed_list_id", id); sarLawsAttrDetailedListDao.delete(wrapper); } sarLawsDetailedListDao.deleteBatchIds(idList); @@ -86,37 +87,39 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (addDetailedDto.getInforlist().indexOf(",") >= 0){ + if (addDetailedDto.getInforlist().indexOf(",") >= 0) { String[] id = addDetailedDto.getInforlist().split(","); String[] putTime = addDetailedDto.getInforlist1().split(","); String[] zcc = addDetailedDto.getInforlist2().split(","); String[] xcx = addDetailedDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ + if ("\"".equals(putTime[a])) { dto.setPutTime(null); - }else { + } else { dto.setPutTime(putTime[a]); } - if ("\"".equals(putTime[a])){ + if ("\"".equals(putTime[a])) { dto.setXcxssrqgj(null); - }else { + } else { dto.setXcxssrqgj(xcx[a]); } - if ("\"".equals(putTime[a])){ + if ("\"".equals(putTime[a])) { dto.setZccssrqgj(null); - }else { + } else { dto.setZccssrqgj(zcc[a]); } timeDto.add(dto); } - }else { + } else { TimeDto dto = new TimeDto(); dto.setStandId(addDetailedDto.getInforlist()); dto.setPutTime(addDetailedDto.getInforlist1()); @@ -125,7 +128,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, - String countryArea,String projectName, - String detailedList,String detailedListName) { + String countryArea, String projectName, + String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); - if ("1".equals(sortKey) ) { - wrapper.like(StringUtils.isNotEmpty(countryArea),"country_area",countryArea). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); - }else if ("2".equals(sortKey)) { - wrapper.like(StringUtils.isNotEmpty(projectName),"project_name",projectName). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); + if ("1".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); + } else if ("2".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); - }else if ("3".equals(sortKey)){ - wrapper.like(StringUtils.isNotEmpty(detailedList),"detailed_list_state",detailedList). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); + } else if ("3".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list_state", detailedList). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } - wrapper.eq("sort_key",sortKey); + wrapper.eq("sort_key", sortKey); Page pageRes = new Page<>(page, pageSize); IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); - if ("1".equals(sortKey)){ - Map map= iDicTypeEOService.getDicTypeListCode(); - List list= userIPage.getRecords(); - List> arr = (List>)map.get("COUNTRY"); - for (SarLawsDetailedList list1:list){ - if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")){ + if ("1".equals(sortKey)) { + Map map = iDicTypeEOService.getDicTypeListCode(); + List list = userIPage.getRecords(); + List> arr = (List>) map.get("COUNTRY"); + for (SarLawsDetailedList list1 : list) { + if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { String[] split = list1.getCountryArea().split(","); StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:arr) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); break; } } } - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); list1.setCountryArea(completedString); } } @@ -186,85 +189,87 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (detailedUpDto.getInforlist().indexOf(",") >= 0){ - String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); - String[] zcc = detailedUpDto.getInforlist2().split(","); - String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + if (null != detailedUpDto.getInforlist()) { + detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1)); + List timeDto = new ArrayList<>(); + if (detailedUpDto.getInforlist().indexOf(",") >= 0) { + String[] id = detailedUpDto.getInforlist().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] zcc = detailedUpDto.getInforlist2().split(","); + String[] xcx = detailedUpDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ - dto.setPutTime(null); - }else { - dto.setPutTime(putTime[a]); - } - if ("\"".equals(putTime[a])){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("\"".equals(putTime[a])){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } + dto.setStandId(detailedUpDto.getInforlist()); + dto.setPutTime(detailedUpDto.getInforlist1()); + dto.setXcxssrqgj(detailedUpDto.getInforlist2()); + dto.setZccssrqgj(detailedUpDto.getInforlist3()); timeDto.add(dto); } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(detailedUpDto.getInforlist()); - dto.setPutTime(detailedUpDto.getInforlist1()); - dto.setXcxssrqgj(detailedUpDto.getInforlist2()); - dto.setZccssrqgj(detailedUpDto.getInforlist3()); - timeDto.add(dto); + service.updateDetailedLaws(detailedUpDto.getId(), timeDto); } - service.updateDetailedLaws(detailedUpDto.getId(), timeDto); return "修改成功"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index f45817e6..347f77df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -140,12 +140,15 @@ public class SarStandUnqualified extends BaseEntity { @ApiModelProperty(value = "质量工程师") + @TableField(exist=false) private String qaEngineerName; @ApiModelProperty(value = "认证工程师") + @TableField(exist=false) private String authEngineerName; @ApiModelProperty(value = "责任工程师") + @TableField(exist=false) private String dutyEngineerName; From 8ec8db04373e5236acec6aa8eef40bfad679b838 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Fri, 23 Jul 2021 14:51:45 +0800 Subject: [PATCH 26/34] =?UTF-8?q?update:=E4=BC=98=E5=8C=96sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandProjectLibraryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f861693..3ccbf5e5 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 @@ -136,7 +136,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("product_line","project_manager","uName"); + wrapper.select("product_line as productLine","project_manager as projectManager","uName"); wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid group by sar_stand_project_library.product_line"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); From 06aa79e3f64f1defaaa4a3b2ad1ca68e4e906736 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 23 Jul 2021 15:03:02 +0800 Subject: [PATCH 27/34] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 3 +- .../entity/SarFindDto.java | 12 +-- .../SarLawsAttrDetailedListServiceImpl.java | 2 +- .../impl/SarLawsDetailedListServiceImpl.java | 94 ++++++++++++------- .../SarLawsAttrDetailedListMapper.xml | 54 ++++++++--- 5 files changed, 107 insertions(+), 58 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index ed36ebde..361864bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.dao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -23,7 +24,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 - List selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); + List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据 List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); //查询时间 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index 1b1af5f2..3357aebb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -1,9 +1,5 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -18,13 +14,13 @@ public class SarFindDto { private int Size; private String id; private String standName; - private String standNumber; +// private String standNumber; private String standEnName; private String typeApplicable; private String NYLX; - private String putTime; - private String XCXSSRQGJ; - private String ZCCSSRQGJ; +// private String putTime; +// private String XCXSSRQGJ; +// private String ZCCSSRQGJ; private String ZRBM; private String SYCPX; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 6dfd5fbf..40385d8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -43,7 +43,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto.getStandName()); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) 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 e9e145da..ea5b7fc6 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 @@ -59,6 +59,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); switch (addDetailedDto.getSortKey()) { case "1": sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + if (addDetailedDto.getInforlist().contains(",")){ + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a =0;a< id.length;a++){ + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])){ + dto.setPutTime(null); + }else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])){ + dto.setXcxssrqgj(null); + }else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])){ + dto.setZccssrqgj(null); + }else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } break; case "2": sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + if (addDetailedDto.getInforlist().contains(",")){ + String[] id = addDetailedDto.getInforlist().split(","); + for (String standId:id){ + TimeDto dto = new TimeDto(); + dto.setStandId(standId); + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + timeDto.add(dto); + } break; case "3": sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + if (addDetailedDto.getInforlist().contains(",")){ + String[] id = addDetailedDto.getInforlist().split(","); + for (String standId:id){ + TimeDto dto = new TimeDto(); + dto.setStandId(standId); + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + timeDto.add(dto); + } break; default: break; @@ -90,41 +149,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (addDetailedDto.getInforlist().indexOf(",") >= 0){ - String[] id = addDetailedDto.getInforlist().split(","); - String[] putTime = addDetailedDto.getInforlist1().split(","); - String[] zcc = addDetailedDto.getInforlist2().split(","); - String[] xcx = addDetailedDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ - TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ - dto.setPutTime(null); - }else { - dto.setPutTime(putTime[a]); - } - if ("\"".equals(putTime[a])){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("\"".equals(putTime[a])){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); - } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(addDetailedDto.getInforlist()); - dto.setPutTime(addDetailedDto.getInforlist1()); - dto.setXcxssrqgj(addDetailedDto.getInforlist2()); - dto.setZccssrqgj(addDetailedDto.getInforlist3()); - timeDto.add(dto); - } - service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); } catch (Exception e) { 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 b8a5e760..6dbff739 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 @@ -2,18 +2,38 @@ - SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - - (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') - or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')) + + (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')) + and + + + a.STAND_EN_NAME LIKE concat ('%',#{sarFindDto.standEnName,jdbcType=VARCHAR},'%') + and + + + b.CLLX LIKE concat ('%',#{sarFindDto.typeApplicable,jdbcType=VARCHAR},'%') + and + + + b.NYLX LIKE concat ('%',#{sarFindDto.NYLX,jdbcType=VARCHAR},'%') + and + + + b.ZRBM LIKE concat ('%',#{sarFindDto.ZRBM,jdbcType=VARCHAR},'%') + and + + + b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%') and a.ID IN - + #{item} @@ -41,13 +61,8 @@ order by number - + - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES - (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR}) + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR}) From 84c8c949bb9645919289df1bcadebcf0c1c12d72 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Fri, 23 Jul 2021 15:55:10 +0800 Subject: [PATCH 28/34] =?UTF-8?q?update:=E4=BC=98=E5=8C=96sql=20one=20more?= =?UTF-8?q?=20time?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandProjectLibraryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3ccbf5e5..f88e9faa 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 @@ -136,8 +136,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("product_line as productLine","project_manager as projectManager","uName"); - wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid group by sar_stand_project_library.product_line"); + wrapper.select("distinct product_line","project_manager as projectManager","uName"); + wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); From 1f57316d3e2e66e721bc3a8142f746a09370b271 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 23 Jul 2021 15:56:56 +0800 Subject: [PATCH 29/34] =?UTF-8?q?update=EF=BC=9A=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 99 +++++++++++-------- 1 file changed, 56 insertions(+), 43 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 af04df77..9a04b236 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 @@ -79,68 +79,82 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Fri, 23 Jul 2021 18:00:24 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E5=87=86=E6=B6=89=E5=8F=8A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=AC=A6=E5=90=88=E6=80=A7=E6=B8=85=E5=8D=95BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardComplianceAssessResultController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 8ec23ad6..0a99a2cc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -163,7 +163,7 @@ public class SarStandardComplianceAssessResultController { IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); +// while(page.getRecords().remove(null)); return Result.success(page); } From cf0d9f6c6d35b51a277673f84bdb079321da547b Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Fri, 23 Jul 2021 18:01:15 +0800 Subject: [PATCH 31/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E5=87=86=E6=B6=89=E5=8F=8A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=AC=A6=E5=90=88=E6=80=A7=E6=B8=85=E5=8D=95BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardComplianceProductAssess.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 706bde15..bdd5c4dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** *

- * + * *

* * @author zyl @@ -33,6 +33,7 @@ public class SarStandardComplianceProductAssess extends BaseEntity { private String productLineId; @ApiModelProperty(value = "'项目id'") + @TableField("product_id") private String productId; @ApiModelProperty(value = "'项目名称'") From ccfbc541d5413d2499b01dc7966c39c1c7068021 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 26 Jul 2021 11:12:16 +0800 Subject: [PATCH 32/34] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=20=E8=BF=81=E7=A7=BB2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussStandPlanController.java | 4 +- .../SarBussionessStandController.java | 23 +++++++- .../dao/SarBussionessStandDao.java | 2 + .../service/ISarBussionessStandService.java | 2 + .../impl/SarBussionessStandServiceImpl.java | 53 +++++++++++++++++-- .../java/com/adc/da/sys/dao/DicTypeEODao.java | 2 + 6 files changed, 79 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java index 5b226c9a..b858ed30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java @@ -16,8 +16,8 @@ import com.adc.da.base.web.BaseController; * @since 2021-07-25 */ @RestController -@Api(description = "|SarBussStandPlan|") -@RequestMapping("/sarBussStandPlan/sar-buss-stand-plan") +@Api(tags = "福田标准法规--企业标准信息-|SarBussStandPlan|") +@RequestMapping("/${restPath}/lawss/sarBussStandPlan") public class SarBussStandPlanController extends BaseController { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 97c01e8c..04e92d80 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -40,12 +41,32 @@ public class SarBussionessStandController extends BaseController getStandInfoById(String id) throws Exception { + SarBussionessStand result = sarBussionessStandEOService.selectStandardsInfoByKey(id); + String collectId = personCollectEOService.queryCollectByUserAndId(id); + result.setCollectId(collectId); + return Result.success(result); + } + /** * 给指定标准配置目录 * @param standardsInfoEO @@ -54,7 +75,7 @@ public class SarBussionessStandController extends BaseController { + List selectStandardsInfoByKey(String id); + List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); int getBussionessStandInfoCount(SarBussionessStandEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 8bb85db8..55f22bd5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -16,6 +16,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + SarBussionessStand selectStandardsInfoByKey(String id) throws Exception; + SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO); List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 52a4180f..c16d1382 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1,5 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; import com.adc.da.common.SelectionTypeEnum; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; @@ -14,6 +16,7 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; @@ -23,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Clob; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -42,6 +42,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id); + SarBussionessStand sarBussionessStandEO = new SarBussionessStand(); + if(!sarBussionessStandlist.isEmpty()) { + List newStandList = new ArrayList<>(); + newStandList.add(sarBussionessStandlist.get(0)); + attrInfoShowDetails(newStandList); + sarBussionessStandEO = newStandList.get(0); + } + return sarBussionessStandEO; + } + + public void attrInfoShowDetails(List sarlist) throws Exception { + for (SarBussionessStand row : sarlist) { + attrInfoDetails(row); + Map getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { + value = entry.getValue().toString(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + + @Override public SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO) { SarBussStandMenu sarStandMenuEO = new SarBussStandMenu(); String nowMenuId = standardsInfoEO.getMenuId(); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java index 5a730ac0..3aa04d45 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java @@ -5,9 +5,11 @@ import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.page.DicTypeEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; +@Repository public interface DicTypeEODao extends BaseMapper { public DicTypeEO getDicTypeEOById(String id); From 404730d5228b2d3fe6a05b2106408e1df8ad1cb1 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 26 Jul 2021 14:53:51 +0800 Subject: [PATCH 33/34] =?UTF-8?q?update=EF=BC=9A=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsDto.java | 25 ++++---- .../SarLawsAttrDetailedListServiceImpl.java | 32 ++++++++++ .../Util/BeanConverUtil.java | 60 +++++++++++++++++++ .../SarLawsDetailedListController.java | 37 +++++++++++- .../entity/FindFileNameDto.java | 21 +++++++ .../impl/SarLawsDetailedListServiceImpl.java | 7 +++ .../SarLawsAttrDetailedListMapper.xml | 6 +- 7 files changed, 174 insertions(+), 14 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index e97d82df..381b50cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -1,13 +1,11 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; -import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -43,44 +41,49 @@ public class LawsDto { @ExcelProperty(value = "能源类型", index = 4) @ApiModelProperty(value = "能源类型") private String NYLX; + @ExcelProperty(value = "标准年份", index = 5) + private String standYear; + @ExcelProperty(value = "标准类别", index = 6) + private String standSortShow; @ColumnWidth(16) - @ExcelProperty(value = "标准实施日期", index = 5) + @ExcelProperty(value = "标准实施日期", index = 7) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") private String putTime; @ColumnWidth(16) - @ExcelProperty(value = "新车型实施日期", index = 6) + @ExcelProperty(value = "新车型实施日期", index = 8) @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat("yyyy年MM月dd日") private String XCXSSRQGJ; @ColumnWidth(16) - @ExcelProperty(value = "在产车实施日期", index = 7) + @ExcelProperty(value = "在产车实施日期", index = 8) @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat("yyyy年MM月dd日") private String ZCCSSRQGJ; - @ExcelProperty(value = "责任部门", index = 8) + @ExcelProperty(value = "责任部门", index = 9) @ApiModelProperty(value = "责任部门") private String ZRBM; @ColumnWidth(14) - @ExcelProperty(value = "适用产品线", index = 9) + @ExcelProperty(value = "适用产品线", index = 10) @ApiModelProperty(value = "适用产品线") private String SYCPX; @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 10) + @ExcelProperty(value = "乘用车VPPS编码", index = 11) @ApiModelProperty(value = "乘用车VPPS编码") private String CYCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 11) + @ExcelProperty(value = "乘用车vpps中文名称", index = 12) @ApiModelProperty(value = "乘用车vpps中文名称") private String CYCVPPSCN; @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 12) + @ExcelProperty(value = "卡车VPPS编码", index = 13) @ApiModelProperty(value = "卡车VPPS编码") private String KCCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 13) + @ExcelProperty(value = "卡车vpps中文名称", index = 14) @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") + @ExcelProperty(value = "责任工程师", index = 15) private String responsibleEngineer; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 40385d8d..f6589b4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -78,6 +78,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:typeApplicable) { + if (map1.get("value").equals(list1.getTypeApplicable())){ + list1.setTypeApplicable(map1.get("label")); + break; + } + } + } } //能源类型 List> nylx = (List>)map.get("NYLXCLASS"); @@ -97,6 +105,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:nylx) { + if (map1.get("value").equals(list1.getNYLX())){ + list1.setNYLX(map1.get("label")); + break; + } + } + } } //责任部门 List> zrbn = (List>)map.get("ZRBMCLASS"); @@ -116,6 +132,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:zrbn) { + if (map1.get("value").equals(list1.getZRBM())){ + list1.setZRBM(map1.get("label")); + break; + } + } + } } //产品线 List> sycpx = (List>)map.get("SYCPXCLASS"); @@ -135,6 +159,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:sycpx) { + if (map1.get("value").equals(list1.getSYCPX())){ + list1.setSYCPX(map1.get("label")); + break; + } + } + } } return list; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java new file mode 100644 index 00000000..3ef12840 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java @@ -0,0 +1,60 @@ +package com.adc.da.slrs.sarLawsDetailedList.Util; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-26 + */ +@Slf4j +public class BeanConverUtil { + + + /** + * 单个类转换 + * + * @param sourceObj + * @param targetClass + * @param + * @return + */ + public static T conver(Object sourceObj, Class targetClass) { + if (sourceObj == null || targetClass == null) { + return null; + } + T targetObj = null; + try { + targetObj = targetClass.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + log.error("sourceObj:{},targetClass:{}", sourceObj, targetClass, e); + return null; + } + BeanUtils.copyProperties(sourceObj, targetObj); + return targetObj; + } + + /** + * List之间转换 + * + * @param sourceList + * @param targetClass + * @param + * @return + */ + public static List converList(List sourceList, Class targetClass) { + if (CollectionUtils.isEmpty(sourceList) || targetClass == null) { + return Collections.emptyList(); + } + return sourceList.stream().map(sourceObj -> conver(sourceObj, targetClass)).collect(Collectors.toList()); + } + +} + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index eeaa8d2c..0cc027c2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -2,24 +2,31 @@ package com.adc.da.slrs.sarLawsDetailedList.controller; import com.adc.da.att.controller.AttFileEOController; +import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.FindFileNameDto; import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; import com.adc.da.slrs.sarLawsDetailedList.service.impl.SarLawsDetailedListServiceImpl; +import com.adc.da.util.utils.CollectionUtils; 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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -37,6 +44,7 @@ public class SarLawsDetailedListController extends BaseController publicList = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, + IPage publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, countryArea, projectName, detailedList, detailedListName); + List list= publicList1.getRecords();//从封装中取出数据 + List list1;//继承类集合实现 + list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 + List attFileEOS;//新建文件信息的集合 + for (int a=0;a idList = attFileEOS.stream().map(AttFileEO::getOldFileName).collect(Collectors.toList());//多个数据取出数据 + String FileNames = StringUtils.join(idList.toArray(),",");//拼接 + fileNameDto.setFileName(FileNames);//存入 + + } + list1.set(a,fileNameDto); + }else if (null!=list.get(a).getFileIds()){ + AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData(); + } + } + IPage publicList = new Page<>(); + publicList.setCurrent(publicList1.getCurrent()); + publicList.setRecords(list1); + publicList.setTotal(publicList1.getTotal()); + publicList.setSize(publicList1.getSize()); + publicList.setPages(publicList1.getPages()); return Result.success("200", publicList); } else { return Result.success("200", null); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java new file mode 100644 index 00000000..639d228c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + + + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-26 + */ +public class FindFileNameDto extends SarLawsDetailedList { + private String fileName; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } +} 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 9a04b236..721a5a1e 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 @@ -210,6 +210,13 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1:arr) { + if (map1.get("value").equals(list1.getCountryArea())){ + list1.setCountryArea(map1.get("label")); + break; + } + } } } userIPage.setRecords(list); 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 6dbff739..56b963c1 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 @@ -3,9 +3,11 @@