Browse Source

报销开发子报销列表新增字段

anderx 2 years ago
parent
commit
ed897b3941

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

@@ -763,13 +763,14 @@
            b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
            c.id sonId,c.total_amount sonAmount,c.`type` ,c.type_other ,c.user_names ,c.release_start ,c.release_end ,
            c.district_name districtName,c.user_names userNames,c.secondary_type ,c.secondary_type_other,c.attachment_url,
-           c.duration,
+           c.duration,pr.plan,
            d.id detId,d.`type` detType,d.amount,d.real_amount realAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
            d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address
     from expense_relationship a left join expense_account b on a.id =b.id
      left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
      left join t_order_new o on b.order_no =o.order_no left join expense_account_private eap on b.eaaid =eap.id
      left join expense_account c on a.ea_id =c.id left join expense_account_details d on c.id =d.eaid
+     left join public_release pr on c.prid=pr.id
   </sql>
 
   <select id="selectListByMainId" resultMap="BaseResultMap">
@@ -815,6 +816,7 @@
     <result column="release_end" jdbcType="VARCHAR" property="releaseEnd" />
     <result column="districtName" jdbcType="VARCHAR" property="districtName" />
     <result column="duration" jdbcType="VARCHAR" property="duration" />
+    <result column="plan" jdbcType="VARCHAR" property="plan" />
     <association property="detList" resultMap="ExpenseAccountDetailsMap"></association>
   </resultMap>
 

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

@@ -16,8 +16,17 @@ public class SonExpenseAccount {
     private String secondaryTypeOther;
     private String attachmentUrl;
     private String duration;
+    private String plan;
     private List<SonExpenseAccountDetails> detList;
 
+    public String getPlan() {
+        return plan;
+    }
+
+    public void setPlan(String plan) {
+        this.plan = plan;
+    }
+
     public String getDuration() {
         return duration;
     }