企业端起草组列表查询

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

@@ -132,7 +132,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
 
     /**
      * 企业端-起草组项目-分页列表查询
-     * 起草组的企业联系人1，2，3、邮寄联系人、打包的企业联系人、打包联系人、关联合同的签订单位联系人
+     * 起草组的企业联系人1，2，3
      * @param payDraftingGroupSubItem 起草组项目成员
      * @param pageNo 页数
      * @param pageSize 条数
@@ -150,15 +150,6 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
         }
         Page<PayDraftingGroupSubItem> page = new Page<>(pageNo, pageSize);
         List<Integer> listNeedInvoice = new ArrayList<>();
-//        if(!Objects.isNull(payDraftingGroupSubItem.getNeedInvoice())){
-//            // 需要发票 ： 3为 需要发票，小程序需要
-//            if(Objects.equals(payDraftingGroupSubItem.getNeedInvoice(), PayProjectCommon.NEED_INVOICE3)){
-//                listNeedInvoice.add(1);
-//                listNeedInvoice.add(2);
-//            }else{
-//                listNeedInvoice.add(payDraftingGroupSubItem.getNeedInvoice());
-//            }
-//        }
         if(!StringUtils.isBlank(payDraftingGroupSubItem.getChargeProject())){
             payDraftingGroupSubItem.setChargeProject(oConvertUtils.replaceAllPercent(payDraftingGroupSubItem.getChargeProject()));
         }
@@ -167,7 +158,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
         if (!sysUser.getIsCompanyManager()) {
             List<String> listProjectIds = new ArrayList<>();
 
-            // 工作组的企业联系人
+            // 起草组的企业联系人
             LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
             queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getContactsId,sysUser.getId());
             List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts);
@@ -175,52 +166,6 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
                 List<String> listProjectId = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getDraftingGroupSubId).collect(Collectors.toList());
                 listProjectIds.addAll(listProjectId);
             }
-
-            // 邮寄联系人
-            LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
-            queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
-            List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
-            if(!CollectionUtils.isEmpty(listPayMailBill)){
-                List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
-                LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-                queryPayMailBillProject.in(PayMailBillProject::getBillId,listId);
-                List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
-                if(!CollectionUtils.isEmpty(listPayMailBillProject)){
-                    List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
-                    listProjectIds.addAll(listProjectId);
-                }
-            }
-            // 打包的企业联系人和打包联系人
-            LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
-            queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or()
-                    .eq(PayPackCompany::getPackContactId,sysUser.getId());
-            List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
-            if(!CollectionUtils.isEmpty(listPayPackCompany)){
-                List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
-                LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
-                queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
-                queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType, PayProjectCommon.PROJECT_TYPE2);
-                List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
-                if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
-                    List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
-                    listProjectIds.addAll(listId);
-                }
-            }
-            // 关联合同的签订单位联系人
-            LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
-            queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId());
-            List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
-            if(!CollectionUtils.isEmpty(listPayIncomeContract)){
-                List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
-                LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
-                queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
-                queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2);
-                List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
-                if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
-                    List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
-                    listProjectIds.addAll(listProjectId);
-                }
-            }
             List<String> listProjectIdsNew = new ArrayList<>();
             if(!CollectionUtils.isEmpty(listProjectIds)){
                 listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
@@ -232,8 +177,6 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             pageList = payDraftingGroupSubItemService.queryCompanyPageListByCompanyManager(page, payDraftingGroupSubItem,listNeedInvoice,sysUser.getCompanyId());
         }
 
-
-
         if(!CollectionUtils.isEmpty(pageList.getRecords())){
             List<PayDraftingGroupSubItem> list = pageList.getRecords();
             List<String> listIds = list.stream().map(PayDraftingGroupSubItem::getDraftingGroupId).collect(Collectors.toList());
@@ -241,7 +184,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             queryPayDraftingGroup.in(PayDraftingGroup::getId,listIds);
             List<PayDraftingGroup> listPayDraftingGroup = payDraftingGroupService.list(queryPayDraftingGroup);
             if(CollectionUtils.isEmpty(listPayDraftingGroup)){
-                return Result.error("工作组不存在");
+                return Result.error("起草组不存在");
             }
             List<String> listString = listPayDraftingGroup.stream().map(PayDraftingGroup::getPrincipalIdA).collect(Collectors.toList());
             LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
@@ -249,12 +192,6 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             List<SysUser> listSysUser = sysUserService.list(querySysUser);
 
             list.forEach(p->{
-//                if(Objects.isNull(p.getReceivableAmount())){
-//                    p.setReceivableAmount(new BigDecimal("0.00"));
-//                }
-//                if(Objects.isNull(p.getPaidAmount())){
-//                    p.setPaidAmount(new BigDecimal("0.00"));
-//                }
                 List<PayDraftingGroup> listPrincipalIdA = listPayDraftingGroup.stream().filter(item->Objects.equals(item.getId(),p.getDraftingGroupId())).collect(Collectors.toList());
                 if(!CollectionUtils.isEmpty(listPrincipalIdA)){
                     if(!CollectionUtils.isEmpty(listSysUser)){
@@ -331,12 +268,12 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
     /**
      * 编辑
      *
-     * @param payDraftingGroupSubItem 工作组成员
+     * @param payDraftingGroupSubItem 起草组成员
      * @return
      */
-    @AutoLog(value = "工作组成员-修改",operateType = 3)
+    @AutoLog(value = "起草组成员-修改",operateType = 3)
     @RequiresPermissions("draftingGroupMember:edit")
-    @ApiOperation(value = "工作组成员-编辑", notes = "工作组成员-编辑")
+    @ApiOperation(value = "起草组成员-编辑", notes = "起草组成员-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) {
         StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem);

jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml

@@ -73,18 +73,9 @@
             <if test="payDraftingGroupSubItem.chargeProject != null and payDraftingGroupSubItem.chargeProject != ''">
                 AND pwg.drafting_group_project like concat('%',concat(#{payDraftingGroupSubItem.chargeProject},'%'))
             </if>
-            <if test="payDraftingGroupSubItem.pack != null">
-                AND pwgs.pack = #{payDraftingGroupSubItem.pack}
-            </if>
             <if test="payDraftingGroupSubItem.year != null and payDraftingGroupSubItem.year != ''">
                 AND pwg.year = #{payDraftingGroupSubItem.year}
             </if>
-            <if test="listNeedInvoice != null and listNeedInvoice.size() > 0">
-                AND pwgs.need_invoice in
-                <foreach collection="listNeedInvoice" index="index" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
             <if test="listProjectIds != null and listProjectIds.size() > 0">
                 AND pwgs.id in
                 <foreach collection="listProjectIds" index="index" item="item" open="(" close=")" separator=",">
@@ -103,18 +94,9 @@
             <if test="payDraftingGroupSubItem.chargeProject != null and payDraftingGroupSubItem.chargeProject != ''">
                 AND pwg.drafting_group_project like concat('%',concat(#{payDraftingGroupSubItem.chargeProject},'%'))
             </if>
-            <if test="payDraftingGroupSubItem.pack != null">
-                AND pwgs.pack = #{payDraftingGroupSubItem.pack}
-            </if>
             <if test="payDraftingGroupSubItem.year != null and payDraftingGroupSubItem.year != ''">
                 AND pwg.year = #{payDraftingGroupSubItem.year}
             </if>
-            <if test="listNeedInvoice != null and listNeedInvoice.size() > 0">
-                AND pwgs.need_invoice in
-                <foreach collection="listNeedInvoice" index="index" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
             <if test="companyId != null and companyId != ''">
                 and pwgs.charge_company_id = #{companyId}
             </if>

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

@@ -1,11 +1,15 @@
 package com.jero.drafting.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.common.ProjectCommon;
+import com.jero.common.dto.PaySendContactsMessageDTO;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ImportExcelUtil;
@@ -26,6 +30,7 @@ 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;
@@ -43,6 +48,7 @@ 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;
 
@@ -80,6 +86,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
     private RolePermissionService rolePermissionService;
     @Resource
     private PayDraftingGroupSubItemContactsMapper payDraftingGroupSubItemContactsMapper;
+    @Resource
+    private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
 
     /**
      * 分页查询
@@ -169,6 +177,29 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         if (Objects.isNull(sysUserInfo)) {
             throw new JeroBootException("负责人不存在!");
         }
+
+        JSONObject json = new JSONObject();
+        json.put("type",ProjectCommon.PROJECT_TYPE2);
+        json.put("draftGroupId",payDraftingGroupSubItem.getDraftingGroupId());
+        json.put("projectId",payDraftingGroupSubItem.getId());
+        json.put("path","/draftTeam/DraftTeamDetail");
+        //新建项目 给企业联系人发消息
+        if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) {
+            for (PayDraftingGroupSubItemContacts subItemContacts : listPayDraftingGroupSubItemContactsNew) {
+                PayContactsManagement payContactsManagement = payContactsManagementService.getById(subItemContacts.getContactsId());
+                if (!Objects.isNull(payContactsManagement)) {
+                    PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO();
+                    paySendContactsMessageDTO.setProjectName(payDraftingGroup.getDraftingGroupProject());
+                    paySendContactsMessageDTO.setProjectId(payDraftingGroupSubItem.getId());
+                    paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
+                    paySendContactsMessageDTO.setUserId(payDraftingGroup.getPrincipalIdA());
+                    paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
+                    paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
+                    paySendContactsMessageDTO.setJson(json);
+                    contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
+                }
+            }
+        }
     }
 
     /**