1.其他支出收入单前端对接

2.收付款单前端对接

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/BankinformationController.java

@@ -1,8 +1,11 @@
 package com.usoftchina.saas.document.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Bankinformation;
 import com.usoftchina.saas.document.service.BankinformationService;
+import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,8 +34,8 @@ public class BankinformationController {
     }
 
     @GetMapping("/list")
-    public Result getAll(){
-        List<Bankinformation> bankinformationList = bankinformationService.findAll();
+    public Result getAll(PageRequest page, ListReqDTO condition){
+        PageInfo<Bankinformation> bankinformationList = bankinformationService.selectList(page, condition);
         return Result.success(bankinformationList);
     }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BankinformationMapper.java

@@ -2,6 +2,9 @@ package com.usoftchina.saas.document.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Bankinformation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface BankinformationMapper extends CommonBaseMapper<Bankinformation> {
     int deleteByPrimaryKey(Integer bkId);
@@ -17,4 +20,6 @@ public interface BankinformationMapper extends CommonBaseMapper<Bankinformation>
     int updateByPrimaryKeyWithBLOBs(Bankinformation record);
 
     int updateByPrimaryKey(Bankinformation record);
+
+    List<Bankinformation> selectBankinformationBycondition(@Param("con") String con, @Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/BankinformationService.java

@@ -1,8 +1,14 @@
 package com.usoftchina.saas.document.service;
 
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Bankinformation;
 import com.usoftchina.saas.document.mapper.BankinformationMapper;
+import com.usoftchina.saas.page.PageRequest;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author heqw
@@ -13,5 +19,7 @@ public interface BankinformationService extends CommonBaseService<Bankinformatio
 
     boolean removeByPrimaryKey(int id);
 
+    PageInfo<Bankinformation> selectList(PageRequest page, ListReqDTO condition);
+
 
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -1,11 +1,19 @@
 package com.usoftchina.saas.document.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.entities.Bankinformation;
 import com.usoftchina.saas.document.mapper.BankinformationMapper;
 import com.usoftchina.saas.document.service.BankinformationService;
+import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
 
 /**
  * @author heqw
@@ -31,4 +39,33 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         bankinformationMapper.deleteByPrimaryKey(id);
         return true;
     }
+
+    @Override
+    public PageInfo<Bankinformation> selectList(PageRequest page, ListReqDTO condition) {
+        //设置默认分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<Bankinformation> recbalancesList = this.getListByMode(condition);
+        //取分页信息
+        PageInfo<Bankinformation> pageInfo = new PageInfo<Bankinformation>(recbalancesList);
+        return pageInfo;
+    }
+
+    private List<Bankinformation> getListByMode(ListReqDTO req) {
+        List<Bankinformation> recbalancesList = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        if (StringUtils.isEmpty(req)) {
+            return  null;
+        }
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
+        recbalancesList = bankinformationMapper.selectBankinformationBycondition(con, companyId);
+        return recbalancesList;
+    }
 }

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -320,4 +320,18 @@
   <select id="selectAll" resultMap="BaseResultMap">
     SELECT * FROM bankinformation
   </select>
+
+  <select id="selectBankinformationBycondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from bankinformation
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and   bankinformation.companyId = #{companyId}
+      </if>
+    </where>  order by bk_id
+  </select>
 </mapper>