工作组，起草组操作列添加联系人维护

jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java

@@ -6,14 +6,12 @@ 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.exception.JeroBootException;
-import com.jero.common.service.ProjectDetailService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
-import com.jero.common.vo.ProjectDetailVO;
 import com.jero.drafting.entity.PayDraftingGroup;
 import com.jero.drafting.entity.PayDraftingGroupSubItem;
 import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
@@ -21,11 +19,6 @@ import com.jero.drafting.service.IPayDraftingGroupService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemService;
 import com.jero.drafting.vo.PayDraftingGroupSubItemExcel;
-import com.jero.modules.system.service.ISysUserService;
-import com.jero.project.entity.PayWorkingGroup;
-import com.jero.project.entity.PayWorkingGroupSubItem;
-import com.jero.project.entity.PayWorkingGroupSubItemContacts;
-import com.jero.project.vo.excel.PayWorkingGroupSubItemExcel;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import io.swagger.annotations.Api;
@@ -41,7 +34,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -175,6 +167,24 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
         return Result.OK("编辑成功!");
     }
 
+    /**
+     * 企业端-工作组成员-修改
+     *
+     * @param payDraftingGroupSubItem 工作组成员
+     * @return
+     */
+    @AutoLog(value = "企业端-工作组成员-修改",operateType = 3)
+    @ApiOperation(value = "企业端-工作组成员-修改", notes = "企业端-工作组成员-修改")
+    @PostMapping(value = "/editCompany")
+    public Result<?> editCompany(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) {
+        StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem);
+        if (!StringUtils.isBlank(msg)) {
+            return Result.error(msg.toString());
+        }
+        payDraftingGroupSubItemService.editPayWorkingGroupSubItem(payDraftingGroupSubItem);
+        return Result.OK("编辑成功!");
+    }
+
 //    /**
 //     * 通过id查询
 //     *

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -2,7 +2,6 @@ package com.jero.project.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
@@ -14,13 +13,11 @@ import com.jero.common.service.ProjectDetailService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.base.controller.JeroController;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.common.vo.ProjectDetailVO;
-import com.jero.company.entity.PayContactsManagement;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
@@ -52,7 +49,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -390,6 +386,28 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 return Result.OK("编辑成功!");
 	 }
 
+	 /**
+	  * 企业端-工作组成员-修改
+	  *
+	  * @param payWorkingGroupSubItem 工作组成员
+	  * @return
+	  */
+	 @AutoLog(value = "企业端-工作组成员-修改",operateType = 3)
+	 @RequiresPermissions("workingGroupMember:edit")
+	 @ApiOperation(value = "企业端-工作组成员-修改", notes = "企业端-工作组成员-修改")
+	 @PostMapping(value = "/editCompany")
+	 public Result<?> editCompany(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
+		 if (Objects.isNull(payWorkingGroupSubItem.getEstimatedArrivalDate())) {
+			 return Result.error("预估到账日期不能为空");
+		 }
+		 StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
+		 if (!StringUtils.isBlank(msg)) {
+			 return Result.error(msg.toString());
+		 }
+		 payWorkingGroupSubItemService.editPayWorkingGroupSubItem(payWorkingGroupSubItem);
+		 return Result.OK("编辑成功!");
+	 }
+
 	 /**
 	  * 催款提醒
 	  *