Browse Source

新增获取借支列表接口

anderx 2 years ago
parent
commit
c1ad86159f

+ 5 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -3,6 +3,9 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.ExpenseAccount;
 import com.goafanti.expenseAccount.bo.InputExpenseAccount;
 import com.goafanti.expenseAccount.bo.OutExpenseAccount;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ExpenseAccountMapper {
     int deleteByPrimaryKey(Integer id);
@@ -20,4 +23,6 @@ public interface ExpenseAccountMapper {
     OutExpenseAccount selectByid(Integer id);
 
     OutExpenseAccount selectByaidAndPrid(InputExpenseAccount in);
+
+    List<OutExpenseAccount> selectByaidAndType(@Param("aid") String aid, @Param("type")Integer type);
 }

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

@@ -264,10 +264,11 @@
   </update>
 
   <sql id="selectDtailsSql">
-    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,d.name ,d.bank ,d.accounts ,
+    a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, 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,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
@@ -276,7 +277,8 @@
     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
+    left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
+    left join t_order_mid tm on a.order_no =tm.order_no
     WHERE a.id= #{id}
   </select>
 
@@ -339,4 +341,13 @@
     WHERE a.status= #{status}
     and a.prid= #{prid} and a.aid = #{aid}
   </select>
+    <select id="selectByaidAndType" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
+      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 left join t_order_new o on a.order_no =o.order_no
+      left join t_order_mid tm on a.order_no =tm.order_no
+      WHERE a.status=2
+      and a.aid= #{aid} and a.type= #{type}
+    </select>
 </mapper>

+ 4 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountList.java

@@ -0,0 +1,4 @@
+package com.goafanti.expenseAccount.bo;
+
+public class OutExpenseAccountList {
+}

+ 11 - 0
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -182,4 +182,15 @@ public class ExpenseAccountController extends CertifyApiController {
         return res;
     }
 
+    /**
+     * 获取借支列表
+     * @return
+     */
+    @RequestMapping(value = "/selectDebitOrder",method = RequestMethod.GET)
+    public Result selectDebitOrder(){
+        Result res=new Result();
+        res.setData(expenseAccountService.selectDebitOrder());
+        return res;
+    }
+
 }

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

@@ -29,4 +29,6 @@ public interface ExpenseAccountService {
     Object selectById(Integer id);
 
     Object updateType(InputExpenseAccount in);
+
+    List<OutExpenseAccount> selectDebitOrder();
 }

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

@@ -258,6 +258,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         return expenseAccountMapper.updateByPrimaryKeySelective(in);
     }
 
+    @Override
+    public List<OutExpenseAccount> selectDebitOrder() {
+        String aid= TokenManager.getAdminId();
+        return expenseAccountMapper.selectByaidAndType(aid,4);
+    }
+
     private void addParam(InputPageListBo in, Map<String, Object> param) {
         param.put("aid",TokenManager.getAdminId());
         if (in.getStartTime()!=null&&in.getEndTime()!=null){