表字段修改

This commit is contained in:
方亮 2025-09-25 15:56:35 +08:00
parent 0abe4478d9
commit 73f9f1d258
1 changed files with 19 additions and 18 deletions

View File

@ -207,13 +207,14 @@
from tb_pro_month_table tpmt from tb_pro_month_table tpmt
left join pm_project pp on pp.id = tpmt.pro_id left join pm_project pp on pp.id = tpmt.pro_id
left join pm_sub_company psc on pp.sub_com_id = psc.id left join pm_sub_company psc on pp.sub_com_id = psc.id
where 1=1 <where>
<if test="proName != null"> <if test="proName != null">
and pp.pro_name LIKE CONCAT('%', #{proName}, '%') and pp.pro_name LIKE CONCAT('%', #{proName}, '%')
</if> </if>
<if test="proStatus != null"> <if test="proStatus != null">
and pp.pro_status = #{proStatus} and pp.pro_status = #{proStatus}
</if> </if>
</where>
</select> </select>
<select id="getProjectById" resultType="com.bonus.bmw.domain.vo.PmProjectVo"> <select id="getProjectById" resultType="com.bonus.bmw.domain.vo.PmProjectVo">
select id,pro_name,pro_status,pro_type,vol_level,start_time,end_time,pro_address select id,pro_name,pro_status,pro_type,vol_level,start_time,end_time,pro_address
@ -226,7 +227,7 @@
from tb_pro_month_table where pro_id = #{proId} from tb_pro_month_table where pro_id = #{proId}
</select> </select>
<select id="getProMonthTableRosterList" resultType="com.bonus.bmw.domain.vo.ProMonthTableRosterVo"> <select id="getProMonthTableRosterList" resultType="com.bonus.bmw.domain.vo.ProMonthTableRosterVo">
select id,pro_id,pro_month,month_id,sub_id,sub_name,team_id,team_name,user_id,user_name,sex, select id,pro_id,`month` as proMonth,month_id,sub_id,sub_name,team_id,team_name,user_id,user_name,sex,
work_id,work_name,unit_and_code,period,id_card,residence,phone,remark,out_time,on_duty,in_time work_id,work_name,unit_and_code,period,id_card,residence,phone,remark,out_time,on_duty,in_time
from tb_pro_month_table_roster where month_id =#{monthId} from tb_pro_month_table_roster where month_id =#{monthId}
<if test="subName != null"> <if test="subName != null">
@ -243,11 +244,11 @@
</if> </if>
</select> </select>
<select id="getUserSalaryApprovalList" resultType="com.bonus.bmw.domain.vo.UserSalaryApprovalVo"> <select id="getUserSalaryApprovalList" resultType="com.bonus.bmw.domain.vo.UserSalaryApprovalVo">
select id,roster_id,pro_id,month_id,`month`,team_id,team_name,user_name,user_id,id_card,phone,sub_id, select id,pro_id,`month`,team_id,team_name,user_name,user_id,id_card,phone,sub_id,
sub_name,bank_name,bank_code,bank_num,cons_id,price_wage,payment,pay_day,remark sub_name,bank_name,bank_card_code as bankCode,bank_identifier_code as bank_num,contract_id as cons_id,price_wage,payment,pay_day,remark
from tb_user_salary_approval where month_id = #{monthId} from tb_pro_month_table_roster where month_id = #{monthId}
<if test="bankCode != null"> <if test="bankCode != null">
and bank_code LIKE CONCAT('%', #{bankCode}, '%') and bank_card_code LIKE CONCAT('%', #{bankCode}, '%')
</if> </if>
<if test="teamName != null"> <if test="teamName != null">
and team_name LIKE CONCAT('%', #{teamName}, '%') and team_name LIKE CONCAT('%', #{teamName}, '%')
@ -257,9 +258,9 @@
</if> </if>
</select> </select>
<select id="getUserAttendanceList" resultType="com.bonus.bmw.domain.vo.UserAttendanceVo"> <select id="getUserAttendanceList" resultType="com.bonus.bmw.domain.vo.UserAttendanceVo">
select id,month_id,pro_id,`month`,pro_name,month_day,roster_id,sub_id,sub_name,user_name, select id,pro_id,`month`,pro_name,month_day,sub_id,sub_name,user_name,
id_card,work_name,work_id,attendance_day,check_day,repair_num,attendance_num id_card,work_name,work_id,attendance_day,check_day,repair_num,attendance_num
from tb_user_attendance where month_id = #{monthId} from tb_pro_month_table_roster where month_id = #{monthId}
<if test="subName != null"> <if test="subName != null">
and sub_name LIKE CONCAT('%', #{subName}, '%') and sub_name LIKE CONCAT('%', #{subName}, '%')
</if> </if>
@ -268,12 +269,12 @@
</if> </if>
</select> </select>
<select id="getUserWagePayList" resultType="com.bonus.bmw.domain.vo.UserWagePayVo"> <select id="getUserWagePayList" resultType="com.bonus.bmw.domain.vo.UserWagePayVo">
select id,pro_id,`month`,user_id,month_id,user_name,roster_id,id_card,team_id,team_name,work_name, select id,pro_id,`month`,user_id,month_id,user_name,id_card,team_id,team_name,work_name,
attendance_num,pay_money,deduct_money,actual_money,bank_name,bank_num,bank_code,is_accord, attendance_num,pay_money,deduct_money,actual_money,bank_name,bank_card_code bank_num,bank_identifier_code as bank_code,is_accord,
signature,remark,pay_day,bank_number,create_time,update_time,update_user signature,remark,pay_day,bank_number,create_time,update_time,update_user
from tb_user_wage_pay where month_id = #{monthId} from tb_pro_month_table_roster where month_id = #{monthId}
<if test="bankCode != null"> <if test="bankCode != null">
and bank_code LIKE CONCAT('%', #{bankCode}, '%') and bank_card_code LIKE CONCAT('%', #{bankCode}, '%')
</if> </if>
<if test="teamName != null"> <if test="teamName != null">
and team_name LIKE CONCAT('%', #{teamName}, '%') and team_name LIKE CONCAT('%', #{teamName}, '%')