Merge branch 'develop_master' into FOTON

adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java

@@ -188,6 +188,41 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                     attrInfoMap.put(key, "null");
                 }
             }
+
+            // 逻辑字段
+            if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){
+                fullTextSearchEO.put("standTypeOrder","2");
+            }else {
+                fullTextSearchEO.put("standTypeOrder","1");
+            }
+            fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap));
+            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
+            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
+            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
+            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName")));
+            fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("standEnName")));
+            fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("textStatusName",""));
+
+
+            // 全文检索 加入 发布稿 分解单条款内容逻辑
+            StringBuilder itemBuilder = new StringBuilder();
+
+            mapItems.forEach((s, s2) -> {
+                itemBuilder.append(s+" ").append(s2).append("</br>");
+            });
+            StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--");
+            fullTextSearchEO.put("textItems",textItemContent.toString());
+
+            if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
+                fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
+                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
+            }else {
+                fullTextSearchEO.put("issue_time", "--");
+                fullTextSearchEO.put("issue_time_order", "--");
+            }
+
+            // 文本内容字段
+           try {
                StringBuilder contentBuilder = new StringBuilder();
 
                contentBuilder.append("标准类别:").append(attrInfoMap.get("standSort")).append("  ");
@@ -268,35 +303,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append("  ");
                StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
                fullTextSearchEO.put("textContent",textContent.toString());
-            if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){
+           }catch (Exception e){
-                fullTextSearchEO.put("standTypeOrder","2");
+               logger.info("err:" + errFilter(e.getMessage()));
-            }else {
-                fullTextSearchEO.put("standTypeOrder","1");
-            }
-            fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap));
-            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
-            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
-            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
-            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName")));
-            fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("standEnName")));
-            fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("textStatusName",""));
-
-
-            // 全文检索 加入 发布稿 分解单条款内容逻辑
-            StringBuilder itemBuilder = new StringBuilder();
-
-            mapItems.forEach((s, s2) -> {
-                itemBuilder.append(s+" ").append(s2).append("</br>");
-            });
-            StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--");
-            fullTextSearchEO.put("textItems",textItemContent.toString());
-
-            if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
-                fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
-                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
-            }else {
-                fullTextSearchEO.put("issue_time", "--");
-                fullTextSearchEO.put("issue_time_order", "--");
             }
         } else if("laws".equals(attrInfoMap.get("type"))){
             // 政策全文
@@ -305,12 +313,32 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                     attrInfoMap.put(key, "null");
                 }
             }
+            // 逻辑字段
             if(StringUtils.isNotBlank(attrInfoMap.getOrDefault("lawsName","").toString())){
                 fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+"  "+attrInfoMap.getOrDefault("lawsNumber","")+"  "+attrInfoMap.getOrDefault("lawsName",""));
             }else{
                 fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+"  "+attrInfoMap.getOrDefault("lawsNumber","")+"  "+attrInfoMap.getOrDefault("lawsEnName",""));
             }
+            fullTextSearchEO.put("standTypeOrder","4");
+            fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap));
+            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName")));
+            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName")));
+            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber")));
+            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName")));
+            fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("lawsEnName")));
+            fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("lawsTextStateName",""));
 
+
+            if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
+                fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
+                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
+            }else {
+                fullTextSearchEO.put("issue_time", "--");
+                fullTextSearchEO.put("issue_time_order", "--");
+            }
+
+            // 文本内容字段
+            try {
                 StringBuilder contentBuilder = new StringBuilder();
                 contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append("  ");
                 contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append("  ");
@@ -359,22 +387,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                 contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append("  ");
                 StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
                 fullTextSearchEO.put("textContent",textContent.toString());
-            fullTextSearchEO.put("standTypeOrder","4");
+            }catch (Exception e){
-            fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap));
+                logger.info("err:" + errFilter(e.getMessage()));
-            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName")));
-            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName")));
-            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber")));
-            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName")));
-            fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("lawsEnName")));
-            fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("lawsTextStateName",""));
-
-
-            if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
-                fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
-                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
-            }else {
-                fullTextSearchEO.put("issue_time", "--");
-                fullTextSearchEO.put("issue_time_order", "--");
             }
         }else if ("bussstand".equals(attrInfoMap.get("type"))){
 
@@ -388,6 +402,25 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             }else{
                 fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+"  "+attrInfoMap.getOrDefault("stand_en_name",""));
             }
+            // 逻辑字段
+            fullTextSearchEO.put("standTypeOrder","3");
+            fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap));
+            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
+            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
+            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
+            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name")));
+            fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("stand_en_name")));
+            fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("textStatusBussName",""));
+
+            if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
+                fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
+                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
+            }else {
+                fullTextSearchEO.put("issue_time", "--");
+                fullTextSearchEO.put("issue_time_order", "--");
+            }
+            // 文本内容字段
+            try {
                 StringBuilder contentBuilder = new StringBuilder();
                 contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append("  ");
                 contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append("  ");
@@ -426,26 +459,20 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
 
                 StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
                 fullTextSearchEO.put("textContent",textContent.toString());
-            fullTextSearchEO.put("standTypeOrder","3");
+            }catch (Exception e){
-            fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap));
+                logger.info("err:" + errFilter(e.getMessage()));
-            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
-            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
-            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
-            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name")));
-            fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("stand_en_name")));
-            fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("textStatusBussName",""));
-
-            if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
-                fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
-                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
-            }else {
-                fullTextSearchEO.put("issue_time", "--");
-                fullTextSearchEO.put("issue_time_order", "--");
             }
         }
         return fullTextSearchEO;
     }
 
+    private String errFilter(String str){
+        if (str.contains("Cause")){
+            str = str.split("Cause")[0].replaceAll("\\r\\n###","");
+        }
+        return str;
+    }
+
     private String esStateOrder(String data, Map<String, Integer> dicMap){
         if(StringUtils.isNotBlank(data)){
             data = data.replace(" ","");

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) {
+    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus,String standSort) {
-        SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus);
+        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){
+    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort){
-        return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus);
+        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)){
+            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,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," +
             "需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本";

adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml

@@ -6,9 +6,10 @@
             SELECT
             DISTINCT
             aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,
-            aq.STANDARD_NAME
+            aq.STANDARD_NAME,
+            MAX(aq.QUESTION_TIME) as questionTime
             FROM ask_questions aq
-            LEFT JOIN reply ON aq.ID = reply.ASK_ID
+            LEFT JOIN (SELECT DISTINCT re.ANSWERER,re.ASK_ID FROM reply re) reply ON aq.ID = reply.ASK_ID
             LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
             LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
             <where>
@@ -37,6 +38,13 @@
                     AND reply.ANSWERER = #{askQuestions.answerer}
                 </if>
             </where>
+            GROUP BY
+            aq.STANDARD_ID,
+            aq.CLASSIFICATION,
+            aq.STANDARD_ENCDOING,
+            aq.STANDARD_NAME
+            ORDER BY
+            questionTime DESC
     </select>
 
     <select id="getAskQuestionsByStandardId" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -83,9 +91,9 @@
 
     <select id="getReplyDetails" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
             SELECT
-            DISTINCT
             aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,
-            aq.STANDARD_NAME
+            aq.STANDARD_NAME,
+            MAX(aq.QUESTION_TIME) as questionTime
             FROM ask_questions aq
             LEFT JOIN reply ON aq.ID = reply.ASK_ID AND reply.STATE = '0'
             LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
@@ -99,6 +107,13 @@
                     AND aq.CLASSIFICATION = #{askQuestions.classification}
                 </if>
             </where>
+            GROUP BY
+            aq.STANDARD_ID,
+            aq.CLASSIFICATION,
+            aq.STANDARD_ENCDOING,
+            aq.STANDARD_NAME
+            ORDER BY
+            questionTime DESC
     </select>
 
     <select id="getReplyDetailsByStandId" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -119,8 +134,8 @@
 
     <select id="getAskQuestionsBySubscription" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
         SELECT
-        DISTINCT
+        aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME,
-        aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME
+        MAX(aq.QUESTION_TIME) as questionTime
         FROM ask_questions aq
         LEFT JOIN reply ON aq.ID = reply.ASK_ID
         LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
@@ -134,6 +149,13 @@
                 AND aq.CLASSIFICATION = #{askQuestions.classification}
             </if>
         </where>
+        GROUP BY
+        aq.STANDARD_ID,
+        aq.CLASSIFICATION,
+        aq.STANDARD_ENCDOING,
+        aq.STANDARD_NAME
+        ORDER BY
+        questionTime DESC
     </select>
 
     <select id="retrieve" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">

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
   </sql>
 
     <sql id="Base_Column_List_show_Export" >
@@ -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
   </sql>
 
     <sql id="Base_Column_List_show_ExportResult" >
@@ -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
   </sql>
 
     <sql id="Group_Column_List_show" >
      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
   </sql>
 
@@ -347,9 +347,8 @@
     </select>
 
     <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select LPAD(MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1, 3, 0) AS newStandSn from sar_bussioness_stand
+        select MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
-        where revise_status = #{value} and valid_flag=0
+        where revise_status = #{value} and REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
-
     </select>
 
     <!-- 删除记录 -->
@@ -488,6 +487,9 @@
             <if test="textStatusBuss!=null">
                 and text_status_buss=#{textStatusBuss}
             </if>
+            <if test="reviseStatus!=null and reviseStatus != ''">
+                and revise_status=#{reviseStatus}
+            </if>
 
             <if test='syncParam != null and syncParam == "sync"'>
                 and SAR_BUSSIONESS_STAND.MODIFY_TIME between DATE_SUB(NOW(),INTERVAL 7 day) and DATE_SUB(NOW(),INTERVAL -1 day)

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao">
 
     <select id="getPublicIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
+        SELECT sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
          sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
          sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
          sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause, sar_public_idea_all.state,sar_public_idea_all.source_type as sourceType
@@ -11,6 +11,7 @@
         INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
         left join ts_user on ts_user.USID = sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
         WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
     </select>
 
@@ -31,7 +32,7 @@
         FROM
         (
         SELECT (@i:=@i+1) as rows,
-        sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,
+        sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text,
         sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,
         sar_public_idea_all.part_code,sar_public_idea_all.user_name,
         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
@@ -39,6 +40,7 @@
         FROM (sar_public_idea_all,(SELECT @i:=0)j)
         left join ts_user on sar_public_idea_all.user_id=ts_user.USID
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
         WHERE
         sar_public_idea_all.idea_id = #{ideaId}
         )c
@@ -53,11 +55,12 @@
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as
+        SELECT sar_public_idea_all.id,reason,concat(t2.name,'_',ts_institution.name) as
         deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
         WHERE sar_public_idea_all.idea_id = #{cid}
         <if test="null!=type and type != ''">
             and sar_public_idea_all.wk_flag ='1' and sar_public_idea_all.state in ('1','2')
@@ -66,11 +69,12 @@
     </select>
 
     <select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as
+        SELECT sar_public_idea_all.id,reason,concat(t2.name,'_',ts_institution.name) as
         deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        left join ts_institution t2 on ts_institution.parent_id=t2.id
         WHERE cid = #{cid}
         <if test="null==type or ''==type">
             and sar_public_idea_all.wk_flag is null