订单统计报表 优化查询逻辑

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/controller/SyCostLossReviewController.java

@@ -58,35 +58,57 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
                                   @RequestParam(name="pageSize", defaultValue="50") Integer pageSize,
                                   HttpServletRequest req) {
        Page<SyCostLossReview> page = new Page<SyCostLossReview>(pageNo, pageSize);
+       IPage<SyCostLossReview> nullList = new Page<>();
        List<String> sumList = new ArrayList<>();
        if(syCostLossReview.getPlanNo()=="" || syCostLossReview.getPlanNo()==null){
            if(syCostLossReview.getFstatus()!=null && syCostLossReview.getFstatus()!=""){
                List<String> list= syCostLossReviewService.queryCodeByfstatus(syCostLossReview.getFstatus());
+               if(list.size()<1){
+                   return Result.OK(nullList);
+               }
                sumList=list;
            }
            if(syCostLossReview.getCstatus()!=null && syCostLossReview.getCstatus()!=""){
                List<String> list= syCostLossReviewService.queryCodeBycstatus(syCostLossReview.getCstatus());
+               if(list.size()<1){
+                   return Result.OK(nullList);
+               }
                if(sumList.size()<1){
                    sumList=list;
                }else {
                    sumList.retainAll(list);
+                   if(sumList.size()<1){
+                       return Result.OK(nullList);
+                   }
                }
            }
            if(syCostLossReview.getMaker()!=null && syCostLossReview.getMaker()!=""){
                List<String> list= syCostLossReviewService.queryCodeBymaker(syCostLossReview.getMaker());
+               if(list.size()<1){
+                   return Result.OK(nullList);
+               }
                if(sumList.size()<1){
                    sumList=list;
                }else {
                    sumList.retainAll(list);
+                   if(sumList.size()<1){
+                       return Result.OK(nullList);
+                   }
                }
            }
            if((syCostLossReview.getRemarks()!=null && syCostLossReview.getRemarks()!="") ||
                    (syCostLossReview.getPlanMan()!=null && syCostLossReview.getPlanMan()!="") ){
                List<String> list= syCostLossReviewService.queryCodeByPlanTable(syCostLossReview.getRemarks(),syCostLossReview.getPlanMan());
+               if(list.size()<1){
+                   return Result.OK(nullList);
+               }
                if(sumList.size()<1){
                    sumList=list;
                }else {
                    sumList.retainAll(list);
+                   if(sumList.size()<1){
+                       return Result.OK(nullList);
+                   }
                }
            }
            if(sumList.size()<1){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -339,7 +339,7 @@
             and remarks=#{remarks}
         </if>
         <if test="planMan!=null and planMan!=''">
-            and plan_man={planMan}
+            and plan_man=#{planMan}
         </if>