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

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/EffectSaveReq.java

@@ -37,4 +37,15 @@ public class EffectSaveReq extends BaseReq {
      * 抓拍图片
      */
     private String snapPath;
+
+    /**
+     * 唯一标识
+     */
+    private String ext;
+
+    /**
+     * 名称
+     */
+    private String staffName;
+
 }

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

@@ -170,7 +170,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
     @PostMapping("effect/save")
     @UnAuth
     public Rest<Void> effectSave(@RequestBody EffectSaveReq req) {
-         log.info("web Api req==>{}", JSON.toJSONString(req));
+        log.info("web Api req==>{}", JSON.toJSONString(req));
         String busiDesc = "外部效能新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
         try {
@@ -405,7 +405,6 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         //效能保存
         StaffEntity staffEntity = getStaff(req.getPhone());
         PerformRulesEntity rule = getRule(req.getRuleCode());
-        checkStaffAutoConf(staffEntity, rule);
         PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
         recordEntity.initAttrValue();
         recordEntity.setSubMethod(SubMethodEnum.系统自动.getValue());
@@ -426,6 +425,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
         recordEntity.setWorkNum(staffEntity.getWorkNum());
+        recordEntity.setRemark(req.getExt());
 
         recordEntity.setWindowNum(req.getWindowNum());
 
@@ -506,13 +506,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         PerformRulesEntity rule = rulesService.getCache(ruleCode);
         if (ObjectUtils.isEmpty(rule))
             throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", ruleCode));
-
         return rule;
     }
 
     private StaffEntity getStaff(String phone) {
         StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(phone));
-        if (ObjectUtils.isEmpty(staffEntity)){
+        if (ObjectUtils.isEmpty(staffEntity)) {
             throw new AppException(String.format("当前手机号码未找到匹配的员工！phone:%s", phone));
         }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/ParamKey.java

@@ -29,4 +29,6 @@ public class ParamKey {
 
     public static String SYS_PARAM_BELONG = "belong";
 
+    public static String SYS_PARAM_XNJC_URL = "xnjc_url";
+
 }

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -86,7 +86,7 @@ Content-Type: application/json
 POST {{baseUrl}}/staff/perform/summary/summary
 Content-Type: application/json
 
-{"checkTimeStart":"2024-02-01","checkTimeEnd":"2024-02-29"}
+{"checkTimeStart":"2024-02-01","checkTimeEnd":"2024-02-29","checkType":4}
 
 ###考勤打卡记录异常信息列表
 POST {{baseUrl}}/attendance/record/error/doReprocess