bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
马三炮 2025-10-23 16:35:11 +08:00
parent df96dc0f18
commit e807076cfe
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java
View File

@ -1,13 +1,13 @@
package com.bonus.bmw.domain.vo;
import java.util.Date;
import java.util.List;
import com.bonus.common.core.annotation.Excel;
import com.bonus.system.api.model.UploadFileVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 人员合同信息表
*/
@ -90,6 +90,7 @@ public class BmWorkerContract {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@ -150,4 +151,4 @@ public class BmWorkerContract {
private String photoIds;
}
}

4
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerWageCard.java
View File

@ -55,6 +55,8 @@ public class BmWorkerWageCard {
*/
private String createUser;
private String createTime;
/**
* 修改人
*/
@ -99,4 +101,4 @@ public class BmWorkerWageCard {
private String photoIds;
}
}

3
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
View File

@ -205,7 +205,8 @@
when brca.check_status = 1 then '审核通过'
when brca.check_status = 2 then '审核未通过'
else '' end as checkStatusName,
brca.check_time as checkTime
brca.check_time as checkTime,
brca.refuse_remark as refuseRemark
from bm_repair_card_apply brca
left join pm_project pp on pp.id = brca.pro_id
<where>

8
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml
View File

@ -8,7 +8,7 @@
ps.sub_name as subName,
ps.legal_person,
count(DISTINCT bsc.pro_id) as proNum,
count(DISTINCT pstc.id) as teamNum,
count(DISTINCT pstc.team_id) as teamNum,
count(DISTINCT bwem.worker_id) as einNum
from pm_sub ps
left join bm_sub_contract bsc on ps.id = bsc.sub_id and bsc.is_active='1' and bsc.sub_ein_status = '1'
@ -130,7 +130,7 @@
INNER JOIN pm_project pp ON pp.id = bsc.pro_id
AND pp.is_active = 1
INNER JOIN pm_sub_team_contract pstc ON ps.id = pstc.sub_id
AND pstc.is_active = 1
AND pstc.is_active = 1 and pstc.pro_id = pp.id
INNER JOIN pm_sub_team pst ON pst.id = pstc.team_id
AND pst.is_active = 1
LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id
@ -140,7 +140,7 @@
AND ps.id = bwer.sub_id and bwer.team_id = pst.id
WHERE
ps.is_active = 1 AND ps.id = #{subId}
GROUP BY pp.id,pst.id
GROUP BY pstc.id
</select>
<select id="getSubDeviceMsg" resultType="com.bonus.bmw.domain.po.PmAttDevice">
SELECT
@ -252,7 +252,7 @@
WHERE
bap.sub_id = #{subId}
<if test="name != null">
and pw.workerName = #{name}
and workerName = #{name}
</if>
<if test="teamId != null">
and bap.team_id = #{teamId}

2
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/WorkerStatisticsMapper.xml
View File

@ -57,7 +57,7 @@
</select>
<select id="getBmWorkerContractList" resultType="com.bonus.bmw.domain.vo.BmWorkerContract">
select bwc.id,bwc.contract_code,bwc.contract_term_type,bwc.is_active,bwc.contract_start_date,
bwc.contract_stop_date,bwc.wage_approved_way,bwc.wage_criterion,bwc.contract_upload_date
bwc.contract_stop_date,bwc.wage_approved_way,bwc.wage_criterion,bwc.create_time
from bm_worker_contract bwc
left join bm_worker_ein_pro_record bwepr on bwc.id = bwepr.worker_id
where bwc.worker_id =#{id}