From 492379a69283df678606ec5c70814d4efd26f310 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 12 Jul 2023 13:52:46 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84-=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/entity/PayContactsManagement.java | 5 ++++ ...kingGroupDistributionRecordController.java | 22 +++++++++++++++- .../PayWorkingGroupDistributionRecord.java | 7 +++++ ...ingGroupDistributionRecordServiceImpl.java | 26 +++++++++++-------- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 91fd6234..22b19179 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -167,4 +167,9 @@ public class PayContactsManagement implements Serializable { @ApiModelProperty(value = "删除状态") private String delFlag; + @TableField(exist = false) + @ApiModelProperty(value = "是否已提醒") + @Dict(dicCode = "yn") + private Integer remind; + } 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 2971e19c..824c1e1f 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 @@ -5,6 +5,8 @@ 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.aspect.annotation.DictPoint; +import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; @@ -12,6 +14,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayContactsManagement; import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.entity.PayCaseCouncilSubitem; +import com.jero.data.mapper.PayFileEmailRemindRecordMapper; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.modules.oss.entity.OSSFile; @@ -71,6 +74,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< private IOSSFileService iossFileService; @Value("${jero.path.upload}") private String upLoadPath; + @Resource + private PayFileEmailRemindRecordMapper fileEmailRemindRecordMapper; /** @@ -194,9 +199,12 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @param projectType 项目类型 * @return */ + @DictPoint @ApiOperation(value="资料分发-分发成员列表", notes="资料分发-分发成员列表") @GetMapping(value = "/list") - public Result list(@RequestParam("projectId") String projectId,@RequestParam("projectType") Integer projectType) { + public Result list(@RequestParam("projectId") String projectId, + @RequestParam("projectType") Integer projectType, + @RequestParam(value = "fileId",required = false) String fileId) { if(StringUtils.isBlank(projectId)){ throw new JeroBootException("项目id不能为空!"); } @@ -248,6 +256,18 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< }else { throw new JeroBootException("项目状态不正确！"); } + if (StringUtils.isNotBlank(fileId)) { + List contactIdByFileId = fileEmailRemindRecordMapper.selectContactIdByFileId(fileId); + for (PayContactsManagement payContactsManagement : listData) { + String id = payContactsManagement.getId(); + if (contactIdByFileId.contains(id)) { + payContactsManagement.setRemind(CommonConstant.DEL_FLAG_1); + }else { + payContactsManagement.setRemind(CommonConstant.DEL_FLAG_0); + } + } + } + return Result.OK(listData); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java index 9c283f71..74b6daf5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java @@ -95,4 +95,11 @@ public class PayWorkingGroupDistributionRecord implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "联系人临时id") private String temporaryContactsId; + + /** + * 是否发送邮件 + */ + @TableField(exist = false) + @ApiModelProperty(value = "是否发送邮件") + private Integer sendEmailFlag; } 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 7c05b5a3..40110a3a 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CommonConstant; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; @@ -16,14 +17,9 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; -import com.jero.data.entity.PayCaseCommittee; -import com.jero.data.entity.PayCaseCommitteeSubitem; -import com.jero.data.entity.PayCaseCouncil; -import com.jero.data.entity.PayCaseCouncilSubitem; -import com.jero.data.service.IPayCaseCommitteeService; -import com.jero.data.service.IPayCaseCommitteeSubitemService; -import com.jero.data.service.IPayCaseCouncilService; -import com.jero.data.service.IPayCaseCouncilSubitemService; +import com.jero.data.entity.*; +import com.jero.data.service.*; +import com.jero.data.service.impl.PayFileEmailRemindRecordService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; @@ -84,6 +80,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listPayWorkingGroupDataFile = payWorkingGroupDataFileService.listByIds(Arrays.asList(payWorkingGroupDistributionRecord.getDataIds().split(","))); + List listPayWorkingGroupDataFile = payWorkingGroupDataFileService.listByIds(Arrays.asList(dataIds.split(","))); if(CollectionUtils.isEmpty(listPayWorkingGroupDataFile)){ throw new JeroBootException("没有找到文件!"); } @@ -414,6 +413,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl