feat: update something

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysImplementPlanController.java

@@ -53,12 +53,30 @@ public class SysImplementPlanController {
     }
 
 
+    /**
+     * 获取执行计划分页（web使用）
+     *
+     * @param query 分页条件
+     * @return 分页结果
+     */
     @GetMapping(value = "/plan/page")
     public R<Page<?>> pagePlans(@Validated SysImplementPlanDTO.OnPage query) {
 
         return R.ok(implementPlanManager.pagePlans(query, SecurityUtils.getUser()));
     }
 
+    /**
+     * 获取执行计划分页（web使用）
+     *
+     * @param query 分页条件
+     * @return 分页结果
+     */
+    @PostMapping(value = "/plan/app/page")
+    public R<Page<?>> pagePlans1(@Validated @RequestBody SysImplementPlanDTO.OnPage query) {
+
+        return R.ok(implementPlanManager.pagePlans(query, SecurityUtils.getUser()));
+    }
+
     @SuppressWarnings("unchecked")
     @GetMapping(value = "/plan/children/list")
     public R<List<Tree<Integer>>> listPlanChildren(@Validated SysImplementPlanDTO.OnPage query) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -38,13 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -246,6 +240,8 @@ public class SysImplementPlanManager {
                                            LocalDate[] period) {
 
         LambdaQueryWrapper<SysImplementPlan> wrapper = Wrappers.<SysImplementPlan>lambdaQuery()
+                .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
+                .eq(Objects.nonNull(consignorId), SysImplementPlan::getConsignorId, consignorId)
                 .like(StrUtil.isNotBlank(planName), SysImplementPlan::getPlanName, planName);
 
         // 服务商管理员（只查询发给我的）

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -801,7 +801,7 @@
 			<if test="scorePackageName != null">
 				AND o.score_package_name like CONCAT('%',#{scorePackageName},'%')
 			</if>
-			<if test="allocationDate != null and allocationDate != '' and endLabelDate != null and endLabelDate != ''">
+			<if test="allocationDate != null and endLabelDate != null">
 				AND (o.allocation_date BETWEEN #{allocationDate} AND #{endLabelDate})
 			</if>
 			<if test="acceptSug != null and acceptSug != ''">