diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java index 1adbc65..2875ebf 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java @@ -78,5 +78,22 @@ public class BmWorkerWageCardController extends BaseController { return error("系统异常,请联系管理员"); } + /** + * 更新人员红绿灯状态 + * @param id + * @return + */ + //, requiresPermissions = @RequiresPermissions("system:wageCard:remove") + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth) + @PostMapping("/light/{id}") + @SysLog(title = "工资卡管理", businessType = OperaType.DELETE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "更新人员红绿灯") + public void light(@PathVariable("id") Integer id) { + try { + service.updateLightByWorkerId(id); + } catch (Exception e) { + logger.error(e.toString(), e); + } + } + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java index 2daeaa6..03556e1 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java @@ -33,17 +33,6 @@ public class PmWorkerController extends BaseController { @Autowired private PmWorkerServiceImpl service; - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("selectOne") - public PmWorker selectOne(Integer id) { - return service.selectByPrimaryKey(id); - } - /** * 查询列表 * @param o diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerWageCardMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerWageCardMapper.java index 87ad218..c74d731 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerWageCardMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerWageCardMapper.java @@ -46,4 +46,8 @@ public interface BmWorkerWageCardMapper { * @return update count */ int updateByPrimaryKeySelective(BmWorkerWageCard record); + + int selectWageCardAndContract(Integer id); + + void updateEinMsgByWorkerId(Integer id); } \ No newline at end of file diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java index 31f5794..f3948c0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java @@ -24,14 +24,6 @@ public interface PmWorkerMapper { */ int insert(PmWorker record); - /** - * insert record to table selective - * - * @param record the record - * @return insert count - */ - int insertSelective(PmWorker record); - /** * select by primary key * @@ -40,22 +32,6 @@ public interface PmWorkerMapper { */ PmWorker selectByPrimaryKey(Integer id); - /** - * update record selective - * - * @param record the updated record - * @return update count - */ - int updateByPrimaryKeySelective(PmWorker record); - - /** - * update record - * - * @param record the updated record - * @return update count - */ - int updateByPrimaryKey(PmWorker record); - /** * 查询人员列表 * diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmWorkerWageCardService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmWorkerWageCardService.java index 1e61677..fa01e72 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmWorkerWageCardService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmWorkerWageCardService.java @@ -40,5 +40,12 @@ public interface BmWorkerWageCardService { * @return */ int deleteByPrimaryKey(Integer id); + + /** + * 更新人员红绿灯 + * @param id + * @return + */ + void updateLightByWorkerId(Integer id); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java index ab7c147..ef86301 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java @@ -13,12 +13,8 @@ public interface PmWorkerService{ AjaxResult insert(PmWorker record); - int insertSelective(PmWorker record); - PmWorker selectByPrimaryKey(Integer id); - int updateByPrimaryKeySelective(PmWorker record); - int updateByPrimaryKey(PmWorker record); List selectWorkList(PmWorkerDto o); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerWageCardServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerWageCardServiceImpl.java index 941a143..6b9aada 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerWageCardServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerWageCardServiceImpl.java @@ -80,5 +80,18 @@ public class BmWorkerWageCardServiceImpl implements BmWorkerWageCardService { //删除minio文件 return i; } + + @Override + public void updateLightByWorkerId(Integer id) { + //查询工资卡和合同是不是存在 + int i = selectWageCardAndContract(id); + if(i==2){ + mapper.updateEinMsgByWorkerId(id); + } + } + + private int selectWageCardAndContract(Integer id) { + return mapper.selectWageCardAndContract(id); + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index b223ac9..a1238a6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -94,11 +94,6 @@ public class PmWorkerServiceImpl implements PmWorkerService{ } } - @Override - public int insertSelective(PmWorker record) { - return mapper.insertSelective(record); - } - @Override public PmWorker selectByPrimaryKey(Integer id) { //人员数据 @@ -118,11 +113,6 @@ public class PmWorkerServiceImpl implements PmWorkerService{ return worker; } - @Override - public int updateByPrimaryKeySelective(PmWorker record) { - return mapper.updateByPrimaryKeySelective(record); - } - @Override public int updateByPrimaryKey(PmWorker record) { //已经入过场了 diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerWageCardMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerWageCardMapper.xml index 511d15f..92b08a1 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerWageCardMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerWageCardMapper.xml @@ -102,4 +102,27 @@ where id = #{id} + + + + + update bm_worker_ein_msg + set light_status = 2 + where worker_id = #{workerId} + \ No newline at end of file diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml index 17f5da5..7003b1a 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml @@ -74,186 +74,6 @@ values (#{name}, #{idNumber}, #{sex}, #{age}, #{phone}, #{birthday}, #{nation}, #{issuingAuthority}, #{startTime}, #{endTime}, #{address}, #{facePhoto}, #{createUser}) - - - insert into pm_worker - - - `name`, - - - id_number, - - - sex, - - - age, - - - phone, - - - birthday, - - - nation, - - - issuing_authority, - - - start_time, - - - end_time, - - - address, - - - face_photo, - - - ein_status, - - - light_status, - - - create_user, - - - update_user, - - - - - #{name}, - - - #{idNumber}, - - - #{sex}, - - - #{age}, - - - #{phone}, - - - #{birthday}, - - - #{nation}, - - - #{issuingAuthority}, - - - #{startTime}, - - - #{endTime}, - - - #{address}, - - - #{facePhoto}, - - - #{einStatus}, - - - #{lightStatus}, - - - #{createUser}, - - - #{updateUser}, - - - - - - update pm_worker - - - `name` = #{name}, - - - id_number = #{idNumber}, - - - sex = #{sex}, - - - age = #{age}, - - - phone = #{phone}, - - - birthday = #{birthday}, - - - nation = #{nation}, - - - issuing_authority = #{issuingAuthority}, - - - start_time = #{startTime}, - - - end_time = #{endTime}, - - - address = #{address}, - - - face_photo = #{facePhoto}, - - - ein_status = #{einStatus}, - - - light_status = #{lightStatus}, - - - create_user = #{createUser}, - - - update_user = #{updateUser}, - - - where id = #{id} - - - - update pm_worker - set `name` = #{name}, - id_number = #{idNumber}, - sex = #{sex}, - age = #{age}, - phone = #{phone}, - birthday = #{birthday}, - nation = #{nation}, - issuing_authority = #{issuingAuthority}, - start_time = #{startTime}, - end_time = #{endTime}, - address = #{address}, - face_photo = #{facePhoto}, - ein_status = #{einStatus}, - light_status = #{lightStatus}, - create_user = #{createUser}, - update_user = #{updateUser} - where id = #{id} -