From 31bb31760bf748fe0492cb91c817205c598c4d02 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 14 Oct 2021 09:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java     | 13 +++++++++----
 .../impl/PayPaymentRecordServiceImpl.java        | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 045d88e3..40c4e072 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -46,8 +46,11 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -96,6 +99,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private PayMailBillProjectMapper payMailBillProjectMapper;
     @Resource
     PayCompanyManagementMapper payCompanyManagementMapper;
+    @Autowired
+    private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -131,7 +136,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         //票据关联项目表
         List<PayMailBillProject> bmpList = payMailBill.getBmpList();
 
-        //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额
+        //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额，企业名称是否审核
         String res = checkCompanyProject(bmpList);
         if (!"success".equals(res)) {
             return Result.error(res);
@@ -276,7 +281,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     }
 
 
-    //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额
+    //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额，企业名称是否审核
     private String checkCompanyProject(List<PayMailBillProject> bmpList) {
         String standardCompanyId = null;//基准公司id
 
@@ -398,8 +403,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     break;
             }
 
-            PayCompanyManagement payCompanyManagement = payCompanyManagementMapper.selectById(standardCompanyId);
-            if(2 == payCompanyManagement.getStatus()){
+            PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(standardCompanyId);
+            if("2".equals(payCompanyManagement.getStatus()) ){
                 return "企业名称未审核，需要审核后开票";
             }
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 307e1867..1fd8d71c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -26,6 +26,7 @@ import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.project.vo.PayCommonProjectOutput;
 import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -78,6 +79,14 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      */
     @Override
     public List<PayCommonProject> mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate){
+
+        //如果前端传来模糊查询的字段有%，就替换掉它
+        if(!StringUtils.isBlank(payCommonProject.getChargeProject())){
+            payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject()));
+        }
+        if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){
+            payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
+        }
         return payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate);
     }
 
@@ -499,6 +508,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType,String paymentDate, Class<PayCommonProjectOutput> clazz, String title) {
 
         // Step.2 获取导出数据
+        //如果前端传来模糊查询的字段有%，就替换掉它
+        if(!StringUtils.isBlank(payCommonProject.getChargeProject())){
+            payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject()));
+        }
+        if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){
+            payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
+        }
         List<PayCommonProjectOutput> pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject, projectType,paymentDate);
         pageList.forEach(p-> {
             if (!Objects.isNull(p.getChargeUse())) {