From af1ffe93134edb60737e2960d7a1903bdecc6050 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 18 Aug 2021 14:44:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 +- .../entity/LawsDto.java | 5 +- .../entity/SarLawsAttrDetailedList.java | 4 +- .../SarLawsAttrDetailedListServiceImpl.java | 9 ++- .../SarLawsDetailedListController.java | 4 +- .../entity/AddDetailedDto.java | 3 +- .../entity/SarLawsDetailedList.java | 3 + .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../service/ISarLawsDetailedListService.java | 2 +- ...ndardComplianceAssessResultController.java | 68 +++++++++---------- .../SarStandardComplianceProductAssessEO.java | 4 ++ .../entity/SarStandardsInfoEO.java | 3 + 12 files changed, 62 insertions(+), 49 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 47156302..724cf5f8 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 @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getPutTime()!=null){ - list1.setPutTime(list1.getPutTime().substring(0,10)); + if (list1.getSSRQ()!=null){ + list1.setSSRQ(list1.getSSRQ().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); 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 730446d8..120a444d 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 @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String putTime; + private String SSRQ; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) @@ -115,4 +115,7 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; } 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 45dc5441..b037f45f 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 @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "putTime") - private String putTime; + @TableField(value = "ssrq") + private String ssrq; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "xcxssrq") 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 92c664b7..a733b867 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 @@ -51,12 +51,15 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ + if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ + lawsDto.setApplyArctic(lawsDto.getApplyArctic()); + } 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).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -199,7 +202,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, - countryArea, projectName, detailedList, detailedListName); + countryArea, projectName, detailedList, detailedListName,carType); List list= publicList1.getRecords();//从封装中取出数据 List list1;//继承类集合实现 list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 6e7af186..47f55aad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -40,5 +40,6 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - + @ApiModelProperty(value = "车辆类别") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index b95650b5..beec8129 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -81,5 +81,8 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; + @ApiModelProperty(value = "附件id") + @TableField("car_type") + private String carType; } 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 index e2dee83d..510ebe8c 100644 --- 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 @@ -15,7 +15,7 @@ public class TimeDto { private String standId; @ApiModelProperty(value = "实施日期") - private String putTime; + private String ssrq; @ApiModelProperty(value = "在产车实施日期") private String zccssrqgj; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index 323c009e..a772e7c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService AllSelectD(Integer pages, Integer size, String sortKey, String countryArea,String projectName, - String detailedList, String detailedListName); + String detailedList, String detailedListName,String carType); // IPage selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); 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 1e7c723f..4ab81ce3 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 @@ -61,64 +61,64 @@ public class SarStandardComplianceAssessResultController { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); + queryWrapper.like("type", eo.getType().trim()); } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else{ + } else { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } } } - private static class InsertEntity{ + private static class InsertEntity { List entityList; T eo; } - @ApiOperation(value="（插入/更新）标准清单") + @ApiOperation(value = "（插入/更新）标准清单") @PostMapping("/standard") public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { @@ -128,27 +128,27 @@ public class SarStandardComplianceAssessResultController { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - }else{ + } else { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -166,14 +166,11 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); + if (eo.getType() != null) queryWrapper.eq("type", eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); -// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); -// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - + if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); + if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - -// while(page.getRecords().remove(null)); - return Result.success(page); } @@ -195,22 +192,22 @@ public class SarStandardComplianceAssessResultController { @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } @@ -223,11 +220,11 @@ public class SarStandardComplianceAssessResultController { InterpretationEO eo = insertEntity.eo; - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -235,10 +232,9 @@ public class SarStandardComplianceAssessResultController { } else { - List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index 53b782b2..c91afc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 9981e6ee..4fb0c327 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,6 +25,9 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; @ApiModelProperty("页数") private Integer current=1;