1、勤策全量修改人员、部门信息；2、促销员计划V2版打卡依据计划打卡新增接口

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityClockCoreController.java

@@ -75,41 +75,42 @@ public class TemporaryActivityClockCoreController {
         tempActivityClockCoreService.clockInTodayActivity(dto, clockType);
         return R.success();
     }
-//    @PostMapping("/today/clock")
-//    public R clockInTodayActivity(@RequestBody TemporaryClockVo clockVo) {
-//        clockVo.validate();
-//        Integer clockType = clockVo.getClockType();
-//        boolean isClockIn = ClockType.TEMPORARY_CLOCK_IN.equals(clockType);
-//        // 上班卡必需有促销计划ID
-//        if (isClockIn && (Objects.isNull(clockVo.getPlanId()) || clockVo.getPlanId() <= 0)) {
-//            throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR, null);
-//        }
-//        // 非上班卡必需有打卡记录ID
-//        if (!isClockIn && Objects.isNull((clockVo.getId()))) {
-//            throw new ParamException(RCode.CLOCK_DETAIL_ERROR, null);
-//        }
-//
-//        // 根据打卡经纬度判断与打卡店铺的距离，距离超过100米不能打卡
-////        tempActivityClockCoreService.clockStoreCalDistance(clockVo.getStoreQcId(),clockVo.getId(),clockVo.getClockCoordinates());
-//
-//        // 限制重复提交
-//        repetitiveClock(clockVo);
-//
-//        Date clockTime = new Date();
-//        TemporaryClockDto dto = new TemporaryClockDto(clockVo.getClockType(), clockVo.getId(), clockVo.getTemporaryId(), clockVo.getTemporaryName(), clockVo.getClockProvince(), clockVo.getClockCity());
-//        // 上班卡、午休下班卡、午休上班卡、下班卡
-//        if (isClockIn) {
-//            builderClockInData(clockVo, dto, clockTime);
-//        } else if (ClockType.TEMPORARY_NOON_CLOCK_OUT.equals(clockType)) {
-//            builderNoonClockOutData(clockVo, dto, clockTime);
-//        } else if (ClockType.TEMPORARY_NOON_CLOCK_IN.equals(clockType)) {
-//            builderNoonClockInData(clockVo, dto, clockTime);
-//        } else if (ClockType.TEMPORARY_CLOCK_OUT.equals(clockType)) {
-//            builderClockOutData(clockVo, dto, clockTime);
-//        }
-//        tempActivityClockCoreService.clockInTodayPlan(dto, clockType);
-//        return R.success();
-//    }
+
+    @PostMapping("/today/v2/clock")
+    public R clockInTodayActivityV2(@RequestBody TemporaryClockVo clockVo) {
+        clockVo.validate();
+        Integer clockType = clockVo.getClockType();
+        boolean isClockIn = ClockType.TEMPORARY_CLOCK_IN.equals(clockType);
+        // 上班卡必需有促销计划ID
+        if (isClockIn && (Objects.isNull(clockVo.getPlanId()) || clockVo.getPlanId() <= 0)) {
+            throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR, null);
+        }
+        // 非上班卡必需有打卡记录ID
+        if (!isClockIn && Objects.isNull((clockVo.getId()))) {
+            throw new ParamException(RCode.CLOCK_DETAIL_ERROR, null);
+        }
+
+        // 根据打卡经纬度判断与打卡店铺的距离，距离超过100米不能打卡
+//        tempActivityClockCoreService.clockStoreCalDistance(clockVo.getStoreQcId(),clockVo.getId(),clockVo.getClockCoordinates());
+
+        // 限制重复提交
+        repetitiveClock(clockVo);
+
+        Date clockTime = new Date();
+        TemporaryClockDto dto = new TemporaryClockDto(clockVo.getClockType(), clockVo.getId(), clockVo.getTemporaryId(), clockVo.getTemporaryName(), clockVo.getClockProvince(), clockVo.getClockCity());
+        // 上班卡、午休下班卡、午休上班卡、下班卡
+        if (isClockIn) {
+            builderClockInData(clockVo, dto, clockTime);
+        } else if (ClockType.TEMPORARY_NOON_CLOCK_OUT.equals(clockType)) {
+            builderNoonClockOutData(clockVo, dto, clockTime);
+        } else if (ClockType.TEMPORARY_NOON_CLOCK_IN.equals(clockType)) {
+            builderNoonClockInData(clockVo, dto, clockTime);
+        } else if (ClockType.TEMPORARY_CLOCK_OUT.equals(clockType)) {
+            builderClockOutData(clockVo, dto, clockTime);
+        }
+        tempActivityClockCoreService.clockInTodayPlan(dto, clockType);
+        return R.success();
+    }
 
     /**
      * 打卡照片更换

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -646,7 +646,7 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                 } else if (PlanStatus.EXECUTION.getCode().equals(hasDto.getPlanStatus())) {
                     dto.setErrorMsg("计划已执行，不可修改；");
                 } else if (!hasDto.getEmployeeNo().equals(row.get(0).toString())) {
-                    dto.setErrorMsg("计划不属于"+row.get(0)+",归属人：" + hasDto.getEmployeeName() + ";");
+                    dto.setErrorMsg("计划不属于"+row.get(0)+"，归属人：" + hasDto.getEmployeeName() + ";");
                 }
                 dto.setEmployeeName(hasDto.getEmployeeName())
                         .setOrgQcId(hasDto.getOrgQcId())

src/main/java/com/wangxiaolu/promotion/utils/QinCeUtils.java

@@ -80,17 +80,18 @@ public class QinCeUtils {
     }
 
     /**
-     * 查询[部门]参数
+     *todo 全量查 查询[部门]参数
      */
     public Map<String, Object> queryOrgParam() {
         Map<String, Object> params = new HashMap<>();
 //        DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
-        params.put("modify_date", DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
+//        params.put("modify_date", DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
+        params.put("modify_date", "");
         return params;
     }
 
     /**
-     * 查询[人员]参数
+     * todo 查询[人员]参数
      */
     public Map<String, Object> queryEmployeeParam(boolean queryId) {
         Map<String, Object> params = new HashMap<>();
@@ -99,7 +100,8 @@ public class QinCeUtils {
             params.put("id", "");
         }
 //        DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
-        params.put("modify_date", DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
+//        params.put("modify_date", DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN));
+        params.put("modify_date", "");
         return params;
     }
 

src/main/resources/application-qa.yml

@@ -89,12 +89,12 @@ xxl:
     admin:
       addresses: http://192.168.100.38:9001/xxl-job-admin
     executor:
-      appname: promotion-dev
-      port: 9996
+      appname: promotion-qa
+      port: 9997
       logretentiondays: 30
       address:
       ip:
-      logpath: /Users/a02200059/Desktop/wangxiaolu-sfa/log/xxl_job # 执行器日志路径
+      logpath: /var/logs/xxl_job
 
 aliyun:
   access-key-id: LTAI5tEvDG8hMRf9tBt9kB3s