优化

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

@@ -33,13 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bptp.progress,
                bptp.audit_status,
                bptp.create_time,
-               fpt.task_staff_num,
-               fpt.task_name,
-               zp.project_name
+               bptp.task_staff_num,
+               bptp.task_name,
+               bptp.project_name
         from bgt_project_task_progress bptp
-                 left join fbs_project_task fpt on bptp.task_id = fpt.id
-                 left join zbf_project zp on bptp.project_id = zp.id
-        where bptp.create_by = #{dto.createBy}
+        where bptp.uploader_id = #{dto.createBy}
         <if test="dto.auditStatus != null and dto.auditStatus != '' ">
             and  bptp.audit_status = #{dto.auditStatus}
         </if>

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

@@ -26,18 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="appQueryPageList" resultType="com.ruoyi.bgt.domain.vo.BgtWageApplicationVO">
-        select fpt.task_name,
-               fpt.task_staff_num,
-               fpt.task_address,
+        select bwa.task_name,
+               bwa.task_staff_num,
+               bwa.task_address,
                bwa.applicant_amount,
                bwa.create_time,
                bwa.id,
-               bu.username,
-               zp.project_name
+               bwa.username,
+               bwa.project_name
         from bgt_wage_application bwa
-            left join bgt_user bu on bwa.user_id = bu.user_id
-            left join zbf_project zp on zp.id = bwa.project_id
-            left join fbs_project_task fpt on fpt.id = bwa.task_id
         <where>
             <if test="dto.userId != null ">
                 and bwa.user_id = #{dto.userId}

ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml

@@ -31,9 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="appQueryPageList" resultType="com.ruoyi.fbs.domain.vo.AppTaskVO">
         select  fpt.id,
+                fpt.project_id,
+                fpt.section_id,
+                fpt.sub_id,
                 fpt.task_name,
                 fpt.task_staff_num,
                 fpt.task_amount,
+                fpt.task_begin_time,
+                fpt.task_end_time,
                 zp.project_name,
                 fpt.task_describe,
                 fpt.task_address,
@@ -43,13 +48,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from fbs_project_task fpt
             left join zbf_project zp on fpt.project_id = zp.id
         <where>
-        <if test="dto.taskIds != null and dto.taskIds.size() > 0">
-            and fpt.id IN
-            <foreach item="item" index="index" collection="dto.taskIds"
-                     open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+        <choose>
+            <when test="dto.myTask">
+                <if test="dto.taskIds != null and dto.taskIds.size() > 0">
+                    and fpt.id IN
+                    <foreach item="item" index="index" collection="dto.taskIds"
+                             open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </when>
+            <otherwise>
+                <if test="dto.taskIds != null and dto.taskIds.size() > 0">
+                    and fpt.id not IN
+                    <foreach item="item" index="index" collection="dto.taskIds"
+                             open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </otherwise>
+        </choose>
+
         <if test="dto.taskName != null and dto.taskName != '' ">
             and fpt.task_name like concat('%', #{dto.taskName}, '%')
         </if>

ruoyi-system/src/main/resources/mapper/wgz/WgzAttendanceMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from wgz_attendance
         where date between #{beginDate} and #{endDate}
         and (missed_in = 0 or missed_out = 0)
-        and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId} ))
+        and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId} )
         group by date
     </select>