计划单统计表审核结束日期调整

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

@@ -15,11 +15,14 @@ import org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview;
 import org.jeecg.modules.documents.costLossReview.service.ISyCostLossReviewService;
 import org.jeecg.modules.documents.orderData.entity.SyOrderData;
 import org.jeecg.modules.documents.orderData.service.ISyOrderDataService;
+import org.jeecg.modules.report.entity.AccessorItem;
 import org.jeecg.modules.report.entity.FabricLoss;
 import org.jeecg.modules.report.entity.SyFabricLossReport;
+import org.jeecg.modules.report.mapper.FabricLossMapper;
 import org.jeecg.modules.report.service.ISyFabricLossReportService;
 import org.jeecg.modules.syPlanStatistics.entity.SyPlanStatistics;
 import org.jeecg.modules.syPlanStatistics.service.ISyPlanStatisticsService;
+import org.jeecg.modules.system.util.oConvertUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +43,8 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
     private ISyPlanStatisticsService syPlanStatisticsService;
    @Autowired
    private ISyFabricLossReportService syFabricLossReportService;
+    @Autowired
+    private FabricLossMapper fabricLossMapper;
 
    /**
     * 分页列表查询
@@ -61,14 +66,16 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
        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(syCostLossReview.getFstatus()!=null && syCostLossReview.getFstatus()!="" || oConvertUtils.isNotEmpty(syCostLossReview.getFfirstApproveDate())){
+               //查面损的数据
+               List<String> list= syCostLossReviewService.queryCodeByfstatus(syCostLossReview.getFstatus(),syCostLossReview.getFfirstApproveDate());
                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);

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

@@ -32,7 +32,7 @@ public interface SyCostLossReviewMapper extends BaseMapper<SyCostLossReview> {
     @DS("multi-one")
     List<String> queryCodeBymaker(@Param("maker")String maker);
 
-    List<String> queryCodeByfstatus(@Param("status")String status);
+    List<String> queryCodeByfstatus(@Param("status")String status,@Param("ffirstApproveDate")String ffirstApproveDate);
     List<String> queryCodeBycstatus(@Param("status")String status);
     List<String> queryCodeByPlanTable(@Param("remarks")String remarks,@Param("planMan")String planMan);
 }

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

@@ -44,7 +44,7 @@
 
         ) t
         ) as views
-        where PATINDEX('%[吖-咗]%', planNo)=0 and PATINDEX('%.%', planNo)=0
+        where PATINDEX('%[吖-咗]%', planNo)=0 and PATINDEX('%.%', planNo)=0 and PATINDEX('%/%', planNo)=0
         <if test="e.planNo !=null and e.planNo !=''">
            and planNo like CONCAT(#{e.planNo},'%')
         </if>
@@ -310,7 +310,13 @@
     <select id="queryCodeByfstatus" resultType="String">
         select plan_code as cCode
         from sy_fabric_loss_report
-        where status=#{status}
+        <if test='status !="" and status != null'>
+            where status=#{status}
+        </if>
+        <if test='ffirstApproveDate !=""'>
+            where first_approve_date like concat(#{ffirstApproveDate},'%')
+        </if>
+
     </select>
     <select id="queryCodeBycstatus" resultType="String">
         select plan_num as cCode

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/ISyCostLossReviewService.java

@@ -23,7 +23,7 @@ public interface ISyCostLossReviewService extends IService<SyCostLossReview> {
      SyCostLossReview querySyFabricLossByCode(String planCode);
      SyCostLossReview queryCostAllocationByCode(String planCode);
      List<String> queryCodeBymaker(String maker);
-     List<String> queryCodeByfstatus(String status);
+     List<String> queryCodeByfstatus(String status,String ffirstApproveDate);
      List<String> queryCodeBycstatus(String status);
      List<String> queryCodeByPlanTable(String remarks,String planMan);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/impl/SyCostLossReviewServiceImpl.java

@@ -62,8 +62,8 @@ public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMap
     }
 
     @Override
-    public List<String> queryCodeByfstatus(String status) {
-        return syCostLossReviewMapper.queryCodeByfstatus(status);
+    public List<String> queryCodeByfstatus(String status,String ffirstApproveDate) {
+        return syCostLossReviewMapper.queryCodeByfstatus(status,ffirstApproveDate);
     }
 
     @Override