Merge branch 'feature-2022.07.29' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.07.29

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) {

eladmin-system/src/main/resources/template/note/notary-note.html

@@ -1,96 +1,97 @@
 <!doctype html>
 <html>
 <head>
-	<meta charset="UTF-8">
-	<title>问询笔录</title>
-	<style type="text/css">
-		.box {
-			/*border: 1px solid gray;*/
-			width: 554px;
-			margin: 0 auto;
-			padding: 0px 120px;
-			/*font-family: "Songti SC Regular";*/
-			font-family: FZFangSong-Z02S;
-			line-height: 28px;
-			font-size: 14px;
-		}
-		.box table.tb {
-			width: 100%;
-			border-top: 1px solid #ddd;
-		}
-		.box table.tb td {
-			border-bottom: 1px solid #ddd;
-			padding: 0 10px;
-		}
-		.box table.tb td.left {
-			border-left: 1px solid #ddd;
-			width: 50%;
-		}
-
-
-		.box h1 {
-			font-size: 18px;
-			display: block;
-			width: 100%;
-			text-align: center;
-			padding-top: 5px;
-		}
-		.box p {
-			font-size: 14px;
-			text-indent: 24px;
-		}
-		.box ul {
-			list-style: none;
-			padding: 0;
-			margin: 0;
-		}
-		.box ul.b {
-			font-size: 14px;
-		}
-		.box ul.b li {
-			list-style:none;
-			padding-top:5px;
-		}
-		.box h3 {
-			text-align: right;
-			font-size: 14px;
-		}
-		.box h3.sign {
-			padding-right: 140px;
-		}
-		.box h3 i {
-			font-style: normal;
-			padding-left: 50px;
-		}
-	</style>
+<meta charset="UTF-8">
+<title>问询笔录</title>
+<style type="text/css">
+.box {
+    /*border: 1px solid gray;*/
+    width: 554px;
+    margin: 0 auto;
+    padding: 0px 40px;
+    font-family: FZFangSong-Z02S;	
+	font-size: 12px;
+}
+.box h1 {
+    font-size: 18px;
+    display: block;
+    width: 100%;
+    text-align: center;
+    padding-top: 5px;
+}
+.box p {
+    font-size: 12px;
+	padding: 8px 0 0 0;
+	margin: 0;
+	line-height: 22px;
+}
+.box table.tb {
+    width: 100%;
+    border-top: 1px solid #cccbcb;
+    font-size: 13px;
+}
+.box table.tb td {
+    border-bottom: 1px solid #cccbcb;
+    padding: 8px 5px;
+}
+.box table.tb td.left {
+    border-left: 1px solid #cccbcb;
+    width: 50%;
+}
+.box ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+.box ul.b {
+	line-height: 20px;
+}
+.box ul.b li {
+    list-style: none;
+}
+.box ul.b li.answer {
+    padding-bottom: 10px;
+}
+.box h3 {
+    text-align: right;
+    /*font-size: 12px;*/
+}
+.box h3.sign {
+    padding-right: 140px;
+}
+.box h3 i {
+    font-style: normal;
+    padding-left: 50px;
+}
+</style>
 </head>
 
 <body>
 <div class="box">
-	<h1>公证问询笔录</h1>
-	<table border="0" cellspacing="0" cellpadding="0" class="tb">
-		<tr>
-			<td>询问日期：${yyyyMMdd}</td>
-			<td class="left">询问地点：江苏省南通市南通公证处</td>
-		</tr>
-		<tr>
-			<td>询问人：${NotaryUserName}</td>
-			<td class="left">记录人：${NotaryUserName}</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				被询问人：<br/>
-				${QueryUsers}
-			</td>
-		</tr>
-	</table>
-	<p>公证人员已告知被询问人：被询问人应当如实说明申请公证事项的有关情况，提供真实、合法、充分的证明材料。因说明不属实引起的法律责任由被询问人承担。</p>
-	被询问内容：<br/>
-	<ul class="b">
-		${QuestionAnswerList}
-	</ul>
-	<h3 class="sign">公证当事人签章：<span style="color:#fff;">signature</span></h3>
-	<h3>日期：${yyyyMMdd}</h3>
+  <h1>公证问询笔录</h1>
+  <table border="0" cellspacing="0" cellpadding="0" class="tb">
+    <tr>
+      <td>询问日期：${yyyyMMdd}</td>
+      <td class="left">询问地点：江苏省南通市南通公证处</td>
+    </tr>
+    <tr>
+      <td>询问人：${NotaryUserName}</td>
+      <td class="left">记录人：${NotaryUserName}</td>
+    </tr>
+    <tr>
+      <td colspan="2"> 
+		<b>被询问人：</b><br/>
+        ${QueryUsers}
+	  </td>
+    </tr>
+  </table>
+  <p>　　公证人员已告知被询问人：被询问人应当如实说明申请公证事项的有关情况，提供真实、合法、充分的证明材料。因说明不属实引起的法律责任由被询问人承担。</p>
+  <p><b>被询问内容：</b></p>
+  <ul class="b">
+    ${QuestionAnswerList}
+  </ul>
+  <h3 class="sign">公证当事人签章：<span style="color:#fff;">signature</span></h3>
+  <h3>日期：${yyyyMMdd}</h3>
 </div>
 </body>
 </html>