Merge branch 'xuqiubiangeng1026'

# Conflicts: # jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
2021-11-01 11:15:08 +08:00
parent 7de8c7ff0d 3ce7e52009
commit ec253597ab
32 changed files with 929 additions and 176 deletions
@@ -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.service.RolePermissionService;
@@ -17,9 +19,10 @@ 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.PayMemberProject;
 import com.jero.member.entity.PayMemberProjectSubitem;
 import com.jero.member.service.IPayMemberProjectService;
@@ -28,12 +31,15 @@ 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;
@@ -59,6 +65,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
    @Resource
    private IPayContactsManagementService contactsManagementService;
    @Resource
+    private IPayIncomeContractService payIncomeContractService;
+    @Resource
    private ISysBaseAPI sysBaseAPI;
    @Resource
    private RolePermissionService rolePermissionService;
@@ -239,6 +247,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)) {
@@ -287,6 +296,17 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
                    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);

@@ -16,6 +16,8 @@ import com.jero.member.service.IPayMemberProjectService;
 import com.jero.member.service.IPayMemberProjectSubitemService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayCommonProject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +21,7 @@ import com.jero.member.mapper.PayMemberProjectMapper;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayCommonProject;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -209,6 +210,21 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 				payMemberProjectSubitem.setMail(projectStatusVO.getMail());
 			}
 		}
+		// 选择无
+		if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY1)){
+			payMemberProjectSubitem.setContractNo(null);
+			payMemberProjectSubitem.setChargeNoticeNo(null);
+			payMemberProjectSubitem.setChargeNoticeFileId(null);
+		}
+		// 选择合同
+		if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
+			payMemberProjectSubitem.setChargeNoticeNo(null);
+			payMemberProjectSubitem.setChargeNoticeFileId(null);
+		}
+		// 选择收费通知
+		if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY3)){
+			payMemberProjectSubitem.setContractNo(null);
+		}
 		validMemberProjectSubitemEdit(payMemberProjectSubitem,payMemberProjectSubitem1);
 		saveOrUpdate(payMemberProjectSubitem);
 	}