财务--资金管理

src/main/java/com/ydtech/modules/inv/controller/invAccountExcelController.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.controller;
 
+import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
@@ -77,7 +78,14 @@ public class invAccountExcelController {
     @GetMapping("getAccountExcelById")
     public HttpResult<InvAccountExcel> getAccountExcelById(@RequestParam("excelAccountOperateId") String excelAccountOperateId) {
         if (excelAccountOperateId != null) {
-            return HttpResult.ok("", invAccountExcelService.getById(excelAccountOperateId));
+            InvAccountExcel byId = invAccountExcelService.getById(excelAccountOperateId);
+            StringBuilder a = new StringBuilder();
+            String[] split = byId.getPayMethod().split(",");
+            for (String i : split) {
+                a.append(InvPayMethodEnum.getNameByCode(i)).append(",");
+            }
+            byId.setPayMethod(a.toString());
+            return HttpResult.ok("", byId);
         } else {
             return HttpResult.error("id不能为空");
         }

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountExcelServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ydtech.modules.inv.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.base.controller.BaseController;
@@ -59,7 +61,18 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
         pageRequest.setPageNum(invAccountExcel.getPageNo());
         pageRequest.setPageSize(invAccountExcel.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        return HttpResult.ok("", insAccountExcelMapper.selectExcelAccount(page, invAccountExcel));
+        IPage<InvAccountExcel> invAccountExcelIPage = insAccountExcelMapper.selectExcelAccount(page, invAccountExcel);
+        List<InvAccountExcel> records = invAccountExcelIPage.getRecords();
+        for (InvAccountExcel record:records){
+            StringBuilder a = new StringBuilder();
+            String[] split = record.getPayMethod().split(",");
+            for (String i : split) {
+                a.append(InvPayMethodEnum.getNameByCode(i)).append(",");
+            }
+            record.setPayMethod(a.toString());
+        }
+        invAccountExcelIPage.setRecords(records);
+        return HttpResult.ok("", invAccountExcelIPage);
     }
 
     /**

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountOperateServiceImpl.java

@@ -4,9 +4,11 @@ package com.ydtech.modules.inv.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.inv.model.InvAccount;
+import com.ydtech.modules.inv.model.InvAccountExcel;
 import com.ydtech.modules.inv.model.InvAccountOperate;
 import com.ydtech.modules.inv.service.InvAccountOperateService;
 import com.ydtech.modules.inv.dao.InvAccountOperateMapper;
@@ -14,6 +16,8 @@ import com.ydtech.modules.inv.service.InvAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 import static com.ydtech.modules.inv.utils.TransferUtils.outsideTransfer;
 
 /**
@@ -43,7 +47,18 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         pageRequest.setPageNum(accountOperate.getPageNo());
         pageRequest.setPageSize(accountOperate.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        return insAccountOperateMapper.selectInsAccountOperate(page, accountOperate);
+        IPage<InvAccountOperate> invAccountOperateIPage = insAccountOperateMapper.selectInsAccountOperate(page, accountOperate);
+        List<InvAccountOperate> records = invAccountOperateIPage.getRecords();
+        for (InvAccountOperate record:records){
+            StringBuilder a = new StringBuilder();
+            String[] split = record.getPayMethod().split(",");
+            for (String i : split) {
+                a.append(InvPayMethodEnum.getNameByCode(i)).append(",");
+            }
+            record.setPayMethod(a.toString());
+        }
+        invAccountOperateIPage.setRecords(records);
+        return invAccountOperateIPage;
     }
 
     /**

src/main/resources/mapper/modules/inv/InvAccountExcelMapper.xml

@@ -27,6 +27,7 @@
             <result property="outFlag" column="out_flag" jdbcType="CHAR"/>
             <result property="outAccountQuality" column="out_account_quality" jdbcType="CHAR"/>
             <result property="delFlag" column="del_flag" jdbcType="CHAR"/>
+        <result property="payMethod" column="pay_method" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -36,7 +37,7 @@
         apply_amount,big_apply_amount,uplode_path,
         update_by,update_time,create_by,
         create_time,enter_account_id,out_account_id,
-        del_flag,out_flag,out_account_quality,transfer_flag
+        del_flag,out_flag,out_account_quality,transfer_flag,pay_method
     </sql>
     <select id="selectExcelAccount" resultType="com.ydtech.modules.inv.model.InvAccountExcel">
         select
@@ -116,5 +117,8 @@
         <if test="insAccountExcel.transferFlag!= null and insAccountExcel.transferFlag!= ''">
             and transfer_flag = #{insAccountExcel.transferFlag}
         </if>
+        <if test="insAccountExcel.payMethod!= null and insAccountExcel.payMethod!= ''">
+            and pay_method = #{insAccountExcel.payMethod}
+        </if>
     </select>
 </mapper>