anderx лет назад: 2
Родитель
Сommit
8655e48dd0

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountPrivateMapper.java

@@ -25,4 +25,6 @@ public interface ExpenseAccountPrivateMapper {
     ExpenseAccountPrivate selectByAccount(String accounts);
 
     OutExpenseAccountPrivate selectById(Integer id);
+
+    Integer selectByaidDefault(String aid);
 }

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

@@ -267,7 +267,8 @@
     a.id, a.prid, a.order_no orderNo, a.aid, a.aname, a.`type`, a.type_other typeOther , a.status, a.process_status processStatus,
            a.total_amount totalAmount, a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,
            a.district_name districtName, a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,
-           b.name appDepName,c.name payDepName,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
+           b.name appDepName,c.name payDepName,d.name ,d.bank ,d.accounts ,
+           date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
             date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
             date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
   </sql>
@@ -275,6 +276,7 @@
     SELECT
     <include refid="selectDtailsSql"/>
     FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+    left join expense_account_private d on a.eaaid=d.id
     WHERE a.id= #{id}
   </select>
 
@@ -329,6 +331,7 @@
     SELECT
     <include refid="selectDtailsSql"/>
     FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+    left join expense_account_private d on a.eaaid=d.id
     WHERE a.status= #{status}
     and a.prid= #{prid} and a.aid = #{aid}
   </select>

+ 5 - 0
src/main/java/com/goafanti/common/mapper/ExpenseAccountPrivateMapper.xml

@@ -172,6 +172,11 @@
     from expense_account_private
     where id= #{id}
   </select>
+    <select id="selectByaidDefault" resultType="java.lang.Integer">
+      select id
+      from expense_account_private
+        where aid=#{aid} and status=1
+    </select>
 
 
 </mapper>

+ 27 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccount.java

@@ -13,6 +13,33 @@ public class OutExpenseAccount extends ExpenseAccount {
     private String releaseEndStr;
     private String appDepName;
     private String payDepName;
+    private String name;
+    private String bank;
+    private String accounts;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBank() {
+        return bank;
+    }
+
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    public String getAccounts() {
+        return accounts;
+    }
+
+    public void setAccounts(String accounts) {
+        this.accounts = accounts;
+    }
 
     public String getCreateTimeStr() {
         return createTimeStr;

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

@@ -40,6 +40,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private WeChatUtils weChatUtils;
     @Autowired
     private ExpenseAccountDetailsMapper expenseAccountDetailsMapper;
+    @Autowired
+    private ExpenseAccountPrivateMapper expenseAccountPrivateMapper;
 
 
 
@@ -59,6 +61,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setUserNames(pr.getUserNames());
             in.setDuration(pr.getDuration());
         }
+        Integer eaaid = expenseAccountPrivateMapper.selectByaidDefault(in.getAid());
+        in.setEaaid(eaaid);
         expenseAccountMapper.insertSelective(in);
         addExpenseAccountLog(in.getId(),0,"创建报销");
         return in.getId();