企业端起草组操作列添加联系人修改

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

@@ -12,10 +12,6 @@ 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.contract.entity.PayIncomeContract;
-import com.jero.contract.entity.PayIncomeContractAssociated;
-import com.jero.contract.service.IPayIncomeContractAssociatedService;
-import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.drafting.common.DraftingConstant;
 import com.jero.drafting.entity.PayDraftingGroup;
 import com.jero.drafting.entity.PayDraftingGroupSubItem;
@@ -25,17 +21,8 @@ import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
 import com.jero.drafting.service.IPayDraftingGroupSubItemService;
 import com.jero.drafting.vo.CheckVo;
 import com.jero.drafting.vo.PayDraftingGroupSubItemExcel;
-import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.entity.PayMailBillProject;
-import com.jero.mail.service.IPayMailBillProjectService;
-import com.jero.mail.service.IPayMailBillService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.pack.entity.PayPackCompany;
-import com.jero.pack.entity.PayPackCompanyProject;
-import com.jero.pack.service.IPayPackCompanyProjectService;
-import com.jero.pack.service.IPayPackCompanyService;
-import com.jero.project.common.PayProjectCommon;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import io.swagger.annotations.Api;
@@ -305,7 +292,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
         if (!StringUtils.isBlank(msg)) {
             return Result.error(msg.toString());
         }
-        payDraftingGroupSubItemService.editPayWorkingGroupSubItem(payDraftingGroupSubItem);
+        payDraftingGroupSubItemService.editPayWorkingGroupSubItemByCompany(payDraftingGroupSubItem);
         return Result.OK("编辑成功!");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java

@@ -52,6 +52,13 @@ public interface IPayDraftingGroupSubItemService extends IService<PayDraftingGro
      */
     void editPayWorkingGroupSubItem(PayDraftingGroupSubItem payDraftingGroupSubItem);
 
+
+    /**
+     * 企业端编辑
+     * @param payDraftingGroupSubItem
+     */
+    void editPayWorkingGroupSubItemByCompany(PayDraftingGroupSubItem payDraftingGroupSubItem);
+
     /**
      * excel导入
      * @param request

jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java

@@ -30,7 +30,6 @@ import com.jero.drafting.service.IPayDraftingGroupSubItemService;
 import com.jero.drafting.vo.CheckVo;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.project.entity.PayWorkingGroupSubItemContacts;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -48,7 +47,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -366,6 +364,71 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         payDraftingGroupSubItemService.updateById(payDraftingGroupSubItem);
     }
 
+    /**
+     * 编辑
+     *
+     * @param payDraftingGroupSubItem
+     */
+    @Override
+    public void editPayWorkingGroupSubItemByCompany(PayDraftingGroupSubItem payDraftingGroupSubItem) {
+        String draftingGroupSubItemId = payDraftingGroupSubItem.getId();
+        PayDraftingGroupSubItem payDraftingGroupSubItemOld = payDraftingGroupSubItemService.getById(draftingGroupSubItemId);
+        if (Objects.isNull(payDraftingGroupSubItemOld)) {
+            throw new JeroBootException("项目不存在！");
+        }
+        PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItemOld.getDraftingGroupId());
+        if (Objects.isNull(payDraftingGroup)) {
+            throw new JeroBootException("起草组不存在！");
+        }
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // 判断当前登录人是否为企业联系人
+        LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
+        queryDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubItemId);
+        queryDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getContactsId,sysUser.getId());
+        long l  = payDraftingGroupSubItemContactsService.count(queryDraftingGroupSubItemContacts);
+        if(l == 0){
+            throw new JeroBootException("非起草组成员不可操作！");
+        }
+
+        try {
+            // 编辑保存前再次校验来款项目是否存在
+            LambdaQueryWrapper<PayDraftingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(PayDraftingGroupSubItem::getDraftingGroupId, payDraftingGroupSubItem.getDraftingGroupId());
+            queryWrapper.eq(PayDraftingGroupSubItem::getChargeCompanyId, payDraftingGroupSubItem.getChargeCompanyId());
+            PayDraftingGroupSubItem payDraftingGroupSubItemNew = payDraftingGroupSubItemService.getOne(queryWrapper);
+            // 企业和联系人同时存在，则校验不通过
+            if (!Objects.isNull(payDraftingGroupSubItemNew) && !Objects.equals(payDraftingGroupSubItemNew.getId(), draftingGroupSubItemId)) {
+                throw new JeroBootException("起草组成员单位已存在！");
+            }
+        } catch (Exception e) {
+            throw new JeroBootException("起草组成员单位已存在！");
+        }
+        LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
+        queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, payDraftingGroupSubItemOld.getId());
+        List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts);
+        if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)) {
+            payDraftingGroupSubItemOld.setPayDraftingGroupSubItemContactsList(listPayDraftingGroupSubItemContacts);
+        }
+        setPayDraftingGroupSubItemEdit(payDraftingGroupSubItem, payDraftingGroupSubItemOld);
+        List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContactsNew = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList();
+        // 添加联系人表
+        if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) {
+            // 先删除之前的企业联系人
+            LambdaUpdateWrapper<PayDraftingGroupSubItemContacts> updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>();
+            updatePayWorkingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubItemId);
+            payDraftingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts);
+            // 添加新的企业联系人
+            for (int i = 0; i < listPayDraftingGroupSubItemContactsNew.size(); i++) {
+                listPayDraftingGroupSubItemContactsNew.get(i).setOrderNum(i + 1);
+                listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupSubId(draftingGroupSubItemId);
+                listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupId(payDraftingGroupSubItem.getDraftingGroupId());
+            }
+            payDraftingGroupSubItemContactsService.saveBatch(listPayDraftingGroupSubItemContactsNew);
+        }
+        payDraftingGroupSubItemService.updateById(payDraftingGroupSubItem);
+    }
+
     /**
      * 插入企业信息，联系人信息到临时表，更新项目记录
      *