优化

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml

@@ -65,11 +65,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="htmlList" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO">
+    <select id="htmlList" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyHtmlVO">
         select
-        distinct
         wu.user_id,
-        wu.username
+        wu.username,
+        bpra.id
         from bgt_project_recruit_apply bpra
         left join wgz_user wu on bpra.user_id = wu.user_id
         where bpra.recruit_id = #{recruitId} and bpra.status in('3','5')
@@ -222,7 +222,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND bpra.status = '0'
             </if>
             <if test="dto.status != null and dto.status == 1">
-                AND bpra.status != '0'
+                AND bpra.status in('1','3','5','6')
+            </if>
+            <if test="dto.status != null and dto.status == 2">
+                AND bpra.status in('2','4','7')
             </if>
         </where>
         order by wu.score desc,bpra.create_time desc
@@ -268,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND bpra.status in ('1','3','5','6')
             </if>
         </where>
-        order by  bpra.create_time desc
+        order by  bpra.id desc
     </select>
 
     <select id="fbsTaskUserList" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO">

ruoyi-system/src/main/resources/mapper/bgt/BgtWageApplicationMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and bwa.audit_status = #{dto.auditStatus}
             </if>
         </where>
+        order by bwa.create_time desc
     </select>
 
     <select id="appQueryList" resultType="com.ruoyi.bgt.domain.vo.BgtWageApplicationListVO">
@@ -85,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bwa.audit_status,
         bwa.employment_situation,
         bwa.completion_situation,
-        bwa.task_situation
+        bwa.task_situation,
+        bwa.audit_opinion
         from bgt_wage_application bwa
         <where>
             <if test="dto.reviewerId != null ">
@@ -97,13 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.taskName != null and dto.taskName != ''">
                 and bpr.task_name like concat('%', #{dto.taskName}, '%')
             </if>
-            <if test="dto.type != null and dto.type == 1 ">
-                and bwa.audit_status = '1'
-            </if>
-            <if test="dto.type != null and dto.type == 2 ">
-                and bwa.audit_status in ('2','3')
+            <if test="dto.type != null">
+                and bwa.audit_status = #{dto.type}
             </if>
         </where>
+        order by bwa.id desc
     </select>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/common/AnnexMapper.xml

@@ -18,5 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="countByRecruitId" resultType="com.ruoyi.common.domain.vo.AnnexUploadCountVO">
+    SELECT
+    user_id,
+    recruit_apply_id,
+    COUNT(DISTINCT annex_type) AS num
+    FROM common_annex ca
+    WHERE ca.recruit_id = #{recruitId}
+    AND ca.annex_type IN (1, 2)
+    AND ca.user_type = 'wgz'
+    GROUP BY user_id,recruit_apply_id
+    </select>
 
-</mapper>
+</mapper>

ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectMapper.xml

@@ -30,6 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                project_img,
                project_status
         FROM zbf_project zp
+        <where>
+            <if test="dto.projectName != null and dto.projectName != ''">
+                AND zp.project_name like concat('%', #{dto.projectName}, '%')
+            </if>
+        </where>
         order by zp.id desc
     </select>