From bee98af01cc5a5dd9c36b2ad4c8a0a850a401202 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 14:33:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B2=A1=E6=9C=89=E7=9B=AE=E5=BD=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index ffd14a83..717910ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1176,6 +1176,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Fri, 12 May 2023 15:53:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E4=BB=85=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=95=B0=E5=AD=97=20=E4=B8=8D=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 11 ++++++++++- .../entity/InterpretationEO.java | 3 +++ 2 files changed, 13 insertions(+), 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 680d71df..12602b7b 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 @@ -292,6 +292,11 @@ public class SarStandardComplianceAssessResultController { iPage.setTotal(datasCount); iPage.setRecords(standards); while (iPage.getRecords().remove(null)) ; + if(StringUtils.isNotBlank(eo.getOrder())){ + if(eo.getOrder().equals("desc")){ + iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem())); + } + } return Result.success(iPage); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); @@ -307,7 +312,11 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; - + if(StringUtils.isNotBlank(eo.getOrder())){ + if(eo.getOrder().equals("desc")){ + iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem())); + } + } return Result.success(page); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java index 660234f8..b7c06f96 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java @@ -51,4 +51,7 @@ public class InterpretationEO { @ApiModelProperty("页内数量") private Integer size=20; + @ApiModelProperty("排序") + private String order; + } From d23a712d1e876049b260be9ec6378b028dc24c5e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 16:49:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=20=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E6=9D=BF=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/processModel/entity/exportExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/exportExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/exportExcel.java index 4fd9072e..b80e1300 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/exportExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/exportExcel.java @@ -24,10 +24,10 @@ public class exportExcel { @Excel(name = "评审责任人" , orderNum = "5", width = 20.0) private String resPersonName; - @Excel(name = "工作组组长" , orderNum = "6", width = 20.0) + @Excel(name = "技术委员会评审负责人" , orderNum = "6", width = 20.0) private String wgLeaderName; - @Excel(name = "计划初稿完成日期" , orderNum = "7", width = 20.0) + @Excel(name = "计划标准初稿完成日期" , orderNum = "7", width = 20.0) private String draftTime; @Excel(name = "计划标准发布时间", orderNum = "8", width = 18.0) From 7a9ad5d8aaee1ef073259a485af3b3c69a3b0903 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 17:10:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java index fe6f68b7..466a6ae8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java @@ -75,7 +75,7 @@ public class StateSync { List standList = new ArrayList<>(); if(!standLists.isEmpty()) { for (SarBussionessStand data : standLists) { - if (!data.getValidFlag().equals("1") || data.getValidFlag() != 1) { + if (data.getValidFlag() == 0) { standList.add(data); } } From 09d2cfab1937e558e94eb6519a051a5f723cefd2 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 12 May 2023 17:35:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=A4=8D=E5=AE=A1=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=87=BA=E6=9C=89=E4=BC=81=E6=A0=87=E6=97=A0=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandStateMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index dab3bdeb..a77e36fc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -372,13 +372,13 @@ SELECT A.* FROM ( select from sar_bussioness_stand_state - LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0 LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id union select from sar_bussioness_stand_state - LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0 LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id ORDER BY @@ -395,7 +395,7 @@ sar_bussioness_stand_state.id FROM sar_bussioness_stand_state - LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0 LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id union @@ -403,7 +403,7 @@ sar_bussioness_stand_state.id FROM sar_bussioness_stand_state - LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0 LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id ) a