修改时修改主表修改时间

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzKgxxServiceImpl.java

@@ -103,6 +103,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
         }
         zsyzSbbzb.setProgress(FOR);
         zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzKgxx.getZsyzFjList();
@@ -175,6 +176,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
         }
         zsyzSbbzb.setProgress(FOR);
         zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //修改附件
         if (zsyzKgxx.getZsyzFjList() != null && zsyzKgxx.getZsyzFjList().size() > 0) {

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzQyxxServiceImpl.java

@@ -102,6 +102,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         }
         zsyzSbbzb.setProgress(THR);
         zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         int count = zsyzQyxxMapper.insertZsyzQyxx(zsyzQyxx);
         //保存附件信息
@@ -175,6 +176,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         }
         zsyzSbbzb.setProgress(THR);
         zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //修改附件
         if (zsyzQyxx.getZsyzFjList() != null && zsyzQyxx.getZsyzFjList().size() > 0) {

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzSbbzbServiceImpl.java

@@ -142,6 +142,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         //获取当前人员信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         zsyzSbbzb.setCreateTime(DateUtils.getNowDate());
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzb.setUserId(user.getUserId());
         zsyzSbbzb.setDeptId(user.getDeptId());
         int count = zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzTcxxServiceImpl.java

@@ -103,6 +103,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         }
         zsyzSbbzb.setProgress(FIV);
         zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzTcxx.getZsyzFjList();
@@ -173,6 +174,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         }
         zsyzSbbzb.setProgress(FIV);
         zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //修改附件
         if (zsyzTcxx.getZsyzFjList() != null && zsyzTcxx.getZsyzFjList().size() > 0) {

ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectFgwJdapNum" resultMap="FgwJdapResult">
+    <!--<select id="selectFgwJdapNum" resultMap="FgwJdapResult">
         SELECT
             ANY_VALUE(id) as id,
             xm_id
@@ -61,9 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and sfwc = '0'
         GROUP BY
             xm_id
-    </select>
+    </select>-->
 
-    <!--<select id="selectFgwJdapNum" resultMap="FgwJdapResult">
+    <select id="selectFgwJdapNum" resultMap="FgwJdapResult">
         SELECT
             id,
             xm_id
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and sfwc = '0'
         GROUP BY
             xm_id
-    </select>-->
+    </select>
     <select id="selectFgwJdapCqxmNum" resultMap="FgwJdapResult">
         SELECT
             xm_id

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

@@ -44,19 +44,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
+    <!--<select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
         select ANY_VALUE(a.id) as id, ANY_VALUE(a.xm_id) as xm_id, ANY_VALUE(a.xmbh) as xmbh, ANY_VALUE(a.xmmc)as xmmc,
                ANY_VALUE(a.dept_id) as dept_id, ANY_VALUE(a.dept_name) as dept_name, ANY_VALUE(MAX(a.cl_time)) as cl_time, ANY_VALUE(a.progress) as progress
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>
+    </select>-->
 
-    <!--<select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
         select id, xm_id, xmbh, xmmc,
                dept_id, dept_name, MAX(cl_time) as cl_time, progress
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time) as cl_time, progress
               from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>-->
+    </select>
 
     <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_lcjl

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

@@ -345,7 +345,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by s.create_time desc
+        order by s.update_time desc
     </select>
 
 
@@ -429,7 +429,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by s.create_time desc
+        order by s.update_time desc
     </select>
 
     <select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
@@ -527,7 +527,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by s.create_time desc
+        order by s.update_time desc
     </select>
     <select id="selectZsyzSbbzbListByZp" resultMap="ZsyzSbbzbResult">
         SELECT * from ( select s.id,
@@ -661,7 +661,7 @@
 
         )d
 
-        order by d.create_time desc
+        order by d.update_time desc
     </select>
 
     <select id="selectZsyzSbbzbListByZpPs"  resultMap="ZsyzSbbzbResult">
@@ -796,7 +796,7 @@
 
         )d
         ${params.dataScope}
-        order by d.create_time desc
+        order by d.update_time desc
     </select>
 
     <select id="selectZsyzSbbzbListCount" resultType="java.lang.Long">
@@ -870,7 +870,7 @@
                 AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
-        order by create_time desc
+        order by update_time desc
     </select>
 
     <select id="selectZsyzSbbzbListYz" resultMap="ZsyzSbbzbResult">
@@ -937,10 +937,10 @@
         <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>
-        order by d.create_time desc
+        order by d.update_time desc
     </select>
 
-    <select id="selectZsyzSbbzbListTz" resultMap="ZsyzSbbzbResult">
+    <!--<select id="selectZsyzSbbzbListTz" resultMap="ZsyzSbbzbResult">
         SELECT
         ANY_VALUE(a.id) AS id,
         ANY_VALUE(a.xmbh) AS xmbh,
@@ -973,9 +973,9 @@
         ) a
         GROUP BY
         a.xmbh
-    </select>
+    </select>-->
 
-    <!--<select id="selectZsyzSbbzbListTz" resultMap="ZsyzSbbzbResult">
+    <select id="selectZsyzSbbzbListTz" resultMap="ZsyzSbbzbResult">
         SELECT
         a.id,
         a.xmbh,
@@ -1007,7 +1007,7 @@
         ) a
         GROUP BY
         a.xmbh
-    </select>-->
+    </select>
 
 
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
@@ -1201,6 +1201,7 @@
             <if test=" progress == 1">cjd_id = null,</if>
             <if test=" progress == 1">cjd_name = null,</if>
             <if test=" sfwlhxxxm != null">sfwlhxxxm = #{sfwlhxxxm},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>