Y0ng
/
gz_att_wechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

轮休、临时外出功能接口调试修改

This commit is contained in:
lSun 2025-02-18 17:01:27 +08:00
parent 508be2814d
commit 4d091b4d40
8 changed files with 88 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.9</version>
<version>1.1.18</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>

18
src/main/java/com/bonus/boot/manager/manager/controller/WeChatController.java
View File

@ -132,9 +132,10 @@ public class WeChatController {
* 获取休假类型
*/
@GetMapping("getHolidayType")
public ServerResponse getHolidayType() {
@DecryptAndVerify(decryptedClass = LeaveReportingBean.class)
public ServerResponse getHolidayType(EncryptedReq<LeaveReportingBean> 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<EvectionBean> data){
try {
return ServerResponse.createSuccess(service.deleteEvectionById(data.getData()));
} catch (Exception e) {
log.error(e.toString(),e);
}
return ServerResponse.createErroe("操作失败");
}
}

4
src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java
View File

@ -98,7 +98,7 @@ public interface WeChatDao {
* 查询休假类型
* @return
*/
List<LeaveReportingBean> getHolidayType();
List<LeaveReportingBean> getHolidayType(LeaveReportingBean data);
/**
* 查询节假日
@ -140,4 +140,6 @@ public interface WeChatDao {
int editHoliday(LeaveReportingBean data);
int editEvection(EvectionBean data);
int deleteEvectionById(EvectionBean data);
}

1
src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java
View File

@ -131,6 +131,7 @@ public class HolidayBean {
* 代理主持工作人员（多个自动隔开）
*/
private String hostUserId;
private String hostUserName;
/**
* 地点

5
src/main/java/com/bonus/boot/manager/manager/entity/LeaveReportingBean.java
View File

@ -152,6 +152,11 @@ public class LeaveReportingBean {
*/
private String type;
/**
* 字典类型
*/
private String dictType;
/**
* 自己项目部所在分公司下的所有项目部id
*/

4
src/main/java/com/bonus/boot/manager/manager/service/WeChatService.java
View File

@ -81,7 +81,7 @@ public interface WeChatService {
* 获取休假类型
* @return
*/
List<LeaveReportingBean> getHolidayType();
List<LeaveReportingBean> getHolidayType(LeaveReportingBean data);
/**
* 获取休假天数
@ -118,4 +118,6 @@ public interface WeChatService {
int editHoliday(LeaveReportingBean data);
int editEvection(EvectionBean data);
int deleteEvectionById(EvectionBean data);
}

41
src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
View File

@ -136,8 +136,8 @@ public class WeChatServiceImpl implements WeChatService {
}
@Override
public List<LeaveReportingBean> getHolidayType() {
return dao.getHolidayType();
public List<LeaveReportingBean> 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对象

37
src/main/resources/mappers/wechat/WeChatMapper.xml
View File

@ -34,7 +34,7 @@
#{leaveEndDate},
#{leaveEndInterval},
#{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{hostUserName},
#{remark}, '0')
#{remark}, '1')
</insert>
<insert id="insertHoliday">
@ -111,7 +111,7 @@
org_name = #{orgName},
</if>
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}
</set>
where uuid = #{uuid}
where leave_form_id = #{uuid}
</update>
<update id="deleteEvectionById">
update leave_apply_wechat SET is_active = '0' WHERE leave_form_id = #{uuid}
</update>
<select id="getById" resultType="com.bonus.boot.manager.manager.entity.UserDto">
@ -331,8 +335,8 @@
l.is_agree,
l.location,
l.remark,
l.is_plateau as isPlateau,
l.plateau_subsidy as plateauSubsidy
l.is_plateau,
l.plateau_subsidy
ORDER BY l.update_time DESC) a
LEFT JOIN sys_user_wechat su ON su.user_id = a.submit_id
GROUP BY uuid
@ -402,7 +406,7 @@
SELECT dict_code AS id,
dict_label AS type
FROM sys_dict_data_wechat
WHERE STATUS = 0
WHERE STATUS = 0 and dict_type = #{dictType}
</select>
<select id="getFestivalAndHoliday" resultType="com.bonus.boot.manager.manager.entity.LeaveReportingBean">
SELECT id, date, `name`, type
@ -427,12 +431,12 @@
la.create_time,
la.leave_type,
la.leave_reason,
la.leave_start_date,
la.leave_start_interval,
la.leave_end_date,
la.leave_end_interval,
la.leave_duration,
la.examine_status
la.leave_start_date as leaveStartDate,
la.leave_start_interval as leaveStartInterval,
la.leave_end_date as leaveEndDate,
la.leave_end_interval as leaveEndInterval,
la.leave_duration as leaveDuration,
la.examine_status as examineStatus
FROM leave_apply_wechat la
WHERE la.is_active = '1'
and la.type = #{type}
@ -447,14 +451,21 @@
la.user_name,
la.org_id,
la.org_name,
la.create_time,
la.leave_type,
la.type,
la.leave_reason,
la.leave_start_date,
la.leave_start_interval,
la.leave_end_date,
la.leave_end_interval,
la.leave_duration,
la.source,
la.create_user_id,
la.is_agree,
la.location,
la.host_user_id,
la.host_user_name,
la.remark,
la.examine_status
FROM leave_apply_wechat la
WHERE la.is_active = '1'