From 4d091b4d40b0f8b925835a98da34d2e1625432df Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Tue, 18 Feb 2025 17:01:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E4=BC=91=E3=80=81=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=A4=96=E5=87=BA=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manager/controller/WeChatController.java | 18 +++++++- .../boot/manager/manager/dao/WeChatDao.java | 4 +- .../manager/manager/entity/HolidayBean.java | 1 + .../manager/entity/LeaveReportingBean.java | 5 +++ .../manager/service/WeChatService.java | 4 +- .../service/impl/WeChatServiceImpl.java | 41 ++++++++++++++++--- .../resources/mappers/wechat/WeChatMapper.xml | 37 +++++++++++------ 8 files changed, 88 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index d3a3311..b21c7ae 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ com.alibaba druid-spring-boot-starter - 1.1.9 + 1.1.18 com.squareup.okhttp3 diff --git a/src/main/java/com/bonus/boot/manager/manager/controller/WeChatController.java b/src/main/java/com/bonus/boot/manager/manager/controller/WeChatController.java index e587c74..72396f1 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/WeChatController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/WeChatController.java @@ -132,9 +132,10 @@ public class WeChatController { * 获取休假类型 */ @GetMapping("getHolidayType") - public ServerResponse getHolidayType() { + @DecryptAndVerify(decryptedClass = LeaveReportingBean.class) + public ServerResponse getHolidayType(EncryptedReq data) { try { - return ServerResponse.createSuccess(service.getHolidayType()); + return ServerResponse.createSuccess(service.getHolidayType(data.getData())); } catch (Exception e) { log.error(e.toString(),e); } @@ -304,6 +305,19 @@ public class WeChatController { return ServerResponse.createErroe("操作失败"); } + /** + * 出差报备删除 + */ + @PostMapping("/deleteEvectionById") + @DecryptAndVerify(decryptedClass = EvectionBean.class)//加解密统一管理 + public ServerResponse deleteEvectionById(@Validated @RequestBody EncryptedReq data){ + try { + return ServerResponse.createSuccess(service.deleteEvectionById(data.getData())); + } catch (Exception e) { + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } } diff --git a/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java b/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java index afc75d0..ed97199 100644 --- a/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java +++ b/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java @@ -98,7 +98,7 @@ public interface WeChatDao { * 查询休假类型 * @return */ - List getHolidayType(); + List getHolidayType(LeaveReportingBean data); /** * 查询节假日 @@ -140,4 +140,6 @@ public interface WeChatDao { int editHoliday(LeaveReportingBean data); int editEvection(EvectionBean data); + + int deleteEvectionById(EvectionBean data); } diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java index 3eb1c1c..3cf8fdb 100644 --- a/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java +++ b/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java @@ -131,6 +131,7 @@ public class HolidayBean { * 代理主持工作人员（多个自动隔开） */ private String hostUserId; + private String hostUserName; /** * 地点 diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/LeaveReportingBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/LeaveReportingBean.java index a14f44f..cffee4e 100644 --- a/src/main/java/com/bonus/boot/manager/manager/entity/LeaveReportingBean.java +++ b/src/main/java/com/bonus/boot/manager/manager/entity/LeaveReportingBean.java @@ -152,6 +152,11 @@ public class LeaveReportingBean { */ private String type; + /** + * 字典类型 + */ + private String dictType; + /** * 自己项目部所在分公司下的所有项目部id */ diff --git a/src/main/java/com/bonus/boot/manager/manager/service/WeChatService.java b/src/main/java/com/bonus/boot/manager/manager/service/WeChatService.java index c07014d..9066004 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/WeChatService.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/WeChatService.java @@ -81,7 +81,7 @@ public interface WeChatService { * 获取休假类型 * @return */ - List getHolidayType(); + List getHolidayType(LeaveReportingBean data); /** * 获取休假天数 @@ -118,4 +118,6 @@ public interface WeChatService { int editHoliday(LeaveReportingBean data); int editEvection(EvectionBean data); + + int deleteEvectionById(EvectionBean data); } diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java index bf2dd6a..6d22145 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java @@ -136,8 +136,8 @@ public class WeChatServiceImpl implements WeChatService { } @Override - public List getHolidayType() { - return dao.getHolidayType(); + public List getHolidayType(LeaveReportingBean data) { + return dao.getHolidayType(data); } /** @@ -256,10 +256,39 @@ public class WeChatServiceImpl implements WeChatService { @Override public int editEvection(EvectionBean data) { - Long userId = Long.valueOf(UserUtil.getLoginUser().getUserId()); - data.setUpdateUserId(userId); - int i = dao.editEvection(data); - return i; + int j = dao.deleteEvectionById(data); + int k = 0; + if(j>0){ + Long userId = Long.valueOf(UserUtil.getLoginUser().getUserId()); + String leaveFormId = data.getUuid(); + data.setLeaveFormId(leaveFormId); + data.setCreateUserId(userId); + data.setSource("3"); + String travelers = data.getTravelers(); + String[] split = travelers.split(","); + String[] splitName = data.getTravelersName().split(","); + try { + //在循环加入出行人的 + for (int i = 0; i < split.length; i++) { + String uuIds = UUID.randomUUID().toString(); + data.setLeaveStartInterval("1"); + data.setLeaveEndInterval("2"); + data.setUuid(uuIds); + data.setUserId(Long.valueOf(split[i])); + data.setUserName(splitName[i]); + dao.insertEvection(data); + } + k = 1; + } catch (Exception e) { + log.error(e.toString(),e); + } + } + return k; + } + + @Override + public int deleteEvectionById(EvectionBean data) { + return dao.deleteEvectionById(data); } // 辅助方法：将字符串解析为Date对象 diff --git a/src/main/resources/mappers/wechat/WeChatMapper.xml b/src/main/resources/mappers/wechat/WeChatMapper.xml index b1acaaf..631a3a0 100644 --- a/src/main/resources/mappers/wechat/WeChatMapper.xml +++ b/src/main/resources/mappers/wechat/WeChatMapper.xml @@ -34,7 +34,7 @@ #{leaveEndDate}, #{leaveEndInterval}, #{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{hostUserName}, - #{remark}, '0') + #{remark}, '1') @@ -111,7 +111,7 @@ org_name = #{orgName}, leave_type = #{leaveType}, - type = '请假', + type = #{type}, leave_reason = #{leaveReason}, leave_start_date = #{leaveStartDate}, leave_start_interval = #{leaveStartInterval}, @@ -158,7 +158,11 @@ host_user_name = #{hostUserName}, remark = #{remark} - where uuid = #{uuid} + where leave_form_id = #{uuid} + + + + update leave_apply_wechat SET is_active = '0' WHERE leave_form_id = #{uuid}