进展情况新增deptId和deptName、列表增加order by

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,12 +3,16 @@ package com.ruoyi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
  * 
  * @author ruoyi
  */
+@EnableAsync
+@EnableScheduling
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzDbdMapper.java

@@ -62,4 +62,5 @@ public interface ZsyzDbdMapper
     public int deleteZsyzDbdByIds(Long[] ids);
 
     long number(ZsyzDbd zsyzDbd);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzJzqkServiceImpl.java

@@ -1,7 +1,10 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzJzqk;
 import com.ruoyi.system.mapper.projectV2.ZsyzJzqkMapper;
 import com.ruoyi.system.service.projectV2.IZsyzJzqkService;
@@ -52,6 +55,9 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
     @Override
     public int insertZsyzJzqk(ZsyzJzqk zsyzJzqk)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        zsyzJzqk.setDeptName(user.getDept().getDeptName());
+        zsyzJzqk.setDeptId(user.getDeptId());
         zsyzJzqk.setCreateTime(DateUtils.getNowDate());
         return zsyzJzqkMapper.insertZsyzJzqk(zsyzJzqk);
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzKgxxServiceImpl.java

@@ -102,8 +102,8 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
         SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
         ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
         zsyzLcjl.setXmId(zsyzSbbzb.getId());
-        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
-        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setXmmc(zsyzKgxx.getXmmc());
+        zsyzLcjl.setXmbh(zsyzKgxx.getXmbh());
         zsyzLcjl.setDeptId(dept.getDeptId());
         String deptName = dept.getDeptName();
         zsyzLcjl.setDeptName(deptName);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzQyxxServiceImpl.java

@@ -102,8 +102,8 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
         ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
         zsyzLcjl.setXmId(zsyzSbbzb.getId());
-        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
-        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setXmmc(zsyzQyxx.getXmmc());
+        zsyzLcjl.setXmbh(zsyzQyxx.getXmbh());
         zsyzLcjl.setDeptId(dept.getDeptId());
         String deptName = dept.getDeptName();
         zsyzLcjl.setDeptName(deptName);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzTcxxServiceImpl.java

@@ -101,8 +101,8 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
         ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
         zsyzLcjl.setXmId(zsyzSbbzb.getId());
-        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
-        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setXmmc(zsyzTcxx.getXmmc());
+        zsyzLcjl.setXmbh(zsyzTcxx.getXmbh());
         zsyzLcjl.setDeptId(dept.getDeptId());
         String deptName = dept.getDeptName();
         zsyzLcjl.setDeptName(deptName);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/common/ZsyzCommonServiceImpL.java

@@ -121,8 +121,8 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //插入流程记录表
         ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
         zsyzLcjl.setXmId(zsyzSbbzb.getId());
-        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
-        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setXmmc(zsyzShyj.getXmmc());
+        zsyzLcjl.setXmbh(zsyzShyj.getXmbh());
         zsyzLcjl.setDeptId(dept.getDeptId());
         String deptName = dept.getDeptName();
         zsyzLcjl.setDeptName(deptName);

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

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rateType != null  and rateType != ''"> and rate_type = #{rateType}</if>
             <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectXmConstructionRateById" parameterType="Long" resultMap="XmConstructionRateResult">

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

@@ -147,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+
     <update id="updateZsyzDbd" parameterType="ZsyzDbd">
         update zsyz_dbd
         <trim prefix="SET" suffixOverrides=",">

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

@@ -42,19 +42,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <!--<select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
-        select ANY_VALUE(id) as id, ANY_VALUE(xm_id) as xm_id, ANY_VALUE(xmbh) as xmbh, ANY_VALUE(xmmc)as xmmc,
-               ANY_VALUE(dept_id) as dept_id, ANY_VALUE(dept_name) as dept_name, ANY_VALUE(cl_time) as cl_time, ANY_VALUE(progress) as progress
+    <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, cl_time, progress
-        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
+               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

@@ -307,6 +307,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by s.create_time desc
     </select>
 
     <select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
@@ -400,6 +401,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by s.create_time desc
     </select>
     <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
         select s.id,
@@ -462,6 +464,7 @@
         <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
     </select>
     <select id="ldpsList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
         select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
@@ -524,9 +527,9 @@
                 AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
-
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by cjsj desc
     </select>
     <select id="ldpsListCount" resultType="java.lang.Long">
         select count(1)
@@ -653,6 +656,7 @@
                 AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
+        order by create_time desc
     </select>