添加工作组列表

2021-09-03 16:33:32 +08:00
parent 5fc91c6752
commit aca9b45003
11 changed files with 726 additions and 601 deletions
@@ -32,7 +32,6 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -59,9 +58,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 * 分页列表查询
 	 * (管理端查询dataSource = 1的数据；报名查询全部的数据)
-	 * @param payCompanyManagement
-	 * @param pageNo
-	 * @param pageSize
+	 * @param payCompanyManagement 企业管理
+	 * @param pageNo 页数
+	 * @param pageSize 条数
 	 * @param req
 	 * @return
 	 */
@@ -96,7 +95,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *   添加
 	 *
-	 * @param payCompanyManagement
+	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-添加", notes="企业管理-添加")
@@ -143,7 +142,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *  编辑
 	 *
-	 * @param payCompanyManagement
+	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-编辑", notes="企业管理-编辑")
@@ -180,12 +179,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *   通过id删除
 	 *
-	 * @param id
+	 * @param id 企业管理id
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-通过id删除", notes="企业管理-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -196,12 +195,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *  批量删除
 	 *
-	 * @param ids
+	 * @param ids 企业管理ids 逗号分隔
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -223,7 +222,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	*/
 	@ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询")
 	@GetMapping(value = "/queryByCompanyName")
-	public Result<?> queryByCompanyName(@RequestParam(name="companyName",required=true) String companyName) {
+	public Result<?> queryByCompanyName(@RequestParam(name="companyName") String companyName) {
 		if(StringUtils.isBlank(companyName)){
 			return Result.error("企业名称不能为空！");
 		}else{
@@ -249,12 +248,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param id 企业管理id
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-通过id查询", notes="企业管理-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(id);
 		if(payCompanyManagement==null) {
 			return Result.error("未找到对应数据");
@@ -266,7 +265,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
    * 导出excel
    *
    * @param request
-    * @param payCompanyManagement
+    * @param payCompanyManagement 企业管理
    */
 	@ApiOperation(value="企业管理-导出excel", notes="企业管理-导出excel")
    @GetMapping(value = "/exportXls")
@@ -277,7 +276,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan

 		// Step.2 获取导出数据
 		List<PayCompanyManagement> pageList = payCompanyManagementService.list(queryWrapper);
-		List<PayCompanyManagement> exportList = null;
+		List<PayCompanyManagement> exportList;

 		// 过滤选中数据
 		String selections = request.getParameter("selections");
@@ -322,12 +321,11 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
      * 通过excel导入数据
    *
    * @param request
-    * @param response
    * @return
    */
 	@ApiOperation(value="企业管理-excel导入数据", notes="企业管理-excel导入数据")
    @PostMapping(value = "/importExcel")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+    public Result<?> importExcel(HttpServletRequest request) {
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -30,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 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.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -69,18 +68,16 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	/**
 	 * 分页列表查询
 	 *
-	 * @param payContactsManagement
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param payContactsManagement 联系人管理
+	 * @param pageNo 页数
+	 * @param pageSize 条数
 	 * @return
 	 */
 	@ApiOperation(value="联系人管理-分页列表查询", notes="联系人管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayContactsManagement payContactsManagement,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 		if(!StringUtils.isBlank(payContactsManagement.getName()) && payContactsManagement.getName().length() > 20){
 			return Result.error("姓名长度不能大于20个字符！");
 		}
@@ -90,7 +87,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		if(!StringUtils.isBlank(payContactsManagement.getPhone()) && payContactsManagement.getPhone().length() > 11){
 			return Result.error("手机号长度不能大于11个字符！");
 		}
-		Page<PayContactsManagement> page = new Page<PayContactsManagement>(pageNo, pageSize);
+		Page<PayContactsManagement> page = new Page<>(pageNo, pageSize);
 		IPage<PayContactsManagement> pageList = payContactsManagementService.queryPageList(page, payContactsManagement);
 		List<PayContactsManagement> listPayContactsManagement = pageList.getRecords();
 		if(!CollectionUtils.isEmpty(listPayContactsManagement)){
@@ -114,7 +111,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	/**
 	 *   添加
 	 *
-	 * @param payContactsManagement
+	 * @param payContactsManagement 联系人管理
 	 * @return
 	 */
 	@ApiOperation(value="联系人管理-添加", notes="联系人管理-添加")
@@ -129,29 +126,22 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			return Result.error("企业不存在！");
 		}
 		payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
-		PayContactsManagement payContactsManagementNew = null;
+		PayContactsManagement payContactsManagementNew;
 		try {
+			String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
 			// 新增联系人前在次校验手机号是否存在
 			LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone());
+			queryWrapper.eq(PayContactsManagement::getPhone,phone);
 			payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
+			// 手机号存在，并且编辑id与查询不同，则校验不通过
+			if(!Objects.isNull(payContactsManagementNew)) {
+				return Result.error("手机号已存在！");
+			}
 		}catch (Exception e){
 			log.info("联系人管理-添加异常",e);
 			return Result.error("手机号已存在！");
 		}
 		// 存在数据
-		if(!Objects.isNull(payContactsManagementNew)){
-			// 如果是管理新增 && 已存在数据来源是报名，更新数据，变更来源为管理端
-			if(Objects.equals(payContactsManagement.getDataSource(), PayContactsManagementCommon.DATA_SOURCE1)
-					&& Objects.equals(payContactsManagementNew.getDataSource(),PayContactsManagementCommon.DATA_SOURCE2)){
-				payContactsManagement.setId(payContactsManagementNew.getId());
-				payContactsManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE1);
-				payContactsManagement.setSigningUp(payContactsManagementNew.getSigningUp());
-				payContactsManagementService.updateById(payContactsManagement);
-				return Result.OK("添加成功！");
-			}
-			return Result.error("手机号已存在！");
-		}
 		try {
 			if (!StringUtils.isBlank(payContactsManagement.getPhone())){
 				payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
@@ -185,9 +175,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		}
 		payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
 		try {
+			String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
 			// 编辑保存联系人前再次校验手机号是否存在
 			LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone());
+			queryWrapper.eq(PayContactsManagement::getPhone,phone);
 			PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
 			// 手机号存在，并且编辑id与查询不同，则校验不通过
 			if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
@@ -219,7 +210,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 */
 	@ApiOperation(value="联系人管理-通过id删除", notes="联系人管理-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -235,7 +226,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 */
 	@ApiOperation(value="联系人管理-批量删除", notes="联系人管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -257,7 +248,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  */
 	 @ApiOperation(value="联系人管理-通过手机号查询", notes="联系人管理-通过手机号查询")
 	 @GetMapping(value = "/queryByCompanyName")
-	 public Result<?> queryByCompanyName(@RequestParam(name="phone",required=true) String phone) {
+	 public Result<?> queryByCompanyName(@RequestParam(name="phone") String phone) {
 		 if(StringUtils.isBlank(phone)){
 			 return Result.error("手机号不能为空！");
 		 }else{
@@ -268,8 +259,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			 }
 		 }
 		 try {
+			 String phoneNew = PasswordUtil.encrypt(phone);
 			 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-			 queryWrapper.eq(PayContactsManagement::getPhone,phone);
+			 queryWrapper.eq(PayContactsManagement::getPhone,phoneNew);
 			 queryWrapper.eq(PayContactsManagement::getDataSource,PayContactsManagementCommon.DATA_SOURCE1);
 			 PayContactsManagement payContactsManagement = payContactsManagementService.getOne(queryWrapper);
 			 if(Objects.isNull(payContactsManagement)) {
@@ -290,9 +282,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 */
 	@ApiOperation(value="联系人管理-通过id查询", notes="联系人管理-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
-		if(payContactsManagement==null) {
+		if(payContactsManagement == null) {
 			return Result.error("未找到对应数据");
 		}
 		return Result.OK(payContactsManagement);
@@ -306,7 +298,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  */
 	 @ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
 	 @GetMapping(value = "/queryByCompany")
-	 public Result<?> queryByCompany(@RequestParam(name="companyId",required=true) String companyId) {
+	 public Result<?> queryByCompany(@RequestParam(name="companyId") String companyId) {
 		 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
 		 queryWrapper.eq(PayContactsManagement::getCompanyId,companyId);
 		 List<PayContactsManagement> list = payContactsManagementService.list(queryWrapper);
@@ -317,14 +309,13 @@ public class PayContactsManagementController extends JeroController<PayContactsM
    * 导出excel
    *
    * @param request
-    * @param payContactsManagement
+    * @param payContactsManagement 联系人管理
    */
 	@ApiOperation(value="联系人管理-导出excel", notes="联系人管理-导出excel")
    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayContactsManagement payContactsManagement) {
 		// Step.1 组装查询条件
 		QueryWrapper<PayContactsManagement> queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagement, request.getParameterMap());
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

 		// Step.2 获取导出数据
 		List<PayContactsManagement> pageList = payContactsManagementService.list(queryWrapper);
@@ -53,8 +53,6 @@ public class PayContactsManagement implements Serializable {
 	/**性别（1:男，2:女）*/
 	@Excel(name = "性别", width = 15,dicCode="sex")
    @ApiModelProperty(value = "性别")
-    @Max(2)
-    @Min(1)
    @Dict(dicCode = "sex")
    private Integer gender;
 	/**职务*/
@@ -1,28 +1,17 @@
 package com.jero.contract.controller;

-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
-import com.jero.common.util.ValidUtil;
 import com.jero.contract.entity.PayIncomeContract;
-import com.jero.contract.entity.PayIncomeContractInstallment;
-import com.jero.contract.service.IPayIncomeContractInstallmentService;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.contract.vo.PayIncomeContractInput;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -43,8 +32,6 @@ import io.swagger.annotations.ApiOperation;
 public class PayIncomeContractController extends JeroController<PayIncomeContract, IPayIncomeContractService> {
 	@Autowired
 	private IPayIncomeContractService payIncomeContractService;
-	@Autowired
-	private IPayIncomeContractInstallmentService payIncomeContractInstallmentService;
 	
 	/**
 	 * 分页列表查询
@@ -79,37 +66,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	@ApiOperation(value="收入合同-添加", notes="收入合同-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayIncomeContractInput input) {
-		if(Objects.isNull(input)){
-			return Result.error("收入合同信息不能为空！");
-		}
-		if(StringUtils.isBlank(input.getContract())){
-			return Result.error("收入合同信息不能为空！");
-		}
-		PayIncomeContract payIncomeContract = JSONObject.parseObject(input.getContract(),PayIncomeContract.class);
-		if(Objects.isNull(payIncomeContract)){
-			return Result.error("收入合同信息不能为空！");
-		}
-		StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
-		if(!StringUtils.isBlank(msgPayIncomeContract)){
-			return Result.error(msgPayIncomeContract.toString());
-		}
-		List<PayIncomeContractInstallment> listPayIncomeContractInstallment = new ArrayList<>();
-		if(!StringUtils.isBlank(input.getInstallment())){
-			listPayIncomeContractInstallment = JSONArray.parseArray(input.getInstallment(),PayIncomeContractInstallment.class);
-		}
-		payIncomeContractService.save(payIncomeContract);
-		StringBuilder msgPayIncomeContractInstallment = new StringBuilder();
-		if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){
-			List<PayIncomeContractInstallment> finalListPayIncomeContractInstallment = listPayIncomeContractInstallment;
-			listPayIncomeContractInstallment.forEach(p->{
-				p.setContractId(payIncomeContract.getId());
-				msgPayIncomeContractInstallment.append("第").append(finalListPayIncomeContractInstallment.indexOf(p)).append("阶段:").append(ValidUtil.validateAll(p));
-			});
-			payIncomeContractInstallmentService.saveBatch(listPayIncomeContractInstallment);
-		}
-		if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
-			return Result.error(msgPayIncomeContractInstallment.toString());
-		}
+		payIncomeContractService.addPayIncomeContractInput(input);
 		return Result.OK("添加成功！");
 	}
 	
@@ -122,39 +79,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	@ApiOperation(value="收入合同-编辑", notes="收入合同-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayIncomeContractInput input) {
-		if(Objects.isNull(input)){
-			return Result.error("收入合同信息不能为空！");
-		}
-		if(StringUtils.isBlank(input.getContract())){
-			return Result.error("收入合同信息不能为空！");
-		}
-		PayIncomeContract payIncomeContract = JSONObject.parseObject(input.getContract(),PayIncomeContract.class);
-		if(Objects.isNull(payIncomeContract)){
-			return Result.error("收入合同信息不能为空！");
-		}
-		StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
-		if(!StringUtils.isBlank(msgPayIncomeContract)){
-			return Result.error(msgPayIncomeContract.toString());
-		}
-		List<PayIncomeContractInstallment> listPayIncomeContractInstallment = new ArrayList<>();
-		if(!StringUtils.isBlank(input.getInstallment())){
-			listPayIncomeContractInstallment = JSONArray.parseArray(input.getInstallment(),PayIncomeContractInstallment.class);
-		}
-		StringBuilder msgPayIncomeContractInstallment = new StringBuilder();
-		if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){
-			List<String> list = listPayIncomeContractInstallment.stream().map(PayIncomeContractInstallment::getId).collect(Collectors.toList());
-			payIncomeContractInstallmentService.removeByIds(list);
-			List<PayIncomeContractInstallment> finalListPayIncomeContractInstallment = listPayIncomeContractInstallment;
-			listPayIncomeContractInstallment.forEach(p->{
-				p.setContractId(payIncomeContract.getId());
-				msgPayIncomeContractInstallment.append("第").append(finalListPayIncomeContractInstallment.indexOf(p)).append("阶段:").append(ValidUtil.validateAll(p));
-			});
-			payIncomeContractInstallmentService.saveBatch(listPayIncomeContractInstallment);
-		}
-		if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
-			return Result.error(msgPayIncomeContractInstallment.toString());
-		}
-		payIncomeContractService.updateById(payIncomeContract);
+		payIncomeContractService.editPayIncomeContractInput(input);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -166,11 +91,11 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	@AutoLog(value = "收入合同-通过id删除")
 	@ApiOperation(value="收入合同-通过id删除", notes="收入合同-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
-		payIncomeContractService.removeById(id);
+		payIncomeContractService.deletePayIncomeContractInputById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -182,7 +107,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	@AutoLog(value = "收入合同-批量删除")
 	@ApiOperation(value="收入合同-批量删除", notes="收入合同-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -192,7 +117,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 				return Result.error("id不能为空!");
 			}
 		}
-		this.payIncomeContractService.removeByIds(Arrays.asList(ids.split(",")));
+		payIncomeContractService.deletePayIncomeContractInputByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -204,7 +129,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	@AutoLog(value = "收入合同-通过id查询")
 	@ApiOperation(value="收入合同-通过id查询", notes="收入合同-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayIncomeContract payIncomeContract = payIncomeContractService.getById(id);
 		if(payIncomeContract==null) {
 			return Result.error("未找到对应数据");
@@ -216,7 +141,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
    * 导出excel
    *
    * @param request
-    * @param payIncomeContract
+    * @param payIncomeContract 收入合同
    */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContract payIncomeContract) {
@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.contract.entity.PayIncomeContract;
+import com.jero.contract.vo.PayIncomeContractInput;
+
+import java.util.List;

 /**
 * @Description: pay_income_contract
@@ -21,5 +24,40 @@ public interface IPayIncomeContractService extends IService<PayIncomeContract> {
    * @Exception
    */
    IPage<PayIncomeContract>  queryPageList(Page<PayIncomeContract> page,PayIncomeContract payIncomeContract,String chargeStatus,String startTime,String endTime);
-
+    /**
+    * @Description 添加
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void addPayIncomeContractInput(PayIncomeContractInput input);
+    /**
+    * @Description 编辑
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void editPayIncomeContractInput(PayIncomeContractInput input);
+    /**
+    * @Description 删除
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void deletePayIncomeContractInputById(String id);
+    /**
+    * @Description 批量删除
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void deletePayIncomeContractInputByIds(List<String> ids);
 }
@@ -1,14 +1,35 @@
 package com.jero.contract.service.impl;

+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.util.ValidUtil;
 import com.jero.contract.entity.PayIncomeContract;
+import com.jero.contract.entity.PayIncomeContractAssociated;
+import com.jero.contract.entity.PayIncomeContractAudit;
+import com.jero.contract.entity.PayIncomeContractInstallment;
 import com.jero.contract.mapper.PayIncomeContractMapper;
+import com.jero.contract.service.IPayIncomeContractAssociatedService;
+import com.jero.contract.service.IPayIncomeContractAuditService;
+import com.jero.contract.service.IPayIncomeContractInstallmentService;
 import com.jero.contract.service.IPayIncomeContractService;
+import com.jero.contract.vo.PayIncomeContractInput;
+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 org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;

 /**
 * @Description: pay_income_contract
@@ -21,9 +42,121 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM

    @Resource
    private PayIncomeContractMapper payIncomeContractMapper;
+    @Autowired
+    private IPayIncomeContractService payIncomeContractService;
+    @Autowired
+    private IPayIncomeContractInstallmentService payIncomeContractInstallmentService;
+    @Autowired
+    private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
+    @Autowired
+    private IPayIncomeContractAuditService payIncomeContractAuditService;

    @Override
    public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String startTime,String endTime) {
        return payIncomeContractMapper.queryPageList(page,payIncomeContract,chargeStatus,startTime,endTime);
    }
+
+    @Override
+    @Transactional
+    public void addPayIncomeContractInput(PayIncomeContractInput input) {
+        if(Objects.isNull(input)){
+            throw new JeroBootException("收入合同信息不能为空！");
+        }
+        if(StringUtils.isBlank(input.getContract())){
+            throw new JeroBootException("收入合同信息不能为空！");
+        }
+        PayIncomeContract payIncomeContract = JSONObject.parseObject(input.getContract(),PayIncomeContract.class);
+        if(Objects.isNull(payIncomeContract)){
+            throw new JeroBootException("收入合同信息不能为空！");
+        }
+        StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
+        if(!StringUtils.isBlank(msgPayIncomeContract)){
+            throw new JeroBootException(msgPayIncomeContract.toString());
+        }
+        List<PayIncomeContractInstallment> listPayIncomeContractInstallment = new ArrayList<>();
+        if(!StringUtils.isBlank(input.getInstallment())){
+            listPayIncomeContractInstallment = JSONArray.parseArray(input.getInstallment(),PayIncomeContractInstallment.class);
+        }
+        payIncomeContractService.save(payIncomeContract);
+        StringBuilder msgPayIncomeContractInstallment = new StringBuilder();
+        if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){
+            List<PayIncomeContractInstallment> finalListPayIncomeContractInstallment = listPayIncomeContractInstallment;
+            listPayIncomeContractInstallment.forEach(p->{
+                p.setContractId(payIncomeContract.getId());
+                msgPayIncomeContractInstallment.append("第").append(finalListPayIncomeContractInstallment.indexOf(p)).append("阶段:").append(ValidUtil.validateAll(p));
+            });
+            payIncomeContractInstallmentService.saveBatch(listPayIncomeContractInstallment);
+        }
+        if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
+            throw new JeroBootException(msgPayIncomeContractInstallment.toString());
+        }
+    }
+
+    @Override
+    @Transactional
+    public void editPayIncomeContractInput(PayIncomeContractInput input) {
+        if(Objects.isNull(input)){
+            throw new JeroBootException("收入合同信息不能为空！");
+        }
+        if(StringUtils.isBlank(input.getContract())){
+            throw new JeroBootException("收入合同信息不能为空！");
+        }
+        PayIncomeContract payIncomeContract = JSONObject.parseObject(input.getContract(),PayIncomeContract.class);
+        if(Objects.isNull(payIncomeContract)){
+            throw new JeroBootException("收入合同信息不能为空！");
+        }
+        StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract);
+        if(!StringUtils.isBlank(msgPayIncomeContract)){
+            throw new JeroBootException(msgPayIncomeContract.toString());
+        }
+        List<PayIncomeContractInstallment> listPayIncomeContractInstallment = new ArrayList<>();
+        if(!StringUtils.isBlank(input.getInstallment())){
+            listPayIncomeContractInstallment = JSONArray.parseArray(input.getInstallment(),PayIncomeContractInstallment.class);
+        }
+        StringBuilder msgPayIncomeContractInstallment = new StringBuilder();
+        if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){
+            List<String> list = listPayIncomeContractInstallment.stream().map(PayIncomeContractInstallment::getId).collect(Collectors.toList());
+            payIncomeContractInstallmentService.removeByIds(list);
+            List<PayIncomeContractInstallment> finalListPayIncomeContractInstallment = listPayIncomeContractInstallment;
+            listPayIncomeContractInstallment.forEach(p->{
+                p.setContractId(payIncomeContract.getId());
+                msgPayIncomeContractInstallment.append("第").append(finalListPayIncomeContractInstallment.indexOf(p)).append("阶段:").append(ValidUtil.validateAll(p));
+            });
+            payIncomeContractInstallmentService.saveBatch(listPayIncomeContractInstallment);
+        }
+        if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
+            throw new JeroBootException(msgPayIncomeContractInstallment.toString());
+        }
+        payIncomeContractService.updateById(payIncomeContract);
+    }
+
+    @Override
+    @Transactional
+    public void deletePayIncomeContractInputById(String id) {
+        payIncomeContractService.removeById(id);
+        LambdaQueryWrapper<PayIncomeContractInstallment> queryPayIncomeContractInstallment = new LambdaQueryWrapper<>();
+        queryPayIncomeContractInstallment.eq(PayIncomeContractInstallment::getContractId,id);
+        payIncomeContractInstallmentService.remove(queryPayIncomeContractInstallment);
+        LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
+        queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getContractId,id);
+        payIncomeContractAssociatedService.remove(queryPayIncomeContractAssociated);
+        LambdaQueryWrapper<PayIncomeContractAudit> queryPayIncomeContractAudit = new LambdaQueryWrapper<>();
+        queryPayIncomeContractAudit.eq(PayIncomeContractAudit::getContractId,id);
+        payIncomeContractAuditService.remove(queryPayIncomeContractAudit);
+    }
+
+    @Override
+    @Transactional
+    public void deletePayIncomeContractInputByIds(List<String> ids) {
+        payIncomeContractService.removeByIds(ids);
+        LambdaQueryWrapper<PayIncomeContractInstallment> queryPayIncomeContractInstallment = new LambdaQueryWrapper<>();
+        queryPayIncomeContractInstallment.in(PayIncomeContractInstallment::getContractId,ids);
+        payIncomeContractInstallmentService.remove(queryPayIncomeContractInstallment);
+        LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
+        queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,ids);
+        payIncomeContractAssociatedService.remove(queryPayIncomeContractAssociated);
+        LambdaQueryWrapper<PayIncomeContractAudit> queryPayIncomeContractAudit = new LambdaQueryWrapper<>();
+        queryPayIncomeContractAudit.in(PayIncomeContractAudit::getContractId,ids);
+        payIncomeContractAuditService.remove(queryPayIncomeContractAudit);
+    }
 }
@@ -4,30 +4,19 @@ import java.util.Arrays;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
-import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.ValidUtil;
-import com.jero.project.common.PayProjectCommon;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.temporary.entity.PayCompanyManagementTemporary;
-import com.jero.temporary.entity.PayContactsManagementTemporary;
-import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
-import com.jero.temporary.service.IPayContactsManagementTemporaryService;
-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;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
@@ -51,10 +40,10 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 /**
 	 * 分页列表查询
 	 *
-	 * @param payCommonProject
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param payCommonProject 普通项目管理
+	 * @param pageNo 页数
+	 * @param pageSize 条数
+	 * @param paymentDate 日期
 	 * @return
 	 */
 	@ApiOperation(value="普通项目管理-分页列表查询", notes="普通项目管理-分页列表查询")
@@ -62,8 +51,7 @@ public class PayCommonProjectController extends JeroController<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) {
+								   @RequestParam(name="paymentDate",required = false) String paymentDate) {
 		if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){
 			return Result.error("来款项目长度不能大于100个字符");
 		}
@@ -78,7 +66,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	/**
 	 *   添加
 	 *
-	 * @param payCommonProject
+	 * @param payCommonProject 普通项目管理
 	 * @return
 	 */
 	@ApiOperation(value="普通项目管理-添加", notes="普通项目管理-添加")
@@ -95,12 +83,11 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	/**
 	 *  编辑
 	 *
-	 * @param payCommonProject
+	 * @param payCommonProject 普通项目管理
 	 * @return
 	 */
 	@ApiOperation(value="普通项目管理-编辑", notes="普通项目管理-编辑")
 	@PostMapping(value = "/edit")
-	@Transactional
 	public Result<?> edit(@RequestBody PayCommonProject payCommonProject) {
 		StringBuilder msg = ValidUtil.validateAll(payCommonProject);
 		if(!StringUtils.isBlank(msg)){
@@ -114,12 +101,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	/**
 	 *   通过id删除
 	 *
-	 * @param id
+	 * @param id 普通项目管理id
 	 * @return
 	 */
 	@ApiOperation(value="普通项目管理-通过id删除", notes="普通项目管理-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -130,12 +117,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	/**
 	 *  批量删除
 	 *
-	 * @param ids
+	 * @param ids 普通项目管理ids 逗号分隔
 	 * @return
 	 */
 	@ApiOperation(value="普通项目管理-批量删除", notes="普通项目管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -152,12 +139,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param id 普通项目管理id
 	 * @return
 	 */
 	@ApiOperation(value="普通项目管理-通过id查询", notes="普通项目管理-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -181,7 +168,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	*/
 	@ApiOperation(value="普通项目管理-通过来款项目查询", notes="普通项目管理-通过来款项目查询")
 	@GetMapping(value = "/queryByChargeProject")
-	public Result<?> queryByChargeProject(@RequestParam(name="chargeProject",required=true) String chargeProject) {
+	public Result<?> queryByChargeProject(@RequestParam(name="chargeProject") String chargeProject) {
 		if(StringUtils.isBlank(chargeProject)){
 			return Result.error("来款项目不能为空！");
 		}else{
@@ -207,7 +194,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
    * 导出excel
    *
    * @param request
-    * @param payCommonProject
+    * @param payCommonProject 普通项目管理
    */
 	@ApiOperation(value="普通项目管理-导出excel", notes="普通项目管理-导出excel")
    @GetMapping(value = "/exportXls")
@@ -15,7 +15,6 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.ValidUtil;
-import com.jero.contract.entity.PayIncomeContractAudit;
 import com.jero.project.vo.PayWorkingGroupPayment;
 import com.jero.project.vo.PayWorkingGroupVO;
 import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -56,18 +55,16 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	/**
 	 * 分页列表查询
 	 *
-	 * @param payWorkingGroup
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param payWorkingGroup 工作组项目
+	 * @param pageNo 页数
+	 * @param pageSize 条数
 	 * @return
 	 */
 	@ApiOperation(value="工作组项目-分页列表查询", notes="工作组项目-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayWorkingGroup payWorkingGroup,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 		if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject()) && payWorkingGroup.getWorkingGroupProject().length() > 50){
 			return Result.error("工作组项目长度不能大于50个字符");
 		}
@@ -116,7 +113,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	 /**
 	  * 分页列表查询
 	  *
-	  * @param payWorkingGroup
+	  * @param payWorkingGroup  工作组项目
 	  * @param req
 	  * @return
 	  */
@@ -132,7 +129,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	/**
 	 *   添加
 	 *
-	 * @param payWorkingGroup
+	 * @param payWorkingGroup 工作组项目
 	 * @return
 	 */
 	@ApiOperation(value="工作组项目-添加", notes="工作组项目-添加")
@@ -155,7 +152,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			log.info("工作组项目-添加异常",e);
 			return Result.error("工作组项目已存在！");
 		}
-		payWorkingGroup = setPayWorkingGroup(payWorkingGroup);
+		setPayWorkingGroup(payWorkingGroup);
 		payWorkingGroupService.save(payWorkingGroup);
 		return Result.OK("添加成功！");
 	}
@@ -163,7 +160,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	/**
 	 *  编辑
 	 *
-	 * @param payWorkingGroup
+	 * @param payWorkingGroup 工作组项目
 	 * @return
 	 */
 	@ApiOperation(value="工作组项目-编辑", notes="工作组项目-编辑")
@@ -186,7 +183,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			log.info("工作组项目-编辑异常",e);
 			return Result.error("工作组项目已存在！");
 		}
-		payWorkingGroup = setPayWorkingGroup(payWorkingGroup);
+		setPayWorkingGroup(payWorkingGroup);
 		payWorkingGroupService.updateById(payWorkingGroup);
 		return Result.OK("编辑成功!");
 	}
@@ -198,7 +195,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	* @Return
 	* @Exception
 	*/
-	private PayWorkingGroup setPayWorkingGroup(PayWorkingGroup payWorkingGroup){
+	private void setPayWorkingGroup(PayWorkingGroup payWorkingGroup){
 		// 负责人A名称
 		SysUser principalIdA = sysUserService.getById(payWorkingGroup.getPrincipalIdA());
 		if (Objects.isNull(principalIdA)) {
@@ -213,18 +210,17 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			}
 			payWorkingGroup.setPrincipalNameB(principalIdB.getRealname());
 		}
-		return payWorkingGroup;
 	}
 	
 	/**
 	 *   通过id删除
 	 *
-	 * @param id
+	 * @param id 工作组项目id
 	 * @return
 	 */
 	@ApiOperation(value="工作组项目-通过id删除", notes="工作组项目-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -235,12 +231,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	/**
 	 *  批量删除
 	 *
-	 * @param ids
+	 * @param ids 工作组项目ids 逗号分隔
 	 * @return
 	 */
 	@ApiOperation(value="工作组项目-批量删除", notes="工作组项目-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -257,12 +253,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param id 工作组项目id
 	 * @return
 	 */
 	@ApiOperation(value="工作组项目-通过id查询", notes="工作组项目-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(id);
 		if(payWorkingGroup==null) {
 			return Result.error("未找到对应数据");
@@ -274,7 +270,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
    * 导出excel
    *
    * @param request
-    * @param payWorkingGroup
+    * @param payWorkingGroup  工作组项目
    */
    @GetMapping(value = "/exportXls")
 	@ApiOperation(value="工作组项目-导出excel", notes="工作组项目-导出excel")
@@ -7,37 +7,20 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
-import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.ValidUtil;
-import com.jero.company.entity.PayCompanyManagement;
-import com.jero.company.entity.PayContactsManagement;
-import com.jero.company.service.IPayCompanyManagementService;
-import com.jero.company.service.IPayContactsManagementService;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
-import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.project.vo.SetChargeInput;
-import com.jero.temporary.entity.PayCompanyManagementTemporary;
-import com.jero.temporary.entity.PayContactsManagementTemporary;
-import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
-import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -55,110 +38,55 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	@Autowired
 	private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
 	@Autowired
-	private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
-	@Autowired
-	private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
-	@Autowired
-	private IPayCompanyManagementService payCompanyManagementService;
-	@Autowired
-	private IPayContactsManagementService payContactsManagementService;
-	@Autowired
-	private IPayWorkingGroupService payWorkingGroupService;
-	@Autowired
 	private ProjectDetailService projectDetailService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param payWorkingGroupSubitem
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param payWorkingGroupSubItem 工作组成员
+	 * @param pageNo 页数
+	 * @param pageSize 条数
+	 * @param paymentDate 日期
 	 * @return
 	 */
 	@ApiOperation(value="工作组成员-分页列表查询", notes="工作组成员-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> queryPageList(PayWorkingGroupSubItem payWorkingGroupSubitem,
+	public Result<?> queryPageList(PayWorkingGroupSubItem payWorkingGroupSubItem,
 								   @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(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) && payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){
+								   @RequestParam(name="paymentDate",required = false) String paymentDate) {
+		if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName()) && payWorkingGroupSubItem.getChargeCompanyTemporaryName().length() > 50){
 			return Result.error("成员单位长度不能大于50个字符");
 		}
-		if(StringUtils.isBlank(payWorkingGroupSubitem.getWorkingGroupId())){
+		if(StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())){
 			return Result.error("工作组id不能为空！");
 		}
 		Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize);
-		IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubitem,paymentDate);
+		IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem,paymentDate);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param payWorkingGroupSubItem
+	 * @param payWorkingGroupSubItem 工作组成员
 	 * @return
 	 */
 	@ApiOperation(value="工作组成员-添加", notes="工作组成员-添加")
 	@PostMapping(value = "/add")
-	@Transactional
 	public Result<?> add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
 		StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());
 		}
-		if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY2){
-			if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
-				return Result.error("应收金额不能为空");
-			}
-			if(StringUtils.isBlank(payWorkingGroupSubItem.getContractNum())){
-				return Result.error("合同号不能为空");
-			}
-		}
-		if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY3){
-			if(Objects.isNull(payWorkingGroupSubItem.getChargeNoticeNo())){
-				return Result.error("收费通知号不能为空");
-			}
-			if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
-				return Result.error("应收金额不能为空");
-			}
-		}
-
-		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
-		if(Objects.isNull(payWorkingGroup)){
-			return Result.error("工作组不存在！");
-		}
-
-		try {
-			// 编辑保存前再次校验来款项目是否存在
-			LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId());
-			queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
-			queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
-			PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper);
-			// 企业和联系人同时存在，则校验不通过
-			if(!Objects.isNull(payWorkingGroupSubItemNew)) {
-				return Result.error("工作组成员已存在！");
-			}
-		}catch (Exception e){
-			log.info("工作组成员-添加异常",e);
-			return Result.error("工作组成员已存在！");
-		}
-
-		payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
-		payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0);
-		payWorkingGroupSubItem.setInAccount(PayProjectCommon.IN_ACCOUNT0);
-		payWorkingGroupSubItem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
-		payWorkingGroupSubItem.setMail(PayProjectCommon.MAIL0);
-		payWorkingGroupSubItemService.save(payWorkingGroupSubItem);
+		payWorkingGroupSubItemService.addPayWorkingGroupSubItem(payWorkingGroupSubItem);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param payWorkingGroupSubItem
+	 * @param payWorkingGroupSubItem 工作组成员
 	 * @return
 	 */
 	@ApiOperation(value="工作组成员-编辑", notes="工作组成员-编辑")
@@ -168,108 +96,19 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());
 		}
-		if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY2){
-			if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
-				return Result.error("应收金额不能为空");
-			}
-			if(StringUtils.isBlank(payWorkingGroupSubItem.getContractNum())){
-				return Result.error("合同号不能为空");
-			}
-		}
-		if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY3){
-			if(Objects.isNull(payWorkingGroupSubItem.getChargeNoticeNo())){
-				return Result.error("收费通知号不能为空");
-			}
-			if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
-				return Result.error("应收金额不能为空");
-			}
-		}
-		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
-		if(Objects.isNull(payWorkingGroup)){
-			return Result.error("工作组不存在！");
-		}
-		try {
-			// 编辑保存前再次校验来款项目是否存在
-			LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId());
-			queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
-			queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
-			PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper);
-			// 来款项目存在，并且编辑id与查询不同，则校验不通过
-			if(!Objects.isNull(payWorkingGroupSubItemNew)
-					&& !Objects.equals(payWorkingGroupSubItemNew.getId(),payWorkingGroupSubItem.getId())) {
-				return Result.error("工作组成员已存在！");
-			}
-		}catch (Exception e){
-			log.info("工作组成员-编辑异常",e);
-			return Result.error("工作组成员已存在！");
-		}
-
-		payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
-		payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+		payWorkingGroupSubItemService.editPayWorkingGroupSubItem(payWorkingGroupSubItem);
 		return Result.OK("编辑成功!");
 	}
-
-	 /**
-	  * @Description 插入企业信息，联系人信息到临时表，更新项目记录
-	  * @Author  lqt
-	  * @Date   2021/8/31
-	  * @Param  payCommonProject
-	  * @Return
-	  * @Exception
-	  */
-	 private PayWorkingGroupSubItem setPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem){
-		 // 企业
-		 PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payWorkingGroupSubItem.getChargeCompanyId());
-		 if(Objects.isNull(chargeCompanyName)){
-			 throw new JeroBootException("企业名称为空！");
-		 }
-		 payWorkingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId());
-		 payWorkingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
-		 // 企业联系人一
-		 PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne());
-		 if(Objects.isNull(contactsNameOne)){
-			 throw new JeroBootException("企业联系人一名称为空！");
-		 }
-		 payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId());
-		 payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName());
-		 if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
-			 // 企业联系人二
-			 PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo());
-			 if(Objects.isNull(contactsNameTwo)){
-				 throw new JeroBootException("企业联系人二名称为空！");
-			 }
-			 payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId());
-			 payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName());
-		 }
-		 if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
-			 // 企业联系人三
-			 PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree());
-			 if(Objects.isNull(contactsNameThree)){
-				 throw new JeroBootException("企业联系人三名称为空！");
-			 }
-			 payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId());
-			 payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName());
-		 }
-		 // 邮寄联系人
-		 PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getMailContactsId());
-		 if(Objects.isNull(mailContactsName)){
-			 throw new JeroBootException("邮寄联系人名称为空！");
-		 }
-		 payWorkingGroupSubItem.setMailContactsTemporaryId(mailContactsName.getId());
-		 payWorkingGroupSubItem.setMailContactsTemporaryName(mailContactsName.getName());
-		 return payWorkingGroupSubItem;
-	 }
 	
 	/**
 	 *   通过id删除
 	 *
-	 * @param id
+	 * @param id 工作组成员id
 	 * @return
 	 */
 	@ApiOperation(value="工作组成员-通过id删除", notes="工作组成员-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -280,12 +119,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	/**
 	 *  批量删除
 	 *
-	 * @param ids
+	 * @param ids 工作组成员ids 逗号分隔
 	 * @return
 	 */
 	@ApiOperation(value="工作组成员-批量删除", notes="工作组成员-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -301,7 +140,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 /**
 	  *  查询工作组成员是否收费通知
 	  *
-	  * @param ids
+	  * @param ids 工作组成员ids 逗号分隔
 	  * @return
 	  */
 	 @ApiOperation(value="工作组成员-查询工作组成员是否收费通知", notes="工作组成员-查询工作组成员是否收费通知")
@@ -333,7 +172,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 /**
 	  *  设置收费通知
 	  *
-	  * @param input
+	  * @param input 收费通知
 	  * @return
 	  */
 	 @ApiOperation(value="工作组成员-设置收费通知", notes="工作组成员-设置收费通知")
@@ -358,12 +197,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param id 工作组成员
 	 * @return
 	 */
 	@ApiOperation(value="工作组成员-通过id查询", notes="工作组成员-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayWorkingGroupSubItem payWorkingGroupSubitem = payWorkingGroupSubItemService.getById(id);
 		if(payWorkingGroupSubitem==null) {
 			return Result.error("未找到对应数据");
@@ -380,12 +219,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
    * 导出excel
    *
    * @param request
-    * @param payWorkingGroupSubitem
+    * @param payWorkingGroupSubItem 工作组成员
    */
    @GetMapping(value = "/exportXls")
 	@ApiOperation(value="工作组成员-导出excel", notes="工作组成员-导出excel")
-    public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubItem payWorkingGroupSubitem) {
-        return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubItem.class, "工作组成员");
+    public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubItem payWorkingGroupSubItem) {
+        return super.exportXls(request, payWorkingGroupSubItem, PayWorkingGroupSubItem.class, "工作组成员");
    }

 	 /**
@@ -403,241 +242,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
      * 通过excel导入数据
    *
    * @param request
-    * @param response
    * @return
    */
    @PostMapping(value = "/importExcel")
 	@ApiOperation(value="工作组成员-通过excel导入数据", notes="工作组成员-通过excel导入数据")
-	@Transactional
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-		String workGroupId;
-		try {
-			workGroupId = multipartRequest.getParameter("workGroupId");
-		}catch (Exception e){
-			log.error("获取工作组id异常",e);
-			throw new RuntimeException("工作组id不能为空 ！");
-		}
-		if(StringUtils.isBlank(workGroupId)){
-			throw new RuntimeException("工作组id不能为空 ！");
-		}
-
-		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-			MultipartFile file = entity.getValue();// 获取上传文件对象
-			ImportParams params = new ImportParams();
-			params.setTitleRows(1);
-			params.setHeadRows(1);
-			try {
-				//导入Excel格式校验，看匹配的字段文本概率
-				Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), PayWorkingGroupSubItem.class, params);
-				if(!t){
-					throw new RuntimeException("导入Excel校验失败 ！");
-				}
-				List<PayWorkingGroupSubItem> list = ExcelImportUtil.importExcel(file.getInputStream(), PayWorkingGroupSubItem.class, params);
-				if(!CollectionUtils.isEmpty(list)){
-					// 校验重复成员的集合
-					List<PayWorkingGroupSubItem> listCompanyAndContacts = new ArrayList<>();
-					StringBuilder msg = new StringBuilder();
-					// 获取excel中的企业名称
-					List<String> listCompanyName = list.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryName).collect(Collectors.toList());
-					// 获取excel企业信息
-					LambdaQueryWrapper<PayCompanyManagement> companyWrapper = new LambdaQueryWrapper<>();
-					companyWrapper.in(PayCompanyManagement::getCompanyName,listCompanyName);
-					List<PayCompanyManagement> listCompanyInfo = payCompanyManagementService.list(companyWrapper);
-					if(CollectionUtils.isEmpty(listCompanyInfo)){
-						throw new RuntimeException("excel中企业不存在 ！");
-					}
-					List<String> listContactsName = new ArrayList<>();
-					// 获取excel中联系人一名称
-					List<String> listContactsNameOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList());
-					if(!CollectionUtils.isEmpty(listContactsNameOne)){
-						listContactsName.addAll(listContactsNameOne);
-					}
-					// 获取excel中联系人二名称
-					List<String> listContactsNameTwo = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameTwo).collect(Collectors.toList());
-					if(!CollectionUtils.isEmpty(listContactsNameTwo)){
-						listContactsName.addAll(listContactsNameTwo);
-					}
-					// 获取excel中联系人三名称
-					List<String> listContactsNameThree = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameThree).collect(Collectors.toList());
-					if(!CollectionUtils.isEmpty(listContactsNameThree)){
-						listContactsName.addAll(listContactsNameThree);
-					}
-					// 获取excel中邮寄联系人名称
-					List<String> listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList());
-					if(!CollectionUtils.isEmpty(listContactsNameMail)){
-						listContactsName.addAll(listContactsNameMail);
-					}
-					// 获取excel联系人信息
-					LambdaQueryWrapper<PayContactsManagement> contactsWrapper = new LambdaQueryWrapper<>();
-					contactsWrapper.in(PayContactsManagement::getName,listContactsName);
-					List<PayContactsManagement> listContactsInfo = payContactsManagementService.list(contactsWrapper);
-					if(CollectionUtils.isEmpty(listContactsInfo)){
-						throw new RuntimeException("excel中联系人不存在 ！");
-					}
-					// 获取工作组信息
-					PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
-					if(Objects.isNull(payWorkingGroup)){
-						throw new RuntimeException("工作组不存在 ！");
-					}
-
-					// 获取工作组成员
-					LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
-					query.eq(PayWorkingGroupSubItem::getWorkingGroupId,workGroupId);
-					List<PayWorkingGroupSubItem> listData = payWorkingGroupSubItemService.list(query);
-					list.forEach(p->{
-						p.setWorkingGroupId(workGroupId);
-						int count = list.indexOf(p);
-						// 校验企业名称
-						List<PayCompanyManagement> listCompany = new ArrayList<>();
-						if(StringUtils.isBlank(p.getChargeCompanyTemporaryName())){
-							msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。</br>");
-						}else{
-							// 通过企业名称获取企业id
-							listCompany = listCompanyInfo.stream().filter(item->
-									Objects.equals(item.getCompanyName(),p.getChargeCompanyTemporaryName())).collect(Collectors.toList());
-							if(CollectionUtils.isEmpty(listCompany)){
-								msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。</br>");
-							}else{
-								p.setChargeCompanyId(listCompany.get(0).getId());
-							}
-						}
-						// 校验联系人一
-						if(StringUtils.isBlank(p.getContactsTemporaryNameOne())){
-							msg.append("第 ").append(count + 3).append(" 行：联系人不能为空，请修改。</br>");
-						}else{
-							if(!CollectionUtils.isEmpty(listCompany)){
-								// 通过联系人获取联系人id
-								List<PayCompanyManagement> finalListCompany = listCompany;
-								List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
-										Objects.equals(item.getName(),p.getContactsTemporaryNameOne())
-												&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
-								if(CollectionUtils.isEmpty(listContacts)){
-									msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人一，请修改。</br>");
-								}else{
-									p.setContactsIdOne(listContacts.get(0).getId());
-								}
-							}
-						}
-						// 校验工作组是否已存在成员
-						if(!StringUtils.isBlank(p.getChargeCompanyId()) && !StringUtils.isBlank(p.getContactsIdOne())){
-							List<PayWorkingGroupSubItem> listDateNew = listData.stream().filter(item->Objects.equals(p.getChargeCompanyId(),item.getChargeCompanyId())
-									&& Objects.equals(p.getContactsIdOne(),item.getContactsIdOne())).collect(Collectors.toList());
-							if(!CollectionUtils.isEmpty(listDateNew)){
-								msg.append("第 ").append(count + 3).append(" 行：工作组成员已存在，请修改。</br>");
-							}
-						}
-						// 校验联系人二
-						if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !CollectionUtils.isEmpty(listCompany)){
-							if(!CollectionUtils.isEmpty(listCompany)){
-								// 通过联系人获取联系人id
-								List<PayCompanyManagement> finalListCompany = listCompany;
-								List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
-										Objects.equals(item.getName(),p.getContactsTemporaryNameTwo())
-												&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
-								if(CollectionUtils.isEmpty(listContacts)){
-									msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人二，请修改。</br>");
-								}else{
-									p.setContactsIdTwo(listContacts.get(0).getId());
-								}
-							}
-						}
-						// 校验联系人三
-						if(!StringUtils.isBlank(p.getContactsTemporaryNameThree()) && !CollectionUtils.isEmpty(listCompany)){
-							if(!CollectionUtils.isEmpty(listCompany)){
-								// 通过联系人获取联系人id
-								List<PayCompanyManagement> finalListCompany = listCompany;
-								List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
-										Objects.equals(item.getName(),p.getContactsTemporaryNameThree())
-												&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
-								if(CollectionUtils.isEmpty(listContacts)){
-									msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人三，请修改。</br>");
-								}else{
-									p.setContactsIdThree(listContacts.get(0).getId());
-								}
-							}
-						}
-						// 校验邮寄联系人
-						if(StringUtils.isBlank(p.getMailContactsTemporaryName())){
-							msg.append("第 ").append(count + 3).append(" 行：邮寄联系人不能为空，请修改。</br>");
-						}else{
-							if(!CollectionUtils.isEmpty(listCompany)){
-								// 通过联系人获取联系人id
-								List<PayCompanyManagement> finalListCompany = listCompany;
-								List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
-										Objects.equals(item.getName(),p.getMailContactsTemporaryName())
-												&& Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
-								if(CollectionUtils.isEmpty(listContacts)){
-									msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该邮寄联系人，请修改。</br>");
-								}else{
-									p.setMailContactsId(listContacts.get(0).getId());
-								}
-							}
-						}
-						// 校验成员唯一性
-						List<PayWorkingGroupSubItem> listCompanyAndContactsNew = listCompanyAndContacts.stream().filter(item->Objects.equals(p.getChargeCompanyTemporaryName(),item.getChargeCompanyTemporaryName())
-							&& Objects.equals(p.getContactsTemporaryNameOne(),item.getContactsTemporaryNameOne())).collect(Collectors.toList());
-						if(!CollectionUtils.isEmpty(listCompanyAndContactsNew)){
-							msg.append("第 ").append(count + 3).append(" 行：工作组成员重复出现，请修改。</br>");
-						}
-						listCompanyAndContacts.add(p);
-
-						if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
-							if(Objects.isNull(p.getReceivableAmount())){
-								msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
-							}
-							if(StringUtils.isBlank(p.getContractNum())){
-								msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。</br>");
-							}
-						}
-						if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
-							if(Objects.isNull(p.getChargeNoticeNo())){
-								msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。</br>");
-							}else{
-								if(Objects.equals(payWorkingGroup.getChargeNoticeNoA(),p.getChargeNoticeNo())) {
-									p.setChargeNoticeId(payWorkingGroup.getChargeNoticeAId());
-								}else if(Objects.equals(payWorkingGroup.getChargeNoticeNoB(),p.getChargeNoticeNo()) ){
-									p.setChargeNoticeId(payWorkingGroup.getChargeNoticeBId());
-								}else{
-									msg.append("第 ").append(count + 3).append(" 行：收费通知号不存在，请修改。</br>");
-								}
-							}
-							if(Objects.isNull(p.getReceivableAmount())){
-								msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
-							}
-						}
-						p.setPack(PayProjectCommon.PACKAGING0);
-						p.setInAccount(PayProjectCommon.IN_ACCOUNT0);
-						p.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
-						p.setMail(PayProjectCommon.MAIL0);
-						// 校验字段值
-						StringBuilder s = ValidUtil.validateExcel(p,(count+3));
-						if(!StringUtils.isBlank(s)){
-							msg.append(s);
-						}
-					});
-					if(!StringUtils.isBlank(msg)){
-						return Result.error(msg.toString());
-					}
-					// 拷贝企业，联系人
-					list.forEach(p->{
-						setPayWorkingGroupSubItem(p);
-					});
-					// 更新数据
-					payWorkingGroupSubItemService.saveBatch(list);
-				}
-			} catch (Exception e) {
-				log.error(e.getMessage(),e);
-				return Result.error("文件导入失败！");
-			} finally {
-				try {
-					file.getInputStream().close();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
+    public Result<?> importExcel(HttpServletRequest request) {
+		payWorkingGroupSubItemService.importExcel(request);
 		return Result.OK("文件导入成功！");
    }

@@ -6,6 +6,7 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.project.vo.SetChargeInput;

+import javax.servlet.http.HttpServletRequest;
 import java.util.List;

 /**
@@ -33,4 +34,31 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
    * @Exception   
    */
    IPage<PayWorkingGroupSubItem> queryPageList(Page<PayWorkingGroupSubItem> page,PayWorkingGroupSubItem payWorkingGroupSubitem,String paymentDate);
+    /**
+    * @Description 添加
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void addPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem);
+    /**
+    * @Description 编辑
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void editPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem);
+    /**
+    * @Description excel导入
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    void importExcel(HttpServletRequest request);
 }
@@ -1,16 +1,47 @@
 package com.jero.project.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.util.ValidUtil;
+import com.jero.company.entity.PayCompanyManagement;
+import com.jero.company.entity.PayContactsManagement;
+import com.jero.company.service.IPayCompanyManagementService;
+import com.jero.company.service.IPayContactsManagementService;
+import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayWorkingGroup;
+import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.project.vo.SetChargeInput;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
+import com.jero.temporary.service.IPayContactsManagementTemporaryService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;

 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;

 /**
 * @Description: pay_working_group_subitem
@@ -18,11 +49,24 @@ import javax.annotation.Resource;
 * @Date:   2021-08-27
 * @Version: V1.0
 */
+@Slf4j
@Service
 public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGroupSubItemMapper, PayWorkingGroupSubItem> implements IPayWorkingGroupSubItemService {

    @Resource
    private PayWorkingGroupSubItemMapper payWorkingGroupSubItemMapper;
+    @Autowired
+    private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
+    @Autowired
+    private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
+    @Autowired
+    private IPayCompanyManagementService payCompanyManagementService;
+    @Autowired
+    private IPayContactsManagementService payContactsManagementService;
+    @Autowired
+    private IPayWorkingGroupService payWorkingGroupService;
+    @Autowired
+    private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;

    @Override
    public void updateBatchSetCharge(SetChargeInput input) {
@@ -34,4 +78,381 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
        return payWorkingGroupSubItemMapper.queryPageList(page,payWorkingGroupSubitem,paymentDate);
    }

+    @Override
+    @Transactional
+    public void addPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem) {
+        if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY2){
+            if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
+                throw new RuntimeException("应收金额不能为空");
+            }
+            if(StringUtils.isBlank(payWorkingGroupSubItem.getContractNum())){
+                throw new RuntimeException("合同号不能为空");
+            }
+        }
+        if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY3){
+            if(Objects.isNull(payWorkingGroupSubItem.getChargeNoticeNo())){
+                throw new RuntimeException("收费通知号不能为空");
+            }
+            if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
+                throw new RuntimeException("应收金额不能为空");
+            }
+        }
+
+        PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+        if(Objects.isNull(payWorkingGroup)){
+            throw new RuntimeException("工作组不存在！");
+        }
+
+        try {
+            // 编辑保存前再次校验来款项目是否存在
+            LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId());
+            queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
+            queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
+            PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper);
+            // 企业和联系人同时存在，则校验不通过
+            if(!Objects.isNull(payWorkingGroupSubItemNew)) {
+                throw new RuntimeException("工作组成员已存在！");
+            }
+        }catch (Exception e){
+            log.info("工作组成员-添加异常",e);
+            throw new RuntimeException("工作组成员已存在！");
+        }
+
+        payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
+        payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0);
+        payWorkingGroupSubItem.setInAccount(PayProjectCommon.IN_ACCOUNT0);
+        payWorkingGroupSubItem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
+        payWorkingGroupSubItem.setMail(PayProjectCommon.MAIL0);
+        payWorkingGroupSubItemService.save(payWorkingGroupSubItem);
+    }
+
+    @Override
+    @Transactional
+    public void editPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem) {
+        if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY2){
+            if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
+                throw new RuntimeException("应收金额不能为空");
+            }
+            if(StringUtils.isBlank(payWorkingGroupSubItem.getContractNum())){
+                throw new RuntimeException("合同号不能为空");
+            }
+        }
+        if(payWorkingGroupSubItem.getChargeWay() == PayProjectCommon.CHARGE_WAY3){
+            if(Objects.isNull(payWorkingGroupSubItem.getChargeNoticeNo())){
+                throw new RuntimeException("收费通知号不能为空");
+            }
+            if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){
+                throw new RuntimeException("应收金额不能为空");
+            }
+        }
+        PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+        if(Objects.isNull(payWorkingGroup)){
+            throw new RuntimeException("工作组不存在！");
+        }
+        try {
+            // 编辑保存前再次校验来款项目是否存在
+            LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId());
+            queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
+            queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
+            PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper);
+            // 来款项目存在，并且编辑id与查询不同，则校验不通过
+            if(!Objects.isNull(payWorkingGroupSubItemNew)
+                    && !Objects.equals(payWorkingGroupSubItemNew.getId(),payWorkingGroupSubItem.getId())) {
+                throw new RuntimeException("工作组成员已存在！");
+            }
+        }catch (Exception e){
+            log.info("工作组成员-编辑异常",e);
+            throw new RuntimeException("工作组成员已存在！");
+        }
+
+        payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
+        payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+    }
+
+    @Override
+    @Transactional
+    public void importExcel(HttpServletRequest request) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        String workGroupId;
+        try {
+            workGroupId = multipartRequest.getParameter("workGroupId");
+        }catch (Exception e){
+            log.error("获取工作组id异常",e);
+            throw new RuntimeException("工作组id不能为空 ！");
+        }
+        if(StringUtils.isBlank(workGroupId)){
+            throw new RuntimeException("工作组id不能为空 ！");
+        }
+
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(1);
+            params.setHeadRows(1);
+            try {
+                //导入Excel格式校验，看匹配的字段文本概率
+                Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), PayWorkingGroupSubItem.class, params);
+                if(!t){
+                    throw new RuntimeException("导入Excel校验失败 ！");
+                }
+                List<PayWorkingGroupSubItem> list = ExcelImportUtil.importExcel(file.getInputStream(), PayWorkingGroupSubItem.class, params);
+                if(!CollectionUtils.isEmpty(list)){
+                    // 校验重复成员的集合
+                    List<PayWorkingGroupSubItem> listCompanyAndContacts = new ArrayList<>();
+                    StringBuilder msg = new StringBuilder();
+                    // 获取excel中的企业名称
+                    List<String> listCompanyName = list.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryName).collect(Collectors.toList());
+                    // 获取excel企业信息
+                    LambdaQueryWrapper<PayCompanyManagement> companyWrapper = new LambdaQueryWrapper<>();
+                    companyWrapper.in(PayCompanyManagement::getCompanyName,listCompanyName);
+                    List<PayCompanyManagement> listCompanyInfo = payCompanyManagementService.list(companyWrapper);
+                    if(CollectionUtils.isEmpty(listCompanyInfo)){
+                        throw new RuntimeException("excel中企业不存在 ！");
+                    }
+                    List<String> listContactsName = new ArrayList<>();
+                    // 获取excel中联系人一名称
+                    List<String> listContactsNameOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList());
+                    if(!CollectionUtils.isEmpty(listContactsNameOne)){
+                        listContactsName.addAll(listContactsNameOne);
+                    }
+                    // 获取excel中联系人二名称
+                    List<String> listContactsNameTwo = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameTwo).collect(Collectors.toList());
+                    if(!CollectionUtils.isEmpty(listContactsNameTwo)){
+                        listContactsName.addAll(listContactsNameTwo);
+                    }
+                    // 获取excel中联系人三名称
+                    List<String> listContactsNameThree = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameThree).collect(Collectors.toList());
+                    if(!CollectionUtils.isEmpty(listContactsNameThree)){
+                        listContactsName.addAll(listContactsNameThree);
+                    }
+                    // 获取excel中邮寄联系人名称
+                    List<String> listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList());
+                    if(!CollectionUtils.isEmpty(listContactsNameMail)){
+                        listContactsName.addAll(listContactsNameMail);
+                    }
+                    // 获取excel联系人信息
+                    LambdaQueryWrapper<PayContactsManagement> contactsWrapper = new LambdaQueryWrapper<>();
+                    contactsWrapper.in(PayContactsManagement::getName,listContactsName);
+                    List<PayContactsManagement> listContactsInfo = payContactsManagementService.list(contactsWrapper);
+                    if(CollectionUtils.isEmpty(listContactsInfo)){
+                        throw new RuntimeException("excel中联系人不存在 ！");
+                    }
+                    // 获取工作组信息
+                    PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
+                    if(Objects.isNull(payWorkingGroup)){
+                        throw new RuntimeException("工作组不存在 ！");
+                    }
+
+                    // 获取工作组成员
+                    LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
+                    query.eq(PayWorkingGroupSubItem::getWorkingGroupId,workGroupId);
+                    List<PayWorkingGroupSubItem> listData = payWorkingGroupSubItemService.list(query);
+                    list.forEach(p->{
+                        p.setWorkingGroupId(workGroupId);
+                        int count = list.indexOf(p);
+                        // 校验企业名称
+                        List<PayCompanyManagement> listCompany = new ArrayList<>();
+                        if(StringUtils.isBlank(p.getChargeCompanyTemporaryName())){
+                            msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。</br>");
+                        }else{
+                            // 通过企业名称获取企业id
+                            listCompany = listCompanyInfo.stream().filter(item->
+                                    Objects.equals(item.getCompanyName(),p.getChargeCompanyTemporaryName())).collect(Collectors.toList());
+                            if(CollectionUtils.isEmpty(listCompany)){
+                                msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。</br>");
+                            }else{
+                                p.setChargeCompanyId(listCompany.get(0).getId());
+                            }
+                        }
+                        // 校验联系人一
+                        if(StringUtils.isBlank(p.getContactsTemporaryNameOne())){
+                            msg.append("第 ").append(count + 3).append(" 行：联系人不能为空，请修改。</br>");
+                        }else{
+                            if(!CollectionUtils.isEmpty(listCompany)){
+                                // 通过联系人获取联系人id
+                                List<PayCompanyManagement> finalListCompany = listCompany;
+                                List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
+                                        Objects.equals(item.getName(),p.getContactsTemporaryNameOne())
+                                                && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
+                                if(CollectionUtils.isEmpty(listContacts)){
+                                    msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人一，请修改。</br>");
+                                }else{
+                                    p.setContactsIdOne(listContacts.get(0).getId());
+                                }
+                            }
+                        }
+                        // 校验工作组是否已存在成员
+                        if(!StringUtils.isBlank(p.getChargeCompanyId()) && !StringUtils.isBlank(p.getContactsIdOne())){
+                            List<PayWorkingGroupSubItem> listDateNew = listData.stream().filter(item->Objects.equals(p.getChargeCompanyId(),item.getChargeCompanyId())
+                                    && Objects.equals(p.getContactsIdOne(),item.getContactsIdOne())).collect(Collectors.toList());
+                            if(!CollectionUtils.isEmpty(listDateNew)){
+                                msg.append("第 ").append(count + 3).append(" 行：工作组成员已存在，请修改。</br>");
+                            }
+                        }
+                        // 校验联系人二
+                        if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !CollectionUtils.isEmpty(listCompany)){
+                            if(!CollectionUtils.isEmpty(listCompany)){
+                                // 通过联系人获取联系人id
+                                List<PayCompanyManagement> finalListCompany = listCompany;
+                                List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
+                                        Objects.equals(item.getName(),p.getContactsTemporaryNameTwo())
+                                                && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
+                                if(CollectionUtils.isEmpty(listContacts)){
+                                    msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人二，请修改。</br>");
+                                }else{
+                                    p.setContactsIdTwo(listContacts.get(0).getId());
+                                }
+                            }
+                        }
+                        // 校验联系人三
+                        if(!StringUtils.isBlank(p.getContactsTemporaryNameThree()) && !CollectionUtils.isEmpty(listCompany)){
+                            if(!CollectionUtils.isEmpty(listCompany)){
+                                // 通过联系人获取联系人id
+                                List<PayCompanyManagement> finalListCompany = listCompany;
+                                List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
+                                        Objects.equals(item.getName(),p.getContactsTemporaryNameThree())
+                                                && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
+                                if(CollectionUtils.isEmpty(listContacts)){
+                                    msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该联系人三，请修改。</br>");
+                                }else{
+                                    p.setContactsIdThree(listContacts.get(0).getId());
+                                }
+                            }
+                        }
+                        // 校验邮寄联系人
+                        if(StringUtils.isBlank(p.getMailContactsTemporaryName())){
+                            msg.append("第 ").append(count + 3).append(" 行：邮寄联系人不能为空，请修改。</br>");
+                        }else{
+                            if(!CollectionUtils.isEmpty(listCompany)){
+                                // 通过联系人获取联系人id
+                                List<PayCompanyManagement> finalListCompany = listCompany;
+                                List<PayContactsManagement> listContacts = listContactsInfo.stream().filter(item->
+                                        Objects.equals(item.getName(),p.getMailContactsTemporaryName())
+                                                && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList());
+                                if(CollectionUtils.isEmpty(listContacts)){
+                                    msg.append("第 ").append(count + 3).append(" 行：该企业下不存在该邮寄联系人，请修改。</br>");
+                                }else{
+                                    p.setMailContactsId(listContacts.get(0).getId());
+                                }
+                            }
+                        }
+                        // 校验成员唯一性
+                        List<PayWorkingGroupSubItem> listCompanyAndContactsNew = listCompanyAndContacts.stream().filter(item->Objects.equals(p.getChargeCompanyTemporaryName(),item.getChargeCompanyTemporaryName())
+                                && Objects.equals(p.getContactsTemporaryNameOne(),item.getContactsTemporaryNameOne())).collect(Collectors.toList());
+                        if(!CollectionUtils.isEmpty(listCompanyAndContactsNew)){
+                            msg.append("第 ").append(count + 3).append(" 行：工作组成员重复出现，请修改。</br>");
+                        }
+                        listCompanyAndContacts.add(p);
+
+                        if(Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY2)){
+                            if(Objects.isNull(p.getReceivableAmount())){
+                                msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
+                            }
+                            if(StringUtils.isBlank(p.getContractNum())){
+                                msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。</br>");
+                            }
+                        }
+                        if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
+                            if(Objects.isNull(p.getChargeNoticeNo())){
+                                msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。</br>");
+                            }else{
+                                if(Objects.equals(payWorkingGroup.getChargeNoticeNoA(),p.getChargeNoticeNo())) {
+                                    p.setChargeNoticeId(payWorkingGroup.getChargeNoticeAId());
+                                }else if(Objects.equals(payWorkingGroup.getChargeNoticeNoB(),p.getChargeNoticeNo()) ){
+                                    p.setChargeNoticeId(payWorkingGroup.getChargeNoticeBId());
+                                }else{
+                                    msg.append("第 ").append(count + 3).append(" 行：收费通知号不存在，请修改。</br>");
+                                }
+                            }
+                            if(Objects.isNull(p.getReceivableAmount())){
+                                msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
+                            }
+                        }
+                        p.setPack(PayProjectCommon.PACKAGING0);
+                        p.setInAccount(PayProjectCommon.IN_ACCOUNT0);
+                        p.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
+                        p.setMail(PayProjectCommon.MAIL0);
+                        // 校验字段值
+                        StringBuilder s = ValidUtil.validateExcel(p,(count+3));
+                        if(!StringUtils.isBlank(s)){
+                            msg.append(s);
+                        }
+                    });
+                    if(!StringUtils.isBlank(msg)){
+                        throw new RuntimeException(msg.toString());
+                    }
+                    // 拷贝企业，联系人
+                    list.forEach(p->{
+                        setPayWorkingGroupSubItem(p);
+                    });
+                    // 更新数据
+                    payWorkingGroupSubItemService.saveBatch(list);
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage(),e);
+                throw new RuntimeException("文件导入失败！");
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * @Description 插入企业信息，联系人信息到临时表，更新项目记录
+     * @Author  lqt
+     * @Date   2021/8/31
+     * @Param  payCommonProject
+     * @Return
+     * @Exception
+     */
+    private PayWorkingGroupSubItem setPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem){
+        // 企业
+        PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payWorkingGroupSubItem.getChargeCompanyId());
+        if(Objects.isNull(chargeCompanyName)){
+            throw new JeroBootException("企业名称为空！");
+        }
+        payWorkingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId());
+        payWorkingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
+        // 企业联系人一
+        PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne());
+        if(Objects.isNull(contactsNameOne)){
+            throw new JeroBootException("企业联系人一名称为空！");
+        }
+        payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId());
+        payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName());
+        if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
+            // 企业联系人二
+            PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo());
+            if(Objects.isNull(contactsNameTwo)){
+                throw new JeroBootException("企业联系人二名称为空！");
+            }
+            payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId());
+            payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName());
+        }
+        if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
+            // 企业联系人三
+            PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree());
+            if(Objects.isNull(contactsNameThree)){
+                throw new JeroBootException("企业联系人三名称为空！");
+            }
+            payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId());
+            payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName());
+        }
+        // 邮寄联系人
+        PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getMailContactsId());
+        if(Objects.isNull(mailContactsName)){
+            throw new JeroBootException("邮寄联系人名称为空！");
+        }
+        payWorkingGroupSubItem.setMailContactsTemporaryId(mailContactsName.getId());
+        payWorkingGroupSubItem.setMailContactsTemporaryName(mailContactsName.getName());
+        return payWorkingGroupSubItem;
+    }
+
 }