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) 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); } } 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; + } 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 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