From 475b430d44e401082ba495d1f4847edc7a24a06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 22 Oct 2021 10:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9#40376?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/controller/PayCompanyManagementController.java  | 2 ++
 .../service/impl/PayCompanyManagementServiceImpl.java       | 6 ++++++
 .../java/com/jero/mail/mapper/xml/PayMailBillMapper.xml     | 4 ++--
 .../controller/PayWorkingGroupDataFileController.java       | 6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index 4d47221f..48a8d0ec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -45,6 +45,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -277,6 +278,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	@RequiresPermissions("company:add")
 	@ApiOperation(value="企业管理-添加", notes="企业管理-添加")
 	@PostMapping(value = "/add")
+	@Transactional
 	public Result<?> add(@RequestBody PayCompanyManagement payCompanyManagement) {
 		if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
 			payCompanyManagement.setCompanyPhone(null);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
index 02d78df1..31ac9b74 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
@@ -122,6 +122,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
     @Override
     @Transactional
     public void companyEdit(PayCompanyManagement payCompanyManagement) {
+        if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
+            payCompanyManagement.setCompanyPhone(null);
+        }
         StringBuilder msg = ValidUtil.validateAll(payCompanyManagement);
         if(!StringUtils.isBlank(msg)){
             throw new JeroBootException(msg.toString());
@@ -173,6 +176,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
     @Override
     @Transactional
     public void edit(PayCompanyManagement payCompanyManagement) {
+        if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
+            payCompanyManagement.setCompanyPhone(null);
+        }
         StringBuilder msg = ValidUtil.validateAll(payCompanyManagement);
         if(!StringUtils.isBlank(msg)){
             throw new JeroBootException(msg.toString());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index 024171c2..12a5ca91 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -51,9 +51,9 @@
     </select>
     <select id="getMonthMailCount" resultType="java.lang.Integer">
         select count(*) from (
-        select id from pay_mail_bill WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
+        select id from pay_mail_bill WHERE DATE_FORMAT(send_date,'%Y-%m') = #{time} AND post_status = '1'
         UNION ALL
-        select id from  pay_mail_contract WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
+        select id from  pay_mail_contract WHERE DATE_FORMAT(send_date,'%Y-%m') = #{time} AND post_status = '1'
         ) A
     </select>
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
index de122192..4084b714 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
@@ -300,7 +300,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
 			zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
 			for (OSSFile ossFile : listOSSFile) {
-				File file = new File(upLoadPath + "\\" + ossFile.getUrl());
+				File file = new File(upLoadPath + File.separator + ossFile.getUrl());
 				if(file.exists()){
 					try {
 						//添加ZipEntry，并ZipEntry中写入文件流w
@@ -386,12 +386,12 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
 			 zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
 			 zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
 			 for (String path : paths){
-				 File file = new File(upLoadPath + "\\" + path);
+				 File file = new File(upLoadPath + File.separator + path);
 				 if(file.exists()){
 					 try {
 						 //添加ZipEntry，并ZipEntry中写入文件流w
 						 //这里，防止要下载的文件有重名的导致下载失败
-						 zipos.putNextEntry(new ZipEntry("folder/"+ file.getName()));
+						 zipos.putNextEntry(new ZipEntry("folder" + File.separator + file.getName()));
 						 os = new DataOutputStream(zipos);
 						 InputStream is = new FileInputStream(file);
 						 byte[] b = new byte[100];