Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.xml

@@ -4,7 +4,22 @@
 
     <resultMap id="DeviceMaintainVO" type="com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainVO">
         <id property="id" column="ID"/>
-        <result property="deviceName" column="DEV_NAME"/>
+        <result property="dataType" column="DAT_TP"/>
+        <result property="ruleId" column="RUL_ID"/>
+        <result property="deviceId" column="DEV_ID"/>
+        <result property="checkDate" column="CHK_DT"/>
+        <result property="content" column="CNTT"/>
+        <result property="checkUserId" column="CHK_USER_ID"/>
+        <result property="checkUserName" column="CHK_USER_NAME"/>
+        <result property="frequencyType" column="FREQ_TP"/>
+        <result property="frequency" column="FREQ"/>
+        <result property="frequencyRemark" column="FREQ_RMK"/>
+        <result property="frequencyTimeStart" column="FREQ_TM_STRT"/>
+        <result property="frequencyTimeEnd" column="FREQ_TM_END"/>
+        <result property="submitFlag" column="SBM_FLG"/>
+        <result property="systemDepartmentCode" column="SYS_DEPT_CD"/>
+        <result property="remark" column="RMK"/>
+        <!--扩展字段-->
         <result property="alias" column="ALS"/>
         <result property="deviceCode" column="DEV_CD"/>
         <result property="factoryCode" column="FACT_CD"/>
@@ -44,7 +59,7 @@
         p.MDL_NO
     </sql>
 
-    <select id="queryMaintainVoById" resultMap="DeviceMaintainVO">
+    <select id="queryVoById" resultMap="DeviceMaintainVO">
         select m.*,
         <include refid="fieldDAndP"/>
         from T_DEV_MATN m
@@ -59,7 +74,7 @@
     <select id="queryPageListWithCount" resultMap="DeviceMaintainVO">
         select
         <include refid="fieldDAndP"/>
-        (
+        ,(
             select count(*) from T_DEV_MATN m
             where m.DAT_TP = #{param.dataType}
             <if test="param.checkDate != null and param.checkDate.length>0">