Prechádzať zdrojové kódy

成本新增A/B标记查询

huxy 14 hodín pred
rodič
commit
89c330bc5f

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/CostAllocationReview.java

@@ -133,6 +133,8 @@ public class CostAllocationReview {
     //附件
     private String attachs;
 
+    @TableField(exist = false)
+    private String signNum;
     //标记(A)数量
 //    @TableField(exist = false)
     private java.math.BigDecimal signNumA;

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

@@ -372,6 +372,15 @@ GROUP BY planNo;
         <if test='sy.rejectDate != null and sy.rejectDate !="" and sy.rejectDate == "1"'>
             AND b.stuta = '驳回'
         </if>
+
+        <if test='sy.signNum != null and sy.signNum !="" and sy.signNum=="1"'>
+            AND JSON_EXTRACT( a.cost_info, '$.signNumA' ) <![CDATA[<]]>0
+        </if>
+        <if test='sy.signNum != null and sy.signNum !="" and sy.signNum=="2"'>
+            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=")">
@@ -498,11 +507,10 @@ GROUP BY planNo;
             AND b.stuta = '驳回'
         </if>
 
-
-        <if test="sy.signNumA != null and sy.signNumA !=''">
+        <if test='sy.signNum != null and sy.signNum !="" and sy.signNum=="1"'>
             AND JSON_EXTRACT( a.cost_info, '$.signNumA' ) <![CDATA[<]]>0
         </if>
-        <if test="sy.signNumB != null and sy.signNumB !=''">
+        <if test='sy.signNum != null and sy.signNum !="" and sy.signNum=="2"'>
             AND JSON_EXTRACT( a.cost_info, '$.signNumB' ) >=0
             AND JSON_EXTRACT( a.cost_info, '$.signNumB' ) <![CDATA[<]]>0.8
         </if>