From 76feeb358a0368142f45dfdb440c1e872ed8338c Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 13 Feb 2023 11:36:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitItemsEOController.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 9f73defb..48fb084a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -418,25 +418,23 @@ public class SarFileSplitItemsEOController extends BaseController multiFileInfos = this.attFileEOService.getMultiFileInfos(fileIds); if(CollectionUtils.isNotEmpty(multiFileInfos)){ + for (AttFileEO data : multiFileInfos){ + if(StringUtils.isNotBlank(data.getOldFileName())){ + String[] split = data.getOldFileName().split("\\."); + //存在则更换后缀 + if(split.length>0){ + data.setOldFileName(split[0]+".png"); + } + } + } this.attFileEOService.downLoadFileList(multiFileInfos,fileNowPath); - + } ZipUtil.zip(fileNowPath,fileNowPath+".zip"); FileInputStream fis = new FileInputStream(fileNowPath+".zip"); int len = 0; @@ -446,7 +444,6 @@ public class SarFileSplitItemsEOController extends BaseController Date: Mon, 13 Feb 2023 13:41:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=20=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../person/service/impl/PersonCollectEOServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index 5b1e7d98..b8685939 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -160,11 +160,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper); //三天以内收藏的 标题名称后面加 new 一小时3600000 一天时间戳 为 86400000 - long newTime = 86400000; + /*long newTime = 86400000; Date date = new Date(); long time = date.getTime(); - - for (TsPersonCollect data : page.getRecords()){ long creationTime = data.getCreationTime().getTime(); if(creationTime + newTime == time || creationTime + newTime > time){ @@ -172,9 +170,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl"+"(new)"+"").append(data.getCollectTitle()); data.setCollectTitle(sb.toString()); } - } - - + }*/ return Result.success(page); } From 91239028661e3c7634c3c6a0e2de714154ce6716 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 14 Feb 2023 14:06:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A5=E5=85=85=E5=AD=90=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StandAttrInfoDto.java | 5 +- .../SarStandProjectLibraryServiceImpl.java | 87 ++++++++++++++++++- 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index 361e245d..2975ca9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -65,8 +65,9 @@ public class StandAttrInfoDto { // //关联模块--乘用车vpps中文名称 // @ExcelProperty("关联模块--乘用车vpps中文名称") // private String CYCVPPSCN; - private Long unCount; - + @ExcelProperty("合规性情况") + private String unCountShow; + @ExcelProperty("整改完成时间") private String endTimes; } \ No newline at end of file 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 54ae351c..7ab05a64 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 @@ -647,7 +647,28 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT"); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT", + + "(select count(*) from sar_stand_unqualified ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '1' and pn.id = '" + id + "') as unCount ", + + "(select count(*) from sar_standard_compliance_product_assess ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.no_involve is not null and pn.id = '" + id + "') as isOverCount ", + + "(select count(*) from sar_standard_compliance_product_assess ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.no_involve is null and pn.id = '" + id + "') as isCount ", + + "(select count(*) from sar_stand_unqualified ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + id + "') as counts ", + + "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( ssu.PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY ssu.PLAN_CLOSE_TIME ) from sar_stand_unqualified ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '1' AND ssu.PLAN_CLOSE_TIME is NOT NULL and pn.id = '" + id + "') as endTimes " + ); // wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'" + "union all " + @@ -658,7 +679,35 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { + p.setUnCount(s.getUnCount()); // uncount==0 + }else if (s.getUnCount() == 0L && s.getCounts()==0L){ + p.setUnCount(2L); + }else { // 有不满足时 + p.setUnCount(1L); // 不符合 + } + // 只显示第一个 + if(StringUtils.isNotBlank(s.getEndTimes())){ + String[] split = s.getEndTimes().split(","); + if(split.length>1){ + p.setEndTimes(split[0]); + }else { + p.setEndTimes(s.getEndTimes()); + } + } + if (0L == s.getUnCount()) { // 没有不满足时 + if (s.getIsCount() != 0L) { // 只有满足和不涉及---符合 + p.setUnCount(0L); // 符合 + } else if (s.getIsOverCount() != 0L) { //只有不涉及---不涉及 + p.setUnCount(-1L); // 不涉及 + } + } list.add(p); } + for (StandAttrInfoDto data : list){ + if(data.getUnCount()== 0){ + data.setUnCountShow("符合"); // 符合 + } + if(data.getUnCount()== 1){ + data.setUnCountShow("不符合"); // 不符合 + } + if(data.getUnCount()== -1){ + data.setUnCountShow("不涉及"); // 不涉及 + } + } return list; }