LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangqinlin
2021-08-31 11:05:35 +08:00
parent ef9ac2f20b 46bdd4662f
commit f6d696d7ab
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java
+27 -2
View File
@@ -17,6 +17,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,8 +43,11 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
private IPayCommonProjectService payCommonProjectService;
@Autowired
private IPayContactsManagementService payContactsManagementService;
/**
@Autowired
private ISysUserService sysUserService;
/**
* 分页列表查询
*
* @param payCommonProject
@@ -97,12 +102,17 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
}
PayContactsManagement contactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
PayContactsManagement mailContactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
SysUser principalName = sysUserService.getById(payCommonProject.getPrincipalId());
if(Objects.isNull(contactsName)){
return Result.error("联系人名称为空！");
}
if(Objects.isNull(mailContactsName)){
return Result.error("邮寄联系人名称为空！");
}
if(Objects.isNull(principalName)){
return Result.error("负责人名称为空！");
}
payCommonProject.setPrincipalName(principalName.getRealname());
payCommonProject.setContactsName(contactsName.getName());
payCommonProject.setMailContactsName(mailContactsName.getName());
payCommonProject.setPackaging(PayProjectCommon.PACKAGING0);
@@ -139,6 +149,21 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
log.info("普通项目管理-编辑异常",e);
return Result.error("来款项目已存在！");
}
PayContactsManagement contactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
PayContactsManagement mailContactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
SysUser principalName = sysUserService.getById(payCommonProject.getPrincipalId());
if(Objects.isNull(contactsName)){
return Result.error("联系人名称为空！");
}
if(Objects.isNull(mailContactsName)){
return Result.error("邮寄联系人名称为空！");
}
if(Objects.isNull(principalName)){
return Result.error("负责人名称为空！");
}
payCommonProject.setPrincipalName(principalName.getRealname());
payCommonProject.setContactsName(contactsName.getName());
payCommonProject.setMailContactsName(mailContactsName.getName());
payCommonProjectService.updateById(payCommonProject);
return Result.OK("编辑成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java
-2
View File
@@ -57,8 +57,6 @@ public class PayCommonProject implements Serializable {
/**负责人名称*/
@Excel(name = "负责人名称", width = 15)
@ApiModelProperty(value = "负责人名称")
@NotEmpty(message = "负责人名称不能为空！")
@Size(max = 50,message = "负责人名称长度应小于50个字符")
private String principalName;
/**来款企业id*/
@Excel(name = "来款企业id", width = 15)