Merge remote-tracking branch 'origin/master'

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

@@ -86,13 +86,16 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzKgxx.getZsyzFjList();
-        for (ZsyzFj zsyzFj : zsyzFjList) {
-            zsyzFj.setSourceId(zsyzKgxx.getId());
-            zsyzFj.setType("3");
-            zsyzFj.setXmId(zsyzKgxx.getXmId());
-            zsyzFj.setXmbh(zsyzKgxx.getXmbh());
-            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        if (zsyzFjList != null){
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzKgxx.getId());
+                zsyzFj.setType("3");
+                zsyzFj.setXmId(zsyzKgxx.getXmId());
+                zsyzFj.setXmbh(zsyzKgxx.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
         }
+
         return count;
     }
 

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

@@ -82,13 +82,16 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         int count = zsyzQyxxMapper.insertZsyzQyxx(zsyzQyxx);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzQyxx.getZsyzFjList();
-        for (ZsyzFj zsyzFj : zsyzFjList) {
-            zsyzFj.setSourceId(zsyzQyxx.getId());
-            zsyzFj.setType("2");
-            zsyzFj.setXmId(zsyzQyxx.getXmId());
-            zsyzFj.setXmbh(zsyzQyxx.getXmbh());
-            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        if (zsyzFjList != null){
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzQyxx.getId());
+                zsyzFj.setType("2");
+                zsyzFj.setXmId(zsyzQyxx.getXmId());
+                zsyzFj.setXmbh(zsyzQyxx.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
         }
+
         return count;
 
     }

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

@@ -86,12 +86,14 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzTcxx.getZsyzFjList();
-        for (ZsyzFj zsyzFj : zsyzFjList) {
-            zsyzFj.setSourceId(zsyzTcxx.getId());
-            zsyzFj.setType("4");
-            zsyzFj.setXmId(zsyzTcxx.getXmId());
-            zsyzFj.setXmbh(zsyzTcxx.getXmbh());
-            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        if (zsyzFjList != null){
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzTcxx.getId());
+                zsyzFj.setType("4");
+                zsyzFj.setXmId(zsyzTcxx.getXmId());
+                zsyzFj.setXmbh(zsyzTcxx.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
         }
         return count;
 

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

@@ -274,7 +274,7 @@
             <if test="zw != null  and zw != ''">and s.zw = #{zw}</if>
             <if test="userId != null ">and s.user_id = #{userId}</if>
             <if test="type != null  and type != ''">and s.type = #{type}</if>
-            <if test="progress != null  and progress != ''">and s.progress in (#{progress})</if>
+            <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
             <if test="isDel != null  and isDel != ''">and s.is_del = #{isDel}</if>
             <if test="cjdId != null ">and s.cjd_id = #{cjdId}</if>
             <if test="cjdName != null  and cjdName != ''">and s.cjd_name like concat('%', #{cjdName}, '%')</if>

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

@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.projectV2.ZsyzShyjMapper">
-    
+
     <resultMap type="ZsyzShyj" id="ZsyzShyjResult">
-        <result property="id"    column="id"    />
-        <result property="xmId"    column="xm_id"    />
-        <result property="xmbh"    column="xmbh"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="shrxm"    column="shrxm"    />
-        <result property="xmjd"    column="xmjd"    />
-        <result property="xmmc"    column="xmmc"    />
-        <result property="shjg"    column="shjg"    />
-        <result property="shyj"    column="shyj"    />
-        <result property="shsj"    column="shsj"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="xmId" column="xm_id"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="shrxm" column="shrxm"/>
+        <result property="xmjd" column="xmjd"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="shjg" column="shjg"/>
+        <result property="shyj" column="shyj"/>
+        <result property="shsj" column="shsj"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
 
         <collection property="zsyzLdpsList" javaType="java.util.List" resultMap="ZsyzLdpsResult"/>
     </resultMap>
 
 
     <resultMap type="ZsyzLdps" id="ZsyzLdpsResult">
-        <result property="ids"    column="ids"    />
-        <result property="xmId"    column="xm_id"    />
-        <result property="xmbh"    column="xmbh"    />
-        <result property="xmmc"    column="xmmc"    />
-        <result property="sourceId"    column="source_id"    />
-        <result property="psnr"    column="psnr"    />
-        <result property="zcpsnr"    column="zcpsnr"    />
-        <result property="remark"    column="remark"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="psr"    column="psr"    />
-        <result property="cjsj"    column="cjsj"    />
-        <result property="xgr"    column="xgr"    />
-        <result property="xgsj"    column="xgsj"    />
+        <result property="ids" column="ids"/>
+        <result property="xmId" column="xm_id"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="sourceId" column="source_id"/>
+        <result property="psnr" column="psnr"/>
+        <result property="zcpsnr" column="zcpsnr"/>
+        <result property="remark" column="remark"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="psr" column="psr"/>
+        <result property="cjsj" column="cjsj"/>
+        <result property="xgr" column="xgr"/>
+        <result property="xgsj" column="xgsj"/>
     </resultMap>
 
     <sql id="selectZsyzShyjVo">
@@ -51,41 +51,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZsyzShyjList" parameterType="ZsyzShyj" resultMap="ZsyzShyjResult">
         <include refid="selectZsyzShyjVo"/>
-        <where>  
-            <if test="xmId != null "> and s.xm_id = #{xmId}</if>
-            <if test="xmbh != null  and xmbh != ''"> and s.xmbh = #{xmbh}</if>
-            <if test="xmmc != null  and xmmc != ''"> and s.xmmc = #{xmmc}</if>
-            <if test="shrxm != null  and shrxm != ''"> and s.shrxm = #{shrxm}</if>
-            <if test="xmjd != null  and xmjd != ''"> and s.xmjd = #{xmjd}</if>
-            <if test="shjg != null  and shjg != ''"> and s.shjg = #{shjg}</if>
-            <if test="shyj != null  and shyj != ''"> and s.shyj = #{shyj}</if>
-            <if test="shsj != null "> and s.shsj = #{shsj}</if>
+        <where>
+            <if test="xmId != null ">and s.xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
+            <if test="xmmc != null  and xmmc != ''">and s.xmmc = #{xmmc}</if>
+            <if test="shrxm != null  and shrxm != ''">and s.shrxm = #{shrxm}</if>
+            <if test="xmjd != null  and xmjd != ''">and s.xmjd = #{xmjd}</if>
+            <if test="shjg != null  and shjg != ''">and s.shjg = #{shjg}</if>
+            <if test="shyj != null  and shyj != ''">and s.shyj = #{shyj}</if>
+            <if test="shsj != null ">and s.shsj = #{shsj}</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by s.shsj desc
     </select>
-    
+
     <select id="selectZsyzShyjById" parameterType="Long" resultMap="ZsyzShyjResult">
         <include refid="selectZsyzShyjVo"/>
         where l.id = #{id}
     </select>
-    <select id="selectZsyzShyjListByWt"  resultMap="ZsyzShyjResult">
+    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
-        ANY_VALUE ( s.id ),
-        ANY_VALUE ( s.xm_id ),
-        ANY_VALUE ( s.xmbh ),
-        ANY_VALUE ( s.dept_id ),
-        ANY_VALUE ( s.shrxm ),
-        ANY_VALUE ( s.xmjd ),
-        ANY_VALUE ( s.xmmc ),
-        ANY_VALUE ( s.shjg ),
-        ANY_VALUE ( s.shyj ),
-        ANY_VALUE ( s.shsj )
+        ANY_VALUE ( s.id ) as id,
+        ANY_VALUE ( s.xm_id ) as xm_id ,
+        ANY_VALUE ( s.xmbh ) as xmbh,
+        ANY_VALUE ( s.dept_id ) as dept_id,
+        ANY_VALUE ( s.shrxm ) as shrxm,
+        ANY_VALUE ( s.xmjd ) as xmjd,
+        ANY_VALUE ( s.xmmc ) as xmmc,
+        ANY_VALUE ( s.shjg ) as shjg,
+        ANY_VALUE ( s.shyj ) as shyj,
+        ANY_VALUE ( s.shsj ) as shsj
         FROM
         zsyz_shyj s
-        where
-        s.shjg = '2'
+        <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 != ''"><!-- 开始时间检索 -->
+                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 != ''"><!-- 结束时间检索 -->
+                AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
+        </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         GROUP BY
@@ -109,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             create_time
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
@@ -125,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             sysdate()
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateZsyzShyj" parameterType="ZsyzShyj">
@@ -154,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteZsyzShyjByIds" parameterType="String">
-        delete from zsyz_shyj where id in 
+        delete from zsyz_shyj where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>