管理平台-查询记录上报列表

src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeCoreTemActivityController.java

@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.*;
 /**
  * @author : liqiulin
  * @date : 2024-06-03 14
- * @describe : 员工操作审批
+ * @describe : 员工操作审批 - 当前未使用此功能，当前逻辑：数据上报默认审批通过，无需人工审核
  */
 @Slf4j
 @RestController
-@RequestMapping("/activity/employee/core")
+//@RequestMapping("/activity/employee/core")
 public class EmployeeCoreTemActivityController {
 
     @Autowired
@@ -27,7 +27,7 @@ public class EmployeeCoreTemActivityController {
     /**
      * 员工审批上报活动数据
      */
-    @PostMapping("/approve/{id}")
+//    @PostMapping("/approve/{id}")
     public R approveActivity(@PathVariable("id") long reportedId,@RequestBody ApproveVO approveVO) {
         if (TemActApproveStatus.SEND_BACK.equals(approveVO.getApproveStatus()) && StringUtils.isBlank(approveVO.getApproveReason())){
             throw new ParamException(RCode.SEND_BACK_REASON_NOT,null);

src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeQueryTemActivityController.java

@@ -25,9 +25,10 @@ public class EmployeeQueryTemActivityController {
      *
      * @param loginQcId 员工
      * @return 活动数据
+     * @RequestHeader("loginQcId") String loginQcId
      */
     @PostMapping("/page")
-    public R findActivitys(@RequestHeader("loginQcId") String loginQcId, @RequestBody PageInfo pageInfo) {
+    public R findActivitys(String loginQcId, @RequestBody PageInfo pageInfo) {
         employeeQueryTemActivityService.getEmployeeApproveActivityPage(loginQcId, pageInfo);
         return R.success(pageInfo);
     }

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

@@ -114,9 +114,18 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         if (!StringUtils.isEmpty(tw.getTemporaryName())) {
             queryWrapper.like(TemporaryActivityReportedDO::getTemporaryName, tw.getTemporaryName());
         }
+        if (!StringUtils.isEmpty(tw.getProvince())) {
+            queryWrapper.eq(TemporaryActivityReportedDO::getProvince, tw.getProvince());
+        }
+        if (!StringUtils.isEmpty(tw.getCity())) {
+            queryWrapper.eq(TemporaryActivityReportedDO::getCity, tw.getCity());
+        }
+        if (Objects.nonNull(tw.getCreateDateStart()) && Objects.nonNull(tw.getCreateDateEnd())) {
+            queryWrapper.between(TemporaryActivityReportedDO::getCreateTime, tw.getCreateDateStart(), tw.getCreateDateEnd());
+        }
 
         // 默认创建日期倒序排列
-        queryWrapper.orderByDesc(TemporaryActivityReportedDO::getCreateDate);
+        queryWrapper.orderByDesc(TemporaryActivityReportedDO::getId);
         return queryWrapper;
     }
 

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

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author : liqiulin
  * @date : 2024-04-09 18
@@ -21,6 +23,21 @@ public class TemporaryActivityWrapper {
     private Integer temporaryId;
 
     private String temporaryName;
+
+    private String province;
+
+    private String city;
+
+    /**
+     * 日期区间 - start
+     */
+    private Date createDateStart;
+
+    /**
+     * 日期区间 - end
+     */
+    private Date createDateEnd;
+
     /**
      * 创建时间YYYY-MM-DD
      */

src/main/java/com/wangxiaolu/promotion/service/activity/employee/impl/EmployeeQueryTemActivityServiceImpl.java

@@ -35,11 +35,13 @@ public class EmployeeQueryTemActivityServiceImpl implements EmployeeQueryTemActi
     @Autowired
     TemporaryActivityMarketCellDao temporaryActivityMarketCellDao;
 
+    /**
+     *  tw.setApproverId(employeeQcId)
+     */
     @Override
     public void getEmployeeApproveActivityPage(String employeeQcId, PageInfo pageInfo) {
         TemporaryActivityWrapper tw = JSONObject.parseObject(JSONObject.toJSONString(pageInfo.getQueryParams()), TemporaryActivityWrapper.class);
         tw = Objects.isNull(tw) ? new TemporaryActivityWrapper() : tw;
-//        tw.setApproverId(employeeQcId)
         tw.setNotApproveStatus(TemActApproveStatus.SUBMITTED.name());
         temporaryActivityReportedDao.findPage(tw, pageInfo);