修改查询列表,修改审核接口

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

@@ -100,7 +100,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 zsyzSbbzb.setShjg(ONE);
                 zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
             } else if (TWO.equals(shjg)) {
-                String progressResult = changeProgress(progress, roleName);
+                String progressResult = changeProgressBack(progress, roleName);
                 if (ERROR.equals(progressResult)){
                     return AjaxResult.error("当前状态下您没有审核权限");
                 }

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

@@ -38,7 +38,7 @@
     <select id="selectZsyzSkxmList" parameterType="ZsyzSkxm" resultMap="ZsyzSkxmResult">
         <include refid="selectZsyzSkxmVo"/>
         <where>
-            <if test="xmmc != null  and xmmc != ''">and xmmc = #{xmmc}</if>
+            <if test="xmmc != null  and xmmc != ''">and xmmc like concat( #{xmmc}, '%') </if>
             <if test="pzwh != null  and pzwh != ''">and pzwh = #{pzwh}</if>
             <if test="tzdw != null  and tzdw != ''">and tzdw = #{tzdw}</if>
             <if test="xmszd != null  and xmszd != ''">and xmszd = #{xmszd}</if>
@@ -56,6 +56,12 @@
             <if test="shTime != null ">and sh_time = #{shTime}</if>
             <if test="shJy != null  and shJy != ''">and sh_jy = #{shJy}</if>
             <if test="deptId != null  and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(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(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
         </where>
     </select>