徐明浩

数据排序规则-单元
列表数据排序规则-装置、单元

master/src/main/resources/mybatis/sems/TReportYlgdMapper.xml

@@ -119,6 +119,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by y.plant_code ,y.unit
     </select>
 
     <select id="queryNeedInsertIds" resultType="Long">

master/src/main/resources/mybatis/sems/TReportYlrqMapper.xml

@@ -183,6 +183,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by y.plant_code ,y.unit
     </select>
 
     <select id="selectTReportYlrqById" parameterType="Long" resultMap="TReportYlrqResult">

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -51,7 +51,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSpecdevCcVo">
-        select d.id, d.plant_code, d.car_no, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner ,s.dept_name,
+        select d.id,
+               d.plant_code,
+               d.car_no,
+               d.devname,
+               d.devno,
+               d.submitdate,
+               d.status,
+               d.del_flag,
+               d.creater_code,
+               d.createdate,
+               d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_CC h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag
         from t_specdev_cc d
       left join sys_dept s on s.dept_id = d.dept_id
@@ -69,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by d.plant_code
     </select>
 
     <select id="selectTSpecdevCcListByYear" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by d.plant_code, d.unit
     </select>
 
     <select id="selectTSpecdevDtListByYear" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by d.plant_code, d.unit
     </select>
     <select id="selectTSpecdevDzsbListByYear" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
         <include refid="selectTSpecdevDzsbVo"/>

master/src/main/resources/mybatis/sems/TSpecdevGlMapper.xml

@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by d.plant_code, d.unit
     </select>
 
     <select id="selectTSpecdevGlListByYear" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -164,6 +164,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by d.plant_code, d.unit
     </select>
 
 

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -137,6 +137,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
+        order by d.plant_code, d.unit
     </select>
 
     <select id="selectTSpecdevYlrqListByYear" parameterType="TSpecdevYlrq" resultMap="TSpecdevYlrqResult">

ui/src/views/sems/reportYlgd/index.vue

@@ -842,6 +842,8 @@ export default {
         approveStatus: null,
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:"unit",
+        isAsc:"asc",
       },
       // 查询历史报告参数
       queryHistoryParams: {

ui/src/views/sems/reportYlrq/index.vue

@@ -1046,6 +1046,8 @@ export default {
         devno: null,
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:"unit",
+        isAsc:"asc",
       },
       // 查询参数
       queryHistoryParams: {

ui/src/views/sems/specGl/index.vue

@@ -618,8 +618,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"id",
-        isAsc:"desc",
+        orderByColumn:"unit",
+        isAsc:"asc",
         plantCode: null,
         unit: null,
         devname: null,

ui/src/views/sems/specYlgd/index.vue

@@ -750,8 +750,8 @@ export default {
       queryParams: {
         dataForm: 0,
         pageNum: 1,
-        orderByColumn:"id",
-        isAsc:"desc",
+        orderByColumn:"unit",
+        isAsc:"asc",
         pageSize: 20,
         plantCode: null,
         unit: null,

ui/src/views/sems/specYlrq/index.vue

@@ -685,8 +685,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"id",
-        isAsc:"desc",
+        orderByColumn:"unit",
+        isAsc:"asc",
         plantCode: null,
         unit: null,
         devname: null,