Pārlūkot izejas kodu

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

anderx 2 gadi atpakaļ
vecāks
revīzija
35c77f6da2

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

@@ -765,7 +765,9 @@
            c.district_name districtName,c.user_names userNames,c.secondary_type ,c.secondary_type_other,c.attachment_url,
            c.duration,pr.plan,pro.contract_no sonContractNo,
            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
+           d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,
+           date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
+           date_format(d.agree_time,'%Y-%m-%d')agreeTime
     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
@@ -836,7 +838,9 @@
     <result column="open_bank" jdbcType="VARCHAR" property="openBank" />
     <result column="bank_accounts" jdbcType="VARCHAR" property="bankAccounts" />
     <result column="open_bank_address" jdbcType="VARCHAR" property="openBankAddress" />
-
+    <result column="startTime" jdbcType="VARCHAR" property="startTime" />
+    <result column="endTime" jdbcType="VARCHAR" property="endTime" />
+    <result column="agreeTime" jdbcType="VARCHAR" property="agreeTime" />
   </resultMap>
 
   <update id="updateByIds" >

+ 26 - 0
src/main/java/com/goafanti/expenseAccount/bo/SonExpenseAccountDetails.java

@@ -12,6 +12,9 @@ public class SonExpenseAccountDetails {
     private String  endDistrict;
     private Integer  vehicle;
     private String  vehicleOther;
+    private String  startTime;
+    private String  endTime;
+    private String  agreeTime;
 
     /**
      * 付款方式
@@ -48,6 +51,29 @@ public class SonExpenseAccountDetails {
      */
     private String openBankAddress;
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getAgreeTime() {
+        return agreeTime;
+    }
+
+    public void setAgreeTime(String agreeTime) {
+        this.agreeTime = agreeTime;
+    }
 
     public Integer getPayType() {
         return payType;

+ 0 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -69,7 +69,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     @Override
     public Integer add(InputExpenseAccount in) {
-
         //如果关联公出,获取公出信息
         if (in.getPrid()!=null){
             PublicRelease pr = publicReleaseMapper.selectByPrimaryKey(in.getPrid());
@@ -450,7 +449,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 pushFinanceCount(admin.getDepFinance(),useEa.getCreateTime(),3);
             }
         }
-
         //审核处理审核表
         pushExpenseAccountExamine(in);
         expenseAccountMapper.updateByPrimaryKeySelective(newEa);