From 13f70a5391a237e1383b0b064b09fd4aefb1d1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Sun, 26 Sep 2021 10:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 9 +++++---- .../service/impl/PayIncomeContractServiceImpl.java | 2 ++ .../src/main/java/com/jero/mail/PayMailBillVO.java | 3 --- .../java/com/jero/mail/entity/PayMailBill.java | 3 +++ .../mail/service/impl/PayMailBillServiceImpl.java | 14 ++++++++++---- .../system/service/impl/SysUserServiceImpl.java | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index c5ad73f0..f761a0ac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -5,6 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,13 +58,13 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/company/payContactsManagement") @Slf4j public class PayContactsManagementController extends JeroController { - @Autowired + @Resource private IPayContactsManagementService payContactsManagementService; - @Autowired + @Resource private IPayCompanyManagementService payCompanyManagementService; - @Autowired + @Resource private Environment env; - @Autowired + @Resource private ProjectCountService projectCountService; @Value("${defaultPassword}") private String defaultPassword; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 51edb634..f7515963 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -737,6 +737,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl bmpList; - - - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 31d5d787..46a437a4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -92,6 +92,9 @@ public class PayMailBill implements Serializable { @Excel(name = "联系人手机号", width = 15) @ApiModelProperty(value = "联系人手机号") private java.lang.String contactMobile; + /** 联系人邮箱*/ + @ApiModelProperty(value = "联系人邮箱") + private String email; /**开票时间*/ @Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 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 2a746884..d0a23e3b 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 @@ -11,13 +11,13 @@ import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayContactsManagementMapper; +import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.BillingInfo; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.mapper.PayMailBillMapper; -import com.jero.mail.mapper.PayMailBillProjectMapper; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; import com.jero.meeting.entity.PayMeeting; @@ -40,7 +40,6 @@ import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; 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; @@ -48,6 +47,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -58,9 +58,9 @@ import java.util.stream.Collectors; */ @Service public class PayMailBillServiceImpl extends ServiceImpl implements IPayMailBillService { - @Autowired + @Resource private IPayMailBillService payMailBillService; - @Autowired + @Resource private IPayMailBillProjectService payMailBillProjectService; @Resource private PayCommonProjectMapper payCommonProjectMapper; @@ -84,6 +84,8 @@ public class PayMailBillServiceImpl extends ServiceImpl selectMailBillVO(String projectId) { @@ -155,6 +157,10 @@ public class PayMailBillServiceImpl extends ServiceImpl impl LambdaQueryWrapper querySysUserRole = new LambdaQueryWrapper<>(); querySysUserRole.in(SysUserRole::getRoleId,listRoleId); List listSysUserRole = sysUserRoleMapper.selectList(querySysUserRole); - if(StringUtils.isEmpty(listSysUserRole)){ + if(CollectionUtils.isEmpty(listSysUserRole)){ return null; } List listUserId = listSysUserRole.stream().map(SysUserRole::getUserId).collect(Collectors.toList());