zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java
This commit is contained in:
罗成
2025-02-20 13:53:22 +08:00
parent b18a181eca 3d232faad8
commit 935c804519
35 changed files with 1040 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml
View File

@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select bpr.id,bpr.recruit_name,bpr.recruit_address,bpr.recruit_amount,bpr.recruit_staff_num,bpr.recruit_requirement,bpr.create_time,fpt.task_name
from bgt_project_recruit bpr left join fbs_project_task fpt on bpr.task_id = fpt.id
<where>
<if test="dto.user_id != null ">
<if test="dto.userId != null ">
and bpr.user_id = #{dto.userId}
</if>
<if test="dto.recruitName != null and dto.recruitName != ''">

78
ruoyi-system/src/main/resources/mapper/bgt/BgtWageApplicationMapper.xml Normal file
View File

@ -0,0 +1,78 @@
<?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">
<mapper namespace="com.ruoyi.bgt.mapper.BgtWageApplicationMapper">
<resultMap type="com.ruoyi.bgt.domain.BgtWageApplication" id="BgtWageApplicationResult">
<result property="id" column="id"/>
<result property="projectId" column="project_id"/>
<result property="sectionId" column="section_id"/>
<result property="subId" column="sub_id"/>
<result property="taskId" column="task_id"/>
<result property="userId" column="user_id"/>
<result property="applicantAmount" column="applicant_amount"/>
<result property="employmentSituation" column="employment_situation"/>
<result property="completionSituation" column="completion_situation"/>
<result property="taskSituation" column="task_situation"/>
<result property="auditStatus" column="audit_status"/>
<result property="reviewerId" column="reviewer_id"/>
<result property="delFlag" column="del_flag"/>
<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"/>
</resultMap>
<select id="appQueryPageList" resultType="com.ruoyi.bgt.domain.vo.BgtWageApplicationVO">
select fpt.task_name,
fpt.task_staff_num,
fpt.task_address,
bwa.applicant_amount,
bwa.create_time,
bwa.id,
bu.username,
zp.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}
</if>
<if test="dto.taskId != null ">
and bwa.task_id = #{dto.taskId}
</if>
<if test="dto.taskName != null and dto.taskName != ''">
and bpr.task_name like concat('%', #{dto.taskName}, '%')
</if>
<if test="dto.auditStatus != null and dto.auditStatus != '' ">
and bwa.audit_status = #{dto.auditStatus}
</if>
</where>
</select>
<select id="appQueryList" resultType="com.ruoyi.bgt.domain.vo.BgtWageApplicationListVO">
select bwa.applicant_amount,
bwa.id,
bwa.audit_status,
bu.username
from bgt_wage_application bwa
left join bgt_user bu on bwa.user_id = bu.user_id
<where>
<if test="dto.userId != null ">
and bwa.user_id = #{dto.userId}
</if>
<if test="dto.taskId != null ">
and bwa.task_id = #{dto.taskId}
</if>
<if test="dto.auditStatus != null and dto.auditStatus != '' ">
and bwa.audit_status = #{dto.auditStatus}
</if>
</where>
</select>
</mapper>

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

@ -30,17 +30,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="appQueryPageList" resultType="com.ruoyi.fbs.domain.vo.AppTaskVO">
select fpt.id,
fpt.task_name,
task_staff_num,
task_amount,
zp.project_name,
task_describe,
task_address,
fpt.create_time,
(select count(task_id) from fbs_project_task_apply where task_id = fpt.id) as applyNum
select fpt.id,
fpt.task_name,
fpt.task_staff_num,
fpt.task_amount,
zp.project_name,
fpt.task_describe,
fpt.task_address,
fpt.create_time,
(select count(task_id) from fbs_project_task_apply where task_id = fpt.id) as applyNum,
(select sum(applicant_amount) from bgt_wage_application where audit_status = '2'and task_id = fpt.id) as taskReceiveAmount
from fbs_project_task fpt
left join zbf_project zp on fpt.project_id = zp.id
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