From f73a4bf9fa15f938379d544ca94604cc57690a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 13 Oct 2021 18:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40557?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayCompanyManagementServiceImpl.java    | 16 +++++++++++++++-
 .../controller/SystemRemindersController.java    | 10 ----------
 .../entity/PayCompanyManagementTemporary.java    |  4 ++++
 3 files changed, 19 insertions(+), 11 deletions(-)

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 b91e2bb6..369c6e86 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
@@ -210,7 +210,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
             payCompanyManagementOld.setCompanyName(payCompanyManagement.getCompanyName());
             // 批量变更企业名称
-            updateBatchData(payCompanyManagementOld);
+            updateBatchData(payCompanyManagement);
         }else{
             // 如果该企业状态为通过，更新时间戳
             if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){
@@ -255,6 +255,20 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         updatePayCompanyManagementTemporary.eq(PayCompanyManagementTemporary::getCompanyId,payCompanyManagement.getId());
         updatePayCompanyManagementTemporary.ge(PayCompanyManagementTemporary::getEditTime,payCompanyManagement.getEditTime());
         updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyName,payCompanyManagement.getCompanyName());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyAddress,payCompanyManagement.getCompanyAddress());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyPhone,payCompanyManagement.getCompanyPhone());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getPostalCode,payCompanyManagement.getPostalCode());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getBankAccountName,payCompanyManagement.getBankAccountName());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getOpeningBank,payCompanyManagement.getOpeningBank());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getDutyCode,payCompanyManagement.getDutyCode());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getStatus,payCompanyManagement.getStatus());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getDataSource,payCompanyManagement.getDataSource());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getRemarks,payCompanyManagement.getRemarks());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getEditTime,payCompanyManagement.getEditTime());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCreateBy,payCompanyManagement.getCreateBy());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCreateTime,payCompanyManagement.getCreateTime());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateBy,payCompanyManagement.getUpdateBy());
+        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateTime,payCompanyManagement.getUpdateTime());
         payCompanyManagementTemporaryService.update(updatePayCompanyManagementTemporary);
         // 更新普通项目
         LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java
index e568c12b..398d3985 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java
@@ -1,13 +1,8 @@
 package com.jero.system.controller;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.quartz.entity.QuartzJob;
-import com.jero.modules.quartz.service.IQuartzJobService;
-import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.system.common.SystemRemindersCommon;
 import com.jero.system.vo.SystemRemindersVO;
 import io.swagger.annotations.Api;
@@ -16,14 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.quartz.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Objects;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
index f29a3b78..af7c526d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
@@ -68,6 +68,10 @@ public class PayCompanyManagementTemporary implements Serializable {
 	@Excel(name = "税号", width = 15)
     @ApiModelProperty(value = "税号")
     private java.lang.String dutyCode;
+    /**审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态*/
+//    @Excel(name = "审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态", width = 15)
+    @ApiModelProperty(value = "审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态")
+    private java.lang.String status;
 	/**数据来源(1：管理端，2：报名)*/
 	@Excel(name = "数据来源(1：财务人员，2：其他人)", width = 15)
     @ApiModelProperty(value = "数据来源(1：财务人员，2：其他人)")