From 32f319e7682dd368078ba6fed04c1dc72d897469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 19 Apr 2022 09:15:18 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupController.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 8e1a1385..ec589851 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -1,18 +1,12 @@ package com.jero.project.controller; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.common.RoleCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; @@ -23,13 +17,14 @@ import com.jero.common.util.oConvertUtils; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; import com.jero.project.common.PayProjectCommon; -import com.jero.project.entity.*; +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.jero.project.vo.PayWorkingGroupPayment; import com.jero.project.vo.PayWorkingGroupVO; -import com.jero.project.service.IPayWorkingGroupService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.service.IPayWorkingGroupSubItemService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -37,8 +32,15 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * @Description: 工作组项目 @@ -59,7 +61,7 @@ public class PayWorkingGroupController extends JeroController Date: Tue, 19 Apr 2022 13:40:36 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...WorkingGroupSubItemContactsController.java | 85 ++++++++++ .../PayWorkingGroupSubItemController.java | 2 +- .../entity/PayWorkingGroupSubItem.java | 7 + .../PayWorkingGroupSubItemContacts.java | 80 +++++++++ .../PayWorkingGroupSubItemContactsMapper.java | 15 ++ .../PayWorkingGroupSubItemContactsMapper.xml | 5 + ...PayWorkingGroupSubItemContactsService.java | 14 ++ ...orkingGroupSubItemContactsServiceImpl.java | 19 +++ .../PayWorkingGroupSubItemServiceImpl.java | 157 +++++++++--------- 9 files changed, 300 insertions(+), 84 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemContactsController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemContactsMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemContactsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemContactsController.java new file mode 100644 index 00000000..8a65a957 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemContactsController.java @@ -0,0 +1,85 @@ +package com.jero.project.controller; + +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.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import java.util.Arrays; + + /** + * @Description: 成员联系人 + * @Author: jeecg-boot + * @Date: 2022-04-19 + * @Version: V1.0 + */ +@Api(tags="成员联系人") +@RestController +@RequestMapping("/project/PayWorkingGroupSubItemContacts") +@Slf4j +public class PayWorkingGroupSubItemContactsController extends JeroController { + @Resource + private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService; + + /** + * 添加 + * + * @param payWorkingGroupSubItemContacts + * @return + */ + @AutoLog(value = "成员联系人-添加") + @ApiOperation(value="成员联系人-添加", notes="成员联系人-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts) { + payWorkingGroupSubItemContactsService.save(payWorkingGroupSubItemContacts); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payWorkingGroupSubItemContacts + * @return + */ + @AutoLog(value = "成员联系人-编辑") + @ApiOperation(value="成员联系人-编辑", notes="成员联系人-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts) { + payWorkingGroupSubItemContactsService.updateById(payWorkingGroupSubItemContacts); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "成员联系人-通过id删除") + @ApiOperation(value="成员联系人-通过id删除", notes="成员联系人-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id") String id) { + payWorkingGroupSubItemContactsService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "成员联系人-批量删除") + @ApiOperation(value="成员联系人-批量删除", notes="成员联系人-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids") String ids) { + payWorkingGroupSubItemContactsService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 611be45d..799a4b2d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -48,7 +48,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; @@ -168,6 +167,7 @@ public class PayWorkingGroupSubItemController extends JeroController listProjectIds = new ArrayList<>(); + // todo 关联企业联系人表 // 工作组的企业联系人1，2，3 LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,sysUser.getId()).or() diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index cd264402..38fe3490 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -20,6 +20,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** * @Description: pay_working_group_subitem @@ -277,4 +278,10 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "任务及目标") @TableField(exist = false) private String missionAndObjectives; + /** + * 企业联系人列表 + */ + @ApiModelProperty(value = "企业联系人列表") + @TableField(exist = false) + private List payWorkingGroupSubItemContactsList; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java new file mode 100644 index 00000000..d9e1cbe8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java @@ -0,0 +1,80 @@ +package com.jero.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: pay_working_group_subitem_contacts + * @Author: jeecg-boot + * @Date: 2022-04-19 + * @Version: V1.0 + */ +@Data +@TableName("pay_working_group_subitem_contacts") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_working_group_subitem_contacts对象", description="pay_working_group_subitem_contacts") +public class PayWorkingGroupSubItemContacts implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**工作组id*/ + @Excel(name = "工作组id", width = 15) + @ApiModelProperty(value = "工作组id") + private String workingGroupId; + /**工作组成员id*/ + @Excel(name = "工作组成员id", width = 15) + @ApiModelProperty(value = "工作组成员id") + private String workingGroupSubId; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private String contactsId; + /**临时企业联系人id*/ + @Excel(name = "临时企业联系人id", width = 15) + @ApiModelProperty(value = "临时企业联系人id") + private String contactsTemporaryId; + /**临时企业联系人名称*/ + @Excel(name = "临时企业联系人名称", width = 15) + @ApiModelProperty(value = "临时企业联系人名称") + private String contactsTemporaryName; + /**联系人备注*/ + @Excel(name = "联系人备注", width = 15) + @ApiModelProperty(value = "联系人备注") + private String remarks; + /**序号*/ + @Excel(name = "序号", width = 15) + @ApiModelProperty(value = "序号") + private Integer orderNum; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java new file mode 100644 index 00000000..652791bf --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java @@ -0,0 +1,15 @@ +package com.jero.project.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; + +/** + * @Description: pay_working_group_subitem_contacts + * @Author: jeecg-boot + * @Date: 2022-04-19 + * @Version: V1.0 + */ +public interface PayWorkingGroupSubItemContactsMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemContactsMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemContactsMapper.xml new file mode 100644 index 00000000..eb8b98a9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemContactsMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java new file mode 100644 index 00000000..4d63ad79 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java @@ -0,0 +1,14 @@ +package com.jero.project.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; + +/** + * @Description: pay_working_group_subitem_contacts + * @Author: jeecg-boot + * @Date: 2022-04-19 + * @Version: V1.0 + */ +public interface IPayWorkingGroupSubItemContactsService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java new file mode 100644 index 00000000..07404cde --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java @@ -0,0 +1,19 @@ +package com.jero.project.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; +import org.springframework.stereotype.Service; + + +/** + * @Description: pay_working_group_subitem_contacts + * @Author: jeecg-boot + * @Date: 2022-04-19 + * @Version: V1.0 + */ +@Service +public class PayWorkingGroupSubItemContactsServiceImpl extends ServiceImpl implements IPayWorkingGroupSubItemContactsService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index caa0a3cc..45730a59 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -38,12 +38,10 @@ import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.payment.service.IPayPaymentCheckService; import com.jero.project.common.PayProjectCommon; -import com.jero.project.entity.PayWorkGroupSubletStatistics; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupSubItem; -import com.jero.project.entity.PayWorkingGroupSubletSearch; +import com.jero.project.entity.*; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.SetChargeInput; import com.jero.statistics.entity.AllMoney; @@ -118,6 +116,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl payWorkingGroupSubItemIPage = payWorkingGroupSubItemMapper.queryPageList(page, payWorkingGroupSubitem, paymentDate); if (StringUtils.isNotBlank(payWorkingGroupSubitem.getMeetingId())){ List records = payWorkingGroupSubItemIPage.getRecords(); - for (PayWorkingGroupSubItem workingGroupSubItem : records) { - String workingGroupSubItemId = workingGroupSubItem.getId(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingRemindRecord::getSubitemId,workingGroupSubItemId); - wrapper.eq(PayMeetingRemindRecord::getMeetingId,payWorkingGroupSubitem.getMeetingId()); - int count = payMeetingRemindRecordService.count(wrapper); - if (count>0){ - workingGroupSubItem.setRemind(PayProjectCommon.YES); - }else { - workingGroupSubItem.setRemind(PayProjectCommon.NO); + if(!CollectionUtils.isEmpty(records)){ + // 获取企业联系人 + List listIds = records.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listIds); + List payWorkingGroupSubItemContactsList = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + for (PayWorkingGroupSubItem workingGroupSubItem : records) { + String workingGroupSubItemId = workingGroupSubItem.getId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingRemindRecord::getSubitemId,workingGroupSubItemId); + wrapper.eq(PayMeetingRemindRecord::getMeetingId,payWorkingGroupSubitem.getMeetingId()); + int count = payMeetingRemindRecordService.count(wrapper); + if (count>0){ + workingGroupSubItem.setRemind(PayProjectCommon.YES); + }else { + workingGroupSubItem.setRemind(PayProjectCommon.NO); + } + if(!CollectionUtils.isEmpty(payWorkingGroupSubItemContactsList)){ + List pwg = payWorkingGroupSubItemContactsList.stream().filter(p->Objects.equals(p.getWorkingGroupSubId(),workingGroupSubItem.getId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(pwg)){ + pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + workingGroupSubItem.setPayWorkingGroupSubItemContactsList(pwg); + } + } } } } @@ -191,6 +205,16 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listPayWorkingGroupSubItemContacts = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { + listPayWorkingGroupSubItemContacts.get(i).setOrderNum(i+1); + listPayWorkingGroupSubItemContacts.get(i).setWorkingGroupId(payWorkingGroupSubItem.getWorkingGroupId()); + listPayWorkingGroupSubItemContacts.get(i).setWorkingGroupSubId(payWorkingGroupSubItem.getId()); + } + payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContacts); + } List listFile = new ArrayList<>(); // 获取收费通知 if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY3) && StringUtils.isNotBlank(payWorkingGroupSubItem.getChargeNoticeId())){ @@ -386,6 +410,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorkingGroupSubItemOld.getId()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + payWorkingGroupSubItemOld.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); + } setPayWorkingGroupSubItemEdit(payWorkingGroupSubItem,payWorkingGroupSubItemOld); payWorkingGroupSubItem.setChargeUse(PayProjectCommon.CHARGE_USE1); // 变更应收金额，重新校验状态 @@ -999,30 +1029,17 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl payWorkingGroupSubItemContactsList = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(payWorkingGroupSubItemContactsList)){ + for (int i = 0; i < payWorkingGroupSubItemContactsList.size(); i++) { + // 企业联系人 + PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItemContactsList.get(i).getContactsId()); + if(Objects.isNull(contactsName)){ + throw new JeroBootException("企业联系人" + (i + 1) + "名称为空！"); + } + payWorkingGroupSubItemContactsList.get(i).setContactsTemporaryId(contactsName.getId()); + payWorkingGroupSubItemContactsList.get(i).setContactsTemporaryName(contactsName.getName()); } - payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId()); - payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName()); - } - if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){ - // 企业联系人3 - PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree()); - if(Objects.isNull(contactsNameThree)){ - throw new JeroBootException("企业联系人3名称为空！"); - } - payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId()); - payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName()); } // 邮寄联系人 PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getMailContactsId()); @@ -1053,56 +1070,30 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl payWorkingGroupSubItemContactsList = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(payWorkingGroupSubItemContactsList)){ + // 删除临时表历史记录 + if(!CollectionUtils.isEmpty(payWorkingGroupSubItemOld.getPayWorkingGroupSubItemContactsList())){ + List list = payWorkingGroupSubItemOld.getPayWorkingGroupSubItemContactsList().stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + payContactsManagementTemporaryService.removeByIds(list); } - }else{ - payWorkingGroupSubItem.setContactsIdTwo(""); - payWorkingGroupSubItem.setContactsTemporaryIdTwo(""); - payWorkingGroupSubItem.setContactsTemporaryNameTwo(""); - payContactsManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo()); - } - if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){ - if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdThree(),payWorkingGroupSubItem.getContactsIdThree())) { - // 企业联系人3 - PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree()); - if (Objects.isNull(contactsNameThree)) { - throw new JeroBootException("企业联系人3名称为空！"); + // 删除联系人记录 + LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorkingGroupSubItem.getId()); + payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); + // 新增 + for (int i = 0; i < payWorkingGroupSubItemContactsList.size(); i++) { + if(!Objects.equals(payWorkingGroupSubItemOld.getContactsTemporaryIdOne(),payWorkingGroupSubItem.getContactsIdOne())) { + // 企业联系人 + PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItemContactsList.get(i).getContactsId()); + if (Objects.isNull(contactsName)) { + throw new JeroBootException("企业联系人" + (i + 1) + "名称为空！"); + } + payWorkingGroupSubItemContactsList.get(i).setContactsTemporaryId(contactsName.getId()); + payWorkingGroupSubItemContactsList.get(i).setContactsTemporaryName(contactsName.getName()); } - payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId()); - payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName()); - payContactsManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree()); - }else{ - payWorkingGroupSubItem.setContactsIdThree(payWorkingGroupSubItemOld.getContactsIdThree()); } - }else{ - payWorkingGroupSubItem.setContactsTemporaryIdThree(""); - payWorkingGroupSubItem.setContactsTemporaryNameThree(""); - payWorkingGroupSubItem.setContactsIdThree(""); - payContactsManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree()); } if(!Objects.equals(payWorkingGroupSubItemOld.getMailContactsTemporaryId(),payWorkingGroupSubItem.getMailContactsId())){ // 邮寄联系人 From c3dc3cb2d21d96b3b3116a84afbd98395e6e36fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 19 Apr 2022 13:57:59 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupSubItemController.java | 4 +++- .../service/impl/PayWorkingGroupSubItemServiceImpl.java | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 799a4b2d..01ce0d0c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -369,6 +369,7 @@ public class PayWorkingGroupSubItemController extends JeroController{ List listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listContactsInfo)){ @@ -510,7 +511,7 @@ public class PayWorkingGroupSubItemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubItem, request.getParameterMap()); - + // todo 联系人关联表 // Step.2 获取导出数据 List pageList = payWorkingGroupSubItemService.list(queryWrapper); List exportList; @@ -597,6 +598,7 @@ public class PayWorkingGroupSubItemController extends JeroController updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,id); + payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); } @Override @@ -783,6 +787,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,Arrays.asList(ids.split(","))); + payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); } @Override @@ -815,6 +823,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemService.listByIds(Arrays.asList(s)); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // todo 联系人关联表 List listMsg = new ArrayList<>(); if(!CollectionUtils.isEmpty(list)){ List listContacts = new ArrayList<>(); From dd895ca1b57fe68906edc0cfeddc7bc23f331124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 20 Apr 2022 14:54:17 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 122 +++++--- .../entity/PayWorkingGroupSubItem.java | 146 +++++++-- .../PayWorkingGroupSubItemServiceImpl.java | 211 ++++++++----- .../vo/excel/PayWorkingGroupSubItemExcel.java | 293 +++++++++++++----- 4 files changed, 575 insertions(+), 197 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 01ce0d0c..57d64f11 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -37,6 +37,7 @@ import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.SetChargeInput; @@ -511,7 +512,6 @@ public class PayWorkingGroupSubItemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubItem, request.getParameterMap()); - // todo 联系人关联表 // Step.2 获取导出数据 List pageList = payWorkingGroupSubItemService.list(queryWrapper); List exportList; @@ -528,40 +528,91 @@ public class PayWorkingGroupSubItemController extends JeroController listPayWorkingGroupSubItemContacts = workingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); + for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = listPayWorkingGroupSubItemContacts.get(i); + List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payWorkingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); + String email = ""; + String phone = ""; + String name = payWorkingGroupSubItemContacts.getContactsTemporaryName(); + String remark = payWorkingGroupSubItemContacts.getRemarks(); + if(!CollectionUtils.isEmpty(temporary)){ + email = temporary.get(0).getEmail(); + if (StringUtils.isNotBlank(email)){ + email = PasswordUtil.decrypt(email); + } + phone = temporary.get(0).getPhone(); + if (StringUtils.isNotBlank(phone)){ + phone = PasswordUtil.decrypt(phone); + } + } + switch (i){ + case 0: + excel.setContactsNameOne(name); + excel.setRemarksOne(remark); + excel.setContactsEmailOne(email); + excel.setContactsPhoneOne(phone); + break; + case 1: + excel.setContactsNameTwo(name); + excel.setRemarksTwo(remark); + excel.setContactsEmailTwo(email); + excel.setContactsPhoneTwo(phone); + break; + case 2: + excel.setContactsNameThree(name); + excel.setRemarksThree(remark); + excel.setContactsEmailThree(email); + excel.setContactsPhoneThree(phone); + break; + case 3: + excel.setContactsNameFour(name); + excel.setRemarksFour(remark); + excel.setContactsEmailFour(email); + excel.setContactsPhoneFour(phone); + break; + case 4: + excel.setContactsNameFive(name); + excel.setRemarksFive(remark); + excel.setContactsEmailFive(email); + excel.setContactsPhoneFive(phone); + break; + case 5: + excel.setContactsNameSix(name); + excel.setRemarksSix(remark); + excel.setContactsEmailSix(email); + excel.setContactsPhoneSix(phone); + break; + case 6: + excel.setContactsNameSeven(name); + excel.setRemarksSeven(remark); + excel.setContactsEmailSeven(email); + excel.setContactsPhoneSeven(phone); + break; + case 7: + excel.setContactsNameEight(name); + excel.setRemarksEight(remark); + excel.setContactsEmailEight(email); + excel.setContactsPhoneEight(phone); + break; + case 8: + excel.setContactsNameNine(name); + excel.setRemarksNine(remark); + excel.setContactsEmailNine(email); + excel.setContactsPhoneNine(phone); + break; + case 9: + excel.setContactsNameTen(name); + excel.setRemarksTen(remark); + excel.setContactsEmailTen(email); + excel.setContactsPhoneTen(phone); + break; + default:break; + } } } excelList.add(excel); @@ -598,7 +649,6 @@ public class PayWorkingGroupSubItemController extends JeroController payWorkingGroupSubItemContactsList; + + /**企业联系人1名称*/ + @Excel(name = "企业联系人1", width = 15) + @ApiModelProperty(value = "企业联系人1") + @TableField(exist = false) + private String contactsNameOne; + /**联系人1备注*/ + @Excel(name = "联系人1备注", width = 15) + @ApiModelProperty(value = "联系人1备注") + @Size(max = 50,message = "联系人1备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksOne; + /**企业联系人2名称*/ + @Excel(name = "企业联系人2", width = 15) + @ApiModelProperty(value = "企业联系人2") + @TableField(exist = false) + private String contactsNameTwo; + /**联系人2备注*/ + @Excel(name = "联系人2备注", width = 15) + @ApiModelProperty(value = "联系人2备注") + @Size(max = 50,message = "联系人2备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksTwo; + /**企业联系人3名称*/ + @Excel(name = "企业联系人3", width = 15) + @ApiModelProperty(value = "企业联系人3") + @TableField(exist = false) + private String contactsNameThree; + /**联系人3备注*/ + @Excel(name = "联系人3备注", width = 15) + @ApiModelProperty(value = "联系人3备注") + @Size(max = 50,message = "联系人3备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksThree; + /**企业联系人4名称*/ + @Excel(name = "企业联系人4", width = 15) + @ApiModelProperty(value = "企业联系人4") + @TableField(exist = false) + private String contactsNameFour; + /**联系人4备注*/ + @Excel(name = "联系人4备注", width = 15) + @ApiModelProperty(value = "联系人4备注") + @Size(max = 50,message = "联系人4备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksFour; + /**企业联系人5名称*/ + @Excel(name = "企业联系人5", width = 15) + @ApiModelProperty(value = "企业联系人5") + @TableField(exist = false) + private String contactsNameFive; + /**联系人5备注*/ + @Excel(name = "联系人5备注", width = 15) + @ApiModelProperty(value = "联系人5备注") + @Size(max = 50,message = "联系人5备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksFive; + /**企业联系人6名称*/ + @Excel(name = "企业联系人6", width = 15) + @ApiModelProperty(value = "企业联系人6") + @TableField(exist = false) + private String contactsNameSix; + /**联系人6备注*/ + @Excel(name = "联系人6备注", width = 15) + @ApiModelProperty(value = "联系人6备注") + @Size(max = 50,message = "联系人6备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksSix; + /**企业联系人7名称*/ + @Excel(name = "企业联系人7", width = 15) + @ApiModelProperty(value = "企业联系人7") + @TableField(exist = false) + private String contactsNameSeven; + /**联系人7备注*/ + @Excel(name = "联系人7备注", width = 15) + @ApiModelProperty(value = "联系人7备注") + @Size(max = 50,message = "联系人7备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksSeven; + /**企业联系人8名称*/ + @Excel(name = "企业联系人8", width = 15) + @ApiModelProperty(value = "企业联系人8") + @TableField(exist = false) + private String contactsNameEight; + /**联系人8备注*/ + @Excel(name = "联系人8备注", width = 15) + @ApiModelProperty(value = "联系人8备注") + @Size(max = 50,message = "联系人8备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksEight; + /**企业联系人9名称*/ + @Excel(name = "企业联系人9", width = 15) + @ApiModelProperty(value = "企业联系人9") + @TableField(exist = false) + private String contactsNameNine; + /**联系人9备注*/ + @Excel(name = "联系人9备注", width = 15) + @ApiModelProperty(value = "联系人9备注") + @Size(max = 50,message = "联系人9备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksNine; + /**企业联系人10名称*/ + @Excel(name = "企业联系人10", width = 15) + @ApiModelProperty(value = "企业联系人10") + @TableField(exist = false) + private String contactsNameTen; + /**联系人10备注*/ + @Excel(name = "联系人10备注", width = 15) + @ApiModelProperty(value = "联系人10备注") + @Size(max = 50,message = "联系人10备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksTen; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 57fa1274..5a0726e4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -507,20 +507,55 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listContactsName = new ArrayList<>(); - // 获取excel中联系人一名称 - List listContactsNameOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsNameOne)){ - listContactsName.addAll(listContactsNameOne); + // 获取excel中联系人1名称 + List listContactsName1 = list.stream().map(PayWorkingGroupSubItem::getContactsNameOne).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName1)){ + listContactsName.addAll(listContactsName1); } - // 获取excel中联系人二名称 - List listContactsNameTwo = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameTwo).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsNameTwo)){ - listContactsName.addAll(listContactsNameTwo); + // 获取excel中联系人2名称 + List listContactsName2 = list.stream().map(PayWorkingGroupSubItem::getContactsNameTwo).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName2)){ + listContactsName.addAll(listContactsName2); } - // 获取excel中联系人三名称 - List listContactsNameThree = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameThree).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsNameThree)){ - listContactsName.addAll(listContactsNameThree); + // 获取excel中联系人3名称 + List listContactsName3 = list.stream().map(PayWorkingGroupSubItem::getContactsNameThree).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName3)){ + listContactsName.addAll(listContactsName3); + } + // 获取excel中联系人4名称 + List listContactsName4 = list.stream().map(PayWorkingGroupSubItem::getContactsNameFour).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName4)){ + listContactsName.addAll(listContactsName4); + } + // 获取excel中联系人5名称 + List listContactsName5 = list.stream().map(PayWorkingGroupSubItem::getContactsNameFive).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName5)){ + listContactsName.addAll(listContactsName5); + } + // 获取excel中联系人6名称 + List listContactsName6 = list.stream().map(PayWorkingGroupSubItem::getContactsNameSix).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName6)){ + listContactsName.addAll(listContactsName6); + } + // 获取excel中联系人7名称 + List listContactsName7 = list.stream().map(PayWorkingGroupSubItem::getContactsNameSeven).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName7)){ + listContactsName.addAll(listContactsName7); + } + // 获取excel中联系人8名称 + List listContactsName8 = list.stream().map(PayWorkingGroupSubItem::getContactsNameEight).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName8)){ + listContactsName.addAll(listContactsName8); + } + // 获取excel中联系人9名称 + List listContactsName9 = list.stream().map(PayWorkingGroupSubItem::getContactsNameNine).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName9)){ + listContactsName.addAll(listContactsName9); + } + // 获取excel中联系人10名称 + List listContactsName10 = list.stream().map(PayWorkingGroupSubItem::getContactsNameTen).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName10)){ + listContactsName.addAll(listContactsName10); } // 获取excel中邮寄联系人名称 List listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList()); @@ -568,67 +603,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); } } - if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameTwo()) - && Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameTwo())){ - msg.append("第").append(count + 3).append("行:企业联系人1与企业联系人2重复，请修改。
"); - } - if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree()) - && Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameThree())){ - msg.append("第").append(count + 3).append("行:企业联系人1与企业联系人3重复，请修改。
"); - } - if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree()) - && Objects.equals(p.getContactsTemporaryNameTwo(),p.getContactsTemporaryNameThree())){ - msg.append("第").append(count + 3).append("行:企业联系人2与企业联系人3重复，请修改。
"); - } - - // 校验联系人一 - if (StringUtils.isBlank(p.getContactsTemporaryNameOne())) { - msg.append("第").append(count + 3).append("行:企业联系人1不能为空，请修改。
"); - } else { - if (!CollectionUtils.isEmpty(listCompany)) { - // 通过联系人获取联系人id - List finalListCompany = listCompany; - List 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("行:该企业下不存在企业联系人1，请修改。
"); - } else { - p.setContactsIdOne(listContacts.get(0).getId()); - } - } - } - - // 校验联系人二 - if (!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !CollectionUtils.isEmpty(listCompany)) { - if (!CollectionUtils.isEmpty(listCompany)) { - // 通过联系人获取联系人id - List finalListCompany = listCompany; - List 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("行:该企业下不存在企业联系人2，请修改。
"); - } else { - p.setContactsIdTwo(listContacts.get(0).getId()); - } - } - } - // 校验联系人三 - if (!StringUtils.isBlank(p.getContactsTemporaryNameThree()) && !CollectionUtils.isEmpty(listCompany)) { - if (!CollectionUtils.isEmpty(listCompany)) { - // 通过联系人获取联系人id - List finalListCompany = listCompany; - List 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("行:该企业下不存在企业联系人3，请修改。
"); - } else { - p.setContactsIdThree(listContacts.get(0).getId()); - } - } - } + // 校验重复 + List listPayWorkingGroupSubItemContacts = checkRepeat(p,msg,count,listCompany,listContactsInfo); + p.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); // 校验邮寄联系人 if (StringUtils.isBlank(p.getMailContactsTemporaryName())) { msg.append("第").append(count + 3).append("行:邮寄联系人不能为空，请修改。
"); @@ -707,6 +684,14 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl{ + List listPayWorkingGroupSubItemContacts = p.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + listPayWorkingGroupSubItemContacts.forEach(s->{ + s.setWorkingGroupId(p.getWorkingGroupId()); + s.setWorkingGroupSubId(p.getId()); + }); + payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContacts); + } PayIncomeContract payIncomeContract = p.getPayIncomeContract(); if(Objects.isNull(payIncomeContract)){ return; @@ -746,6 +731,86 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl checkRepeat(PayWorkingGroupSubItem p,StringBuilder msg,int count,List listCompany,List listContactsInfo){ + List list = new ArrayList<>(); + HashMap map = new HashMap<>(); + if(!StringUtils.isBlank(p.getContactsNameOne())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameOne(),1,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + }else{ + msg.append("第").append(count + 3).append("行:企业联系人1不能为空，请修改。
"); + } + + if(!StringUtils.isBlank(p.getContactsNameTwo())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTwo(),2,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameThree())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameThree(),3,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameFour())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameFour(),4,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameFive())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameFive(),5,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameSix())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameSix(),6,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameSeven())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameSeven(),7,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameEight())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameEight(),8,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameNine())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameNine(),9,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameTen())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTen(),10,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + return list; + } + + private PayWorkingGroupSubItemContacts setContactsId(StringBuilder msg,String name,int num,int count,List listCompany,List listContactsInfo,HashMap map){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = new PayWorkingGroupSubItemContacts(); + if(map.containsKey(name)){ + int c = map.get(name); + msg.append("第").append(count + 3).append("行:企业联系人").append(c).append("与企业联系人3重复，请修改。
"); + }else{ + map.put(name,3); + } + if (!CollectionUtils.isEmpty(listCompany)) { + // 通过联系人获取联系人id + List listContacts = listContactsInfo.stream().filter(item -> + Objects.equals(item.getName(), name) + && Objects.equals(item.getCompanyId(), listCompany.get(0).getId())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(listContacts)) { + msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人").append(num).append("，请修改。
"); + } else { + payWorkingGroupSubItemContacts.setContactsId(listContacts.get(0).getId()); + } + } + return payWorkingGroupSubItemContacts; + } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index 326ba6bb..4bd92799 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -import javax.validation.constraints.DecimalMax; import java.io.Serializable; import java.math.BigDecimal; @@ -26,75 +25,6 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @ApiModelProperty(value = "临时成员单位") private String chargeCompanyTemporaryName; - /** - * 临时企业联系人1名称 - */ - @Excel(name = "企业联系人1", width = 15) - @ApiModelProperty(value = "临时企业联系人1名称") - private String contactsTemporaryNameOne; - - /** - * 企业联系人1手机号 - */ - @Excel(name = "企业联系人1手机号", width = 17) - private String contactsPhoneOne; - - /** - * 企业联系人1邮箱 - */ - @Excel(name = "企业联系人1邮箱", width = 15) - private String contactsEmailOne; - - /** - * 联系人1备注 - */ - @Excel(name = "联系人1备注", width = 15) - @ApiModelProperty(value = "联系人1备注") - private String remarksOne; - /** - * 临时企业联系人2名称 - */ - @Excel(name = "企业联系人2", width = 15) - @ApiModelProperty(value = "临时企业联系人2名称") - private String contactsTemporaryNameTwo; - /** - * 企业联系人2手机号 - */ - @Excel(name = "企业联系人2手机号", width = 17) - private String contactsPhoneTwo; - /** - * 企业联系人2邮箱 - */ - @Excel(name = "企业联系人2邮箱", width = 15) - private String contactsEmailTwo; - /** - * 联系人2备注 - */ - @Excel(name = "联系人2备注", width = 15) - @ApiModelProperty(value = "联系人2备注") - private String remarksTwo; - /** - * 临时企业联系人3名称 - */ - @Excel(name = "企业联系人3", width = 15) - @ApiModelProperty(value = "临时企业联系人3名称") - private String contactsTemporaryNameThree; - /** - * 企业联系人3手机号 - */ - @Excel(name = "企业联系人3手机号", width = 17) - private String contactsPhoneThree; - /** - * 企业联系人3邮箱 - */ - @Excel(name = "企业联系人3邮箱", width = 15) - private String contactsEmailThree; - /** - * 联系人3备注 - */ - @Excel(name = "联系人3备注", width = 15) - @ApiModelProperty(value = "联系人3备注") - private String remarksThree; /** * 临时邮寄联系人名称 */ @@ -138,4 +68,227 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private String remarks; + /** + * 企业联系人1名称 + */ + @Excel(name = "企业联系人1", width = 15) + @ApiModelProperty(value = "企业联系人1名称") + private String contactsNameOne; + + /** + * 企业联系人1手机号 + */ + @Excel(name = "企业联系人1手机号", width = 15) + private String contactsPhoneOne; + + /** + * 企业联系人1邮箱 + */ + @Excel(name = "企业联系人1邮箱", width = 15) + private String contactsEmailOne; + + /** + * 联系人1备注 + */ + @Excel(name = "联系人1备注", width = 15) + @ApiModelProperty(value = "联系人1备注") + private String remarksOne; + /** + * 企业联系人2名称 + */ + @Excel(name = "企业联系人2", width = 15) + @ApiModelProperty(value = "企业联系人2名称") + private String contactsNameTwo; + /** + * 企业联系人2手机号 + */ + @Excel(name = "企业联系人2手机号", width = 15) + private String contactsPhoneTwo; + /** + * 企业联系人2邮箱 + */ + @Excel(name = "企业联系人2邮箱", width = 15) + private String contactsEmailTwo; + /** + * 联系人2备注 + */ + @Excel(name = "联系人2备注", width = 15) + @ApiModelProperty(value = "联系人2备注") + private String remarksTwo; + /** + * 企业联系人3名称 + */ + @Excel(name = "企业联系人3", width = 15) + @ApiModelProperty(value = "企业联系人3名称") + private String contactsNameThree; + /** + * 企业联系人3手机号 + */ + @Excel(name = "企业联系人3手机号", width = 15) + private String contactsPhoneThree; + /** + * 企业联系人3邮箱 + */ + @Excel(name = "企业联系人3邮箱", width = 15) + private String contactsEmailThree; + /** + * 联系人3备注 + */ + @Excel(name = "联系人3备注", width = 15) + @ApiModelProperty(value = "联系人3备注") + private String remarksThree; + /** + * 企业联系人4名称 + */ + @Excel(name = "企业联系人4", width = 15) + @ApiModelProperty(value = "企业联系人4名称") + private String contactsNameFour; + /** + * 企业联系人4手机号 + */ + @Excel(name = "企业联系人4手机号", width = 15) + private String contactsPhoneFour; + /** + * 企业联系人4邮箱 + */ + @Excel(name = "企业联系人4邮箱", width = 15) + private String contactsEmailFour; + /** + * 联系人4备注 + */ + @Excel(name = "联系人4备注", width = 15) + @ApiModelProperty(value = "联系人4备注") + private String remarksFour; + /** + * 企业联系人5名称 + */ + @Excel(name = "企业联系人5", width = 15) + @ApiModelProperty(value = "企业联系人5名称") + private String contactsNameFive; + /** + * 企业联系人5手机号 + */ + @Excel(name = "企业联系人5手机号", width = 15) + private String contactsPhoneFive; + /** + * 企业联系人5邮箱 + */ + @Excel(name = "企业联系人5邮箱", width = 15) + private String contactsEmailFive; + /** + * 联系人5备注 + */ + @Excel(name = "联系人5备注", width = 15) + @ApiModelProperty(value = "联系人5备注") + private String remarksFive; + /** + * 企业联系人6名称 + */ + @Excel(name = "企业联系人6", width = 15) + @ApiModelProperty(value = "企业联系人6名称") + private String contactsNameSix; + /** + * 企业联系人6手机号 + */ + @Excel(name = "企业联系人6手机号", width = 15) + private String contactsPhoneSix; + /** + * 企业联系人6邮箱 + */ + @Excel(name = "企业联系人6邮箱", width = 15) + private String contactsEmailSix; + /** + * 联系人6备注 + */ + @Excel(name = "联系人6备注", width = 15) + @ApiModelProperty(value = "联系人6备注") + private String remarksSix; + /** + * 企业联系人7名称 + */ + @Excel(name = "企业联系人7", width = 15) + @ApiModelProperty(value = "企业联系人7名称") + private String contactsNameSeven; + /** + * 企业联系人7手机号 + */ + @Excel(name = "企业联系人7手机号", width = 15) + private String contactsPhoneSeven; + /** + * 企业联系人7邮箱 + */ + @Excel(name = "企业联系人7邮箱", width = 15) + private String contactsEmailSeven; + /** + * 联系人7备注 + */ + @Excel(name = "联系人7备注", width = 15) + @ApiModelProperty(value = "联系人7备注") + private String remarksSeven; + /** + * 企业联系人8名称 + */ + @Excel(name = "企业联系人8", width = 15) + @ApiModelProperty(value = "企业联系人8名称") + private String contactsNameEight; + /** + * 企业联系人8手机号 + */ + @Excel(name = "企业联系人8手机号", width = 15) + private String contactsPhoneEight; + /** + * 企业联系人8邮箱 + */ + @Excel(name = "企业联系人8邮箱", width = 15) + private String contactsEmailEight; + /** + * 联系人8备注 + */ + @Excel(name = "联系人8备注", width = 15) + @ApiModelProperty(value = "联系人8备注") + private String remarksEight; + /** + * 企业联系人9名称 + */ + @Excel(name = "企业联系人9", width = 15) + @ApiModelProperty(value = "企业联系人9名称") + private String contactsNameNine; + /** + * 企业联系人9手机号 + */ + @Excel(name = "企业联系人9手机号", width = 15) + private String contactsPhoneNine; + /** + * 企业联系人9邮箱 + */ + @Excel(name = "企业联系人9邮箱", width = 15) + private String contactsEmailNine; + /** + * 联系人9备注 + */ + @Excel(name = "联系人9备注", width = 15) + @ApiModelProperty(value = "联系人9备注") + private String remarksNine; + /** + * 企业联系人10名称 + */ + @Excel(name = "企业联系人10", width = 15) + @ApiModelProperty(value = "企业联系人10名称") + private String contactsNameTen; + /** + * 企业联系人10手机号 + */ + @Excel(name = "企业联系人10手机号", width = 15) + private String contactsPhoneTen; + /** + * 企业联系人10邮箱 + */ + @Excel(name = "企业联系人10邮箱", width = 15) + private String contactsEmailTen; + /** + * 联系人10备注 + */ + @Excel(name = "联系人10备注", width = 15) + @ApiModelProperty(value = "联系人10备注") + private String remarksTen; } From 4a48c51c57b46ecf673bb7702dcaf42be09cd682 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Wed, 20 Apr 2022 17:22:30 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=86=85=E9=83=A8?= =?UTF-8?q?=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 4 +++ .../PayCompanyManagementController.java | 34 +++++++++++++++++++ .../company/entity/PayCompanyManagement.java | 5 +++ 3 files changed, 43 insertions(+) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index 57bb2e1b..026c0db4 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -183,3 +183,7 @@ alter TABLE pay_mail_contract ADD (contract_type TINYINT(2) COMMENT '合同类 INSERT INTO `sys_dict` VALUES ('1509830472616779778', '合同类型', 'contract_type', '（1：支出合同，2：收入合同）', 0, 'LKGLZ', '2022-04-01 17:50:11', 'LKGLZ', '2022-04-01 17:51:38', 0); INSERT INTO `sys_dict_item` VALUES ('1509830576870400001', '1509830472616779778', '支出合同', '1', '', 1.00, 1, 'LKGLZ', '2022-04-01 17:50:35', NULL, NULL); INSERT INTO `sys_dict_item` VALUES ('1509830618775691265', '1509830472616779778', '收入合同', '2', '', 1.00, 1, 'LKGLZ', '2022-04-01 17:50:45', NULL, NULL); + +-- 2022-04-20 新增是否是内部企业 +ALTER TABLE pay_company_management ADD COLUMN internal_enterprise VARCHAR(6) DEFAULT NULL COMMENT '是否内部企业'; +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1516688284384772098', '1430376267109978113', '是否内部企业', NULL, NULL, NULL, NULL, 2, 'company:internalEnterprise', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-20 16:00:40', NULL, NULL, 0, 0, '0', 0); 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 d3ed792d..ef5b9d11 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 @@ -278,6 +278,7 @@ public class PayCompanyManagementController extends JeroController add(@RequestBody PayCompanyManagement payCompanyManagement) { + payCompanyManagement.setInternalEnterprise("false");//是否内部企业 if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){ payCompanyManagement.setCompanyPhone(null); } @@ -389,6 +390,23 @@ public class PayCompanyManagementController extends JeroController updateInternalEnterprise(@RequestBody PayCompanyManagement payCompanyManagement) { + payCompanyManagementService.updateById(payCompanyManagement); + return Result.OK("成功!"); + } + + @ApiOperation(value="企业管理-查看是否内部企业", notes="企业管理-查看是否内部企业") + @GetMapping(value = "/getInternalEnterprise") + public Result getInternalEnterprise(String id) { + PayCompanyManagement pcm = payCompanyManagementService.getById(id); + return Result.OK(pcm.getInternalEnterprise()); + } + /** * 确认 * @@ -761,6 +779,11 @@ public class PayCompanyManagementController extends JeroController"); + } + } + // 校验 表中是否存在企业名称 if(!CollectionUtils.isEmpty(listCompanyAll)){ List listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java index 35a38243..e3fbc758 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java @@ -137,4 +137,9 @@ public class PayCompanyManagement implements Serializable { */ @TableField(exist = false) private String flagStatus; + + @Excel(name = "是否内部企业", width = 15) + @ApiModelProperty(value = "是否内部企业") + @Size(max = 6, message = "是否内部企业长度不能大于6个字符") + private String internalEnterprise; } From e8d4fb545a599fcae1fbc4c3eaf335e18fd54f0f Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 21 Apr 2022 12:05:40 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=86=85=E9=83=A8?= =?UTF-8?q?=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/controller/PayCompanyManagementController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ef5b9d11..c1406683 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 @@ -391,7 +391,7 @@ public class PayCompanyManagementController extends JeroController getInternalEnterprise(String id) { PayCompanyManagement pcm = payCompanyManagementService.getById(id); + if(StringUtils.isBlank(pcm.getInternalEnterprise())){ + pcm.setInternalEnterprise("false"); + } return Result.OK(pcm.getInternalEnterprise()); } From 7a1c259f2078fda149866e2d4ea7aff0aebfdc9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 21 Apr 2022 13:41:21 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 181 +++++++++--------- .../PayWorkingGroupSubItemContacts.java | 8 +- .../PayWorkingGroupSubItemServiceImpl.java | 105 +++++----- 3 files changed, 161 insertions(+), 133 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 57d64f11..25e66dd3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -39,6 +39,7 @@ import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.SetChargeInput; import com.jero.project.vo.excel.PayWorkingGroupSubItemExcel; @@ -97,6 +98,8 @@ public class PayWorkingGroupSubItemController extends JeroController excelList = new ArrayList<>(); - for (PayWorkingGroupSubItem workingGroupSubItem : exportList) { - PayWorkingGroupSubItemExcel excel = new PayWorkingGroupSubItemExcel(); - BeanUtils.copyProperties(workingGroupSubItem,excel); - List listPayWorkingGroupSubItemContacts = workingGroupSubItem.getPayWorkingGroupSubItemContactsList(); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ - listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); - List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); - for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { - PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = listPayWorkingGroupSubItemContacts.get(i); - List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payWorkingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); - String email = ""; - String phone = ""; - String name = payWorkingGroupSubItemContacts.getContactsTemporaryName(); - String remark = payWorkingGroupSubItemContacts.getRemarks(); - if(!CollectionUtils.isEmpty(temporary)){ - email = temporary.get(0).getEmail(); - if (StringUtils.isNotBlank(email)){ - email = PasswordUtil.decrypt(email); + if(!CollectionUtils.isEmpty(exportList)){ + List listWGSIds = exportList.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listWGSIds); + List payWorkingGroupSubItemContactsList = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + for (PayWorkingGroupSubItem workingGroupSubItem : exportList) { + PayWorkingGroupSubItemExcel excel = new PayWorkingGroupSubItemExcel(); + BeanUtils.copyProperties(workingGroupSubItem,excel); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsList.stream().filter(o->Objects.equals(workingGroupSubItem.getId(),o.getWorkingGroupSubId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); + for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = listPayWorkingGroupSubItemContacts.get(i); + List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payWorkingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); + String email = ""; + String phone = ""; + String name = payWorkingGroupSubItemContacts.getContactsTemporaryName(); + String remark = payWorkingGroupSubItemContacts.getRemarks(); + if(!CollectionUtils.isEmpty(temporary)){ + email = temporary.get(0).getEmail(); + if (StringUtils.isNotBlank(email)){ + email = PasswordUtil.decrypt(email); + } + phone = temporary.get(0).getPhone(); + if (StringUtils.isNotBlank(phone)){ + phone = PasswordUtil.decrypt(phone); + } } - phone = temporary.get(0).getPhone(); - if (StringUtils.isNotBlank(phone)){ - phone = PasswordUtil.decrypt(phone); + switch (i){ + case 0: + excel.setContactsNameOne(name); + excel.setRemarksOne(remark); + excel.setContactsEmailOne(email); + excel.setContactsPhoneOne(phone); + break; + case 1: + excel.setContactsNameTwo(name); + excel.setRemarksTwo(remark); + excel.setContactsEmailTwo(email); + excel.setContactsPhoneTwo(phone); + break; + case 2: + excel.setContactsNameThree(name); + excel.setRemarksThree(remark); + excel.setContactsEmailThree(email); + excel.setContactsPhoneThree(phone); + break; + case 3: + excel.setContactsNameFour(name); + excel.setRemarksFour(remark); + excel.setContactsEmailFour(email); + excel.setContactsPhoneFour(phone); + break; + case 4: + excel.setContactsNameFive(name); + excel.setRemarksFive(remark); + excel.setContactsEmailFive(email); + excel.setContactsPhoneFive(phone); + break; + case 5: + excel.setContactsNameSix(name); + excel.setRemarksSix(remark); + excel.setContactsEmailSix(email); + excel.setContactsPhoneSix(phone); + break; + case 6: + excel.setContactsNameSeven(name); + excel.setRemarksSeven(remark); + excel.setContactsEmailSeven(email); + excel.setContactsPhoneSeven(phone); + break; + case 7: + excel.setContactsNameEight(name); + excel.setRemarksEight(remark); + excel.setContactsEmailEight(email); + excel.setContactsPhoneEight(phone); + break; + case 8: + excel.setContactsNameNine(name); + excel.setRemarksNine(remark); + excel.setContactsEmailNine(email); + excel.setContactsPhoneNine(phone); + break; + case 9: + excel.setContactsNameTen(name); + excel.setRemarksTen(remark); + excel.setContactsEmailTen(email); + excel.setContactsPhoneTen(phone); + break; + default:break; } } - switch (i){ - case 0: - excel.setContactsNameOne(name); - excel.setRemarksOne(remark); - excel.setContactsEmailOne(email); - excel.setContactsPhoneOne(phone); - break; - case 1: - excel.setContactsNameTwo(name); - excel.setRemarksTwo(remark); - excel.setContactsEmailTwo(email); - excel.setContactsPhoneTwo(phone); - break; - case 2: - excel.setContactsNameThree(name); - excel.setRemarksThree(remark); - excel.setContactsEmailThree(email); - excel.setContactsPhoneThree(phone); - break; - case 3: - excel.setContactsNameFour(name); - excel.setRemarksFour(remark); - excel.setContactsEmailFour(email); - excel.setContactsPhoneFour(phone); - break; - case 4: - excel.setContactsNameFive(name); - excel.setRemarksFive(remark); - excel.setContactsEmailFive(email); - excel.setContactsPhoneFive(phone); - break; - case 5: - excel.setContactsNameSix(name); - excel.setRemarksSix(remark); - excel.setContactsEmailSix(email); - excel.setContactsPhoneSix(phone); - break; - case 6: - excel.setContactsNameSeven(name); - excel.setRemarksSeven(remark); - excel.setContactsEmailSeven(email); - excel.setContactsPhoneSeven(phone); - break; - case 7: - excel.setContactsNameEight(name); - excel.setRemarksEight(remark); - excel.setContactsEmailEight(email); - excel.setContactsPhoneEight(phone); - break; - case 8: - excel.setContactsNameNine(name); - excel.setRemarksNine(remark); - excel.setContactsEmailNine(email); - excel.setContactsPhoneNine(phone); - break; - case 9: - excel.setContactsNameTen(name); - excel.setRemarksTen(remark); - excel.setContactsEmailTen(email); - excel.setContactsPhoneTen(phone); - break; - default:break; - } } + excelList.add(excel); } - excelList.add(excel); } return super.exportListXls(excelList, PayWorkingGroupSubItemExcel.class, "工作组成员"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java index d9e1cbe8..ec5e46a9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java @@ -65,16 +65,16 @@ public class PayWorkingGroupSubItemContacts implements Serializable { @ApiModelProperty(value = "创建人") private 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 Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private 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 Date updateTime; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 5a0726e4..b62b8ab0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -124,31 +124,31 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryPageList(Page page, PayWorkingGroupSubItem payWorkingGroupSubitem,String paymentDate) { IPage payWorkingGroupSubItemIPage = payWorkingGroupSubItemMapper.queryPageList(page, payWorkingGroupSubitem, paymentDate); - if (StringUtils.isNotBlank(payWorkingGroupSubitem.getMeetingId())){ - List records = payWorkingGroupSubItemIPage.getRecords(); - if(!CollectionUtils.isEmpty(records)){ - // 获取企业联系人 - List listIds = records.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listIds); - List payWorkingGroupSubItemContactsList = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); - for (PayWorkingGroupSubItem workingGroupSubItem : records) { + List records = payWorkingGroupSubItemIPage.getRecords(); + if(!CollectionUtils.isEmpty(records)){ + // 获取企业联系人 + List listIds = records.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listIds); + List payWorkingGroupSubItemContactsList = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + for (PayWorkingGroupSubItem workingGroupSubItem : records) { + if (StringUtils.isNotBlank(payWorkingGroupSubitem.getMeetingId())) { String workingGroupSubItemId = workingGroupSubItem.getId(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingRemindRecord::getSubitemId,workingGroupSubItemId); - wrapper.eq(PayMeetingRemindRecord::getMeetingId,payWorkingGroupSubitem.getMeetingId()); + wrapper.eq(PayMeetingRemindRecord::getSubitemId, workingGroupSubItemId); + wrapper.eq(PayMeetingRemindRecord::getMeetingId, payWorkingGroupSubitem.getMeetingId()); int count = payMeetingRemindRecordService.count(wrapper); - if (count>0){ + if (count > 0) { workingGroupSubItem.setRemind(PayProjectCommon.YES); - }else { + } else { workingGroupSubItem.setRemind(PayProjectCommon.NO); } - if(!CollectionUtils.isEmpty(payWorkingGroupSubItemContactsList)){ - List pwg = payWorkingGroupSubItemContactsList.stream().filter(p->Objects.equals(p.getWorkingGroupSubId(),workingGroupSubItem.getId())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(pwg)){ - pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); - workingGroupSubItem.setPayWorkingGroupSubItemContactsList(pwg); - } + } + if(!CollectionUtils.isEmpty(payWorkingGroupSubItemContactsList)){ + List pwg = payWorkingGroupSubItemContactsList.stream().filter(p->Objects.equals(p.getWorkingGroupSubId(),workingGroupSubItem.getId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(pwg)){ + pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + workingGroupSubItem.setPayWorkingGroupSubItemContactsList(pwg); } } } @@ -157,8 +157,17 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listPayWorkingGroupSubItemContacts = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + long oldNum = listPayWorkingGroupSubItemContacts.size(); + long newNum = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsId).collect(Collectors.toList()).stream().distinct().count(); + if(oldNum != newNum){ + throw new JeroBootException("企业联系人重复"); + } + } + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){ throw new JeroBootException("应收金额不能为空"); @@ -167,7 +176,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listPayWorkingGroupSubItemContactsNew = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); // 添加联系人表 - List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ - for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { - listPayWorkingGroupSubItemContacts.get(i).setOrderNum(i+1); - listPayWorkingGroupSubItemContacts.get(i).setWorkingGroupId(payWorkingGroupSubItem.getWorkingGroupId()); - listPayWorkingGroupSubItemContacts.get(i).setWorkingGroupSubId(payWorkingGroupSubItem.getId()); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContactsNew)){ + for (int i = 0; i < listPayWorkingGroupSubItemContactsNew.size(); i++) { + listPayWorkingGroupSubItemContactsNew.get(i).setOrderNum(i+1); + listPayWorkingGroupSubItemContactsNew.get(i).setWorkingGroupId(payWorkingGroupSubItem.getWorkingGroupId()); + listPayWorkingGroupSubItemContactsNew.get(i).setWorkingGroupSubId(payWorkingGroupSubItem.getId()); } - payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContacts); + payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContactsNew); } List listFile = new ArrayList<>(); // 获取收费通知 @@ -325,6 +334,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listPayWorkingGroupSubItemContactsNew = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + // 添加联系人表 + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContactsNew)){ + for (int i = 0; i < listPayWorkingGroupSubItemContactsNew.size(); i++) { + listPayWorkingGroupSubItemContactsNew.get(i).setOrderNum(i+1); + listPayWorkingGroupSubItemContactsNew.get(i).setWorkingGroupId(payWorkingGroupSubItem.getWorkingGroupId()); + listPayWorkingGroupSubItemContactsNew.get(i).setWorkingGroupSubId(payWorkingGroupSubItem.getId()); + } + payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContactsNew); + } payWorkingGroupSubItem.setChargeUse(PayProjectCommon.CHARGE_USE1); // 变更应收金额，重新校验状态 ProjectStatusVO projectStatusVO = projectDetailService.getStatus(payWorkingGroupSubItem.getId(),payWorkingGroupSubItem.getReceivableAmount(),payWorkingGroupSubItem.getNeedInvoice()); @@ -458,7 +478,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl{ List listPayWorkingGroupSubItemContacts = p.getPayWorkingGroupSubItemContactsList(); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ - listPayWorkingGroupSubItemContacts.forEach(s->{ - s.setWorkingGroupId(p.getWorkingGroupId()); - s.setWorkingGroupSubId(p.getId()); - }); + for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { + listPayWorkingGroupSubItemContacts.get(i).setWorkingGroupId(p.getWorkingGroupId()); + listPayWorkingGroupSubItemContacts.get(i).setWorkingGroupSubId(p.getId()); + listPayWorkingGroupSubItemContacts.get(i).setOrderNum(i + 1); + } payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContacts); } PayIncomeContract payIncomeContract = p.getPayIncomeContract(); @@ -794,9 +815,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第").append(count + 3).append("行:企业联系人").append(c).append("与企业联系人").append(num).append("重复，请修改。
"); }else{ - map.put(name,3); + map.put(name,num); } if (!CollectionUtils.isEmpty(listCompany)) { // 通过联系人获取联系人id @@ -1158,15 +1179,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl Date: Thu, 21 Apr 2022 14:10:34 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/mapper/xml/ProjectDetailMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index ec9a88d6..a439b37e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -14,10 +14,11 @@ UNION ALL - select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name,g.mission_and_objectives + select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,pwgsc.contacts_temporary_id as contacts_temporary_id_one,pwgsc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name,g.mission_and_objectives from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id + left join pay_working_group_subitem_contacts pwgsc on gsub.id = pwgsc.working_group_sub_id and pwgsc.order_num = 1 AND gsub.id = #{projectId} From 8aff2b91091ad4ab4cfedca1ebf34bbedb386bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 21 Apr 2022 14:15:05 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/PayWorkingGroupSubItemServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index b62b8ab0..e94a30a1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -148,6 +148,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl pwg = payWorkingGroupSubItemContactsList.stream().filter(p->Objects.equals(p.getWorkingGroupSubId(),workingGroupSubItem.getId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(pwg)){ pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + workingGroupSubItem.setContactsTemporaryNameOne(pwg.get(0).getContactsTemporaryName()); workingGroupSubItem.setPayWorkingGroupSubItemContactsList(pwg); } } From e362062272df88b9b6dbea6fd77abff1854c2396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 22 Apr 2022 10:12:57 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/mapper/xml/ProjectDetailMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index a439b37e..ec9a88d6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -14,11 +14,10 @@ UNION ALL - select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,pwgsc.contacts_temporary_id as contacts_temporary_id_one,pwgsc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name,g.mission_and_objectives + select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name,g.mission_and_objectives from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id - left join pay_working_group_subitem_contacts pwgsc on gsub.id = pwgsc.working_group_sub_id and pwgsc.order_num = 1 AND gsub.id = #{projectId} From 04fdb4f8c2a71c383247f9af0480529e2e91b603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 22 Apr 2022 10:49:24 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectDetailServiceImpl.java | 114 ++++++++---------- .../com/jero/common/vo/ProjectDetailVO.java | 12 +- .../PayWorkingGroupSubItemContacts.java | 44 +++++++ 3 files changed, 104 insertions(+), 66 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 4f7fbb3c..d8cab966 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -33,7 +33,9 @@ import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.temporary.common.PayCompanyManagementTemporaryCommon; import com.jero.temporary.entity.PayCompanyManagementTemporary; @@ -82,6 +84,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { private ISysUserService sysUserService; @Resource private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; + @Resource + private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService; @Override public ProjectDetailVO getProjectDetail(String projectId) { @@ -229,75 +233,63 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectDetailVO.setBankAccountName(payCompanyManagementTemporary.getBankAccountName()); projectDetailVO.setBankAccount(payCompanyManagementTemporary.getBankAccount()); projectDetailVO.setOpeningBank(payCompanyManagementTemporary.getOpeningBank()); - PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId()); - if(Objects.isNull(payContactsManagementTemporary)){ - throw new JeroBootException("联系人不存在！"); - } - projectDetailVO.setName(payContactsManagementTemporary.getName()); - projectDetailVO.setGender(payContactsManagementTemporary.getGender()); - if(!Objects.isNull(payContactsManagementTemporary.getGender())){ - projectDetailVO.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender()))); - } - projectDetailVO.setPost(payContactsManagementTemporary.getPost()); - if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){ - projectDetailVO.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone())); - } - if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){ - projectDetailVO.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail())); - } - projectDetailVO.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode()); - projectDetailVO.setContactAddress(payContactsManagementTemporary.getContactAddress()); - // 工作组 添加企业联系人2，联系人3 + + // 工作组 添加企业联系人 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){ PayWorkingGroupSubItem payWorkingGroupSubItem = payWorkingGroupSubItemService.getById(projectId); if(Objects.isNull(payWorkingGroupSubItem)){ throw new JeroBootException("项目不存在！"); } - projectDetailVO.setRemarksOne(payWorkingGroupSubItem.getRemarksOne()); - - if(!StringUtils.isEmpty(payWorkingGroupSubItem.getContactsIdTwo())){ - projectDetailVO.setRemarksTwo(payWorkingGroupSubItem.getRemarksTwo()); - PayContactsManagementTemporary payContactsManagementTemporary2 = payContactsManagementTemporaryService.getById(payWorkingGroupSubItem.getContactsTemporaryIdTwo()); - if(Objects.isNull(payContactsManagementTemporary2)){ - throw new JeroBootException("联系人2不存在！"); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,projectId); + queryPayWorkingGroupSubItemContacts.orderByAsc(PayWorkingGroupSubItemContacts::getOrderNum); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List payContactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(listIds); + if(!CollectionUtils.isEmpty(payContactsManagementTemporaryList)){ + listPayWorkingGroupSubItemContacts.forEach(p->{ + List listNew = payContactsManagementTemporaryList.stream().filter(o->Objects.equals(o.getId(),p.getContactsTemporaryId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listNew)){ + return; + } + PayContactsManagementTemporary payContactsManagementTemporary = listNew.get(0); + p.setGender(payContactsManagementTemporary.getGender()); + if(!Objects.isNull(payContactsManagementTemporary.getGender())){ + p.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender()))); + } + p.setPost(payContactsManagementTemporary.getPost()); + if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){ + p.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone())); + } + if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){ + p.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail())); + } + p.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode()); + p.setContactAddress(payContactsManagementTemporary.getContactAddress()); + }); + projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); } - projectDetailVO.setNameTwo(payContactsManagementTemporary2.getName()); - projectDetailVO.setGenderTwo(payContactsManagementTemporary2.getGender()); - if(!Objects.isNull(payContactsManagementTemporary2.getGender())){ - projectDetailVO.setGenderTwo_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender()))); - } - projectDetailVO.setPostTwo(payContactsManagementTemporary2.getPost()); - if(!StringUtils.isBlank(payContactsManagementTemporary2.getPhone())){ - projectDetailVO.setPhoneTwo(PasswordUtil.decrypt(payContactsManagementTemporary2.getPhone())); - } - if(!StringUtils.isBlank(payContactsManagementTemporary2.getEmail())){ - projectDetailVO.setEmailTwo(PasswordUtil.decrypt(payContactsManagementTemporary2.getEmail())); - } - projectDetailVO.setPostalCodeContactsTwo(payContactsManagementTemporary2.getPostalCode()); - projectDetailVO.setContactAddressTwo(payContactsManagementTemporary2.getContactAddress()); } - - if(!StringUtils.isEmpty(payWorkingGroupSubItem.getContactsIdThree())){ - projectDetailVO.setRemarksThree(payWorkingGroupSubItem.getRemarksThree()); - PayContactsManagementTemporary payContactsManagementTemporary3 = payContactsManagementTemporaryService.getById(payWorkingGroupSubItem.getContactsTemporaryIdThree()); - if(Objects.isNull(payContactsManagementTemporary3)){ - throw new JeroBootException("联系人3不存在！"); - } - projectDetailVO.setNameThree(payContactsManagementTemporary3.getName()); - projectDetailVO.setGenderThree(payContactsManagementTemporary3.getGender()); - if(!Objects.isNull(payContactsManagementTemporary3.getGender())){ - projectDetailVO.setGenderThree_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary3.getGender()))); - } - projectDetailVO.setPostThree(payContactsManagementTemporary3.getPost()); - if(!StringUtils.isBlank(payContactsManagementTemporary3.getPhone())){ - projectDetailVO.setPhoneThree(PasswordUtil.decrypt(payContactsManagementTemporary3.getPhone())); - } - if(!StringUtils.isBlank(payContactsManagementTemporary3.getEmail())){ - projectDetailVO.setEmailThree(PasswordUtil.decrypt(payContactsManagementTemporary3.getEmail())); - } - projectDetailVO.setPostalCodeContactsThree(payContactsManagementTemporary3.getPostalCode()); - projectDetailVO.setContactAddressThree(payContactsManagementTemporary3.getContactAddress()); + }else { + PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId()); + if(Objects.isNull(payContactsManagementTemporary)){ + throw new JeroBootException("联系人不存在！"); } + projectDetailVO.setName(payContactsManagementTemporary.getName()); + projectDetailVO.setGender(payContactsManagementTemporary.getGender()); + if(!Objects.isNull(payContactsManagementTemporary.getGender())){ + projectDetailVO.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender()))); + } + projectDetailVO.setPost(payContactsManagementTemporary.getPost()); + if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){ + projectDetailVO.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone())); + } + if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){ + projectDetailVO.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail())); + } + projectDetailVO.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode()); + projectDetailVO.setContactAddress(payContactsManagementTemporary.getContactAddress()); } } // 到账信息 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java index 9f91ba1c..174ba8fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java @@ -1,15 +1,11 @@ package com.jero.common.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.mail.entity.PayMailBill; import com.jero.payment.entity.PayPaymentRecord; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -266,4 +262,10 @@ public class ProjectDetailVO implements Serializable { @ApiModelProperty(value = "开票邮寄记录") private List mailBill; + /** + * 工作组企业联系人列表 + */ + @ApiModelProperty(value = "工作组企业联系人列表") + private List payWorkingGroupSubItemContactsList; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java index ec5e46a9..652c0846 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java @@ -1,6 +1,7 @@ package com.jero.project.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -77,4 +78,47 @@ public class PayWorkingGroupSubItemContacts implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; + + /** + * 企业联系人性别3 + */ + @ApiModelProperty(value = "企业联系人性别") + @TableField(exist = false) + private String gender; + /** + * 企业联系人性别3 + */ + @ApiModelProperty(value = "企业联系人性别") + @TableField(exist = false) + private String gender_dictText; + /** + * 企业联系人职务3 + */ + @ApiModelProperty(value = "企业联系人职务") + @TableField(exist = false) + private String post; + /** + * 企业联系人电话3 + */ + @ApiModelProperty(value = "企业联系人电话") + @TableField(exist = false) + private String phone; + /** + * 企业联系人邮箱3 + */ + @ApiModelProperty(value = "企业联系人邮箱") + @TableField(exist = false) + private String email; + /** + * 企业联系人邮编3 + */ + @ApiModelProperty(value = "企业联系人邮编") + @TableField(exist = false) + private String postalCodeContacts; + /** + * 企业联系人地址 + */ + @ApiModelProperty(value = "企业联系人地址") + @TableField(exist = false) + private String contactAddress; } From 89206204c621091ffdc5fd86b34f311e70f2b2b0 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 22 Apr 2022 10:55:32 +0800 Subject: [PATCH 12/26] =?UTF-8?q?add:=E5=90=88=E5=90=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=82=AE=E5=AF=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/contract/entity/PayIncomeContract.java | 7 +++++++ .../contract/entity/PaySpendingContract.java | 13 +++++++++++++ .../mapper/xml/PayIncomeContractMapper.xml | 3 +++ .../mapper/xml/PaySpendingContractMapper.xml | 3 +++ .../controller/PayMailContractController.java | 16 ++++++++++++++++ 5 files changed, 42 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index 96f4e955..0c951cd7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -223,4 +223,11 @@ public class PayIncomeContract implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "邮寄状态") private Integer postStatus; + + /** + * 邮寄表id,用于展示邮寄状态并用于查询邮寄信息 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄id") + private String mailId; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index db1cdffd..9dc8e203 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -212,4 +212,17 @@ public class PaySpendingContract implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "来款状态 0：全部 1:到期未付款") private Integer chargeStatus; + /** + * 邮寄状态 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄状态") + private Integer postStatus; + + /** + * 邮寄表id,用于展示邮寄状态并用于查询邮寄信息 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄id") + private String mailId; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 29cca89f..41ab71e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -33,6 +33,8 @@ pic.pack, pic.pack_year AS packYear, pic.status, + pmc.id as mailId, + pmc.post_status as postStatus, if(pic.status = 2,1,0) as statusOrder, pic.create_by AS createBy, pic.create_time AS createTime, @@ -45,6 +47,7 @@ ) AS chargeStatus, if(pic.status = 6,GROUP_CONCAT(picac.charge_project ORDER BY picac.id DESC),GROUP_CONCAT(project.projectName ORDER BY project.id DESC)) AS associatedProject FROM pay_income_contract pic + LEFT JOIN pay_mail_contract pmc ON pmc.contract_id = pic.id LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id LEFT JOIN pay_income_contract_associated_cancellation picac ON picac.contract_id = pic.id LEFT JOIN diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index c6e3508d..bfe0aaf8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -32,6 +32,8 @@ psc.pack_year, psc.status, if(psc.status = 2,1,0) as statusOrder, + pmc.id as mailId, + pmc.post_status as postStatus, psc.create_by, psc.create_time, psc.update_by, @@ -42,6 +44,7 @@ ) AS chargeStatus FROM pay_spending_contract psc left join sys_user su on psc.principal_id = su.id + LEFT JOIN pay_mail_contract pmc ON pmc.contract_id = psc.id AND contract_num LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractNum},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java index d4e0ccd1..729db11d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java @@ -304,5 +304,21 @@ public class PayMailContractController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { + PayMailContract payMailContract = payMailContractService.getById(id); + if(payMailContract==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMailContract); + } } From 75306289753259c5d471f554632f3834eee4c6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Sun, 24 Apr 2022 10:10:03 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...kingGroupDistributionRecordController.java | 86 +++++++------------ ...ingGroupDistributionRecordServiceImpl.java | 75 +++++----------- 2 files changed, 54 insertions(+), 107 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java index 04d733fc..d4ae01c9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java @@ -1,27 +1,12 @@ package com.jero.project.controller; -import java.io.*; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - 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; import com.jero.common.aspect.annotation.AutoLog; 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.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayContactsManagement; @@ -29,31 +14,36 @@ import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.entity.PayCaseCouncilSubitem; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; -import com.jero.modules.message.handle.impl.EmailSendMsgHandle; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.DownloadFileRecord; import com.jero.project.entity.PayWorkingGroupDistributionRecord; -import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; -import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.Api; +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.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.mybatis.logging.Logger; -import org.mybatis.logging.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * @Description: 资料 @@ -66,14 +56,16 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/project/payWorkingGroupDistributionRecord") @Slf4j public class PayWorkingGroupDistributionRecordController extends JeroController { - @Autowired - private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService; - @Autowired - private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; - @Autowired - private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; - @Autowired - private IPayCaseCouncilSubitemService payCaseCouncilSubitemService; + @Resource + private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService; + @Resource + private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; + @Resource + private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; + @Resource + private IPayCaseCouncilSubitemService payCaseCouncilSubitemService; + @Resource + private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService; @Resource private IOSSFileService iossFileService; @@ -215,29 +207,15 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< } List listData = new ArrayList<>(); if(projectType == PayProjectCommon.PROJECT_TYPE_FILE1){ - LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,projectId); - List list = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId); + List list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); if(!CollectionUtils.isEmpty(list)){ list.forEach(p->{ - if(!StringUtils.isEmpty(p.getContactsIdOne()) && !StringUtils.isEmpty(p.getContactsTemporaryNameOne())){ - PayContactsManagement payContactsManagement = new PayContactsManagement(); - payContactsManagement.setId(p.getContactsTemporaryIdOne()); - payContactsManagement.setName(p.getContactsTemporaryNameOne()); - listData.add(payContactsManagement); - } - if(!StringUtils.isEmpty(p.getContactsIdTwo()) && !StringUtils.isEmpty(p.getContactsTemporaryNameTwo())){ - PayContactsManagement payContactsManagement1 = new PayContactsManagement(); - payContactsManagement1.setId(p.getContactsTemporaryIdTwo()); - payContactsManagement1.setName(p.getContactsTemporaryNameTwo()); - listData.add(payContactsManagement1); - } - if(!StringUtils.isEmpty(p.getContactsIdThree()) && !StringUtils.isEmpty(p.getContactsTemporaryNameThree())){ - PayContactsManagement payContactsManagement2 = new PayContactsManagement(); - payContactsManagement2.setId(p.getContactsTemporaryIdThree()); - payContactsManagement2.setName(p.getContactsTemporaryNameThree()); - listData.add(payContactsManagement2); - } + PayContactsManagement payContactsManagement = new PayContactsManagement(); + payContactsManagement.setId(p.getContactsTemporaryId()); + payContactsManagement.setName(p.getContactsTemporaryName()); + listData.add(payContactsManagement); }); } }else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE2){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index b44fc380..08ed1392 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -29,20 +29,15 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.*; import com.jero.project.mapper.PayWorkingGroupDistributionRecordMapper; -import com.jero.project.service.IPayWorkingGroupDataFileService; -import com.jero.project.service.IPayWorkingGroupDistributionRecordService; -import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.project.service.*; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.io.File; import java.util.*; @@ -83,10 +78,12 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listPayWorkingGroupDistributionRecord,OSSFile byId){ - // 查询工作组成员一，二，三 - LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.nested(i ->i.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s)).or() - .in(PayWorkingGroupSubItem::getContactsTemporaryIdTwo,Arrays.asList(s)).or() - .in(PayWorkingGroupSubItem::getContactsTemporaryIdThree,Arrays.asList(s))); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupDistributionRecord.getProjectId()); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ - listPayWorkingGroupSubItem.forEach(p->{ - if(!StringUtils.isEmpty(p.getContactsTemporaryIdOne()) && Arrays.asList(s).contains(p.getContactsTemporaryIdOne())){ - PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); - payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); - payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); - payWorkingGroupDistributionRecordNew.setSubId(p.getId()); - payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdOne()); - payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameOne()); - payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdOne()); - listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); - } - if(!StringUtils.isEmpty(p.getContactsTemporaryIdTwo()) && Arrays.asList(s).contains(p.getContactsTemporaryIdTwo())){ - PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); - payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); - payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); - payWorkingGroupDistributionRecordNew.setSubId(p.getId()); - payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdTwo()); - payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameTwo()); - payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdTwo()); - listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); - } - if(!StringUtils.isEmpty(p.getContactsTemporaryIdThree()) && Arrays.asList(s).contains(p.getContactsTemporaryIdThree())){ - PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); - payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); - payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); - payWorkingGroupDistributionRecordNew.setSubId(p.getId()); - payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdThree()); - payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameThree()); - payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdThree()); - listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); - } + // 查询工作组成员 + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,payWorkingGroupDistributionRecord.getProjectId()); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getContactsTemporaryId,Arrays.asList(s)); + List list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); + payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); + payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); + payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); + payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); + payWorkingGroupDistributionRecordNew.setSubId(p.getWorkingGroupSubId()); + payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); + payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryName()); + payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryId()); + listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); }); } } From 11a85e753c3a16c0c31620863052b36bc54bca16 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Sun, 24 Apr 2022 11:21:19 +0800 Subject: [PATCH 14/26] fix:bug --- .../main/java/com/jero/mail/entity/PayMailContracrList.java | 2 +- .../src/main/java/com/jero/mail/entity/PayMailContract.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java index 10e2107f..6bd01185 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java @@ -33,7 +33,7 @@ public class PayMailContracrList { @Excel(name = "合同总金额", width = 15) @ApiModelProperty(value = "合同总金额") private java.lang.String contractAmount; - @Dict(dicCode ="mail_type" ) + @Dict(dicCode ="mail_send" ) @ApiModelProperty(value = "邮寄方式") private java.lang.String sendMethod; @ApiModelProperty(value = "邮寄单号") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java index b0a0cec3..2e8cd0d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -53,10 +54,12 @@ public class PayMailContract implements Serializable { @ApiModelProperty(value = "合同id") private java.lang.String contractId; /**邮寄状态(0:未邮寄，1::已邮寄)*/ + @Dict(dicCode = "mail_type") @Excel(name = "邮寄状态(0:未邮寄，1::已邮寄)", width = 15) @ApiModelProperty(value = "邮寄状态(0:未邮寄，1::已邮寄)") private java.lang.Integer postStatus; /**快递公司(1:EMS,2:顺丰)*/ + @Dict(dicCode ="mail_send" ) @Excel(name = "快递公司(1:EMS,2:顺丰)", width = 15) @ApiModelProperty(value = "快递公司(1:EMS,2:顺丰)") private java.lang.Integer sendMethod; @@ -92,6 +95,7 @@ public class PayMailContract implements Serializable { @ApiModelProperty(value = "邮寄人(详情使用）") @TableField(exist = false) private String mailName; + @Dict(dicCode ="contract_type") @ApiModelProperty(value = "合同类型：1 支出合同，2 收入合同") private Integer contractType; } From 5130bb80038c0554af7628cee96d2eb4b5824d25 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Sun, 24 Apr 2022 14:36:02 +0800 Subject: [PATCH 15/26] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E5=90=88=E5=90=8C+=E6=94=AF=E5=87=BA=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=9F=A5=E8=AF=A2=E9=82=AE=E5=AF=84=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index 026c0db4..a9f4300d 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -187,3 +187,7 @@ INSERT INTO `sys_dict_item` VALUES ('1509830618775691265', '1509830472616779778' -- 2022-04-20 新增是否是内部企业 ALTER TABLE pay_company_management ADD COLUMN internal_enterprise VARCHAR(6) DEFAULT NULL COMMENT '是否内部企业'; INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1516688284384772098', '1430376267109978113', '是否内部企业', NULL, NULL, NULL, NULL, 2, 'company:internalEnterprise', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-20 16:00:40', NULL, NULL, 0, 0, '0', 0); + +-- 2022-04-24 收入合同+支出合同查询邮寄详情按钮权限 +INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1518071675121545217', '1433250634957398018', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'revenueContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:37:46', NULL, NULL, 0, 0, '1', 0); +INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1518071807695106050', '1435135348211298306', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'expenditureContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:38:18', NULL, NULL, 0, 0, '1', 0); From 7a17217ea334fd73d06c742d900a9417c106974f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 25 Apr 2022 14:08:24 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 5 +++++ .../jero/contract/mapper/xml/PayIncomeContractMapper.xml | 3 ++- .../service/impl/PayWorkingGroupSubItemServiceImpl.java | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index a9f4300d..cd8d2bc3 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -191,3 +191,8 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com -- 2022-04-24 收入合同+支出合同查询邮寄详情按钮权限 INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1518071675121545217', '1433250634957398018', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'revenueContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:37:46', NULL, NULL, 0, 0, '1', 0); INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1518071807695106050', '1435135348211298306', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'expenditureContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:38:18', NULL, NULL, 0, 0, '1', 0); + +-- 2022-04-25 工作组成员单位3个联系人修改成多个联系人变更 +insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_one,contacts_temporary_id_one,contacts_temporary_name_one,remarks_one,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_one is not null and contacts_id_one !=''); +insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_two,contacts_temporary_id_two,contacts_temporary_name_two,remarks_two,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_two is not null and contacts_id_two !=''); +insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_three,contacts_temporary_id_three,contacts_temporary_name_three,remarks_three,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_three is not null and contacts_id_three !=''); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 41ab71e2..fc4147ce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -140,10 +140,11 @@ pwgs.receivable_amount AS receivableAmount, pwgs.paid_amount AS paidAmount, su.realname AS principalName, - pwgs.contacts_temporary_name_one AS contactsName, + pwgsc.contacts_temporary_name AS contactsName, pica.create_time AS createTime FROM pay_income_contract_associated pica JOIN pay_working_group_subitem pwgs ON pica.project_id = pwgs.id + LEFT JOIN pay_working_group_subitem_contacts pwgsc ON pwgsc.working_group_sub_id = pwgs.id and order_num = 1 LEFT JOIN pay_working_group pwg ON pwgs.working_group_id = pwg.id left join sys_user su on pwg.principal_id_a = su.id WHERE pica.contract_id = #{contractId} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index e94a30a1..969c935b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -150,7 +150,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl Date: Mon, 25 Apr 2022 14:42:46 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index cd8d2bc3..c34c986a 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -194,5 +194,5 @@ INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, -- 2022-04-25 工作组成员单位3个联系人修改成多个联系人变更 insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_one,contacts_temporary_id_one,contacts_temporary_name_one,remarks_one,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_one is not null and contacts_id_one !=''); -insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_two,contacts_temporary_id_two,contacts_temporary_name_two,remarks_two,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_two is not null and contacts_id_two !=''); -insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_three,contacts_temporary_id_three,contacts_temporary_name_three,remarks_three,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_three is not null and contacts_id_three !=''); +insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_two,contacts_temporary_id_two,contacts_temporary_name_two,remarks_two,2,create_by,create_time FROM pay_working_group_subitem where contacts_id_two is not null and contacts_id_two !=''); +insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_three,contacts_temporary_id_three,contacts_temporary_name_three,remarks_three,3,create_by,create_time FROM pay_working_group_subitem where contacts_id_three is not null and contacts_id_three !=''); From 76bf91cb108a85aa65030dc444b461aae7691908 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Tue, 26 Apr 2022 14:07:14 +0800 Subject: [PATCH 18/26] =?UTF-8?q?[update]=20-=E4=BF=AE=E6=94=B9=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=AF=E5=86=85=E9=83=A8=E4=BC=81=E4=B8=9A=E7=9A=84?= =?UTF-8?q?sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 2 +- .../src/main/java/com/jero/config/shiro/ShiroConfig.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index c34c986a..a203cff8 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -186,7 +186,7 @@ INSERT INTO `sys_dict_item` VALUES ('1509830618775691265', '1509830472616779778' -- 2022-04-20 新增是否是内部企业 ALTER TABLE pay_company_management ADD COLUMN internal_enterprise VARCHAR(6) DEFAULT NULL COMMENT '是否内部企业'; -INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1516688284384772098', '1430376267109978113', '是否内部企业', NULL, NULL, NULL, NULL, 2, 'company:internalEnterprise', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-20 16:00:40', NULL, NULL, 0, 0, '0', 0); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1516688284384772098', '1430376267109978113', '是否内部企业', NULL, NULL, NULL, NULL, 2, 'company:updateInternalEnterprise', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-20 16:00:40', NULL, NULL, 0, 0, '1', 0); -- 2022-04-24 收入合同+支出合同查询邮寄详情按钮权限 INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1518071675121545217', '1433250634957398018', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'revenueContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:37:46', NULL, NULL, 0, 0, '1', 0); diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index c38a7249..e1682ef1 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -178,9 +178,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/company/payContactsManagement/queryWXByCompany","anon"); //企业端注册个人 filterChainDefinitionMap.put("/home/registerSelf", "anon"); - - - + // 判断当前企业是否是内部企业 + filterChainDefinitionMap.put("/company/payCompanyManagement/getInternalEnterprise","anon"); // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap(1); From 655515295e10c18aaa739a69ea4f56da8efb5d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 26 Apr 2022 14:10:38 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemServiceImpl.java | 120 +++++------------- 1 file changed, 35 insertions(+), 85 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 969c935b..2e09ba54 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -916,27 +916,23 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemService.listByIds(Arrays.asList(s)); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // todo 联系人关联表 List listMsg = new ArrayList<>(); if(!CollectionUtils.isEmpty(list)){ - List listContacts = new ArrayList<>(); - List listOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdOne).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listOne)){ - listContacts.addAll(listOne); - } - List listTwo = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdTwo).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listTwo)){ - listContacts.addAll(listTwo); - } - List listThree = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdThree).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listThree)){ - listContacts.addAll(listThree); - } - // 获取所有联系人 - List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listContacts); - if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){ - throw new JeroBootException("联系人不存在!"); + List listStr = list.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.listByIds(listStr); + List listPayContactsManagementTemporary = new ArrayList<>(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + List listContacts = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContacts)){ + // 获取所有联系人 + listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listContacts); + if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){ + throw new JeroBootException("联系人不存在!"); + } + } } + + List finalListPayContactsManagementTemporary = listPayContactsManagementTemporary; list.forEach(p->{ // 获取工作组信息 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(list.get(0).getWorkingGroupId()); @@ -964,6 +960,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listContactsOne = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsOne)){ + if(CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + return; + } + List listNew = listPayWorkingGroupSubItemContacts.stream().filter(n->Objects.equals(n.getWorkingGroupSubId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listNew)){ + return; + } + List listIds = listNew.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + // 发消息 项目负责人发给企业联系人、工作组联系人 + List listContacts = finalListPayContactsManagementTemporary.stream().filter(item->listIds.contains(item.getId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContacts)) { + return; + } + listContacts.forEach(m->{ try { // 发送消息 SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(listContactsOne.get(0).getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsOne.get(0).getEmail())); + if(!StringUtils.isBlank(m.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(m.getEmail())); } - if(!StringUtils.isBlank(listContactsOne.get(0).getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsOne.get(0).getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsOne.get(0).getPhone())); + if(!StringUtils.isBlank(m.getPhone())){ + sendMessageDTO.setToUser(PasswordUtil.decrypt(m.getPhone())); + sendMessageDTO.setPhone(PasswordUtil.decrypt(m.getPhone())); } HashMap map = new HashMap<>(); map.put("projectName",payWorkingGroup.getWorkingGroupProject()); @@ -1003,65 +1011,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listContactsTwo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdTwo(),item.getId())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsTwo)){ - try { - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(listContactsTwo.get(0).getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsTwo.get(0).getEmail())); - } - if(!StringUtils.isBlank(listContactsTwo.get(0).getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsTwo.get(0).getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsTwo.get(0).getPhone())); - } - HashMap map = new HashMap<>(); - map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUserInfo.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE22"); - sendMessageDTO.setListFile(listFile); - JSONObject json = new JSONObject(); - json.put("id",p.getId()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - }catch (Exception e){ - if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败")){ - listMsg.add(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败"); - } - } - } - List listContactsThree = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdThree(),item.getId())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsThree)){ - try { - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(listContactsThree.get(0).getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsThree.get(0).getEmail())); - } - if(!StringUtils.isBlank(listContactsThree.get(0).getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsThree.get(0).getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsThree.get(0).getPhone())); - } - HashMap map = new HashMap<>(); - map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUserInfo.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE22"); - sendMessageDTO.setListFile(listFile); - JSONObject json = new JSONObject(); - json.put("id",p.getId()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - }catch (Exception e){ - if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败")){ - listMsg.add(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败"); - } - } - } + }); }); } return listMsg; From 5ee61d4e17bd520707da2e9ec648d2000bee8ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 26 Apr 2022 15:31:50 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 22 ++++++++++++++----- .../PayWorkingGroupSubItemServiceImpl.java | 18 +++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 25e66dd3..52092e3b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -367,15 +367,27 @@ public class PayWorkingGroupSubItemController extends JeroController listContacts = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdOne).collect(Collectors.toList()); + List listIds = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listIds); + // 查询序号为1的联系人 + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getOrderNum,1); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + return Result.error("联系人不存在!"); + } + List listContacts = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listContacts); if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){ return Result.error("联系人不存在!"); } - // todo 联系人关联表 + listPayWorkingGroupSubItem.forEach(p->{ - List listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList()); + List listNew = listPayWorkingGroupSubItemContacts.stream().filter(n->Objects.equals(n.getWorkingGroupSubId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listNew)){ + return; + } + List listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(listNew.get(0).getContactsTemporaryId(),item.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listContactsInfo)){ return; } @@ -432,7 +444,7 @@ public class PayWorkingGroupSubItemController extends JeroController finalListPayContactsManagementTemporary = listPayContactsManagementTemporary; + // 获取工作组信息 + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(list.get(0).getWorkingGroupId()); + if(Objects.isNull(payWorkingGroup)){ + throw new JeroBootException("工作组不存在!"); + } + SysUser sysUserInfo = sysUserService.getById(payWorkingGroup.getPrincipalIdA()); + if(Objects.isNull(sysUserInfo)){ + throw new JeroBootException("负责人不存在!"); + } list.forEach(p->{ - // 获取工作组信息 - PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(list.get(0).getWorkingGroupId()); - if(Objects.isNull(payWorkingGroup)){ - throw new JeroBootException("工作组不存在!"); - } - SysUser sysUserInfo = sysUserService.getById(payWorkingGroup.getPrincipalIdA()); - if(Objects.isNull(sysUserInfo)){ - throw new JeroBootException("负责人不存在!"); - } LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); // 变更应收金额，重新校验状态 ProjectStatusVO projectStatusVO = projectDetailService.getStatus(p.getId(),input.getReceivableAmount(),p.getNeedInvoice()); From 4dbfbd71d7e5ca04378b40b6cb72a31dfe76489d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 27 Apr 2022 10:57:12 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/PayPackCompanyProjectMapper.xml | 8 +-- .../PayPaymentRecordController.java | 50 +++++++------------ .../mapper/xml/PayPaymentRecordMapper.xml | 5 +- 3 files changed, 25 insertions(+), 38 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index 324c2e48..fdd385a3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -47,11 +47,12 @@ UNION ALL - select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount, + select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsubc.contacts_temporary_id as contacts_temporary_id_one,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount, if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','' from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id + inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1 AND gsub.charge_company_id = #{companyId} @@ -175,10 +176,11 @@ UNION ALL - select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsub.contacts_temporary_name_one + select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsubc.contacts_temporary_name as contacts_temporary_name_one from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id + inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1 AND gsub.id = #{projectId} @@ -421,4 +423,4 @@ LEFT JOIN pay_pack_company_project ppcp ON project.id = ppcp.project_id LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = project.contacts_temporary_id - \ No newline at end of file + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index 2fb2fad2..f7c69c1d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -1,33 +1,15 @@ package com.jero.payment.controller; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.common.ProjectCommon; import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; -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.util.AuthenticationUtils; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.PayMailBillVO; -import com.jero.mail.entity.PayMailBill; -import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillService; -import com.jero.meeting.entity.PayMeetingSituation; -import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbCertificatePaymentService; @@ -35,17 +17,19 @@ import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.entity.PayCommonProject; -import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.vo.PayCommonProjectOutput; import com.jero.standards.memberinfo.entity.MemberInfo; -import io.lettuce.core.dynamic.annotation.Param; -import lombok.extern.slf4j.Slf4j; -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; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; /** * @Description: pay_payment_record @@ -58,13 +42,13 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/paymentRecord/payPaymentRecord") @Slf4j public class PayPaymentRecordController extends JeroController { - @Autowired - private IPayPaymentRecordService payPaymentRecordService; - @Autowired - private IPayMailBillService payMailBillService; - @Autowired + @Resource + private IPayPaymentRecordService payPaymentRecordService; + @Resource + private IPayMailBillService payMailBillService; + @Resource private ITbMemberProjectSubitemService tbMemberProjectSubitemService; - @Autowired + @Resource private ITbCertificatePaymentService tbCertificatePaymentService; /** @@ -85,7 +69,7 @@ public class PayPaymentRecordController extends JeroController UNION ALL select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_id,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2, - gsub.invoice_amount,gsub.mail_contacts_id,'' as register_check_result,gsub.contacts_temporary_name_one,gsub.payment_status,gsub.charge_company_temporary_id + gsub.invoice_amount,gsub.mail_contacts_id,'' as register_check_result,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.payment_status,gsub.charge_company_temporary_id from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id + inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1 where gsub.receivable_amount ]]> 0 and gsub.receivable_amount is not null @@ -425,4 +426,4 @@ - \ No newline at end of file + From 5cb1493c33fc91a25f407a7393224b86b5cd4e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 27 Apr 2022 11:39:01 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMailBillServiceImpl.java | 32 +++++++------ .../impl/PayPaymentRecordServiceImpl.java | 48 ++++++++----------- 2 files changed, 38 insertions(+), 42 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index f3e3927b..66ac8f64 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -48,10 +48,12 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -66,7 +68,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -129,6 +134,8 @@ public class PayMailBillServiceImpl extends ServiceImpl queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorking.getId()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List payWorkingTemporary = payContactsManagementTemporaryService.listByIds(listIds); + if(!CollectionUtils.isEmpty(payWorkingTemporary)){ + listId.addAll(payWorkingTemporary); } } project = payWorkingGroup.getWorkingGroupProject(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index a09c86ce..aba8a690 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -17,6 +17,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayCompanyManagement; @@ -48,15 +49,14 @@ import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; -import com.jero.common.util.AuthenticationUtils; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.vo.PayCommonProjectOutput; import com.jero.standards.memberinfo.entity.MemberInfo; -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 org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; @@ -66,12 +66,12 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.servlet.ModelAndView; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; @@ -122,10 +122,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl typr5List,List typr6List,Integer flag,String checkOrRecord){ BigDecimal newPaidAmount; @@ -375,24 +377,16 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorking.getId()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List payWorkingTemporary = payContactsManagementTemporaryService.listByIds(listIds); + if(!CollectionUtils.isEmpty(payWorkingTemporary)){ + listId.addAll(payWorkingTemporary); } } principalId = payWorkingGroup.getPrincipalIdA(); @@ -407,7 +401,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl Date: Fri, 29 Apr 2022 15:23:18 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 52092e3b..c24c644e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -171,19 +171,17 @@ public class PayWorkingGroupSubItemController extends JeroController listProjectIds = new ArrayList<>(); - // todo 关联企业联系人表 - // 工作组的企业联系人1，2，3 - LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getContactsIdTwo,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getContactsIdThree,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getMailContactsId,sysUser.getId()); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ - List listProjectId = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + + // 工作组的企业联系人 + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getContactsId,sysUser.getId()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + List listProjectId = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getWorkingGroupSubId).collect(Collectors.toList()); listProjectIds.addAll(listProjectId); } - // 邮寄联系人 + + // 邮寄联系人 LambdaQueryWrapper queryPayMailBill = new LambdaQueryWrapper<>(); queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId()); List listPayMailBill = payMailBillService.list(queryPayMailBill); From a7d00cd791898340c6efcc0c11088687bbe24d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Sat, 7 May 2022 14:30:33 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=82=AC?= =?UTF-8?q?=E6=AC=BE=E6=8F=90=E9=86=92=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 64 ++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index c24c644e..9a159524 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -379,37 +379,43 @@ public class PayWorkingGroupSubItemController extends JeroController listMsg = new ArrayList<>(); listPayWorkingGroupSubItem.forEach(p->{ - List listNew = listPayWorkingGroupSubItemContacts.stream().filter(n->Objects.equals(n.getWorkingGroupSubId(),p.getId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listNew)){ - return; - } - List listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(listNew.get(0).getContactsTemporaryId(),item.getId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listContactsInfo)){ - return; - } - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(listContactsInfo.get(0).getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsInfo.get(0).getEmail())); - } - if(!StringUtils.isBlank(listContactsInfo.get(0).getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone())); - } - HashMap map = new HashMap<>(); - map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE11"); - JSONObject json = new JSONObject(); - json.put("id",p.getId()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); + try{ + List listNew = listPayWorkingGroupSubItemContacts.stream().filter(n->Objects.equals(n.getWorkingGroupSubId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listNew)){ + return; + } + List listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(listNew.get(0).getContactsTemporaryId(),item.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listContactsInfo)){ + return; + } + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(listContactsInfo.get(0).getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsInfo.get(0).getEmail())); + } + if(!StringUtils.isBlank(listContactsInfo.get(0).getPhone())){ + sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone())); + sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone())); + } + HashMap map = new HashMap<>(); + map.put("projectName",payWorkingGroup.getWorkingGroupProject()); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE11"); + JSONObject json = new JSONObject(); + json.put("id",p.getId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }catch (Exception e){ + if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败")){ + listMsg.add(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败"); + } + } }); - return Result.OK("添加成功！"); + return Result.OK("添加成功！",listMsg); } /** From fe2a9e87e1f0acfa0206db69111d05cac0b37ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Sat, 7 May 2022 15:33:12 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=82=AC?= =?UTF-8?q?=E6=AC=BE=E6=8F=90=E9=86=92=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index fcae5fc1..01d8d7dd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -912,6 +912,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemService.listByIds(Arrays.asList(s)); @@ -919,7 +923,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listMsg = new ArrayList<>(); if(!CollectionUtils.isEmpty(list)){ List listStr = list.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); - List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.listByIds(listStr); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listStr); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); List listPayContactsManagementTemporary = new ArrayList<>(); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ List listContacts = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); @@ -943,6 +949,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl{ + // 收费通知为合同的，不进行变更，其他方式直接变更 + if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + return; + } LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); // 变更应收金额，重新校验状态 ProjectStatusVO projectStatusVO = projectDetailService.getStatus(p.getId(),input.getReceivableAmount(),p.getNeedInvoice()); @@ -981,7 +991,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listIds = listNew.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); // 发消息 项目负责人发给企业联系人、工作组联系人 List listContacts = finalListPayContactsManagementTemporary.stream().filter(item->listIds.contains(item.getId())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContacts)) { + if(CollectionUtils.isEmpty(listContacts)) { return; } listContacts.forEach(m->{ @@ -1007,8 +1017,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl Date: Mon, 9 May 2022 13:45:20 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index a203cff8..35cf305d 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -193,6 +193,26 @@ INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1518071807695106050', '1435135348211298306', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'expenditureContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:38:18', NULL, NULL, 0, 0, '1', 0); -- 2022-04-25 工作组成员单位3个联系人修改成多个联系人变更 +DROP TABLE IF EXISTS `pay_working_group_subitem_contacts`; +CREATE TABLE `pay_working_group_subitem_contacts` ( + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `working_group_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工作组id', + `working_group_sub_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工作组成员id', + `contacts_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业联系人id', + `contacts_temporary_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时企业联系人id', + `contacts_temporary_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时企业联系人名称', + `remarks` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人备注', + `order_num` int(3) NULL DEFAULT NULL COMMENT '序号', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `idx_wg_working_group_id`(`working_group_id`) USING BTREE, + INDEX `idx_wg_working_group_sub_id`(`working_group_sub_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '工作组成员企业联系人表' ROW_FORMAT = Dynamic; + insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_one,contacts_temporary_id_one,contacts_temporary_name_one,remarks_one,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_one is not null and contacts_id_one !=''); insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_two,contacts_temporary_id_two,contacts_temporary_name_two,remarks_two,2,create_by,create_time FROM pay_working_group_subitem where contacts_id_two is not null and contacts_id_two !=''); insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_three,contacts_temporary_id_three,contacts_temporary_name_three,remarks_three,3,create_by,create_time FROM pay_working_group_subitem where contacts_id_three is not null and contacts_id_three !=''); +