pom文件修改版本信息；员工上传门店计划添加批量上传模块；取消部分log打印

pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.wangxiaolu</groupId>
     <artifactId>wangxiaolu-promotion-service</artifactId>
 
-    <version>0.1.11</version>
+    <version>0.1.12</version>
 
     <name>wangxiaolu-promotion-service</name>
     <description>promotion-service</description>

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

@@ -86,6 +86,9 @@ public class ManageEmployeeInfoInfoDaoImpl implements ManageEmployeeInfoDao {
         if (ewrap.isHasDeptQcId()){
             qw.ne(ManageEmployeeInfoDO::getDeptQcId,"");
         }
+        if (!CollectionUtils.isEmpty(ewrap.getEmployeeNos())){
+            qw.in(ManageEmployeeInfoDO::getEmployeeNo,ewrap.getEmployeeNos());
+        }
         return qw;
     }
 

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

@@ -51,7 +51,6 @@ public class PromotionStoreDaoImpl implements PromotionStoreDao {
         PromotionStoreDO storeDo = new PromotionStoreDO();
         BeanUtils.copyProperties(promotionStoreDto, storeDo);
         promotionStoreMapper.insert(storeDo);
-        log.info("录入店铺：{}", JSONObject.toJSONString(storeDo));
     }
 
     @Override

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

@@ -34,7 +34,6 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
     @Override
     public void saveReportedList(Integer temporaryId, Long reportedId, Integer photoType, List<String> urls, List<String> changeUrls) {
         if (CollectionUtils.isEmpty(changeUrls)) {
-            log.info("活动id[{}]图片无改变值", reportedId);
             return;
         }
 
@@ -45,7 +44,6 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
             String uId = uArr[uArr.length - 1];
             urlTypeMap.put(uId, type);
         }
-        log.info("活动id[{}]图片修改后的list为：{}", reportedId, urlTypeMap);
 
 
         for (String photoUrl : urls) {
@@ -53,7 +51,6 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
             String photoFiledId = photoArr[photoArr.length - 1];
             String type = urlTypeMap.get(photoFiledId);
 
-            log.info("图片文件id[{}]类型为{}", photoFiledId, type);
             // 现存图片列表中不存在，删除
             if (StringUtils.isBlank(type)) {
                 temporaryActivityPhotoMapper.updateIsDelete(reportedId, photoFiledId);
@@ -180,7 +177,6 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
         }
 
         temporaryActivityPhotoMapper.insert(photoDo);
-        log.info("保存促销员打卡图片：{}", photoDo);
     }
     /**
      * DO to DTO (单个对象)

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

@@ -48,7 +48,6 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         tDo.setCreateDate(DateUtil.today());
 
         temporaryActivityReportedMapper.insert(tDo);
-        log.info("促销员今日活动上报数据完成，生成id[{}]，数据信息：{}", tDo.getId(), tDo);
         return tDo.getId();
     }
 

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

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Set;
+
 /**
  * @author : liqiulin
  * @date : 2024-09-20 11
@@ -21,5 +23,7 @@ public class ManageEmployeeWrapper {
 
     private String employeeNo;
 
+    private Set<String> employeeNos;
+
     private boolean hasDeptQcId;
 }

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

@@ -26,6 +26,8 @@ public class EmployeeActivityPlanRecordDO implements Serializable {
      */
     private Integer employeeId;
 
+    private String employeeName;
+
     /**
      * 文件http地址
      */

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

@@ -24,6 +24,8 @@ public class EmployeeActivityPlanRecordDto implements Serializable {
      */
     private Integer employeeId;
 
+    private String employeeName;
+
     /**
      * 文件http地址
      */

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

@@ -55,7 +55,6 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void clockInTodayActivity(TemporaryClockDto dto, Integer clockType) {
-        log.info("促销员当日打卡[type-{}]信息保存：{}", clockType, dto.toString());
         if (Objects.isNull(dto.getId())) {
             // 补充信息
             EmployeeActivityPlanInfoDto planInfoDto = employeeActivityPlanInfoDao.selectById(dto.getStoreId());

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

@@ -103,6 +103,5 @@ public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivity
             temporaryClockDto.setClockOutPhotoUpdateTime(clockOutPhotoDto.getUpdateTime());
         }
 
-        log.info("查询打卡记录{}的所有图片:{}", temporaryClockDto.getId(), photoGroup);
     }
 }

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

@@ -259,6 +259,5 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
         if (!CollectionUtils.isEmpty(temActDto.getPsvPhotoUrls())) {
             tempActivityPhotoDao.saveReportedList(temporaryId, reportedId, ActivityPhotoType.POS_SELL_VOUCHER.getType(), temActDto.getPsvPhotoUrls(), temActDto.getPsvChangePhotoUrls());
         }
-        log.info("促销员今日活动上报-图片保存成功，关联活动上报数据id[{}]，数据信息：{}", temActDto.getId(), temActDto);
     }
 }

src/main/java/com/wangxiaolu/promotion/service/user/impl/PromotionServiceImpl.java

@@ -29,7 +29,6 @@ public class PromotionServiceImpl implements PromotionService {
         Integer userCount = userInfoDao.findUserByUserName(userLoginParam.getLoginName());
         if (1 == userCount){
             // 生成登录信息
-            log.info("生成登录信息：{}",userLoginParam.getLoginName());
             return;
         }
         throw new ParamException(RCode.LOGIN_PARAM_ERROR,null);