diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAtt.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAtt.java index ef4ee65..a6b118a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAtt.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAtt.java @@ -155,4 +155,6 @@ public class BmWorkerAtt { */ private String attTime; + private String phone; + } \ No newline at end of file diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java index 8a2145e..00246a7 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java @@ -42,13 +42,13 @@ public class BmWorkerContract { * 合同开始时间 */ @Excel(name = "合同生效时间", type = Excel.Type.EXPORT, sort = 9) - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd") private Date contractStartDate; /** * 合同结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd") private Date contractStopDate; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerAttMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerAttMapper.java index ba240f4..0d868ae 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerAttMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerAttMapper.java @@ -13,8 +13,6 @@ public interface BmWorkerAttMapper { List getProAttList(BmWorkerAtt o); - List getWorkerAttList(BmWorkerAtt o); - List getTeamAttList(BmWorkerAtt o); /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerBlackServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerBlackServiceImpl.java index 7a6687e..b0584c6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerBlackServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerBlackServiceImpl.java @@ -39,7 +39,7 @@ public class BmWorkerBlackServiceImpl implements BmWorkerBlackService{ public AjaxResult insert(BmWorkerBlack o) { // 添加员工时，判断员工编号是否已存在 BmWorkerBlack worker = mapper.getWorkerBlackByNumber(o.getIdNumber()); - if(worker != null && worker.getId() != null){ + if(worker != null && worker.getName() != null){ return new AjaxResult(500, "施工人员身份证已存在，当前姓名为"+worker.getName()); } o.setCreateUser(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml index 56e72a6..8984f44 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml @@ -25,7 +25,8 @@ - + + @@ -116,9 +120,12 @@ bwedr.worker_id, bwedr.id_number, bwedr.name, + pw.phone, bwedr.pro_id, - bwedr.team_id, - bwedr.sub_id + bwedr.pro_name, + bwedr.team_name, + bwedr.sub_name, + bwedr.post_name FROM bm_worker_ein_day_record bwedr INNER JOIN ( -- 子查询：找出每个 worker_id 在 2025-08-01 至 2025-08-11 区间内的最后在场日期 @@ -133,6 +140,7 @@ GROUP BY worker_id ) latest ON bwedr.worker_id = latest.worker_id AND bwedr.ein_day = latest.max_current_day + left join pm_worker pw on bwedr.worker_id = pw.id and bwedr.name = #{name} diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerBlackMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerBlackMapper.xml index 951c4e4..ff6be65 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerBlackMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerBlackMapper.xml @@ -52,9 +52,12 @@ and sub_name LIKE CONCAT('%',#{subName},'%') - + and is_remove = #{isRemove} + + and id_number LIKE CONCAT('%',#{idNumber},'%') + diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/PmWorkerJob.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/PmWorkerJob.java index 20be62d..37b57d7 100644 --- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/PmWorkerJob.java +++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/PmWorkerJob.java @@ -60,6 +60,15 @@ public class PmWorkerJob { */ private String teamName; + /** + * 工种id + */ + private Integer postId; + /** + * 工种 + */ + private String postName; + /** * 创建时间 */ diff --git a/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml b/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml index 51161ba..25924e9 100644 --- a/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml +++ b/bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml @@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sub_name as subName, team_id as teamId, team_name as teamName, + post_id as postId, + post_name as postName, contract_id as contractId, ein_day as einDay, DATE_FORMAT(ein_day, '%Y-%m') as attMonth @@ -29,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bwepr.sub_name, bwepr.team_id, bwepr.team_name, + bwepr.post_id, + bwepr.post_name, bwepr.contract_id, #{currentDay} as ein_day FROM @@ -47,11 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" replace INTO bm_worker_ein_day_record( - worker_id,id_number,name,pro_id,pro_name,sub_id,sub_name,team_id,team_name,att_month,ein_day,contract_id + worker_id,id_number,name,pro_id,pro_name,sub_id,sub_name,team_id,team_name,post_id,post_name,att_month,ein_day,contract_id ) VALUES (#{item.workerId},#{item.idNumber},#{item.name},#{item.proId},#{item.proName},#{item.subId},#{item.subName},#{item.teamId}, - #{item.teamName},#{item.attMonth},#{item.einDay},#{item.contractId} + #{item.teamName},#{item.postId},#{item.postName},#{item.attMonth},#{item.einDay},#{item.contractId} )