消息修改

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<PayContactsManagement, IPayContactsManagementService> {
-	@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;

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -737,6 +737,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 sendMessageDTO.setBusType("M_OPEN_TYPE2");
                 JSONObject json = new JSONObject();
                 json.put("revenueId",payIncomeContractNew.getId());
+                json.put("contractNum",payIncomeContractNew.getContractNum());
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             });
@@ -887,6 +888,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 sendMessageDTO.setBusType(finalType);
                 JSONObject json = new JSONObject();
                 json.put("revenueId",payIncomeContractStatus.getId());
+                json.put("contractNum",payIncomeContractStatus.getContractNum());
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             });

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

@@ -21,7 +21,4 @@ public class PayMailBillVO extends PayMailBill {
      */
     @TableField(exist = false)
     List<PayMailBillProject> bmpList;
-
-
-
 }

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")

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<PayMailBillMapper, PayMailBill> 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<PayMailBillMapper, PayMa
     private PayContactsManagementMapper payContactsManagementMapper;
     @Resource
     private PayMailBillMapper payMailBillMapper;
+    @Resource
+    private IPayContactsManagementService payContactsManagementService;
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -155,6 +157,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     projectName,chargeCompanyName,principalName,principalId,
                     i,bmpList.size());
         }
+        PayContactsManagement payContactsManagement = payContactsManagementService.getById(payMailBill.getContactId());
+        if(!Objects.isNull(payContactsManagement) && StringUtils.isEmpty(payContactsManagement.getEmail())){
+            payMailBill.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
+        }
         payMailBill.setProjectName(projectName.toString());
         payMailBill.setChargeCompanyName(chargeCompanyName.toString());
         payMailBill.setPrincipalName(principalName.toString());

jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -540,7 +540,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		LambdaQueryWrapper<SysUserRole> querySysUserRole = new LambdaQueryWrapper<>();
 		querySysUserRole.in(SysUserRole::getRoleId,listRoleId);
 		List<SysUserRole> listSysUserRole = sysUserRoleMapper.selectList(querySysUserRole);
-		if(StringUtils.isEmpty(listSysUserRole)){
+		if(CollectionUtils.isEmpty(listSysUserRole)){
 			return null;
 		}
 		List<String> listUserId = listSysUserRole.stream().map(SysUserRole::getUserId).collect(Collectors.toList());