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-10-28 16:08:35 +08:00
parent 0f6ac2b1db
commit 4ad3f471ec
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+1 -1
View File
@@ -1115,7 +1115,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
// 能关联上合同
if(!Objects.isNull(payIncomeContract)){
if(!Objects.equals(payIncomeContract.getSignedCompanyId(),companyId)){
throw new JeroBootException("关联合同中签订单位与项目中来款企业不匹配！");
throw new JeroBootException("关联合同中签订单位与项目中来款企业不匹配");
}
return payIncomeContract;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+22 -2
View File
@@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
@@ -16,21 +18,25 @@ import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ValidUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.member.vo.PayMemberProjectSubitemExcel;
import com.jero.project.common.PayProjectCommon;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -54,6 +60,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@Resource
private IPayContactsManagementService contactsManagementService;
@Resource
private IPayIncomeContractService payIncomeContractService;
@Resource
private ISysBaseAPI sysBaseAPI;
/**
@@ -206,6 +214,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@AutoLog(value = "会员项目成员表-导入数据")
@ApiOperation(value = "会员项目成员表-导入数据", notes = "会员项目成员表-通过id查询")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@Transactional
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
String projectId = request.getParameter("projectId");
if (StringUtils.isBlank(projectId)) {
@@ -253,6 +262,17 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
} else {
errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
}
if (Objects.equals(Integer.parseInt(paymentTypeMap.get(paymentMethod)), PayProjectCommon.CHARGE_WAY2)) {
// 合同编号验证
LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper();
queryPayIncomeContract.eq(PayIncomeContract::getContractNum,projectSubitemExcel.getContractNo());
queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,projectSubitemExcel.getCompanyId());
List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
if(CollectionUtils.isEmpty(listPayIncomeContract)){
errorMessage.add("第" + errorRowNum + "行:合同号不存在");
}
}
//复制属性
BeanUtils.copyProperties(projectSubitemExcel, projectSubitem);
@@ -266,7 +286,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
if (!errorMessage.isEmpty()) {
StringBuilder msg = new StringBuilder();
for (String s : errorMessage) {
msg.append(s).append("，请修改！<br/>");
msg.append(s).append(",请修改！<br/>");
}
throw new JeroBootException(msg.toString());
}