Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!535

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -83,8 +83,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @ApiOperation(value = "|SarBussionessStandEO|根据计划库制定状态查询企标编号")
     @GetMapping("/getStandInfoByReviseStatus")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")
-    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus) {
-        SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus);
+    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus,String standSort) {
+        SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort);
         return Result.success(result);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -38,7 +38,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
     List<SarBussionessStand> queryByBussStateSync(SarBussionessStand sarBussionessStand);
 
-    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort);
 
     SarBussionessStand selectByPrimaryKey(String standId);
 

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> {
 
-    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort);
 
     void attrInfoDetails (SarBussionessStand row) throws Exception;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -162,8 +162,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     private INewsFeedService iNewsFeedService;
 
     @Override
-    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus){
-        return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus);
+    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort){
+        return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
     }
 
     public ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception {

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

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 = "";
         }

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,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," +
             "需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本";