From 3390af3b82dff4db85c49df26e19bff145d270ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 12 Oct 2021 14:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9C=AA=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 103 ++------ .../PayContactsManagementController.java | 13 +- .../company/entity/PayCompanyManagement.java | 7 +- .../company/entity/PayContactsManagement.java | 7 + .../company/mapper/ProjectCountMapper.java | 7 +- .../xml/PayContactsManagementMapper.xml | 3 +- .../company/mapper/xml/ProjectCountMapper.xml | 70 ++++-- .../service/IPayCompanyManagementService.java | 30 +++ .../company/service/ProjectCountService.java | 8 +- .../impl/PayCompanyManagementServiceImpl.java | 238 +++++++++++++++++- .../service/impl/ProjectCountServiceImpl.java | 5 +- .../company/vo/CompanyOrContactsCount.java | 19 ++ .../controller/PayPackCompanyController.java | 3 - .../entity/PayCompanyManagementTemporary.java | 18 +- .../PayContactsManagementTemporary.java | 11 +- ...CompanyManagementTemporaryServiceImpl.java | 7 +- ...ontactsManagementTemporaryServiceImpl.java | 6 +- 17 files changed, 411 insertions(+), 144 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyOrContactsCount.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 7b2e266a..d4bc2155 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -28,6 +28,7 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.service.ProjectCountService; +import com.jero.company.vo.CompanyOrContactsCount; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.collections.CollectionUtils; @@ -142,9 +143,9 @@ public class PayCompanyManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); @@ -290,6 +292,8 @@ public class PayCompanyManagementController extends JeroController companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) { - StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); - if(!StringUtils.isBlank(msg)){ - return Result.error(msg.toString()); - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - int status = PayCompanyManagementCommon.STATUS2; - // 只有财务人员操作不需要重新审核，其他人都需要审核 - if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ - status = PayCompanyManagementCommon.STATUS1; - } - payCompanyManagement.setStatus(status); - PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId()); - if(Objects.isNull(payCompanyManagementOld)){ - return Result.error("企业不存在!"); - } - if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){ - return Result.error("企业名称不可修改!"); - } - payCompanyManagement.setStatus(payCompanyManagementOld.getStatus()); - payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource()); - try { - // 编辑保存企业前再次校验企业名称是否存在 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); - // 企业名称存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { - return Result.error("企业名称已存在！"); - } - }catch (Exception e){ - log.info("企业管理-编辑异常",e); - return Result.error("企业名称已存在！"); - } - if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ - try { - payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); - }catch (Exception e){ - log.error("公司电话加密异常！",e); - } - } - payCompanyManagementService.updateById(payCompanyManagement); + payCompanyManagementService.companyEdit(payCompanyManagement); return Result.OK("编辑成功!"); } @@ -418,39 +382,7 @@ public class PayCompanyManagementController extends JeroController edit(@RequestBody PayCompanyManagement payCompanyManagement) { - StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); - if(!StringUtils.isBlank(msg)){ - return Result.error(msg.toString()); - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - int status = PayCompanyManagementCommon.STATUS2; - // 只有财务人员操作不需要重新审核，其他人都需要审核 - if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ - status = PayCompanyManagementCommon.STATUS1; - } - payCompanyManagement.setStatus(status); - - try { - // 编辑保存企业前再次校验企业名称是否存在 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); - // 企业名称存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { - return Result.error("企业名称已存在！"); - } - }catch (Exception e){ - log.info("企业管理-编辑异常",e); - return Result.error("企业名称已存在！"); - } - if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ - try { - payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); - }catch (Exception e){ - log.error("公司电话加密异常！",e); - } - } - payCompanyManagementService.updateById(payCompanyManagement); + payCompanyManagementService.edit(payCompanyManagement); return Result.OK("编辑成功!"); } /** @@ -467,15 +399,10 @@ public class PayCompanyManagementController extends JeroController updatePayCompanyManagement = new LambdaUpdateWrapper<>(); - updatePayCompanyManagement.eq(PayCompanyManagement::getId,id); - updatePayCompanyManagement.set(PayCompanyManagement::getStatus,PayCompanyManagementCommon.STATUS1); - updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername()); - updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date()); - payCompanyManagementService.update(updatePayCompanyManagement); + payCompanyManagementService.audit(id); return Result.OK("确认成功!"); } + /** * 通过id删除 * @@ -490,7 +417,9 @@ public class PayCompanyManagementController extends JeroController diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml index 86b1ec89..f1b89780 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/ProjectCountMapper.xml @@ -8,55 +8,85 @@ select id from pay_common_project - - AND charge_company_id = #{companyId} + + AND charge_company_id in + + #{item} + - - AND contacts_id = #{contactsId} + + AND contacts_id in + + #{item} + UNION ALL select id from pay_working_group_subitem - - AND charge_company_id = #{companyId} + + AND charge_company_id in + + #{item} + - - AND contacts_id_one = #{contactsId} + + AND contacts_id_one in + + #{item} + UNION ALL select id from pay_meeting_situation - - AND company_id = #{companyId} + + AND company_id in + + #{item} + - - AND company_contact_id = #{contactsId} + + AND company_contact_id in + + #{item} + UNION ALL select id from pay_member_project_subitem - - AND company_id = #{companyId} + + AND company_id in + + #{item} + - - AND company_contact_id = #{contactsId} + + AND company_contact_id in + + #{item} + UNION ALL select id from tb_member_project_subitem - - AND company_id = #{companyId} + + AND company_id in + + #{item} + - - AND liaison_man_id = #{contactsId} + + AND liaison_man_id in + + #{item} + ) project diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index 46daa5e5..b549b24b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -53,4 +53,34 @@ public interface IPayCompanyManagementService extends IService ids); + /** + * @Description 企业端-编辑 + * @Author lqt + * @Date 2021/10/12 + * @Param + * @Return + * @Exception + */ + void companyEdit(PayCompanyManagement payCompanyManagement); + + /** + * @Description 管理端-编辑 + * @Author lqt + * @Date 2021/10/12 + * @Param + * @Return + * @Exception + */ + void edit(PayCompanyManagement payCompanyManagement); + + /** + * @Description 确认 + * @Author lqt + * @Date 2021/10/12 + * @Param + * @Return + * @Exception + */ + void audit(String id); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java index 79fb6406..72dd1c17 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java @@ -1,14 +1,16 @@ package com.jero.company.service; +import com.jero.company.vo.CompanyOrContactsCount; + + public interface ProjectCountService { /** * @Description 获取关联企业或者联系人的项目个数 * @Author lqt * @Date 2021/9/15 - * @Param companyId 企业id - * @Param contactsId 联系人id + * @Param companyOrContactsCount * @Return * @Exception */ - void getProjectCount(String companyId,String contactsId); + void getProjectCount(CompanyOrContactsCount companyOrContactsCount); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 1f9b05d8..62c1c0b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -1,19 +1,43 @@ package com.jero.company.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.common.RoleCommon; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.ValidUtil; +import com.jero.company.common.PayCompanyManagementCommon; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayCompanyManagementMapper; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; +import com.jero.company.service.ProjectCountService; +import com.jero.company.vo.CompanyOrContactsCount; +import com.jero.contract.entity.PayIncomeContract; +import com.jero.contract.service.IPayIncomeContractService; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.service.IPayMemberProjectSubitemService; +import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.service.IPayPackCompanyService; +import com.jero.project.entity.PayCommonProject; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.IPayCommonProjectService; +import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; +import java.util.Date; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * @Description: pay_company_management @@ -24,14 +48,26 @@ import java.util.List; @Service public class PayCompanyManagementServiceImpl extends ServiceImpl implements IPayCompanyManagementService { - @Autowired - IPayCompanyManagementService payCompanyManagementService; - - @Autowired - private IPayContactsManagementService payContactsManagementService; - @Resource - PayCompanyManagementMapper payCompanyManagementMapper; + private IPayCompanyManagementService payCompanyManagementService; + @Resource + private IPayContactsManagementService payContactsManagementService; + @Resource + private PayCompanyManagementMapper payCompanyManagementMapper; + @Resource + private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService; + @Resource + private IPayCommonProjectService payCommonProjectService; + @Resource + private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; + @Resource + private IPayMemberProjectSubitemService memberProjectSubitemService; + @Resource + private IPayIncomeContractService payIncomeContractService; + @Resource + private IPayPackCompanyService payPackCompanyService; + @Resource + private ProjectCountService projectCountService; @Override @Transactional @@ -57,7 +93,14 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayContactsManagement::getCompanyId,id); - payContactsManagementService.remove(query); + List listPayContactsManagement = payContactsManagementService.list(query); + if(!CollectionUtils.isEmpty(listPayContactsManagement)){ + List listIds = listPayContactsManagement.stream().map(PayContactsManagement::getId).collect(Collectors.toList()); + CompanyOrContactsCount companyOrContactsCount = new CompanyOrContactsCount(); + companyOrContactsCount.setContactsId(listIds); + projectCountService.getProjectCount(companyOrContactsCount); + payContactsManagementService.removeByIds(listIds); + } } @Override @@ -66,6 +109,179 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.in(PayContactsManagement::getCompanyId,ids); - payContactsManagementService.remove(query); + List listPayContactsManagement = payContactsManagementService.list(query); + if(!CollectionUtils.isEmpty(listPayContactsManagement)){ + List listIds = listPayContactsManagement.stream().map(PayContactsManagement::getId).collect(Collectors.toList()); + CompanyOrContactsCount companyOrContactsCount = new CompanyOrContactsCount(); + companyOrContactsCount.setContactsId(listIds); + projectCountService.getProjectCount(companyOrContactsCount); + payContactsManagementService.removeByIds(listIds); + } + } + + @Override + @Transactional + public void companyEdit(PayCompanyManagement payCompanyManagement) { + StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); + if(!StringUtils.isBlank(msg)){ + throw new JeroBootException(msg.toString()); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + int status = PayCompanyManagementCommon.STATUS2; + // 只有财务人员操作不需要重新审核，其他人都需要审核 + if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ + status = PayCompanyManagementCommon.STATUS1; + } + payCompanyManagement.setStatus(status); + PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId()); + if(Objects.isNull(payCompanyManagementOld)){ + throw new JeroBootException("企业不存在!"); + } + if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){ + throw new JeroBootException("企业名称不可修改!"); + } + payCompanyManagement.setStatus(payCompanyManagementOld.getStatus()); + payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource()); + try { + // 编辑保存企业前再次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 企业名称存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { + throw new JeroBootException("企业名称已存在！"); + } + }catch (Exception e){ + // log.info("企业管理-编辑异常",e); + throw new JeroBootException("企业名称已存在！"); + } + if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ + try { + payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); + }catch (Exception e){ + log.error("公司电话加密异常！",e); + throw new JeroBootException("公司电话加密异常！"); + } + } + // 如果该企业状态为通过，更新时间戳 + if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){ + payCompanyManagement.setEditTime(new Date()); + } + payCompanyManagementService.updateById(payCompanyManagement); + } + + @Override + @Transactional + public void edit(PayCompanyManagement payCompanyManagement) { + StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); + if(!StringUtils.isBlank(msg)){ + throw new JeroBootException(msg.toString()); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + int status = PayCompanyManagementCommon.STATUS2; + // 只有财务人员操作不需要重新审核，其他人都需要审核 + if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ + status = PayCompanyManagementCommon.STATUS1; + } + payCompanyManagement.setStatus(status); + PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId()); + try { + // 编辑保存企业前再次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 企业名称存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { + throw new JeroBootException("企业名称已存在！"); + } + }catch (Exception e){ +// log.info("企业管理-编辑异常",e); + throw new JeroBootException("企业名称已存在！"); + } + if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ + try { + payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); + }catch (Exception e){ +// log.error("公司电话加密异常！",e); + throw new JeroBootException("公司电话加密异常！"); + } + } + // 财务人员，直接批量变更状态 + if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ + payCompanyManagementOld.setCompanyName(payCompanyManagement.getCompanyName()); + // 批量变更企业名称 + updateBatchData(payCompanyManagementOld); + }else{ + // 如果该企业状态为通过，更新时间戳 + if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){ + payCompanyManagement.setEditTime(new Date()); + } + } + payCompanyManagementService.updateById(payCompanyManagement); + + } + + @Override + @Transactional + public void audit(String id) { + PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(id); + if(Objects.isNull(payCompanyManagement)){ + throw new JeroBootException("企业不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaUpdateWrapper updatePayCompanyManagement = new LambdaUpdateWrapper<>(); + updatePayCompanyManagement.eq(PayCompanyManagement::getId,id); + updatePayCompanyManagement.set(PayCompanyManagement::getStatus, PayCompanyManagementCommon.STATUS1); + updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername()); + updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date()); + payCompanyManagementService.update(updatePayCompanyManagement); + // 批量变更企业名称 + updateBatchData(payCompanyManagement); + } + /** + * @Description 批量更新数据 + * @Author lqt + * @Date 2021/10/12 + * @Param + * @Return + * @Exception + */ + private void updateBatchData(PayCompanyManagement payCompanyManagement){ + // 更新临时数据 + LambdaUpdateWrapper updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>(); + updatePayCompanyManagementTemporary.eq(PayCompanyManagementTemporary::getCompanyId,payCompanyManagement.getId()); + updatePayCompanyManagementTemporary.ge(PayCompanyManagementTemporary::getEditTime,payCompanyManagement.getEditTime()); + updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyName,payCompanyManagement.getCompanyName()); + payCompanyManagementTemporaryService.update(updatePayCompanyManagementTemporary); + // 更新普通项目 + LambdaUpdateWrapper updatePayCommonProject = new LambdaUpdateWrapper<>(); + updatePayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId()); + updatePayCommonProject.ge(PayCommonProject::getCreateTime,payCompanyManagement.getEditTime()); + updatePayCommonProject.set(PayCommonProject::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName()); + payCommonProjectService.update(updatePayCommonProject); + // 更新工作组 + LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()); + updatePayWorkingGroupSubItem.ge(PayWorkingGroupSubItem::getCreateTime,payCompanyManagement.getEditTime()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName()); + payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + // 更新会员 + LambdaUpdateWrapper updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>(); + updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + updatePayMemberProjectSubitem.ge(PayMemberProjectSubitem::getCreateTime,payCompanyManagement.getEditTime()); + updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName()); + memberProjectSubitemService.update(updatePayMemberProjectSubitem); + // 更新合同 + LambdaUpdateWrapper updatePayIncomeContract = new LambdaUpdateWrapper<>(); + updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,payCompanyManagement.getId()); + updatePayIncomeContract.ge(PayIncomeContract::getCreateTime,payCompanyManagement.getEditTime()); + updatePayIncomeContract.set(PayIncomeContract::getSignedCompanyTemporaryName,payCompanyManagement.getCompanyName()); + payIncomeContractService.update(updatePayIncomeContract); + // 更新打包 + LambdaUpdateWrapper updatePayPackCompany = new LambdaUpdateWrapper<>(); + updatePayPackCompany.eq(PayPackCompany::getCompanyId,payCompanyManagement.getId()); + updatePayPackCompany.ge(PayPackCompany::getCreateTime,payCompanyManagement.getEditTime()); + updatePayPackCompany.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName()); + payPackCompanyService.update(updatePayPackCompany); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/ProjectCountServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/ProjectCountServiceImpl.java index 905022c4..594cb1e5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/ProjectCountServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/ProjectCountServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.company.service.impl; import com.jero.common.exception.JeroBootException; import com.jero.company.mapper.ProjectCountMapper; import com.jero.company.service.ProjectCountService; +import com.jero.company.vo.CompanyOrContactsCount; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -14,8 +15,8 @@ public class ProjectCountServiceImpl implements ProjectCountService { private ProjectCountMapper projectCountMapper; @Override - public void getProjectCount(String companyId, String contactsId) { - int count = projectCountMapper.getProjectCount(companyId, contactsId); + public void getProjectCount(CompanyOrContactsCount companyOrContactsCount) { + int count = projectCountMapper.getProjectCount(companyOrContactsCount); if(count > 0){ throw new JeroBootException("已关联项目，不可删除！"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyOrContactsCount.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyOrContactsCount.java new file mode 100644 index 00000000..58a32939 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyOrContactsCount.java @@ -0,0 +1,19 @@ +package com.jero.company.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class CompanyOrContactsCount implements Serializable { + + /** + * 企业id + */ + private List companyId; + /** + * 联系人id + */ + private List contactsId; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index e25dd29c..dc0322ce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -18,8 +18,6 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.company.entity.PayContactsManagement; -import com.jero.company.service.IPayContactsManagementService; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.pack.entity.PayPackCompany; @@ -34,7 +32,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java index 59f01794..f29a3b78 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java @@ -1,6 +1,8 @@ package com.jero.temporary.entity; import java.io.Serializable; +import java.util.Date; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -31,6 +33,9 @@ public class PayCompanyManagementTemporary implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; + /**企业id*/ + @ApiModelProperty(value = "主键") + private java.lang.String companyId; /**企业名称*/ @Excel(name = "企业名称", width = 15) @ApiModelProperty(value = "企业名称") @@ -71,20 +76,25 @@ public class PayCompanyManagementTemporary implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remarks; + /**记录第一次编辑时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "记录第一次编辑时间") + private Date editTime; /**创建人*/ @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java index c8499b2d..21580f33 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java @@ -31,6 +31,9 @@ public class PayContactsManagementTemporary implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; + /**联系人id*/ + @ApiModelProperty(value = "联系人id") + private java.lang.String contactId; /**企业id*/ @Excel(name = "企业id", width = 15) @ApiModelProperty(value = "企业id") @@ -75,16 +78,16 @@ public class PayContactsManagementTemporary implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java index 4ecc846d..53ddb947 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java @@ -46,12 +46,13 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl implements IPayContactsManagementTemporaryService { - @Autowired + @Resource private IPayContactsManagementService payContactsManagementService; - @Autowired + @Resource private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; @Override @@ -47,6 +48,7 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl