变更

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java

@@ -709,20 +709,22 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		}
     }
 
+
 	private void getMobile(List<PayMailBill> list) {
 		if (!CollectionUtils.isEmpty(list)) {
-			try {
-				list.forEach(p -> {
+			list.forEach(p -> {
+				try {
 					if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
 						p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
 					}
 					if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPrincipalPhone())) {
 						p.setPrincipalPhone(PasswordUtil.decrypt(p.getPrincipalPhone()));
 					}
-				});
-			} catch (Exception e) {
-				log.error("手机号解密异常！", e);
-			}
+				} catch (Exception e) {
+					log.error("手机号解密异常！", e);
+				}
+			});
+
 		}
 	}
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java

@@ -75,18 +75,19 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 		 Page<PayMailContracrList> page = new Page<>(pageNo, pageSize);
 		 IPage<PayMailContracrList> pageList = payMailContractService.pageContract(page, payMailContracrList);
 		 if (!CollectionUtils.isEmpty(pageList.getRecords())) {
-			 try {
-				 pageList.getRecords().forEach(p -> {
+			 pageList.getRecords().forEach(p -> {
+				 try {
 					 if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
 						 p.setMobile(PasswordUtil.decrypt(p.getMobile()));
 					 }
 					 String principalId = p.getPrincipalId();
 					 SysUser sysUser = sysUserService.getById(principalId);
 					 p.setPrincipalPhone(PasswordUtil.decrypt(sysUser.getPhone()));
-				 });
-			 } catch (Exception e) {
-				 log.error("手机号解密异常！", e);
-			 }
+				 } catch (Exception e) {
+					 log.error("手机号解密异常！", e);
+				 }
+			 });
+
 		 }
 		 return Result.OK(pageList);
 	 }
@@ -269,15 +270,16 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 			 payMailContracrList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailContracrList.getSignedCompanyTemporaryName()));
 			 List<PayMailContracrList> pageList = payMailContractService.pageContractTwo(payMailContracrList);
 			 if (!CollectionUtils.isEmpty(pageList)) {
-				 try {
-					 pageList.forEach(p -> {
+				 pageList.forEach(p -> {
+					 try {
 						 if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
 							 p.setMobile(PasswordUtil.decrypt(p.getMobile()));
 						 }
-					 });
-				 } catch (Exception e) {
-					 log.error("手机号解密异常！", e);
-				 }
+					 } catch (Exception e) {
+						 log.error("手机号解密异常！", e);
+					 }
+				 });
+
 			 }
 			 return AmountUtil.exportListXls(pageList, PayMailContracrList.class, "邮寄合同");
 		 } else {
@@ -286,15 +288,16 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 				 List<PayMailContracrList> list = payMailContractService.getOneExcel(strings);
 
 			 if (!CollectionUtils.isEmpty(list)) {
-				 try {
-					 list.forEach(p -> {
+				 list.forEach(p -> {
+					 try {
 						 if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
 							 p.setMobile(PasswordUtil.decrypt(p.getMobile()));
 						 }
-					 });
-				 } catch (Exception e) {
-					 log.error("手机号解密异常！", e);
-				 }
+					 } catch (Exception e) {
+						 log.error("手机号解密异常！", e);
+					 }
+				 });
+
 			 }
 			 return AmountUtil.exportListXls(list, PayMailContracrList.class, "邮寄合同");
 		 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java

@@ -31,4 +31,6 @@ public interface PayMailContractMapper extends BaseMapper<PayMailContract> {
 
     PayMailContracrList checkOne(@Param("id") String id);
 
+    void del();
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.mail.mapper.PayMailContractMapper">
+    <delete id="del">
+        delete from pay_mail_contract where contract_id not in (select id from pay_income_contract) and contract_type='2'
+    </delete>
     <select id="pageContract"  resultType="com.jero.mail.entity.PayMailContracrList">
 select * from(
         SELECT
@@ -8,8 +11,8 @@ select * from(
         pc.post_status as postStatus,
         pc.send_method as sendMethod,
         pc.post_no as postNo,
-        pc.liaison_man as liaisonMan,
-        pc.mobile,
+        pic.signed_contacts_temporary_name as liaisonMan,
+        pcmt.phone as mobile,
         pc.remark,
         pc.mailer,
         pc.send_date as sendDate,
@@ -46,8 +49,8 @@ union all
         pc.post_status as postStatus,
         pc.send_method as sendMethod,
         pc.post_no as postNo,
-        pc.liaison_man as liaisonMan,
-        pc.mobile,
+        psc.signed_contacts_temporary_name as liaisonMan,
+        psc.phone as mobile,
         pc.remark,
         pc.mailer,
         pc.send_date as sendDate,

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java

@@ -19,8 +19,6 @@ import java.util.List;
  */
 public interface IPayMailContractService extends IService<PayMailContract> {
 
-
-
     IPage<PayMailContracrList> pageContract(Page<PayMailContracrList> page, PayMailContracrList payMailContracrList);
 
     List<PayMailContracrList> pageContractExcel(QueryWrapper<PayMailContracrList> queryWrapper);
@@ -32,4 +30,6 @@ public interface IPayMailContractService extends IService<PayMailContract> {
     PayMailContracrList checkOne(String id);
 
 
+    void del();
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java

@@ -52,5 +52,10 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
         return payMailContractMapper.checkOne(id);
     }
 
+    @Override
+    public void del() {
+        payMailContractMapper.del();
+    }
+
 
 }