打卡、任务上报负责人由原来的qc_id修改为manage_employee_info表id

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

@@ -69,8 +69,8 @@ public class TemporaryActivityCoreController {
                 .setStoreName(clockDto.getStoreName())
                 .setDeptQcId(clockDto.getDeptQcId())
                 .setDeptQcOrgName(clockDto.getDeptQcOrgName())
-                .setApproverId(clockDto.getChargerQcId())
-                .setApproveName(clockDto.getChargerName())
+                .setManageId(clockDto.getChargerId())
+                .setManageName(clockDto.getChargerName())
                 .setActivityPattern(clockDto.getActivityPattern())
                 .setProvince(clockDto.getClockProvince())
                 .setCity(clockDto.getClockCity());

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityClockDaoImpl.java

@@ -135,8 +135,11 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
         if (StringUtils.isNotBlank(tcw.getDeptQcId())){
             qw.eq(TemporaryActivityClockDO::getDeptQcId, tcw.getDeptQcId());
         }
-        if (StringUtils.isNotBlank(tcw.getChargerQcId())){
-            qw.eq(TemporaryActivityClockDO::getChargerQcId, tcw.getChargerQcId());
+//        if (StringUtils.isNotBlank(tcw.getChargerQcId())){
+//            qw.eq(TemporaryActivityClockDO::getChargerQcId, tcw.getChargerQcId());
+//        }
+        if (Objects.nonNull(tcw.getChargerId())){
+            qw.eq(TemporaryActivityClockDO::getChargerId, tcw.getChargerId());
         }
 
         qw.eq(TemporaryActivityClockDO::getIsDelete, StatusType.VALID.getType());

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityReportedDaoImpl.java

@@ -105,8 +105,11 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         if (!StringUtils.isEmpty(tw.getApproveStatus())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getApproveStatus, tw.getApproveStatus());
         }
-        if (!StringUtils.isEmpty(tw.getApproverId())) {
-            queryWrapper.eq(TemporaryActivityReportedDO::getApproverId, tw.getApproverId());
+//        if (!StringUtils.isEmpty(tw.getApproverId())) {
+//            queryWrapper.eq(TemporaryActivityReportedDO::getApproverId, tw.getApproverId());
+//        }
+        if (Objects.nonNull(tw.getManageId())) {
+            queryWrapper.eq(TemporaryActivityReportedDO::getManageId, tw.getManageId());
         }
         if (!StringUtils.isEmpty(tw.getDeptQcId())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getDeptQcId, tw.getDeptQcId());

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityClockDO.java

@@ -60,7 +60,8 @@ public class TemporaryActivityClockDO implements Serializable {
 
     private String deptQcOrgName;
 
-    private String chargerQcId;
+//    private String chargerQcId;
+    private Integer chargerId;
 
     private String chargerName;
 

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityReportedDO.java

@@ -80,16 +80,25 @@ public class TemporaryActivityReportedDO implements Serializable {
     private String deptQcId;
 
     private String deptQcOrgName;
+//    /**
+//     * 关联—审核人员qc_id
+//     */
+//    private String approverId;
+//
+//    /**
+//     * 关联—审核人员姓名
+//     */
+//    private String approveName;
     /**
-     * 关联—审核人员qc_id
+     * 管理员id
+     *
      */
-    private String approverId;
+    private Integer manageId;
 
     /**
-     * 关联—审核人员姓名
+     * 管理员姓名
      */
-    private String approveName;
-
+    private String manageName;
     /**
      * 审批状态（审批中、审批通过、退回……）
      * 关联enum类 TemActApproveStatus

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryActivityWrapper.java

@@ -54,7 +54,10 @@ public class TemporaryActivityWrapper {
      * 关联—审核人员(负责人)的战区、user
      */
     private String deptQcId;
-    private String approverId;
+
+//    private String approverId;
+
+    private Integer manageId;
 
     /**
      * 不查询的审批状态（审批中、审批通过、退回……）

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryClockWrapper.java

@@ -50,5 +50,5 @@ public class TemporaryClockWrapper {
     private String createDateEnd;
     private String nameLike;
     private String deptQcId;
-    private String chargerQcId;
+    private Integer chargerId;
 }

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java

@@ -40,7 +40,6 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
         try {
             activityPlanInfoMapper.saveList(table, recordId);
         } catch (PersistenceException e) {
-            e.printStackTrace();
             throw new DataException(RCode.ACTIVITY_PLAN_REPETITION_ERROR);
         }
     }
@@ -56,7 +55,6 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
                 activityPlanInfoMapper.updateOne(pdo, recordId);
             }
         } catch (PersistenceException e) {
-            e.printStackTrace();
             throw new DataException(RCode.ACTIVITY_PLAN_REPETITION_ERROR);
         }
     }
@@ -75,9 +73,13 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
 
     @Override
     public void save(ActivityPlanInfoDto planDto) {
-        ActivityPlanInfoDo planDo = new ActivityPlanInfoDo();
-        BeanUtils.copyProperties(planDto,planDo);
-        activityPlanInfoMapper.insert(planDo);
+        try {
+            ActivityPlanInfoDo planDo = new ActivityPlanInfoDo();
+            BeanUtils.copyProperties(planDto, planDo);
+            activityPlanInfoMapper.insert(planDo);
+        } catch (PersistenceException e) {
+            throw new DataException(RCode.ACTIVITY_PLAN_REPETITION_ERROR);
+        }
     }
 
     @Override

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryActivityReportedDto.java

@@ -79,16 +79,26 @@ public class TemporaryActivityReportedDto {
     private String deptQcId;
 
     private String deptQcOrgName;
-    /**
-     * 关联—审核人员qc_id
+//    /**
+//     * 关联—审核人员qc_id
+//     *
+//     */
+//    private String approverId;
+//
+//    /**
+//     * 关联—审核人员姓名
+//     */
+//    private String approveName;
+    /**
+     * 管理员id
      *
      */
-    private String approverId;
+    private Integer manageId;
 
     /**
-     * 关联—审核人员姓名
+     * 管理员姓名
      */
-    private String approveName;
+    private String manageName;
 
     /**
      * 审批状态（审批中、审批通过、退回……）

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryClockDto.java

@@ -54,7 +54,9 @@ public class TemporaryClockDto {
 
     String deptQcOrgName;
 
-    String chargerQcId;
+//    String chargerQcId;
+
+    Integer chargerId;
 
     String chargerName;
 

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityClockCoreServiceImpl.java

@@ -63,28 +63,28 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void clockInTodayActivity(TemporaryClockDto dto, Integer clockType) {
-        if (Objects.isNull(dto.getId())) {
-            // 补充信息
-            EmployeeActivityPlanInfoDto planInfoDto = employeeActivityPlanInfoDao.selectById(dto.getStoreId());
-            ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfoDto.getEmployeeId());
-
-            dto.setLineName(planInfoDto.getLineName())
-                    .setDeptQcId(employeeDto.getDeptQcId())
-                    .setDeptQcOrgName(employeeDto.getDeptQcName())
-                    .setChargerQcId(employeeDto.getQcId())
-                    .setChargerName(employeeDto.getName())
-                    .setActivityPatternId(planInfoDto.getActivityPatternId())
-                    .setActivityPattern(planInfoDto.getActivityPattern())
-                    .setDealerName(planInfoDto.getDealerName())
-                    .setQinceStoreCode(planInfoDto.getQinceStoreCode());
-            temporaryActivityClockDao.save(dto);
-        } else {
-            temporaryActivityClockDao.updateById(dto);
-        }
-        // 根据ID保存图片
-        saveClockPhoto(dto, clockType);
-        // 日志保存
-        tempActivityLogDao.save(dto.getTemporaryId(), dto.getTemporaryName(), LogType.t_1, dto.getId(), dto);
+//        if (Objects.isNull(dto.getId())) {
+//            // 补充信息
+//            EmployeeActivityPlanInfoDto planInfoDto = employeeActivityPlanInfoDao.selectById(dto.getStoreId());
+//            ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfoDto.getEmployeeId());
+//
+//            dto.setLineName(planInfoDto.getLineName())
+//                    .setDeptQcId(employeeDto.getDeptQcId())
+//                    .setDeptQcOrgName(employeeDto.getDeptQcName())
+//                    .setChargerQcId(employeeDto.getQcId())
+//                    .setChargerName(employeeDto.getName())
+//                    .setActivityPatternId(planInfoDto.getActivityPatternId())
+//                    .setActivityPattern(planInfoDto.getActivityPattern())
+//                    .setDealerName(planInfoDto.getDealerName())
+//                    .setQinceStoreCode(planInfoDto.getQinceStoreCode());
+//            temporaryActivityClockDao.save(dto);
+//        } else {
+//            temporaryActivityClockDao.updateById(dto);
+//        }
+//        // 根据ID保存图片
+//        saveClockPhoto(dto, clockType);
+//        // 日志保存
+//        tempActivityLogDao.save(dto.getTemporaryId(), dto.getTemporaryName(), LogType.t_1, dto.getId(), dto);
     }
 
     /**
@@ -135,7 +135,7 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
             dto.setLineName(planInfo.getLineName())
                     .setDeptQcId(employeeDto.getDeptQcId())
                     .setDeptQcOrgName(employeeDto.getDeptQcName())
-                    .setChargerQcId(employeeDto.getQcId())
+                    .setChargerId(employeeDto.getId())
                     .setChargerName(employeeDto.getName())
                     .setActivityPattern(planInfo.getPattern())
                     .setDealerName(planInfo.getDealerName())

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityCoreServiceImpl.java

@@ -64,7 +64,6 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
      *
      * @return 生成id
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public long activityDataReportedSave(TemporaryActivityReportedDto temActDto) {
         // 判断是否已存在保存数据

src/main/resources/mapper/TemporaryActivityReportedMapper.xml

@@ -12,8 +12,8 @@
 <!--        <result property="storeQcId" column="store_qc_id" jdbcType="BIGINT"/>-->
         <result property="storeName" column="store_name" jdbcType="VARCHAR"/>
         <result property="storeAddr" column="store_addr" jdbcType="VARCHAR"/>
-        <result property="approverId" column="approver_id" jdbcType="BIGINT"/>
-        <result property="approveName" column="approve_name" jdbcType="VARCHAR"/>
+        <result property="manageId" column="manage_id" jdbcType="INTEGER"/>
+        <result property="manageName" column="manage_name" jdbcType="VARCHAR"/>
         <result property="approveStatus" column="approve_status" jdbcType="VARCHAR"/>
         <result property="approveTime" column="approve_time" jdbcType="TIMESTAMP"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>