Przeglądaj źródła

公出&报销表与导出开发

anderx 1 rok temu
rodzic
commit
ded977aad6

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -751,7 +751,7 @@
     </select>
     <select id="releaseAndExpenseCount" resultType="com.goafanti.weChat.bo.releaseAndExpenseCountOut">
         select
-            a.order_no orderNo,a.contract_no contractNo,b.buyer_name buyerName,b.salesman_name salesmanName,
+            a.order_no orderNo,a.contract_no contractNo,b.buyer_name buyerName,b.salesman_name salesmanName,b.dep_name depName,
             toc.max_duration maxDuration ,toc.actual_duration actualDuration ,
             toc.exceed_duration exceedDuration, a.total_amount totalAmount,a.settlement_amount settlementAmount,b.bid_type bidType,
             c.expenseCount,c.peopleCount,c.notExamine,c.rejectCount,d.paymentAmount,c.days,c.amount expenseAmount

+ 1 - 1
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -32,7 +32,7 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.common.bo.OutPoverty");
 		pc.addAccept("com.goafanti.common.bo.OutPovertyFlag");
 		pc.addAccept("com.goafanti.expenseAccount.bo.ExpenseCountsBo");
-		pc.addAccept("com.goafanti.expenseAccount.bo.ExpenseCountsOrder");
+		pc.addAccept("com.goafanti.weChat.bo.releaseAndExpenseCountOut");
 
 	}
 

+ 10 - 0
src/main/java/com/goafanti/weChat/bo/releaseAndExpenseCountOut.java

@@ -12,6 +12,8 @@ public class releaseAndExpenseCountOut {
     private String contractNo;
     @Excel(name = "客户名称")
     private String buyerName;
+    @Excel(name = "部门名称")
+    private String depName;
     @Excel(name = "营销员名称")
     private String salesmanName;
 
@@ -42,6 +44,14 @@ public class releaseAndExpenseCountOut {
     private Integer rejectCount;
     private Integer exceedType;
 
+    public String getDepName() {
+        return depName;
+    }
+
+    public void setDepName(String depName) {
+        this.depName = depName;
+    }
+
     public String getSalesmanName() {
         return salesmanName;
     }