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 1/3] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20add=EF=BC=9A=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 12fa95cea9bf5fa61d44a85bf894d7e4f53bfd00 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 15 Jul 2021 17:43:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=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 06c616a68274655b653a8a7951b0b9023c3b9e84 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 16 Jul 2021 14:08:16 +0800 Subject: [PATCH 3/3] =?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 +