From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java | 6
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java | 13 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java | 2
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/IRemoteSysConfigService.xml | 0
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 117 +++++++--
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java | 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/ISysConfigService.java | 115 +++++----
febs-server/febs-server-job/src/main/resources/mapper/IRemoteSysConfigService.xml | 0
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 12
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 32 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/IRemoteSysConfigService.xml | 0
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java | 143 ++++++-----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 10
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 27 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java | 35 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java | 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/SysConfigServiceImpl.java | 177 ++++++++------
19 files changed, 452 insertions(+), 256 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index b3696c9..108b35b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -50,8 +50,15 @@
@GetMapping("list")
@PreAuthorize("hasAuthority('empContractinfo:list')")
- public FebsResponse empContractinfoList(QueryRequest request, EmpContractInfo empContractinfo) {
+ public FebsResponse getEmpContractList(QueryRequest request, EmpContractInfo empContractinfo) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
+ return new FebsResponse().data(dataTable);
+ }
+
+ @RequestMapping(value = "remind/list", method = RequestMethod.GET)
+ @PreAuthorize("hasAuthority('empContractinfo:list')")
+ public FebsResponse empRemindContractList(QueryRequest request, EmpContractInfo empContractinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findRemindContractinfos(request, empContractinfo));
return new FebsResponse().data(dataTable);
}
@@ -76,6 +83,29 @@
}
}
+ @RequestMapping(value = "remind/not", method = RequestMethod.POST)
+ @PreAuthorize("hasAuthority('empContractinfo:update')")
+ public void updateEmpContractRemind(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.updateEmpContractRemind(empContractinfo);
+ } catch (Exception e) {
+ String message = "不续签员工合同操作失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @RequestMapping(value = "remind/continue", method = RequestMethod.POST)
+ @PreAuthorize("hasAuthority('empContractinfo:add')")
+ public void continueEmpContract(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.continueEmpContract(empContractinfo);
+ } catch (Exception e) {
+ String message = "续签员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
@DeleteMapping
@PreAuthorize("hasAuthority('empContractinfo:delete')")
public void deleteEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 42cb6c6..e4bd062 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -101,8 +101,9 @@
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
+// @TableField("sex")
// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ @TableField(exist = false)
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -170,13 +171,20 @@
// @Version
private Integer version = 0;
+ @TableField("diffDay")
+ private Integer diffDay = 0;
+
+ @TableField("remindFlag")
+ private Integer remindFlag = 0;
+
@TableField(exist = false)
private String signingDateStr = "";
@TableField(exist = false)
private String endDateStr = "";
-
+ @TableField(exist = false)
+ private String diffLabel = "";
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index 3a53a27..bcc7a00 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -54,9 +54,9 @@
@ExcelField(value = "部门(护卫点)")
private String allDeptName = "";
- // @FieldInfo(name = "deptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String deptName = "";
+ @TableField("deptName")
+ @ExcelField(value = "部门/护卫点")
+ private String deptName;
@TableField(exist = false)
@ExcelField(value = "岗位")
@@ -138,6 +138,10 @@
@TableField(exist = false)
private String empIds;
+ @FieldInfo(name = "deptNames", explain = "关闭档案人员部门名称")
+ @TableField(exist = false)
+ private String deptNames;
+
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
index 7feaba5..4b9689d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
@@ -97,4 +97,10 @@
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
+
+ @TableField(exist = false)
+ private String deptName = "";
+
+ @TableField(exist = false)
+ private String deptId = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
index 3c0922e..ac1c4c5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
@@ -99,10 +99,23 @@
@Update("<script> " +
" UPDATE t_emp_contractinfo SET contractStatus='4',\n" +
" empStatus='1',\n" +
+ " remindFlag=1,\n" +
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
" WHERE TO_DAYS(t_emp_contractinfo.endDate) = TO_DAYS(NOW()) " +
"</script>")
int autoStopContract(@Param("operatorId") String operatorId);
+
+ @Update("<script>" +
+ " UPDATE t_emp_contractinfo SET diffDay=DATEDIFF(endDate, NOW())\n" +
+ " WHERE endDate>=now()" +
+ "</script>")
+ int updateContractRemindDay();
+
+ @Update("<script>" +
+ " UPDATE t_emp_contractinfo SET remindFlag=1\n" +
+ " WHERE contractId=#{contractId}" +
+ "</script>")
+ int updateEmpContractRemind(@Param("contractId") Long contractId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/IRemoteSysConfigService.xml
similarity index 100%
rename from febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.xml
rename to febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/IRemoteSysConfigService.xml
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
index 5961076..e6d8c3e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
@@ -28,6 +28,8 @@
*/
IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
+ IPage<EmpContractInfo> findRemindContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
+
/**
* 查询（所有）
*
@@ -84,4 +86,37 @@
void terminateContract(String empIds, String operatorId);
void autoStopContract(String operatorId);
+
+ /*
+ *
+ * 更新合同的到期天数
+ *
+ * date 2024-03-09 16:53
+ * @author: luoyibo
+ * @param 1
+ * @return void
+ */
+ void updateContractRemindDay();
+
+ /*
+ *
+ * 设置合同不再提醒
+ *
+ * date 2024-03-09 22:07
+ * @author: luoyibo
+ * @param empContractinfo 合同信息
+ * @return void
+ */
+ void updateEmpContractRemind(EmpContractInfo empContractinfo);
+
+ /**
+ *
+ * 提醒合同的续签操作
+ *
+ * date 2024-03-09 23:04
+ * @author: luoyibo
+ * @param empContractinfo 合同信息
+ * @return void
+ */
+ void continueEmpContract(EmpContractInfo empContractinfo);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 249fb05..c38bb66 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -214,15 +214,15 @@
}
/**
- *
* 增加员工后同步增加入职记录
- *
+ * <p>
* date 2021-07-30 09:12
- * @author: luoyibo
+ *
* @param empBaseInfo 员工信息
- * @param operatorId 操作员Id
- * @param empId 员工Id
+ * @param operatorId 操作员Id
+ * @param empId 员工Id
* @return void
+ * @author: luoyibo
*/
private void addEmpDimissLog(EmpBaseInfo empBaseInfo, String operatorId, Long empId) {
EmpDimissionLog dimissionLog = new EmpDimissionLog();
@@ -231,6 +231,7 @@
dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
dimissionLog.setDimissionType("20");
dimissionLog.setRemark(empBaseInfo.getRemark());
+ dimissionLog.setDeptName(empBaseInfo.getAllDeptName());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
@@ -355,6 +356,10 @@
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
+// for (int i = 0, j = str.length; i < j; i++) {
+// EmpBaseInfo emp = this.getById(str[i]);
+// addEmpDimissLog(emp, operatorId, Long.valueOf(str[i]));
+// }
return empBaseInfoMapper.momentToNormal(list, operatorId) > 0;
}
@@ -380,6 +385,7 @@
public boolean closeEmpArchives(EmpDimissionLog empDimissionLog) {
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
String[] str = empDimissionLog.getEmpIds().split(",");
+ String[] empDeptNames = empDimissionLog.getDeptNames().split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
String[] strDate = empDimissionLog.getEntryDates().split(",");
@@ -396,6 +402,7 @@
dimissionLog.setReporter(empDimissionLog.getReporter());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
+ dimissionLog.setDeptName(empDeptNames[i]);
dimissionLogService.save(dimissionLog);
}
@@ -656,7 +663,7 @@
empBaseInfo.setEmpStatus("0");
this.save(empBaseInfo);
//新入职员工需要增加一条入职记录
- this.addEmpDimissLog(empBaseInfo,"2",empBaseInfo.getEmpId());
+ this.addEmpDimissLog(empBaseInfo, "2", empBaseInfo.getEmpId());
}
}
@@ -1189,7 +1196,7 @@
public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
for (int i = 0; i < certificates.length; i++) {
String ageBtn = "|" + certificates[i] + "|";
- wrapper.gt("LOCATE('"+ageBtn+"',CONCAT('|',replace( certificateList, ',', '|,|'),'|'))",0);
+ wrapper.gt("LOCATE('" + ageBtn + "',CONCAT('|',replace( certificateList, ',', '|,|'),'|'))", 0);
}
}
};
@@ -1435,14 +1442,14 @@
@Override
public boolean updateEmpAge(String userId) {
List<EmpBaseInfo> empBaseInfoList = new ArrayList<>();
- if(StringUtils.isNotBlank(userId)){
+ if (StringUtils.isNotBlank(userId)) {
EmpBaseInfo empBaseInfo = this.getById(userId);
empBaseInfoList.add(empBaseInfo);
} else {
empBaseInfoList = this.list();
}
- if(empBaseInfoList.size()>0){
- empBaseInfoList.forEach(p->{
+ if (empBaseInfoList.size() > 0) {
+ empBaseInfoList.forEach(p -> {
p.setAge(DateUtil.ageOfNow(p.getBirthdate()));
this.saveOrUpdate(p);
});
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index beb237c..ae5cb11 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -24,6 +24,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -56,7 +57,7 @@
@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
- QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
queryWrapper.like("a.EmpNumb", empContractinfo.getEmpNumb());
@@ -168,39 +169,39 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
- for (List<Object> list : listObject) {
- if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
+ public void importEmpContractInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
continue;
}
- EmpContractInfo contractInfo = new EmpContractInfo();
- contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- contractInfo.setEmpNumb(list.get(0).toString());
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ EmpContractInfo contractInfo = new EmpContractInfo();
+ contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ contractInfo.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
- returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(1).toString()));
continue;
}
Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
- returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ if (null == empId) {
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
}
contractInfo.setDelFlag(0);
contractInfo.setEmpId(empId);
- contractInfo.setDeptName(list.get(1).toString());
- contractInfo.setDeptId(dept.getDeptId());
- contractInfo.setJobName(list.get(2).toString());
- contractInfo.setEmpName(list.get(3).toString());
- contractInfo.setCertificateNumb(list.get(4).toString());
- try {
+ contractInfo.setDeptName(list.get(1).toString());
+ contractInfo.setDeptId(dept.getDeptId());
+ contractInfo.setJobName(list.get(2).toString());
+ contractInfo.setEmpName(list.get(3).toString());
+ contractInfo.setCertificateNumb(list.get(4).toString());
+ try {
if (StringUtils.isNotBlank(list.get(5).toString())) {
contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
}
@@ -211,26 +212,26 @@
if (StringUtils.isNotBlank(list.get(7).toString())) {
contractInfo.setEndDate(DateUtil.parse(list.get(7).toString()));
}
- }catch (Exception e){
- returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
- }
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
+ }
//合同
- DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "contractStatus") && StrUtil.equals(j.getDicItemName(), list.get(9).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
contractInfo.setContractStatus(dicItem.getDicItemCode());
}
- contractInfo.setTransactor(list.get(10).toString());
- contractInfo.setRemark(list.get(11).toString());
+ contractInfo.setTransactor(list.get(10).toString());
+ contractInfo.setRemark(list.get(11).toString());
- this.save(contractInfo);
- }
- }
+ this.save(contractInfo);
+ }
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -244,4 +245,54 @@
public void autoStopContract(String operatorId) {
empContractinfoMapper.autoStopContract(operatorId);
}
+
+ @Override
+ public void updateContractRemindDay() {
+ empContractinfoMapper.updateContractRemindDay();
+ }
+
+ @Override
+ public IPage<EmpContractInfo> findRemindContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
+ int diffDay = Integer.parseInt(redisService.get("contract_remind").toString());
+ List<String> contractStatus = Lists.newArrayList("1","2");
+ QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
+ queryWrapper.eq("a.remindFlag", 0);
+ queryWrapper.in("a.contractStatus", contractStatus);
+ queryWrapper.between("a.diffDay", 0, diffDay);
+ queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));
+
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "diffDay", FebsConstant.ORDER_ASC, true);
+ IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
+ List<EmpContractInfo> list = iPage.getRecords();
+ //设置字典数据
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setContractStatusName(dicItems.stream()
+ .filter(k -> DicCode.CONTRACTSTATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getContractStatus()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("新签"));
+ });
+ iPage.setRecords(list);
+ return iPage;
+ }
+
+ @Override
+ public void updateEmpContractRemind(EmpContractInfo empContractinfo) {
+ empContractinfoMapper.updateEmpContractRemind(empContractinfo.getContractId());
+ }
+
+ @Override
+ public void continueEmpContract(EmpContractInfo empContractinfo) {
+ Long contractId = empContractinfo.getContractId();
+ //创建一份新合同信息
+ empContractinfo.setDelFlag(0);
+ this.createEmpContractinfo(empContractinfo);
+
+ //设置不再提醒
+ empContractinfoMapper.updateEmpContractRemind(contractId);
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
index 76d3bfb..462a1c6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
@@ -73,6 +73,9 @@
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empOpenarchives.getEmpId());
empBaseInfo.setEntryDate(empOpenarchives.getOpenDate());
empBaseInfo.setEntryType(empOpenarchives.getOpenType());
+ empBaseInfo.setDeptId(Long.valueOf(empOpenarchives.getDeptId()));
+ empBaseInfo.setDeptName(empOpenarchives.getDeptName());
+ empBaseInfo.setAllDeptName(empOpenarchives.getAllDeptName());
empBaseInfo.setEmpStatus("0");
empBaseInfo.setDimissionType("");
empBaseInfo.setDimissionDate(DateUtil.parse("1900-01-01"));
@@ -88,6 +91,7 @@
dimissionLog.setRemark(empOpenarchives.getRemark());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
+ dimissionLog.setDeptName(empOpenarchives.getAllDeptName());
dimissionLogService.save(dimissionLog);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
index ec518e9..736f0b5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
@@ -283,7 +283,7 @@
List<EmpDimissionAttend> dimissionAttends = iEmpDimissionAttendService.findEmpDimissionattends(queryRequest, empDimissionAttend).getRecords();
//入离职记录
- String[] dimissionLog = { "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
+ String[] dimissionLog = { "部门/护卫点", "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
EmpDimissionLog empDimissionLog=new EmpDimissionLog();
empDimissionLog.setEmpId(empBaseInfo.getEmpId());
empDimissionLog.setEmpStatus(empBaseInfo.getEmpStatus());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java
index 22c1ec6..76daa6f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java
@@ -3,13 +3,12 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.CommandLineRunner;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import javax.swing.*;
/**
* name: ScheduledTask
@@ -52,6 +51,9 @@
public void autoStopContract(){
log.info("每天凌晨3点检查到期合同");
empContractInfoService.autoStopContract("32");
+ log.info("设置合同间隔的天数");
+ empContractInfoService.updateContractRemindDay();
+
}
@Scheduled(cron = "0 0 4 * * ?")
public void autoCalculateAge(){
@@ -61,9 +63,10 @@
}
@Override
public void run(String... args) throws Exception {
- calculateSeniority();
- autoStopContract();
- autoCalculateAge();
+ //calculateSeniority();
+// autoStopContract();
+ //autoCalculateAge();
// updateDeptName();
+ //autoStopContract();
}
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java
index 93c3e81..b3961fc 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/CreatePdf.java
@@ -594,6 +594,7 @@
int size = records1.size();
for (int i = 0; i < size; i++) {
Map user = records1.get(i);
+ dimissionLogtable.addCell(createCell(user.get("deptName")==null?"":user.get("deptName").toString(), textfont));
dimissionLogtable.addCell(createCell(user.get("entryDate")==null?"":user.get("entryDate").toString(), textfont));
dimissionLogtable.addCell(createCell(user.get("dimissionDate")==null?"":user.get("dimissionDate").toString(), textfont));
dimissionLogtable.addCell(createCell(user.get("dimissionType")==null?"":user.get("dimissionType").toString(), textfont));
diff --git a/febs-server/febs-server-job/src/main/resources/mapper/JobMapper.xml b/febs-server/febs-server-job/src/main/resources/mapper/IRemoteSysConfigService.xml
similarity index 100%
rename from febs-server/febs-server-job/src/main/resources/mapper/JobMapper.xml
rename to febs-server/febs-server-job/src/main/resources/mapper/IRemoteSysConfigService.xml
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
index 48a9cc9..7711cbd 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
@@ -89,4 +89,5 @@
String userRightDepts = userDataPermissionService.findByUserId(FebsUtil.getUserId());
return userRightDepts;
}
+
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java
index 9e7e8a5..6e130be 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java
@@ -1,16 +1,15 @@
package cc.mrbird.febs.server.system.controller;
-import cc.mrbird.febs.common.core.entity.system.SysConfig;
-import cc.mrbird.febs.server.system.service.ISysConfigService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.server.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -18,15 +17,14 @@
import java.util.Map;
/**
-*
-* name:SysConfig
-* package:cc.mrbird.febs.server.system.controller
-* description:参数配置表控制器
-*
-* @author Alan
-* @date 2021-02-20 09:40:38
-* @since JDK1.8
-*/
+ * name:SysConfig
+ * package:cc.mrbird.febs.server.system.controller
+ * description:参数配置表控制器
+ *
+ * @author Alan
+ * @date 2021-02-20 09:40:38
+ * @since JDK1.8
+ */
@Api(tags = "参数配置表管理接口")
@Slf4j
@Validated
@@ -35,67 +33,72 @@
@RequiredArgsConstructor
public class SysConfigController {
-private final ISysConfigService sysConfigService;
+ private final ISysConfigService sysConfigService;
-@ApiOperation(value = "参数配置表无翻页列表")
-@GetMapping
-public FebsResponse getAllSysConfigs(SysConfig sysConfig) {
-return new FebsResponse().data(sysConfigService.findSysConfigs(sysConfig));
-}
+ @ApiOperation(value = "参数配置表无翻页列表")
+ @GetMapping
+ public FebsResponse getAllSysConfigs(SysConfig sysConfig) {
+ return new FebsResponse().data(sysConfigService.findSysConfigs(sysConfig));
+ }
-@ApiOperation(value = "参数配置表翻页列表")
-@GetMapping("list")
-public FebsResponse sysConfigList(QueryRequest request, SysConfig sysConfig) {
-Map
-<String, Object> dataTable = FebsUtil.getDataTable(this.sysConfigService.findSysConfigs(request, sysConfig));
-return new FebsResponse().data(dataTable);
-}
+ @ApiOperation(value = "参数配置表翻页列表")
+ @GetMapping("list")
+ public FebsResponse sysConfigList(QueryRequest request, SysConfig sysConfig) {
+ Map
+ <String, Object> dataTable = FebsUtil.getDataTable(this.sysConfigService.findSysConfigs(request, sysConfig));
+ return new FebsResponse().data(dataTable);
+ }
-@ApiOperation(value = "参数配置表增加")
-@PostMapping
-public void addSysConfig(@Valid SysConfig sysConfig) throws FebsException {
-try {
-this.sysConfigService.createSysConfig(sysConfig);
-} catch (Exception e) {
-String message = "新增参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表增加")
+ @PostMapping
+ public void addSysConfig(@Valid SysConfig sysConfig) throws FebsException {
+ try {
+ this.sysConfigService.createSysConfig(sysConfig);
+ } catch (Exception e) {
+ String message = "新增参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "参数配置表物理删除")
-@DeleteMapping
-public void deleteSysConfig(SysConfig sysConfig) throws FebsException {
-try {
-this.sysConfigService.deleteSysConfig(sysConfig);
-} catch (Exception e) {
-String message = "删除参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表物理删除")
+ @DeleteMapping
+ public void deleteSysConfig(SysConfig sysConfig) throws FebsException {
+ try {
+ this.sysConfigService.deleteSysConfig(sysConfig);
+ } catch (Exception e) {
+ String message = "删除参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "参数配置表逻辑删除")
-@DeleteMapping("{ids}")
-public void logicDeleteSysConfig(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.sysConfigService.logicDelSysConfig(ids);
-} catch (Exception e) {
-String message = "逻辑删除参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表逻辑删除")
+ @DeleteMapping("{ids}")
+ public void logicDeleteSysConfig(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.sysConfigService.logicDelSysConfig(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "参数配置表修改")
-@PutMapping
-public void updateSysConfig(SysConfig sysConfig) throws FebsException {
-try {
-this.sysConfigService.updateSysConfig(sysConfig);
-} catch (Exception e) {
-String message = "修改参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表修改")
+ @PutMapping
+ public void updateSysConfig(SysConfig sysConfig) throws FebsException {
+ try {
+ this.sysConfigService.updateSysConfig(sysConfig);
+ } catch (Exception e) {
+ String message = "修改参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @RequestMapping(value = "set/contract/remind",method = RequestMethod.POST)
+ public void setContractRemindToRedis() throws FebsException{
+ sysConfigService.setContractRemindToRedis();
+ }
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/SysConfigMapper.xml b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/IRemoteSysConfigService.xml
similarity index 100%
rename from febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/SysConfigMapper.xml
rename to febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/IRemoteSysConfigService.xml
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/ISysConfigService.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/ISysConfigService.java
index 00ea268..4780856 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/ISysConfigService.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/ISysConfigService.java
@@ -9,62 +9,73 @@
import java.util.List;
/**
-*
-* name:SysConfig
-* package:cc.mrbird.febs.server.system.controller
-* description:参数配置表服务接口
-*
-* @author Alan
-* @date 2021-02-20 09:40:38
-* @since JDK1.8
-*/
+ * name:SysConfig
+ * package:cc.mrbird.febs.server.system.controller
+ * description:参数配置表服务接口
+ *
+ * @author Alan
+ * @date 2021-02-20 09:40:38
+ * @since JDK1.8
+ */
public interface ISysConfigService extends IService<SysConfig> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param sysConfig sysConfig
-* @return IPage<SysConfig>
-*/
-IPage<SysConfig> findSysConfigs(QueryRequest request, SysConfig sysConfig);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param sysConfig sysConfig
+ * @return IPage<SysConfig>
+ */
+ IPage<SysConfig> findSysConfigs(QueryRequest request, SysConfig sysConfig);
-/**
-* 查询（所有）
-*
-* @param sysConfig sysConfig
-* @return List<SysConfig>
-*/
-List<SysConfig> findSysConfigs(SysConfig sysConfig);
+ /**
+ * 查询（所有）
+ *
+ * @param sysConfig sysConfig
+ * @return List<SysConfig>
+ */
+ List<SysConfig> findSysConfigs(SysConfig sysConfig);
-/**
-* 新增
-*
-* @param sysConfig sysConfig
-*/
-void createSysConfig(SysConfig sysConfig);
+ /**
+ * 新增
+ *
+ * @param sysConfig sysConfig
+ */
+ void createSysConfig(SysConfig sysConfig);
-/**
-* 修改
-*
-* @param sysConfig sysConfig
-*/
-void updateSysConfig(SysConfig sysConfig);
+ /**
+ * 修改
+ *
+ * @param sysConfig sysConfig
+ */
+ void updateSysConfig(SysConfig sysConfig);
-/**
-* 删除
-*
-* @param sysConfig sysConfig
-*/
-void deleteSysConfig(SysConfig sysConfig);
+ /**
+ * 删除
+ *
+ * @param sysConfig sysConfig
+ */
+ void deleteSysConfig(SysConfig sysConfig);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelSysConfig(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelSysConfig(String ids);
+
+ /**
+ * 将合同提前提醒参数设置到redis中
+ * <p>
+ * date 2024-03-10 08:12
+ *
+ * @param
+ * @return java.lang.Void
+ * @author: luoyibo
+ */
+ Void setContractRemindToRedis();
}
+
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/SysConfigServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/SysConfigServiceImpl.java
index 5bc5cbc..a7b8313 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/SysConfigServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/SysConfigServiceImpl.java
@@ -1,107 +1,126 @@
package cc.mrbird.febs.server.system.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.entity.system.Dic;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.system.mapper.SysConfigMapper;
import cc.mrbird.febs.server.system.service.ISysConfigService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/**
-*
-* name:SysConfig
-* package:cc.mrbird.febs.server.system.controller
-* description:参数配置表服务接口实现
-*
-* @author Alan
-* @date 2021-02-20 09:40:38
-* @since JDK1.8
-*/
+ * name:SysConfig
+ * package:cc.mrbird.febs.server.system.controller
+ * description:参数配置表服务接口实现
+ *
+ * @author Alan
+ * @date 2021-02-20 09:40:38
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
-private final SysConfigMapper sysConfigMapper;
-private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
-.map(u -> u.getUserId().toString())
-.orElse("1");
-@Override
-public IPage<SysConfig> findSysConfigs(QueryRequest request, SysConfig sysConfig) {
-LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
-queryWrapper.eq(SysConfig::getDelFlag, 0);
-if(StringUtils.isNotBlank(sysConfig.getConfigName())){
- queryWrapper.like(SysConfig::getConfigName, sysConfig.getConfigName());
-}
-Page<SysConfig> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ private final SysConfigMapper sysConfigMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public List<SysConfig> findSysConfigs(SysConfig sysConfig) {
-LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
-queryWrapper.eq(SysConfig::getDelFlag, 0);
-return this.baseMapper.selectList(queryWrapper);
-}
+ private final RedisService redisService;
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createSysConfig(SysConfig sysConfig) {
-sysConfig.setConfigId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
-sysConfig.setCreateBy(operatorId);
-this.save(sysConfig);
-}
+ @Override
+ public IPage<SysConfig> findSysConfigs(QueryRequest request, SysConfig sysConfig) {
+ LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SysConfig::getDelFlag, 0);
+ if (StringUtils.isNotBlank(sysConfig.getConfigName())) {
+ queryWrapper.like(SysConfig::getConfigName, sysConfig.getConfigName());
+ }
+ Page<SysConfig> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateSysConfig(SysConfig sysConfig) {
-SysConfig dbData = this.getById(sysConfig.getConfigId());
-sysConfig.setDelFlag(dbData.getDelFlag());
-sysConfig.setUpdateTime(new Date());
-sysConfig.setUpdateBy(operatorId);
-this.saveOrUpdate(sysConfig);
-}
+ @Override
+ public List<SysConfig> findSysConfigs(SysConfig sysConfig) {
+ LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SysConfig::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteSysConfig(SysConfig sysConfig) {
-LambdaQueryWrapper<SysConfig> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(SysConfig::getConfigId, sysConfig.getConfigId());
-// TODO 设置删除条件
-this.remove(wrapper);
-}
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void logicDelSysConfig(String ids) {
- String[] str = ids.split(",");
- List<String> list = new ArrayList<>(Arrays.asList(str));
- for (String str1:list){
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createSysConfig(SysConfig sysConfig) {
+ sysConfig.setConfigId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ sysConfig.setCreateBy(operatorId);
+ this.save(sysConfig);
+
+ redisService.set(sysConfig.getConfigKey(), sysConfig.getConfigValue());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSysConfig(SysConfig sysConfig) {
+ SysConfig dbData = this.getById(sysConfig.getConfigId());
+ sysConfig.setDelFlag(dbData.getDelFlag());
+ sysConfig.setUpdateTime(new Date());
+ sysConfig.setUpdateBy(operatorId);
+ this.saveOrUpdate(sysConfig);
+
+ redisService.set(sysConfig.getConfigKey(), sysConfig.getConfigValue());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteSysConfig(SysConfig sysConfig) {
LambdaQueryWrapper<SysConfig> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(SysConfig::getConfigId, str1);
+ wrapper.eq(SysConfig::getConfigId, sysConfig.getConfigId());
// TODO 设置删除条件
this.remove(wrapper);
}
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelSysConfig(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ for (String str1 : list) {
+ LambdaQueryWrapper<SysConfig> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysConfig::getConfigId, str1);
+// TODO 设置删除条件
+ this.remove(wrapper);
+ }
}
-}
\ No newline at end of file
+
+ @Override
+ public Void setContractRemindToRedis() {
+ QueryWrapper<SysConfig> sysConfigQueryWrapper = new QueryWrapper<>();
+ sysConfigQueryWrapper.eq("config_key", "contract_remind");
+ SysConfig sysConfig = sysConfigMapper.selectOne(sysConfigQueryWrapper);
+
+ redisService.set("diffDay", sysConfig.getConfigValue());
+ return null;
+ }
+}
+
--
Gitblit v1.8.0