Переглянути джерело

成本分配列表导出调整

huxy 1 день тому
батько
коміт
6dceaf0dc2

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

@@ -585,10 +585,10 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
         for(CostAllocationReview li:pageList.getRecords()){
             li.setSignA("");
             li.setSignB("");
-            if (li.getSignNumA()!=null&&li.getSignNumA().doubleValue()>0){
+            if (li.getSignNumA()!=null&&li.getSignNumA().doubleValue()<0){
                 li.setSignA("red");
             }
-            if (li.getSignNumB()!=null&&li.getSignNumB().doubleValue()>0.8){
+            if (li.getSignNumB()!=null&&li.getSignNumB().doubleValue()<0.8&&li.getSignNumB().doubleValue()>=0){
                 li.setSignB("blue");
             }
             //查询指派人
@@ -598,7 +598,7 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
             }else{
                 li.setApprovalMan("");
             }
-
+//            System.out.println("计划单号  "+li.getPlanNum()+"  signA  "+li.getSignA()+"  signB  "+li.getSignB()+"  SignNumA  "+li.getSignNumA()+"  SignNumB  "+li.getSignNumB());
         }
         //获取模板输入流
         InputStream inStream = new FileInputStream("D:\\单证模板\\成本分配列表.xlsx");

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

@@ -497,6 +497,16 @@ GROUP BY planNo;
         <if test='sy.rejectDate != null and sy.rejectDate !="" and sy.rejectDate == "1"'>
             AND b.stuta = '驳回'
         </if>
+
+
+        <if test="sy.signNumA != null and sy.signNumA !=''">
+            AND JSON_EXTRACT( a.cost_info, '$.signNumA' ) <![CDATA[<]]>0
+        </if>
+        <if test="sy.signNumB != null and sy.signNumB !=''">
+            AND JSON_EXTRACT( a.cost_info, '$.signNumB' ) >=0
+            AND JSON_EXTRACT( a.cost_info, '$.signNumB' ) <![CDATA[<]]>0.8
+        </if>
+
         <if test="sy.status != null and sy.status !=''">
             AND a.status in
             <foreach collection="status" item="value" index="index" open="(" separator="," close=")">