From 5d8dcb23ebf4325326f92d5423c584990fd861b0 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 22 Jun 2022 18:11:11 +0800 Subject: [PATCH] feat: There is no way the, bug #55745 #55786 #55815 --- .../SarBussionessStandController.java | 4 +-- .../dao/SarBussionessStandDao.java | 2 +- .../service/ISarBussionessStandService.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 4 +-- .../entity/SarBussionessStandEOPage.java | 10 +++++++ .../da/utils/util/BussStandExportUtil.java | 30 ++++++++++++++++++- .../adc/da/utils/util/FieldConvertUtil.java | 2 +- .../SarBussionessStandMapper.xml | 16 +++++----- 8 files changed, 55 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index b6c1068f..376af408 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -83,8 +83,8 @@ public class SarBussionessStandController extends BaseController getStandInfoByReviseStatus(String reviseStatus) { - SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus); + public ResponseMessage getStandInfoByReviseStatus(String reviseStatus,String standSort) { + SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort); return Result.success(result); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 84b36f01..49cef6a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -38,7 +38,7 @@ public interface SarBussionessStandDao extends BaseMapper { List queryByBussStateSync(SarBussionessStand sarBussionessStand); - SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort); SarBussionessStand selectByPrimaryKey(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index eafda7a5..4ab28a1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { - SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort); void attrInfoDetails (SarBussionessStand row) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 84b93d36..9e1d44df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -162,8 +162,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 371858e1..d1c84a84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -16,6 +16,8 @@ public class SarBussionessStandEOPage extends BasePage { private String textStatusBuss; + private String reviseStatus; + public String getTextStatusBuss() { return textStatusBuss; } @@ -176,6 +178,14 @@ public class SarBussionessStandEOPage extends BasePage { private String syncParam; + public String getReviseStatus() { + return reviseStatus; + } + + public void setReviseStatus(String reviseStatus) { + this.reviseStatus = reviseStatus; + } + public String getSyncParam() { return syncParam; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index 5982d778..eca54f03 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -106,6 +106,9 @@ public class BussStandExportUtil { case "文本状态": value = verifyBean(sarStandardsInfoEO.getStandStatusShow()); break; + case "企标制修订状态": + value = verifyBean(sarStandardsInfoEO.getReviseStatus()); + break; case "企标实施日期": String putTime=""; if(sarStandardsInfoEO.getPutTime() != null){ @@ -160,7 +163,32 @@ public class BussStandExportUtil { private static String verifyBean(String value){ String val = ""; if(StringUtils.isNotBlank(value)){ - val =value; + if(value.contains("buss1_")){ + if("buss1_1".equals(value)){ + val = "制定"; + }else if("buss1_2".equals(value)){ + val = "修订"; + }else { + val = ""; + } + }else if(value.contains("buss2_")){ + switch (value) { + case "buss2_1": + val = "制定"; + break; + case "buss2_2": + val = "修订"; + break; + case "buss2_3": + val = "修改"; + break; + default: + val = ""; + break; + } + }else { + val =value; + } }else { val = ""; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 18a5bf30..1e8f3a1b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -54,7 +54,7 @@ public class FieldConvertUtil { "个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," + "相关部门,责任部门,FO,维护工程师,归口管理部门,发布机构,我司是否参与,相关资料"; - public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期"; + public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态"; public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," + "需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本"; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 9e477888..5e7856b7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -52,7 +52,7 @@ SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year, stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, - stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number + stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number,SAR_BUSSIONESS_STAND.revise_status @@ -61,7 +61,7 @@ SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year, stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, stand_name, stand_code,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number, - dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow + dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSSIONESS_STAND.revise_status @@ -70,12 +70,12 @@ tmp_tb.apply_country, tmp_tb.stand_nature,tmp_tb.stand_sort,tmp_tb.stand_year, tmp_tb.stand_status, tmp_tb.replaced_stand_num,tmp_tb.replace_stand_num,tmp_tb.put_time,tmp_tb.issue_time,tmp_tb.stand_en_name, tmp_tb.stand_name, tmp_tb.stand_code,tmp_tb.text_status_buss,tmp_tb.stand_number, - tmp_tb.standStatusShow + tmp_tb.standStatusShow,tmp_tb.revise_status stand_status, replaced_stand_num, replace_stand_num,put_time, - issue_time, stand_en_name, stand_name, stand_code,stand_status, + issue_time, stand_en_name, stand_name, stand_code,stand_status,revise_status, SAR_BUSSIONESS_STAND.id, SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS @@ -347,9 +347,8 @@ @@ -488,6 +487,9 @@ and text_status_buss=#{textStatusBuss} + + and revise_status=#{reviseStatus} + and SAR_BUSSIONESS_STAND.MODIFY_TIME between DATE_SUB(NOW(),INTERVAL 7 day) and DATE_SUB(NOW(),INTERVAL -1 day)