添加接口同步效能记录

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

@@ -174,16 +174,16 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         String busiDesc = "外部效能新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
         try {
-            boolean isMobile = Validator.isMobile(req.getPhone());
+/*            boolean isMobile = Validator.isMobile(req.getPhone());
             if (!isMobile) {
                 effectErrorSave(req);
                 rest = Rest.fail("手机号码不正确！");
-            }
-            if (ObjectUtils.isEmpty(req.getPhone())) {
+            }*/
+/*            if (ObjectUtils.isEmpty(req.getPhone())) {
                 //保存异常数据/
                 effectErrorSave(req);
                 rest = Rest.fail("手机号码为空！");
-            }
+            }*/
             //如果手机号码为空 将当前记录保存到临时表中，人工手动处理
 
             if (ObjectUtils.isEmpty(req.getRuleCode())) {
@@ -403,7 +403,8 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
 
     private boolean effect(EffectSaveReq req) throws AppException {
         //效能保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req);
+        if (ObjectUtils.isEmpty(staffEntity)) return false;
         PerformRulesEntity rule = getRule(req.getRuleCode());
         PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
         recordEntity.initAttrValue();
@@ -426,9 +427,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setDeductTime(new Date());
         recordEntity.setWorkNum(staffEntity.getWorkNum());
         recordEntity.setRemark(req.getExt());
-
         recordEntity.setWindowNum(req.getWindowNum());
-
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId());
@@ -440,7 +439,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
 
     private void effectErrorSave(EffectSaveReq req) throws AppException {
         //效能异常保存
-        //StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getPhone());
         PerformRulesEntity rule = getRule(req.getRuleCode());
         //checkStaffAutoConf(staffEntity, rule);
         PerformErrorRecordEntity recordEntity = new PerformErrorRecordEntity();
@@ -518,6 +517,31 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         return staffEntity;
     }
 
+    private StaffEntity getStaff(EffectSaveReq req) {
+        if (!ObjectUtils.isEmpty(req.getPhone())) {
+            List<StaffEntity> staffEntityList = staffService.find(new StaffQuery().phoneNumber(req.getPhone()));
+            if (staffEntityList.size() > 1) {
+                //多个 比对名字
+                for (StaffEntity staffEntity : staffEntityList) {
+                    if (staffEntity.getName().equals(req.getStaffName())) {
+                        return staffEntity;
+                    }
+                }
+                return staffEntityList.get(0);
+            } else if (staffEntityList.size() == 1) {
+                return staffEntityList.get(0);
+            }
+            StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(req.getPhone()));
+            if (!ObjectUtils.isEmpty(staffEntity)) return staffEntity;
+        }
+        if (!ObjectUtils.isEmpty(req.getStaffName())) {
+            StaffEntity staffEntity = staffService.selectOne(new StaffQuery().name(req.getStaffName()));
+            if (!ObjectUtils.isEmpty(staffEntity)) return staffEntity;
+        }
+        return null;
+
+    }
+
 
     public static void main(String[] args) {
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java

@@ -233,7 +233,7 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         //效能保存
         //StaffEntity staffEntity = getStaff(req.getPhone());
         StaffEntity staffEntity = getStaff(req);
-        if (ObjectUtils.isEmpty(staffEntity))return false;
+        if (ObjectUtils.isEmpty(staffEntity)) return false;
         PerformRulesEntity rule = getRule(req.getRuleCode());
         PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
         recordEntity.initAttrValue();
@@ -302,6 +302,18 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
 
     private StaffEntity getStaff(EffectSaveReq req) {
         if (!ObjectUtils.isEmpty(req.getPhone())) {
+            List<StaffEntity> staffEntityList = staffService.find(new StaffQuery().phoneNumber(req.getPhone()));
+            if (staffEntityList.size() > 1) {
+                //多个 比对名字
+                for (StaffEntity staffEntity : staffEntityList) {
+                    if (staffEntity.getName().equals(req.getStaffName())) {
+                        return staffEntity;
+                    }
+                }
+                return staffEntityList.get(0);
+            } else if (staffEntityList.size() == 1) {
+                return staffEntityList.get(0);
+            }
             StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(req.getPhone()));
             if (!ObjectUtils.isEmpty(staffEntity)) return staffEntity;
         }

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

@@ -109,8 +109,8 @@ POST {{baseUrl}}/perform/effect/record/sync
 Content-Type: application/json
 
 {
-  "happenTimeStart": "2024-03-08",
-  "happenTimeEnd": "2024-03-09"
+  "happenTimeStart": "2024-03-07",
+  "happenTimeEnd": "2024-03-07"
 }