11

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -72,7 +72,7 @@
     </select>
 
 
-    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ) as id,
         ANY_VALUE ( s.xm_id ) as xm_id ,
@@ -89,48 +89,48 @@
         <where>
             s.shjg = '2'
             <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
-            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
-            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
                 AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
-        <!-- 数据范围过滤 -->
+        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
         ${params.dataScope}
         GROUP BY
         s.xm_id
-    </select>
+    </select>-->
 
-<!--    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
-        id,
-        xm_id ,
-        xmbh,
-        dept_id,
-        shrxm,
-        xmjd,
-        xmmc,
-        shjg,
-        shyj,
-        shsj
+        s.id,
+        s.xm_id ,
+        s.xmbh,
+        s.dept_id,
+        s.shrxm,
+        s.xmjd,
+        s.xmmc,
+        s.shjg,
+        s.shyj,
+        s.shsj
         FROM
-        zsyz_shyj
+        zsyz_shyj s
         <where>
-            shjg = '2'
-            <if test="xmmc != null  and xmmc != ''">and xmmc like concat( #{xmmc}, '%') </if>
-            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
+            s.shjg = '2'
+            <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
-            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
-        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
+        <!-- 数据范围过滤 -->
         ${params.dataScope}
         GROUP BY
-        xm_id
-    </select>-->
+        s.xm_id
+    </select>
 
     <insert id="insertZsyzShyj" parameterType="ZsyzShyj" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_shyj