兼容邮储产品

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/BankOrderController.java

@@ -68,7 +68,9 @@ public class BankOrderController extends BaseController {
         String phone = jsonObj.getString("phone");
         String status = jsonObj.getString("status");
         String contractNo = jsonObj.getString("contractNo");
-        List<BankOrderVO> list = bankOrderService.getContractOrderList(contractNo, phone, status);
+        Long index = jsonObj.getLong("index");
+        Long size = jsonObj.getLong("size");
+        List<BankOrderVO> list = bankOrderService.getContractOrderList(contractNo, phone, status, index, size);
         return ResponseDTO.success(list);
     }
 

eladmin-system/src/main/java/me/zhengjie/application/bank/service/BankOrderService.java

@@ -23,9 +23,11 @@ public interface BankOrderService {
 	 * @param contractNo
 	 * @param phone
 	 * @param status
+	 * @param index
+	 * @param size
 	 * @return
 	 */
-	List<BankOrderVO> getContractOrderList(String contractNo, String phone, String status);
+	List<BankOrderVO> getContractOrderList(String contractNo, String phone, String status, Long index, Long size);
 
 	/**
 	 * 订单详情

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankOrderServiceImpl.java

@@ -84,11 +84,11 @@ public class BankOrderServiceImpl implements BankOrderService {
 	}
 
 	@Override
-	public List<BankOrderVO> getContractOrderList(String contractNo, String phone, String status) {
+	public List<BankOrderVO> getContractOrderList(String contractNo, String phone, String status, Long index, Long size) {
 		SysUserEntity user = sysUserRepository.getUserWithPhone(phone);
 		List<BankOrderVO> volist = new ArrayList<>();
 		if (user != null) {
-			List<ContractOrderEntity> entiryList = contractOrderRepository.searchOrderWithContractNo(String.valueOf(user.getUserId()), status, contractNo);
+			List<ContractOrderEntity> entiryList = contractOrderRepository.searchOrderWithContractNo(String.valueOf(user.getUserId()), status, contractNo, index, size);
 			volist = BeanCopyUtils.convertList2List(entiryList, BankOrderVO.class);
 		}
 		return volist;

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/ContractOrderRepository.java

@@ -2,6 +2,8 @@ package me.zhengjie.dao.mybatis;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.dao.mybatis.mapper.*;
@@ -139,21 +141,25 @@ public class ContractOrderRepository {
     }
 
     /**
-     * 根据合同号查询订单
+     * 根据合同号分页查询订单
      *
      * @param customerId
      * @param status
      * @param contractNo
+     * @param index
+     * @param size
      * @return
      */
-    public List<ContractOrderEntity> searchOrderWithContractNo(String customerId, String status, String contractNo) {
+    public List<ContractOrderEntity> searchOrderWithContractNo(String customerId, String status, String contractNo, Long index, Long size) {
+        IPage<ContractOrderEntity> page = new Page<>(index, size);
         QueryWrapper<ContractOrderEntity> qw = new QueryWrapper<>();
         qw.eq("customer_id", customerId);
         qw.eq("status", status);
         if (!StringUtils.isEmpty(contractNo)) {
             qw.like("contract_no", contractNo);
         }
-        return contractOrderMapper.selectList(qw);
+        page = contractOrderMapper.selectPage(page, qw);
+        return page.getRecords();
     }
 
     /**

eladmin-system/src/main/java/me/zhengjie/domain/model/ModelSynthesizerDomain.java

@@ -152,8 +152,8 @@ public class ModelSynthesizerDomain {
         String htmlContent = "";
         String modelContent = readFileInString("template/note/notary-note.html");
         for (NotaryNoteDto noteDto : notaryNoteDtoList) {
-            htmlContent = htmlContent.concat("<li>").concat("问：").concat(noteDto.getQuestion())
-                    .concat("<br>答：").concat(noteDto.getAnswer()).concat("</li>");
+            htmlContent = htmlContent.concat("<li class=\"question\">问：").concat(noteDto.getQuestion()).concat("</li>")
+                    .concat("<li class=\"answer\">答：").concat(noteDto.getAnswer()).concat("</li>");
         }
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         htmlContent = modelContent.replace("${QuestionAnswerList}", htmlContent).replace("${yyyyMMdd}",
@@ -186,8 +186,8 @@ public class ModelSynthesizerDomain {
     private String composeNotePartyList(String businessNo) {
         ContractOrderEntity order = contractOrderRepository.getContractOrderWithBizNo(businessNo);
         BankEntity bank = bankMapper.selectById(order.getBankId());
-        String lender = "贷款人：" + bank.getBankName() + "，住所：" + bank.getAddress() + "，负责人：" + bank.getPrincipal() + "<br/>";
-        String template = "$Title$：$Name$，$Sex$，$Birth$出生，公民身份证号码：$IdCard$，联系电话：$Phone$<br/>";
+        String lender = "贷款人：" + bank.getBankName() + "，住所：" + bank.getAddress() + "，负责人：" + bank.getPrincipal() + "<br/><br/>";
+        String template = "$Title$：$Name$，$Sex$，$Birth$出生，公民身份证号码：$IdCard$，联系电话：$Phone$<br/><br/>";
         List<Map<String, String>> userList = prepareNotePartyTemplateData(order);
         String users = lender;
         for (Map<String, String> map : userList) {