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

去掉联系人名称校验

Browse Source
This commit is contained in:
梁琦涛
2021-08-31 10:50:52 +08:00
parent 0928f7e649
commit 192d6f5fbe
2 changed files with 22 additions and 15 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
+22 -11
View File
@@ -15,6 +15,8 @@ import com.jero.commonProject.entity.PayCommonProject;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,8 @@ import io.swagger.annotations.ApiOperation;
public class PayCommonProjectController extends JeroController<PayCommonProject, IPayCommonProjectService> {
@Autowired
private IPayCommonProjectService payCommonProjectService;
@Autowired
private IPayContactsManagementService payContactsManagementService;
/**
* 分页列表查询
@@ -49,23 +53,20 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
*/
@ApiOperation(value="普通项目管理-分页列表查询", notes="普通项目管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<PayCommonProject>> queryPageList(PayCommonProject payCommonProject,
public Result<?> queryPageList(PayCommonProject payCommonProject,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="paymentDate",required = false) String paymentDate,
HttpServletRequest req) {
// if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){
// return Result.error("来款项目长度应小于100个字符");
// }
// if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){
// return Result.error("来款单位长度应小于50个字符");
// }
Result<IPage<PayCommonProject>> result = new Result<>();
if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){
return Result.error("来款项目长度应小于100个字符");
}
if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){
return Result.error("来款单位长度应小于50个字符");
}
Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
IPage<PayCommonProject> pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate);
result.setSuccess(true);
result.setResult(pageList);
return result;
return Result.OK(pageList);
}
/**
@@ -94,6 +95,16 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
log.info("普通项目管理-添加异常",e);
return Result.error("来款项目已存在！");
}
PayContactsManagement contactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
PayContactsManagement mailContactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
if(Objects.isNull(contactsName)){
return Result.error("联系人名称为空！");
}
if(Objects.isNull(mailContactsName)){
return Result.error("邮寄联系人名称为空！");
}
payCommonProject.setContactsName(contactsName.getName());
payCommonProject.setMailContactsName(mailContactsName.getName());
payCommonProject.setPackaging(PayProjectCommon.PACKAGING0);
payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT2);
payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE2);
jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java
-4
View File
@@ -86,8 +86,6 @@ public class PayCommonProject implements Serializable {
/**联系人名称*/
@Excel(name = "联系人名称", width = 15)
@ApiModelProperty(value = "联系人名称")
@NotEmpty(message = "联系人名称不能为空！")
@Size(max = 50,message = "联系人名称长度应小于50个字符")
private String contactsName;
/**应收金额（元）*/
@Excel(name = "应收金额（元）", width = 15)
@@ -109,8 +107,6 @@ public class PayCommonProject implements Serializable {
/**邮寄联系人名称*/
@Excel(name = "邮寄联系人名称", width = 15)
@ApiModelProperty(value = "邮寄联系人名称")
@NotEmpty(message = "邮寄联系人名称不能为空！")
@Size(max = 50,message = "邮寄联系人名称长度应小于50个字符")
private String mailContactsName;
/**打包（1：是，0：否）*/
@Excel(name = "打包（1：是，0：否）", width = 15)