Merge branch 'develop_migration' into 'develop_master'

Develop migration

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

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

@@ -242,37 +242,42 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         if(page.getUserId() == null || page.getUserId().equals("")){
             page.setUserId(LoginUserUtil.getUserId());
         }
-        if(StringUtils.isNotBlank(page.getPaixu())){
+
-            String sql = page.getPaixu()+" "+page.getShunxu();
+        if (null != page.getNowOrderBy()) {
-            page.setSql(sql);
+            nowOrderFunc(page);
-        }else{
-            page.setOrderBy("SAR_BUSSIONESS_STAND.MODIFY_TIME DESC");
         }
         List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+    }
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+
-//            String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
+    private void nowOrderFunc(SarBussionessStandEOPage page) {
-//            if (StringUtils.isNotBlank(advanceStr)) {
+        switch (page.getNowOrderBy()) {
-//                page.setAdvanceSearchStr(advanceStr);
+            case 1:
-//            } else {
+                page.setOrderByA("tmp_tb.issue_time");//发布日期
-//                page.setAdvanceSearchStr(null);
+                break;
-//            }
+            case 2:
-//        }
+                page.setOrderByA("tmp_tb.put_time");//实施日期
-//        page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time desc nulls last,SAR_BUSSIONESS_STAND.id");
+                break;
-//        List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
+            case 3:
-////        List<String> getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
+                page.setOrderByA("tmp_tb.standStatusShow");//文本状态
-//        if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                break;
-//            page.setMenuRoleList(getMenuIdList);
+            default:
-//        } else {
+                page.setNowOrder(null);
-//            page.setMenuRoleList(null);
+                break;
-//        }
+        }
-//        List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
+        if (null != page.getNowOrder()) {
-//        if (ids != null && !ids.isEmpty()) {
+            switch (page.getNowOrder()) {
-//            page.setMenuAllChildrenIdList(ids);
+                case 1:
-//        }
+                    page.setOrder1("desc");
-//        List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
+                    break;
-//        return Result.success(getPageInfo(page.getPager(), rows));
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
     }
 
 

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

@@ -278,11 +278,46 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
+
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+        
         List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page);
         attrInfoShowExport(getList);
         return getList;
     }
 
+    private void nowOrderFunc(SarBussionessStandEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("tmp_tb.issue_time");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("tmp_tb.put_time");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("tmp_tb.standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     public void attrInfoShow (List<SarBussionessStand> sarlist) throws Exception {
         for(SarBussionessStand row : sarlist){
             attrInfoDetails(row);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java

@@ -77,22 +77,13 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
         if (null != page.getNowOrderBy()) {
             switch (page.getNowOrderBy()) {
                 case 1:
-                    page.setOrderByA("a.issueTime");//发布日期
+                    page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                     break;
                 case 2:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期
+                    page.setOrderByA("XCXSSRQLAWS");
                     break;
                 case 3:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期
+                    page.setOrderByA("standStatusShow");//文本状态
-                    break;
-                case 4:
-                    page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态
-                    break;
-                case 5:
-                    page.setOrderByA("paixu");
-                    break;
-                case 6:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ");
                     break;
                 default:
                     page.setNowOrder(null);
@@ -105,6 +96,7 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
                         break;
                     case 2:
                         page.setOrder1("asc");
+                        break;
                     default:
                         page.setOrder1(null);
                         break;
@@ -131,44 +123,10 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
     @GetMapping("/pageLaws")
     /*@RequiresPermissions("lawss:sarLawsInfo:page")*/
     public ResponseMessage<PageInfo<SarLawsStandInfo>> pageLaws(SarLawsStandInfoPage page) throws Exception {
-        if (null != page.getNowOrderBy()) {
-            switch (page.getNowOrderBy()) {
-                case 1:
-                    page.setOrderByA("a.issueTime");//发布日期
-                    break;
-                case 2:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期
-                    break;
-                case 3:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期
-                    break;
-                case 4:
-                    page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态
-                    break;
-                case 5:
-                    page.setOrderByA("paixu");
-                    break;
-                case 6:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ");
-                    break;
-                default:
-                    page.setNowOrder(null);
-                    break;
-            }
-            if (null != page.getNowOrder()) {
-                switch (page.getNowOrder()) {
-                    case 1:
-                        page.setOrder1("desc");
-                        break;
-                    case 2:
-                        page.setOrder1("asc");
-                    default:
-                        page.setOrder1(null);
-                        break;
-                }
-            }
-        }
 
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
 
         if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
@@ -184,6 +142,36 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    private void nowOrderFunc(SarLawsStandInfoPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("XCXSSRQLAWS");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     @ApiOperation(value = "|SarLawsStandInfo|详情")
     @GetMapping("/getStandInfoById")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java

@@ -268,10 +268,10 @@ public class SarLawsStandInfoPage extends BasePage {
     @TableField(exist = false)
     private Integer nowOrderBy;
     @TableField(exist = false)
-    private String orderByA = "a.issue_time";
+    private String orderByA = "";
     @TableField(exist = false)
     private String orderBy1 = "SAR_LAWS_STAND_INFO.issue_time";
     @TableField(exist = false)
-    private String order1 = "desc";
+    private String order1 = "";
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java

@@ -436,11 +436,46 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
+
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+
         List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsExportInfo(page);
         attrInfoShowExport(rows);
         return rows;
     }
 
+    private void nowOrderFunc(SarLawsStandInfoPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("XCXSSRQLAWS");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     public void attrInfoShow (List<SarLawsStandInfo> sarlist) throws Exception {
         for(SarLawsStandInfo row : sarlist){
             attrInfoDetails(row);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -92,46 +92,10 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @GetMapping("/getSarStandardsInfoPage")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
     public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
-        int isNull = -1;
         if (null != page.getNowOrderBy()) {
-            switch (page.getNowOrderBy()) {
+            nowOrderFunc(page);
-                case 1:
-                    page.setOrderByA("ISSUE_TIME");//发布日期
-                    break;
-                case 2:
-                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
-                    break;
-                case 3:
-                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
-                    break;
-                case 4:
-                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
-                    break;
-                case 5:
-                    page.setOrderByA("paixu");
-                    break;
-                case 6:
-                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
-                    break;
-                default:
-                    page.setNowOrder(null);
-                    break;
-            }
-            if (null != page.getNowOrder()) {
-                switch (page.getNowOrder()) {
-                    case 1:
-                        page.setOrder1("desc");
-                        break;
-                    case 2:
-                        page.setOrder1("asc");
-                    default:
-                        page.setOrder1(null);
-                        break;
-                }
-            }
         }
 
-
         if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
             String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
@@ -142,40 +106,6 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
             }
         }
 
-
-
-
-
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-//            int i = 0;
-//            for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){
-//                if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){
-//                    isNull = i;
-//                }
-//                i++;
-//            }
-//            if (-1 != isNull) {
-//                searchList.remove(isNull);
-//            }
-//            if (isNull == 0 && searchList.size() > 0){
-//                searchList.get(0).setConnect("");
-//            }
-//            String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
-//            if (null != advanceStr) {
-//                advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)");
-//            }
-//            if (-1 != isNull && StringUtils.isBlank(advanceStr)){
-//                advanceStr = advanceStr + " SVPPS is null";
-//            }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){
-//                advanceStr = advanceStr + " and SVPPS is null";
-//            }
-//            if (StringUtils.isNotBlank(advanceStr)) {
-//                page.setAdvanceSearchStr(advanceStr);
-//            } else {
-//                page.setAdvanceSearchStr(null);
-//            }
-//        }
         if(page.getUserId() == null || page.getUserId().equals("")){
             page.setUserId(LoginUserUtil.getUserId());
         }
@@ -183,6 +113,45 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    private void nowOrderFunc(SarStandardsInfoEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("ZCCSSRQ");//新车型实施日期
+                break;
+            case 3:
+                page.setOrderByA("XCXSSRQ");//在产车实施日期
+                break;
+            case 4:
+                page.setOrderByA("standTextStatusShow");//文本状态
+                break;
+            case 5:
+                page.setOrderByA("paixu");
+                break;
+            case 6:
+                page.setOrderByA("SSRQ");
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
     @GetMapping("/getSarStandardsInfoPageBak")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java

@@ -120,6 +120,10 @@ public class SarBussionessStandEOPage extends BasePage {
     private String paixu;
     private String shunxu;
     private String sql;
+    private Integer nowOrder;
+    private Integer nowOrderBy;
+    private String orderByA = "";
+    private String order1 = "";
 
     // 新增字段
     private String FZRQBUSS;
@@ -144,6 +148,38 @@ public class SarBussionessStandEOPage extends BasePage {
     private String GLWJBUSS;
     private String XCSJBUSS;
 
+    public Integer getNowOrder() {
+        return nowOrder;
+    }
+
+    public void setNowOrder(Integer nowOrder) {
+        this.nowOrder = nowOrder;
+    }
+
+    public Integer getNowOrderBy() {
+        return nowOrderBy;
+    }
+
+    public void setNowOrderBy(Integer nowOrderBy) {
+        this.nowOrderBy = nowOrderBy;
+    }
+
+    public String getOrderByA() {
+        return orderByA;
+    }
+
+    public void setOrderByA(String orderByA) {
+        this.orderByA = orderByA;
+    }
+
+    public String getOrder1() {
+        return order1;
+    }
+
+    public void setOrder1(String order1) {
+        this.order1 = order1;
+    }
+
     public String getFZRQBUSS() {
         return FZRQBUSS;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -84,9 +84,9 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String productId;
     private Integer nowOrder;
     private Integer nowOrderBy;
-    private String orderByA = "a.issue_time";
+    private String orderByA = "";
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
-    private String order1 = "desc";
+    private String order1 = "";
 
 //    zhaokaiyao
     private String textStatus;//文本状态

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1613,11 +1613,53 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
         List<SarStandardsInfo> getList = dao.getSarStandardsExportInfo(page);
         attrInfoShowExport(getList);
         return getList;
     }
 
+    private void nowOrderFunc(SarStandardsInfoEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("ZCCSSRQ");//新车型实施日期
+                break;
+            case 3:
+                page.setOrderByA("XCXSSRQ");//在产车实施日期
+                break;
+            case 4:
+                page.setOrderByA("text_status");//文本状态
+                break;
+            case 5:
+                page.setOrderByA("paixu");
+                break;
+            case 6:
+                page.setOrderByA("SSRQ");
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     public ResponseMessage<SarStandardsInfo> importSarStandardsInfoData(List<Map<String, String>> dataList, String standType, String menuId, String filepath) {
 //此处需要做各种验证，数据库操作
         try {

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -350,6 +350,9 @@
     <!-- 分页查询条件 -->
     <sql id="standSort_in">
         ORDER BY
+        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
+            ${orderByA} ${order1},
+        </if>
         CASE
             when tmp_tb.stand_code like concat('%', 'Q/FT A', '%')  THEN 0
             when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
@@ -401,6 +404,11 @@
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
         left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0)
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_BUSSIONESS_STAND.text_status_buss
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
         where 1=1
         <trim suffixOverrides="," >
 
@@ -624,16 +632,12 @@
     <select id="getBussionessStandInfoPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
         select * from
         (select tmp_tb.*  from
-        (select <include refid="Base_Column_List_show" />
+        (select
+        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
+        <include refid="Base_Column_List_show" />
         from SAR_BUSSIONESS_STAND
         <include refid="SarBussionInfo_Where_Clause"/>
         GROUP BY <include refid="Group_Column_List_show"/>
-        <if test="pager.orderCondition != null and pager.orderCondition != ''" >
-            ${pager.orderCondition}
-        </if>
-        <if test="sql != null and sql != ''" >
-            ORDER BY ${sql}
-        </if>
         ) tmp_tb
         <include refid="standSort_in"/>
         limit ${pager.startIndex-1},${pageSize}) a

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml

@@ -79,6 +79,12 @@
 
     <sql id="SarStandardsInfo_in_left">
         left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
+        left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
         where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0
         <trim suffixOverrides=",">
             <!--                     基本搜索项                         -->
@@ -175,22 +181,15 @@
                 and TS_PERSON_COLLECT.user_id=#{userId}
                 )
             </if>
-        </trim>
+
-    </sql>
-    <sql id="SarStandardsInfo_out_left">
-        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
-        dicstandTextStatus.dic_type_code = a.LAWS_TEXT_STATE
-        AND dicstandTextStatus.dic_id IS NOT NULL
-        AND dicstandTextStatus.valid_flag = 0
-        )
-        left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = a.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
-        where 1=1
-        <trim suffixOverrides=",">
             <if test="advanceSearchStr != null and advanceSearchStr != ''">
                 and (${advanceSearchStr})
             </if>
         </trim>
     </sql>
+    <sql id="SarStandardsInfo_out_left">
+
+    </sql>
 
     <sql id="Base_Column_List_Show" >
     DISTINCT SAR_LAWS_STAND_INFO.ID,
@@ -234,38 +233,6 @@
     <!-- 查询SAR_LAWS_STAND_INFO列表 -->
     <select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
             parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
-        select
-            DISTINCT a.ID,
-            a.LAWS_TYPE,
-            a.LAWS_NUMBER,
-            a.LAWS_NAME,
-            a.LAWS_EN_NAME,
-            a.LAWS_NO,
-            a.ISSUE_TIME,
-            a.ISSUE_COMPANY,
-            a.COMMENT_CYCLE_START,
-            a.COMMENT_CYCLE_END,
-            a.LAWS_TEXT_STATE,
-            a.LAWS_SYQY,
-            a.LAWS_SYCX,
-            a.IS_RELATE_ACCESS,
-            a.LAWS_YEAR,
-            a.LAWS_NOTISYNC_NUM,
-            a.LAWS_BULLETIN,
-            a.LAWS_LABEL,
-            a.LAWS_REMARK,
-            a.COUNTRY,
-            a.MODIFY_TIME,
-            dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
-            (
-            CASE
-            WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
-            ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS
-            END
-            ) AS XCXSSRQLAWS
-        from
-        (select tmp_tb.*  from
-        (
         SELECT
         DISTINCT SAR_LAWS_STAND_INFO.ID,
         SAR_LAWS_STAND_INFO.LAWS_TYPE,
@@ -287,19 +254,27 @@
         SAR_LAWS_STAND_INFO.LAWS_LABEL,
         SAR_LAWS_STAND_INFO.LAWS_REMARK,
         SAR_LAWS_STAND_INFO.COUNTRY,
-        SAR_LAWS_STAND_INFO.MODIFY_TIME
+        SAR_LAWS_STAND_INFO.MODIFY_TIME,
+        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
+        (
+        CASE
+        WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
+        ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS
+        END
+        ) AS XCXSSRQLAWS
         from SAR_LAWS_STAND_INFO
         <include refid="SarStandardsInfo_in_left"/>
-        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
-        <include refid="SarStandardsInfo_out_left"/>
         order by
-        ${orderByA} ${order1},a.id
+        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
+            ${orderByA} ${order1},
+        </if>
+        SAR_LAWS_STAND_INFO.id
+        limit ${pager.startIndex-1},${pageSize}
     </select>
 
     <select id="getSarStandardsInfoCount" resultType="java.lang.Integer"
             parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
         select count(1) from (select count(*) from SAR_LAWS_STAND_INFO
-        left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
         <include refid="SarStandardsInfo_in_left"/>
         GROUP BY SAR_LAWS_STAND_INFO.id) a
     </select>
@@ -307,33 +282,35 @@
     <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
             parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
         select
-            DISTINCT a.ID,
+        DISTINCT SAR_LAWS_STAND_INFO.ID,
-            a.LAWS_TYPE,
+        SAR_LAWS_STAND_INFO.LAWS_TYPE,
-            a.LAWS_NUMBER,
+        SAR_LAWS_STAND_INFO.LAWS_NUMBER,
-            a.LAWS_NAME,
+        SAR_LAWS_STAND_INFO.LAWS_NAME,
-            a.LAWS_EN_NAME,
+        SAR_LAWS_STAND_INFO.LAWS_EN_NAME,
-            a.LAWS_NO,
+        SAR_LAWS_STAND_INFO.LAWS_NO,
-            a.ISSUE_TIME,
+        SAR_LAWS_STAND_INFO.ISSUE_TIME,
-            a.ISSUE_COMPANY,
+        SAR_LAWS_STAND_INFO.ISSUE_COMPANY,
-            a.COMMENT_CYCLE_START,
+        SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START,
-            a.COMMENT_CYCLE_END,
+        SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END,
-            a.LAWS_TEXT_STATE,
+        SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE,
-            a.LAWS_SYQY,
+        SAR_LAWS_STAND_INFO.LAWS_SYQY,
-            a.LAWS_SYCX,
+        SAR_LAWS_STAND_INFO.LAWS_SYCX,
-            a.IS_RELATE_ACCESS,
+        SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS,
-            a.LAWS_YEAR,
+        SAR_LAWS_STAND_INFO.LAWS_YEAR,
-            a.LAWS_NOTISYNC_NUM,
+        SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM,
-            a.LAWS_BULLETIN,
+        SAR_LAWS_STAND_INFO.LAWS_BULLETIN,
-            a.LAWS_LABEL,
+        SAR_LAWS_STAND_INFO.LAWS_LABEL,
-            a.LAWS_REMARK,
+        SAR_LAWS_STAND_INFO.LAWS_REMARK,
-            a.COUNTRY,
+        SAR_LAWS_STAND_INFO.COUNTRY,
-            a.MODIFY_TIME,
+        SAR_LAWS_STAND_INFO.MODIFY_TIME,
         dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
-        from (select <include refid="Base_Column_List_Show"/>
         from SAR_LAWS_STAND_INFO
-        <include refid="SarStandardsInfo_in_left"/>) a
+        <include refid="SarStandardsInfo_in_left"/>
-        <include refid="SarStandardsInfo_out_left"/>
+        order by
-        order by a.issue_time is null,a.issue_time desc,a.id
+        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
+            ${orderByA} ${order1},
+        </if>
+        SAR_LAWS_STAND_INFO.id
     </select>
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -73,7 +73,28 @@
         SAR_STANDARDS_INFO.creation_time,
         SAR_STANDARDS_INFO.modify_time,
         SAR_STANDARDS_INFO.STAND_SYSTEM,
-        SAR_STANDARDS_INFO.IS_RELATE_ACCESS
+        SAR_STANDARDS_INFO.IS_RELATE_ACCESS,
+        SAR_STAND_ATTR_INFO.CHJL AS CHJL,
+        dicstandSort.DIC_TYPE_NAME AS standSortShow,
+        dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
+        (
+        CASE
+        WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01'
+        ELSE SAR_STAND_ATTR_INFO.SSRQ
+        END
+        ) AS SSRQ,
+        (
+        CASE
+        WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01'
+        ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ
+        END
+        ) AS ZCCSSRQ,
+        (
+        CASE
+        WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01'
+        ELSE SAR_STAND_ATTR_INFO.XCXSSRQ
+        END
+        ) AS XCXSSRQ
     </sql>
 
     <sql id="Base_Column_List_Show" >
@@ -566,9 +587,12 @@
     </sql>
 
     <sql id="standSort_in">
+        ORDER BY
+        <if test='page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != ""'>
+            ${page.orderByA} ${page.order1},
+        </if>
         <if test='page.standType != null and page.standType == "INLAND"'>
-            ORDER BY
+            CASE sar_standards_info.stand_sort
-            CASE tmp_tb.stand_sort
             when 'GB' THEN 0
             when 'GB/T' THEN 1
             when 'QC/T' THEN 2
@@ -579,11 +603,10 @@
             when 'HJ' THEN 7
             ELSE 8
             END,
-            tmp_tb.stand_sort ASC
+            sar_standards_info.stand_sort ASC,sar_standards_info.id
         </if>
         <if test='page.standType != null and page.standType == "FOREIGN"'>
-            ORDER BY
+            CASE sar_standards_info.stand_sort
-            CASE tmp_tb.stand_sort
             when 'ECE' THEN 0
             when 'EU' THEN 1
             when 'EC' THEN 2
@@ -610,7 +633,7 @@
             when 'ADR' THEN 23
             ELSE 24
             END,
-            tmp_tb.stand_sort ASC
+            sar_standards_info.stand_sort ASC,sar_standards_info.id
         </if>
     </sql>
     <sql id="standSort_out">
@@ -709,6 +732,14 @@
 
     <sql id="SarStandardsInfo_in_left_2">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
         <trim suffixOverrides=",">
             <!-- 标准分类 国内标准，国外标准  必要搜索项                 -->
@@ -820,6 +851,21 @@
                 and TS_PERSON_COLLECT.user_id=#{page.userId}
                 )
             </if>
+
+            <!-- out -->
+            <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ is not null
+            </if>
+            <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
+            </if>
+            <!--适用车型-->
+            <if test="page.applyArctic != null and page.applyArctic != ''">
+                and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
+            </if>
+            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
+                and (${page.advanceSearchStr})
+            </if>
         </trim>
     </sql>
 
@@ -935,80 +981,13 @@
         </trim>
     </sql>
     <sql id="SarStandardsInfo_out_left">
-        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
+
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
-        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
-        dicstandTextStatus.dic_type_code = a.text_status
-        AND dicstandTextStatus.dic_id IS NOT NULL
-        AND dicstandTextStatus.valid_flag = 0
-        )
-        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = a.id and SAR_STAND_ATTR_INFO.valid_flag=0)
-        where 1=1
-        <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
-            and SAR_STAND_ATTR_INFO.GXHBQ is not null
-        </if>
-        <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
-            and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
-        </if>
-        <!--适用车型-->
-        <if test="page.applyArctic != null and page.applyArctic != ''">
-            and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
-        </if>
-        <trim suffixOverrides=",">
-            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
-                and (${page.advanceSearchStr})
-            </if>
-        </trim>
     </sql>
 
 
     <!--    分页查询-->
     <select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
             parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
-        select
-            DISTINCT a.id,
-            a.stand_type,
-            a.country,
-            a.stand_sort,
-            a.stand_number,
-            a.stand_year,
-            a.stand_name,
-            a.stand_en_name,
-            a.stand_state,
-            a.stand_nature,
-            a.issue_time,
-            a.put_time,
-            a.text_status,
-            a.creation_user,
-            a.valid_flag,
-            a.creation_time,
-            a.modify_time,
-            a.STAND_SYSTEM,
-            a.IS_RELATE_ACCESS,
-            SAR_STAND_ATTR_INFO.CHJL AS CHJL,
-            dicstandSort.DIC_TYPE_NAME AS standSortShow,
-            dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
-        (
-        CASE
-        WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01'
-        ELSE SAR_STAND_ATTR_INFO.SSRQ
-        END
-        ) AS SSRQ,
-        (
-        CASE
-        WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01'
-        ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ
-        END
-        ) AS ZCCSSRQ,
-        (
-        CASE
-        WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01'
-        ELSE SAR_STAND_ATTR_INFO.XCXSSRQ
-        END
-        ) AS XCXSSRQ
-         from
-        (select tmp_tb.*  from
-        (
         SELECT
         <include refid="Base_Column_List_DIS"/>
         from SAR_STANDARDS_INFO
@@ -1016,14 +995,8 @@
         <if test="mark == 999 ">
             and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
         </if>
-        ) tmp_tb
         <include refid="standSort_in"/>
         limit ${page.pager.startIndex-1},${page.pageSize}
-        ) a
-        <include refid="SarStandardsInfo_out_left"/>
-        order by
-        <include refid="standSort_out_2"/>
-        ${page.orderByA} ${page.order1},a.id
     </select>
     <!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
     <!--if(isnull(SAR_STANDARDS_INFO.issue_time),0,1) desc  ,-->
@@ -1160,6 +1133,9 @@
             GROUP BY <include refid="Group_Column_List_Show"/>
         ) a
         order by
+        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
+            ${orderByA} ${order1},
+        </if>
         <include refid="standSort_out"/>
         a.issue_time is null
         ,a.issue_time desc,a.id