add 工作组-其他分发资料增加是否发送邮件参数

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;
+
 }

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<String> 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);
 	 }
 

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;
 }

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<Pa
     private IPayCaseCouncilService payCaseCouncilService;
     @Resource
     private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
+    @Resource
+    private PayFileEmailRemindRecordService fileEmailRemindRecordService;
 
     @Override
     @Transactional
@@ -263,16 +261,17 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 throw new JeroBootException("成员id不能为空!");
             }
         }
-        if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getDataIds())){
+        String dataIds = payWorkingGroupDistributionRecord.getDataIds();
+        if(StringUtils.isBlank(dataIds)){
             throw new JeroBootException("资料id不能为空!");
         }
-        String[] n = payWorkingGroupDistributionRecord.getDataIds().split(",");
+        String[] n = dataIds.split(",");
         for (String s1 : n) {
             if(StringUtils.isBlank(s1)){
                 throw new JeroBootException("资料id不能为空!");
             }
         }
-        List<PayWorkingGroupDataFile> listPayWorkingGroupDataFile =  payWorkingGroupDataFileService.listByIds(Arrays.asList(payWorkingGroupDistributionRecord.getDataIds().split(",")));
+        List<PayWorkingGroupDataFile> listPayWorkingGroupDataFile =  payWorkingGroupDataFileService.listByIds(Arrays.asList(dataIds.split(",")));
         if(CollectionUtils.isEmpty(listPayWorkingGroupDataFile)){
             throw new JeroBootException("没有找到文件!");
         }
@@ -414,6 +413,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 }
                 // 发送消息
                 SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag();
+                sendMessageDTO.setSendEmailFlag(sendEmailFlag);
                 if(!StringUtils.isBlank(p.getEmail())){
                     sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
                 }
@@ -436,6 +437,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 }
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
+                if (!CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)) {
+                    fileEmailRemindRecordService.insertByFileList(Arrays.asList(n),p.getContactId());
+                }
             }catch (Exception e){
                 if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getName() + "邮件发送失败")){
                     listMsg.add(p.getName() + "邮件发送失败");