1. employee_activity_plan_info删除字段2. 计划表导入批量报错

src/main/java/com/wangxiaolu/promotion/domain/manage/dao/impl/EmployeeActivityPlanInfoDaoImpl.java

@@ -90,10 +90,6 @@ public class EmployeeActivityPlanInfoDaoImpl implements EmployeeActivityPlanInfo
             qw.eq(EmployeeActivityPlanInfoDO::getActivityMonth, wrapper.getActivityMonth());
         }
 
-        if (Objects.nonNull(wrapper.getActivityStartDate())) {
-            qw.eq(EmployeeActivityPlanInfoDO::getActivityStartDate, wrapper.getActivityStartDate());
-        }
-
         if (StringUtils.isNotBlank(wrapper.getDealerName())) {
             qw.like(EmployeeActivityPlanInfoDO::getDealerName, wrapper.getDealerName());
         }

src/main/java/com/wangxiaolu/promotion/domain/manage/mapper/entity/EmployeeActivityPlanInfoDO.java

@@ -82,30 +82,6 @@ public class EmployeeActivityPlanInfoDO implements Serializable {
      */
     private String activityPattern;
 
-    /**
-     * 活动开始日期
-     */
-    private Date activityStartDate;
-
-    /**
-     * 活动结束日期
-     */
-    private Date activityEndDate;
-
-    /**
-     * 虎皮场次
-     */
-    private Integer hupiCount;
-
-    /**
-     * 去骨场次
-     */
-    private Integer quguCount;
-
-    /**
-     * 促销员上班时间
-     */
-    private String temporaryOnTime;
     private Date createTime;
 
     private Date modifyTime;

src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/dto/EmployeeActivityPlanInfoDto.java

@@ -85,31 +85,6 @@ public class EmployeeActivityPlanInfoDto implements Serializable {
      */
     private String activityPattern;
 
-    /**
-     * 活动开始日期
-     */
-    private Date activityStartDate;
-
-    /**
-     * 活动结束日期
-     */
-    private Date activityEndDate;
-
-    /**
-     * 虎皮场次
-     */
-    private Integer hupiCount;
-
-    /**
-     * 去骨场次
-     */
-    private Integer quguCount;
-
-    /**
-     * 促销员上班时间
-     */
-    private String temporaryOnTime;
-
     private Integer activityStatus;
 
     /**

src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/ActivityPlanRecordCoreServiceImpl.java

@@ -57,15 +57,16 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
 
     private void saveActivityPlanInfo(ActivityPlanVo activityPlanVo, EmployeeActivityPlanRecordDto planDto) throws Exception {
         // 下载
-        String filePath = "/var/logs/activity_plan/" + activityPlanVo.getEmployeeNo() + "/" + planDto.getExcelFiledId();
-        downloadExcel(activityPlanVo.getExcelUrl(),filePath);
+//        String filePath = "/var/logs/activity_plan/" + activityPlanVo.getEmployeeNo() + "/" + planDto.getExcelFiledId();
+        String filePath = "/Users/a02200059/Desktop/错误图片/push/" + planDto.getExcelFiledId();
+        downloadExcel(activityPlanVo.getExcelUrl(), filePath);
         // 读取
         List<EmployeeActivityPlanInfoDto> planInfoDtos = readSheet0(filePath, activityPlanVo, planDto);
         // 保存
         employeeActivityPlanInfoDao.saveList(planInfoDtos);
     }
 
-    private void downloadExcel( String urlStr,String filePath) throws Exception{
+    private void downloadExcel(String urlStr, String filePath) throws Exception {
         // 保存文件
         URL url = new URL(urlStr);
         URLConnection urlConnection = url.openConnection();
@@ -91,7 +92,7 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
 
         Map<Object, Object> dealers = redisCache.getAllHash(RedisKeys.UserKeys.DEALER_HAVE_LIST.getKey());
         // 2、校验数据准确性
-        verifyRow(rows,dealers);
+        verifyRow(rows, dealers);
 
         /**
          * 3、保存入库
@@ -113,12 +114,7 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                     .setDealerName((String) dealers.get(value.get(1)))
                     .setLineName((String) value.get(2))
                     .setStoreName((String) value.get(3))
-                    .setActivityPattern((String) value.get(4))
-                    .setActivityStartDate((Date) value.get(5))
-                    .setActivityEndDate((Date) value.get(6))
-                    .setHupiCount(Integer.parseInt(StringUtils.isBlank((String)value.get(7)) ? "0" : (String) value.get(7)))
-                    .setQuguCount(Integer.parseInt(StringUtils.isBlank((String)value.get(8)) ? "0" : (String) value.get(8)))
-                    .setTemporaryOnTime((String) value.get(9));
+                    .setActivityPattern((String) value.get(4));
 
             planInfoDtos.add(planInfoDto);
         }
@@ -129,45 +125,48 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
      * 校验数据是否规范
      */
     private void verifyRow(Map<Integer, List<Object>> rows, Map<Object, Object> dealers) throws Exception {
+        StringBuilder msg = new StringBuilder();
+        List<String> storeList = new ArrayList<>();
         for (Map.Entry<Integer, List<Object>> entry : rows.entrySet()) {
-            Integer rowNo = entry.getKey()+1;
+            Integer rowNo = entry.getKey() + 1;
             List<Object> value = entry.getValue();
-            System.out.println(value);
 
-            String city = (String) value.get(0);
-            if (StringUtils.isBlank(city)) {
-                throw new DataException("第"+rowNo+"行 - 城市不可为空");
+            StringBuilder sb = new StringBuilder();
+
+            if (StringUtils.isBlank((String) value.get(0))) {
+                sb.append("城市不可为空；");
             }
 
-            String dealerId = (String) value.get(1);
-            if (!dealers.containsKey(dealerId.trim())) {
-                throw new DataException("第"+rowNo+"行 - 经销商编码错误");
+            if (!dealers.containsKey(((String) value.get(1)).trim())) {
+                sb.append("经销商编码错误；");
             }
 
-            String lineName = (String) value.get(2);
-            if (StringUtils.isBlank(lineName)) {
-                throw new DataException("第"+rowNo+"行 - 系统名称为空");
+            if (StringUtils.isBlank((String) value.get(2))) {
+                sb.append("系统名称不可为空；");
             }
 
             String storeName = (String) value.get(3);
             if (StringUtils.isBlank(storeName)) {
-                throw new DataException("第"+rowNo+"行 - 店铺名称为空");
+                sb.append("店铺名称不可为空；");
+            } else if (storeList.contains(storeName)) {
+                sb.append("店铺名称重复；");
+            } else {
+                storeList.add(storeName);
             }
 
-            String pattern = (String) value.get(4);
-            if (StringUtils.isBlank(pattern)) {
-                throw new DataException("第"+rowNo+"行 - 活动模式为空");
+            if (StringUtils.isBlank((String) value.get(4))) {
+                sb.append("活动模式不可为空；");
             }
 
-            Object activityStartDateO = value.get(5);
-            if (StringUtils.isBlank(activityStartDateO.toString()) || !(activityStartDateO instanceof Date)) {
-                throw new DataException("第"+rowNo+"行 - 活动开始时间为空或格式错误（请将【开始日期】【结束日期】两列设置为时间格式）");
+            if (sb.length() > 0) {
+                msg.append("第").append(rowNo).append("行：").append(sb);
             }
 
-            Object activityENDDateO = value.get(6);
-            if (StringUtils.isBlank(activityENDDateO.toString()) || !(activityENDDateO instanceof Date)) {
-                throw new DataException("第"+rowNo+"行 - 活动结束时间为空或格式错误（请将【开始日期】【结束日期】两列设置为时间格式）");
-            }
         }
+
+        if (msg.length() > 0) {
+            throw new DataException(msg.toString());
+        }
+
     }
 }

src/main/resources/mapper/EmployeeActivityPlanInfoMapper.xml

@@ -18,11 +18,11 @@
             <result property="lineName" column="line_name" jdbcType="VARCHAR"/>
             <result property="storeName" column="store_name" jdbcType="VARCHAR"/>
             <result property="activityPattern" column="activity_pattern" jdbcType="VARCHAR"/>
-            <result property="activityStartDate" column="activity_start_date" jdbcType="DATE"/>
-            <result property="activityEndDate" column="activity_end_date" jdbcType="DATE"/>
-            <result property="hupiCount" column="hupi_count" jdbcType="INTEGER"/>
-            <result property="quguCount" column="qugu_count" jdbcType="INTEGER"/>
-            <result property="temporaryOnTime" column="temporary_on_time" jdbcType="VARCHAR"/>
+<!--            <result property="activityStartDate" column="activity_start_date" jdbcType="DATE"/>-->
+<!--            <result property="activityEndDate" column="activity_end_date" jdbcType="DATE"/>-->
+<!--            <result property="hupiCount" column="hupi_count" jdbcType="INTEGER"/>-->
+<!--            <result property="quguCount" column="qugu_count" jdbcType="INTEGER"/>-->
+<!--            <result property="temporaryOnTime" column="temporary_on_time" jdbcType="VARCHAR"/>-->
             <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -39,14 +39,12 @@
     <insert id="saveList">
         insert into employee_activity_plan_info (activity_plan_record_id, excel_filed_id, employee_id, employee_name,
         employee_no, activity_month, city, dealer_id, dealer_name, line_name,
-        store_name, activity_pattern, activity_start_date, activity_end_date,
-        hupi_count, qugu_count, temporary_on_time)
+        store_name, activity_pattern)
         values
         <foreach collection="dos" item="item" separator=",">
             (#{item.activityPlanRecordId},#{item.excelFiledId},#{item.employeeId},#{item.employeeName},
             #{item.employeeNo},#{item.activityMonth},#{item.city},#{item.dealerId},#{item.dealerName},#{item.lineName},
-            #{item.storeName},#{item.activityPattern},#{item.activityStartDate},#{item.activityEndDate},
-            #{item.hupiCount},#{item.quguCount},#{item.temporaryOnTime})
+            #{item.storeName},#{item.activityPattern})
         </foreach>
     </insert>