diff --git a/src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java b/src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java
index 2706221..87ddc6a 100644
--- a/src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java
+++ b/src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java
@@ -36,7 +36,7 @@ public class JxglServiceImpl implements JxglService {
performanceRating.setName("C");
performanceRating.setSectionMinScore(0);
performanceRating.setSectionMaxScore(60);
- performanceRating.setRanks(0);
+ performanceRating.setRanks(1);
res = !performanceRating.insert() && res ? false : res;
@@ -45,7 +45,7 @@ public class JxglServiceImpl implements JxglService {
performanceRating.setName("B");
performanceRating.setSectionMinScore(60);
performanceRating.setSectionMaxScore(80);
- performanceRating.setRanks(0);
+ performanceRating.setRanks(2);
res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
@@ -53,7 +53,7 @@ public class JxglServiceImpl implements JxglService {
performanceRating.setName("A");
performanceRating.setSectionMinScore(80);
performanceRating.setSectionMaxScore(100);
- performanceRating.setRanks(0);
+ performanceRating.setRanks(3);
res = !performanceRating.insert() && res ? false : res;
return res;
diff --git a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
index 0c54f7c..be94168 100644
--- a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+++ b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
@@ -127,6 +127,9 @@ public class SpmkController {
@Autowired
private SpmkInitiatorConfigMapper spmkInitiatorConfigMapper;
+ @Autowired
+ private SpmkAssoBusinessFactory spmkAssoBusinessFactory;
+
private boolean ISFIRST = true; // 第一次启动审批流程
//TODO 审批模板组
@@ -146,7 +149,6 @@ public class SpmkController {
return spmkApprovalTemplateG.insertOrUpdate() ?
ResultUtil.data(spmkApprovalTemplateG) : ResultUtil.error();
-
}
/**
@@ -160,10 +162,8 @@ public class SpmkController {
if (spmkApprovalTemplateMapper.selectCount(new QueryWrapper<SpmkApprovalTemplate>().lambda().eq(SpmkApprovalTemplate::getApprovalTemplateGId, id)) > 0 )
return ResultUtil.error("审批模板组存在 模板，不可直接删除!");
-
return SpmkApprovalTemplateG.builder().id(id).build().deleteById() ?
ResultUtil.success() : ResultUtil.error("没有找到该对象");
-
}
/**
@@ -652,9 +652,6 @@ public class SpmkController {
return ResultUtil.data(adD);
}
- @Autowired
- private SpmkAssoBusinessFactory spmkAssoBusinessFactory;
-
//TODO 审批人审批
/**
* 审批人审批
diff --git a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
index d626d6e..856d13b 100644
--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -6,7 +6,6 @@
package cn.timer.api.controller.yggl;
import java.io.IOException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -61,7 +60,6 @@ import cn.hutool.poi.excel.ExcelWriter;
import cn.timer.api.bean.clazz.CommonArea;
import cn.timer.api.bean.clazz.SysRegion;
import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
-import cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance;
import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.qyzx.QyzxEmpLogin;
@@ -291,19 +289,25 @@ public class YgglController {
.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).build();
ygglMainEmp.insert();
+
+
//假期规则初始化
- String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+
List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
for(KqglAssoLeaveRules r : rul) {
if(r.getLeaveBalance() == 0) {
- KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).balanceDays(-1).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
+ KqglAssoLeaveBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).modifyAction(2).balanceDays("-1")
+ .reason("不限制余额").modifyUserid(ygglMainEmp.getEmpNum()).modifyTimer(new Date().getTime()).orgCode(userBean.getOrgCode()).isAutomatic(1).modifyNumber(1).build().insert();//员工假期余额
}else {
- KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
+ KqglAssoLeaveBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).modifyAction(1).balanceDays("+0")
+ .reason("系统按照规则自动").modifyUserid(ygglMainEmp.getEmpNum()).modifyTimer(new Date().getTime()).orgCode(userBean.getOrgCode()).isAutomatic(1).modifyNumber(1).build().insert();//员工假期余额
}
}
+
+
return ResultUtil.data(ygglMainEmp, "添加员工成功!");
} else {
return ResultUtil.error("该手机号已被使用,请输入正确手机号");
@@ -1799,7 +1803,7 @@ public class YgglController {
@ApiOperation(value = "71.获取用户头像", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 71)
public Result<List<YgglMainEmp>> headphotos(@CurrentUser UserBean userBean, @RequestBody List<Integer> empNumList) {
- if (empNumList.size() == 0) {
+ if (empNumList == null || empNumList.size() == 0) {
return ResultUtil.error("请输入empNum数组");
}
List<YgglMainEmp> yglList = YgglMainEmp.builder().build()
diff --git a/src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml b/src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
index 8891640..4463ca7 100644
--- a/src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
@@ -110,7 +110,7 @@
c.remarks c_remarks,
c.type c_type,
c.create_time c_create_time,
- c.level c_level
+ c.level c_level
</sql>
<sql id="Base_Column_List_Alias">