Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java

@@ -152,6 +152,10 @@ public class TestController {
                 }
             }
         }
+        if(!ObjectUtils.isEmpty(updateList)){
+            staffService.update(updateList);
+        }
+
 
         return "更新数量：" + updateList.size();
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java

@@ -82,9 +82,9 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
         try {
             //todo 查询当前登录人的绩效分数
             AppealStatInfo appealStatInfo = new AppealStatInfo();
-            appealStatInfo.setTotalScore(new BigDecimal("10.52"));
+            appealStatInfo.setTotalScore(new BigDecimal("10.52").setScale(1,BigDecimal.ROUND_HALF_UP));
             appealStatInfo.setTotalTimes(12);
-            appealStatInfo.setTodayScore(new BigDecimal("2.5"));
+            appealStatInfo.setTodayScore(new BigDecimal("2.5").setScale(1,BigDecimal.ROUND_HALF_UP));
             appealStatInfo.setTodayTimes(3);
             rest.setData(appealStatInfo);
             recordSysLog(request, busiDesc + " 【成功】");
@@ -114,7 +114,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
                 //未设置时间的情况，默认为当月
                 appealReq.setApperalStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
                 appealReq.setAppealEndDate(DateUtil.today());
-            }else{
+            } else {
                 //格式化到指定日期的当月
                 appealReq.setApperalStartDate(DateUtil.beginOfMonth(DateUtil.parse(appealReq.getApperalStartDate()).toJdkDate()).toDateStr());
                 appealReq.setAppealEndDate(DateUtil.endOfMonth(DateUtil.parse(appealReq.getApperalStartDate()).toJdkDate()).toDateStr());
@@ -224,6 +224,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             entity.setStaffId(context.getUser().getCustomerId());
             entity.setCreateUserId(context.getUser().getId());
             entity.setCheckRecordId(req.getId());
+            entity.setAppealTime(new Date());
 
             PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
             rest.setData(saveEntity);
@@ -261,7 +262,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
 
 
     public static void main(String[] args) {
-
+        System.out.println(new BigDecimal(15.52).setScale(1,BigDecimal.ROUND_HALF_UP).toString());
     }
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java

@@ -101,8 +101,10 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
             //根据code 查询钉钉用户id
             Rest<String> personRest = dingPersonService.getPersonByCode(req.getCode());
             if (personRest.getCode() != YesNoEnum.YES.getValue()) {
-                throw new AppException(String.format("获取钉钉用户异常,{}", personRest.getMsg()));
+                throw new AppException(String.format("获取钉钉用户异常,%s", personRest.getMsg()));
             }
+
+            if(ObjectUtils.isEmpty(personRest.getData())) throw new AppException(REGISTER_AUTH_FAIL, "不存在当前匹配的钉钉关联用户！");
             //根据钉钉的用户查询系统绑定的用户,获取
             UserQuery userQuery = new UserQuery();
             userQuery.setDingUserId(personRest.getData());

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java

@@ -287,6 +287,9 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         //  recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
 
+        recordEntity.setDeductTime(new Date());
+        recordEntity.setDeductPerson(staffEntity.getName());
+
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
@@ -318,6 +321,9 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
 
+        recordEntity.setDeductTime(new Date());
+        recordEntity.setDeductPerson(staffEntity.getName());
+
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -346,6 +352,9 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         // recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
 
+        recordEntity.setDeductTime(new Date());
+        recordEntity.setDeductPerson(staffEntity.getName());
+
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
@@ -374,6 +383,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         //recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
 
+
+        recordEntity.setDeductTime(new Date());
+        recordEntity.setDeductPerson(staffEntity.getName());
+
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
@@ -402,6 +415,9 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         //recordEntity.setStaffId(staffEntity.getId());
         recordEntity.setStaffName(staffEntity.getName());
 
+        recordEntity.setDeductTime(new Date());
+        recordEntity.setDeductPerson(staffEntity.getName());
+
         recordEntity.setDeptId(staffEntity.getDeptId());
         recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
@@ -88,10 +89,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
         try {
             //todo
             PerformStatInfo performStatInfo = new PerformStatInfo();
-            performStatInfo.setTotalScore(new BigDecimal("15.9"));
-            performStatInfo.setTotalTimes(12);
-            performStatInfo.setTodayScore(new BigDecimal("12.6"));
-            performStatInfo.setTodayTimes(4);
+            performStatInfo.setTotalScore(RandomUtil.randomBigDecimal(new BigDecimal("15"),new BigDecimal("45")).setScale(1,BigDecimal.ROUND_HALF_UP));
+            performStatInfo.setTotalTimes(RandomUtil.randomInt(10,40));
+            performStatInfo.setTodayScore(RandomUtil.randomBigDecimal(new BigDecimal("2"),new BigDecimal("10")).setScale(1,BigDecimal.ROUND_HALF_UP));
+            performStatInfo.setTodayTimes(RandomUtil.randomInt(10));
             rest.setData(performStatInfo);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {