Browse Source

报销列表BUG修复

anderx 1 year ago
parent
commit
67c76ec252

+ 3 - 3
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -477,7 +477,7 @@
     </if>
     <if test="expenseMain ==1">
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
-      <if test="contractNo !=null">
+      <if test="contractNo !=null or username !=null">
         left join expense_relationship er on a.id=er.id
         left join expense_account sea on  er.ea_id=sea.id
         left join t_order_new e on sea.order_no =e.order_no
@@ -597,7 +597,7 @@
     </if>
     <if test="expenseMain ==1">
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
-      <if test="contractNo !=null">
+      <if test="contractNo !=null or username !=null">
         left join expense_relationship er on a.id=er.id
         left join expense_account sea on  er.ea_id=sea.id
         left join t_order_new e on sea.order_no =e.order_no
@@ -631,7 +631,7 @@
     </if>
     <if test="expenseMain ==1">
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
-      <if test="contractNo !=null">
+      <if test="contractNo !=null or username !=null">
         left join expense_relationship er on a.id=er.id
         left join expense_account sea on  er.ea_id=sea.id
         left join t_order_new e on sea.order_no =e.order_no

+ 3 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2250,6 +2250,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       <if test="contactNo !=null ">
         and  a.contract_no like concat('%' ,#{contactNo},'%')
       </if>
+      <if test="buyerName !=null ">
+        and  b.buyer_name like concat('%' ,#{buyerName},'%')
+      </if>
       <if test="depId !=null ">
         and a.order_dep = #{depId}
       </if>

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/bo/ExpenseCountsInput.java

@@ -5,12 +5,21 @@ public class ExpenseCountsInput {
     private String endTime;
     private String depId;
     private String contactNo;
+    private String buyerName;
 
     /**
      * 0:部门 1 订单
      */
     private Integer targetType;
 
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
     public String getStartTime() {
         return startTime;
     }

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseCountsServiceImpl.java

@@ -15,7 +15,7 @@ public class ExpenseCountsServiceImpl implements ExpenseCountsService {
     @Autowired
     private TOrderNewMapper tOrderNewMapper;
     @Override
-    @Cacheable(value = "getCounts#300", key = "'getCounts:key='+#in.startTime+#in.endTime+#in.depId+#in.contactNo+#in.targetType")
+    @Cacheable(value = "getCounts#300", key = "'getCounts:key='+#in.buyerName+#in.startTime+#in.endTime+#in.depId+#in.contactNo+#in.targetType")
     public Object getCounts(ExpenseCountsInput in) {
         if (in.getTargetType()==null)in.setTargetType(1);
         if (in.getTargetType()==1){