From 39942ec4cfa58405584084bb9d7384b70eecb854 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 12 Jul 2023 10:54:48 +0800 Subject: [PATCH 01/66] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=8F=90=E9=86=92=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/dto/SendMessageDTO.java | 6 ++++++ .../jero/common/service/impl/SendMessageServiceImpl.java | 3 ++- .../jero/meeting/service/impl/PayMeetingServiceImpl.java | 1 + .../main/java/com/jero/meeting/vo/PublishReminderVO.java | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java index 178f2fda..9a07328d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java @@ -1,5 +1,6 @@ package com.jero.common.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -53,4 +54,9 @@ public class SendMessageDTO implements Serializable { * 文件名集合(邮箱发送附件) */ private List listFile; + /** + * 是否发送邮件 + */ + @ApiModelProperty(value = "是否发送邮件") + private Integer sendEmailFlag; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 1e55f0c6..face320b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -104,8 +104,9 @@ public class SendMessageServiceImpl implements SendMessageService { // 1短信 2邮件 3系统 // 发送邮件 true String fromUser = sendMessageDTO.getFromUser(); + Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag(); LoginUser loginUser = sysBaseAPI.getUserByName(fromUser); - if(templateType.contains(ProjectCommon.MESSAGE_TYPE2)){ + if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){ if(StringUtils.isEmpty(sendMessageDTO.getEmail())){ throw new JeroBootException("邮件发送，邮箱地址不能为空！"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index c4b209de..757e99d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -724,6 +724,7 @@ public class PayMeetingServiceImpl extends ServiceImpl subitemIds; @ApiModelProperty(value = "项目类型1:工作组，2：分标委") private Integer projectType; + @ApiModelProperty(value = "是否发送邮件") + private Integer sendEmailFlag; } From 492379a69283df678606ec5c70814d4efd26f310 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 12 Jul 2023 13:52:46 +0800 Subject: [PATCH 02/66] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84-?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=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 Date: Wed, 12 Jul 2023 13:56:12 +0800 Subject: [PATCH 03/66] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84-?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/entity/PayFileEmailRemindRecord.java | 72 +++++++++++++++++++ .../PayFileEmailRemindRecordMapper.java | 18 +++++ .../xml/PayFileEmailRemindRecordMapper.xml | 26 +++++++ .../impl/PayFileEmailRemindRecordService.java | 27 +++++++ 4 files changed, 143 insertions(+) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileEmailRemindRecord.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayFileEmailRemindRecordMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayFileEmailRemindRecordMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileEmailRemindRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileEmailRemindRecord.java new file mode 100644 index 00000000..fdc5e2d2 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileEmailRemindRecord.java @@ -0,0 +1,72 @@ +package com.jero.data.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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2023-07-12 10:52 + */ +/** + * 文件邮件提醒记录表 + */ +@ApiModel(description="文件邮件提醒记录表") +@Data +@TableName(value = "pay_file_email_remind_record") +public class PayFileEmailRemindRecord { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private String id; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建日期 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建日期") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新日期 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新日期") + private Date updateTime; + + /** + * 会议id + */ + @TableField(value = "file_id") + @ApiModelProperty(value="会议id") + private String fileId; + + /** + * 联系人id + */ + @TableField(value = "contact_id") + @ApiModelProperty(value="联系人id") + private String contactId; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayFileEmailRemindRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayFileEmailRemindRecordMapper.java new file mode 100644 index 00000000..df8f3b2d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayFileEmailRemindRecordMapper.java @@ -0,0 +1,18 @@ +package com.jero.data.mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +import com.baomidou.mybatisplus.core.injector.methods.SelectMaps; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.data.entity.PayFileEmailRemindRecord; + +/** + * + *@author liJiaRao + *@date 2023-07-12 10:52 + */ +public interface PayFileEmailRemindRecordMapper extends BaseMapper { + List selectContactIdByFileId(@Param("fileId")String fileId); + + +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayFileEmailRemindRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayFileEmailRemindRecordMapper.xml new file mode 100644 index 00000000..bdc9b273 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayFileEmailRemindRecordMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + id, create_by, create_time, update_by, update_time, file_id, contact_id + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java new file mode 100644 index 00000000..7dc5c722 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java @@ -0,0 +1,27 @@ +package com.jero.data.service.impl; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.data.entity.PayFileEmailRemindRecord; +import com.jero.data.mapper.PayFileEmailRemindRecordMapper; +/** + * + *@author liJiaRao + *@date 2023-07-12 10:52 + */ +@Service +public class PayFileEmailRemindRecordService extends ServiceImpl { + + public void insertByFileList(List fileIdList, String contactId) { + for (String fileId : fileIdList) { + PayFileEmailRemindRecord payFileEmailRemindRecord = new PayFileEmailRemindRecord(); + payFileEmailRemindRecord.setFileId(fileId); + payFileEmailRemindRecord.setContactId(contactId); + this.save(payFileEmailRemindRecord); + } + } + + +} From fe53ac50431eae821f054ff759183625d02fd6d4 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 12 Jul 2023 15:10:49 +0800 Subject: [PATCH 04/66] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84-?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayFileEmailRemindRecordService.java | 4 +++- ...ingGroupDistributionRecordServiceImpl.java | 21 ++++++++++++------- .../handle/impl/EmailSendMsgHandle.java | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java index 7dc5c722..802ad58d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java @@ -2,6 +2,7 @@ package com.jero.data.service.impl; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.data.entity.PayFileEmailRemindRecord; @@ -14,7 +15,8 @@ import com.jero.data.mapper.PayFileEmailRemindRecordMapper; @Service public class PayFileEmailRemindRecordService extends ServiceImpl { - public void insertByFileList(List fileIdList, String contactId) { + public void insertByFileList(String fileIds, String contactId) { + String[] fileIdList = fileIds.split(","); for (String fileId : fileIdList) { PayFileEmailRemindRecord payFileEmailRemindRecord = new PayFileEmailRemindRecord(); payFileEmailRemindRecord.setFileId(fileId); 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 40110a3a..77882f6c 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 @@ -86,10 +86,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { - if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){ + String contactsIds = payWorkingGroupDistributionRecord.getContactsIds(); + if(StringUtils.isBlank(contactsIds)){ throw new JeroBootException("成员id不能为空!"); } - String[] s = payWorkingGroupDistributionRecord.getContactsIds().split(","); + String[] s = contactsIds.split(","); for (String s1 : s) { if(StringUtils.isBlank(s1)){ throw new JeroBootException("成员id不能为空!"); @@ -135,7 +136,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); - queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(","))); + queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); if(!CollectionUtils.isEmpty(listContacts)){ String str = JSON.toJSONString(listContacts); @@ -167,7 +168,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); - queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(","))); + queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); if(!CollectionUtils.isEmpty(listContacts)){ String str = JSON.toJSONString(listContacts); @@ -219,6 +220,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { - if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){ + String contactsIds = payWorkingGroupDistributionRecord.getContactsIds(); + if(StringUtils.isBlank(contactsIds)){ throw new JeroBootException("成员id不能为空!"); } - String[] s = payWorkingGroupDistributionRecord.getContactsIds().split(","); + String[] s = contactsIds.split(","); for (String s1 : s) { if(StringUtils.isBlank(s1)){ throw new JeroBootException("成员id不能为空!"); @@ -438,7 +445,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl Date: Wed, 12 Jul 2023 16:08:50 +0800 Subject: [PATCH 05/66] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84-?= =?UTF-8?q?=E6=88=90=E5=91=98=20=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月.sql | 2 ++ .../PayWorkingGroupSubItemController.java | 27 +++++++++++++++++++ .../entity/PayWorkingGroupSubItem.java | 4 +++ .../xml/PayWorkingGroupSubItemMapper.xml | 6 ++++- .../IPayWorkingGroupSubItemService.java | 5 ++++ .../PayWorkingGroupSubItemServiceImpl.java | 20 ++++++++++++++ .../java/com/jero/project/vo/SetLabelVO.java | 20 ++++++++++++++ .../vo/excel/PayWorkingGroupSubItemExcel.java | 4 +++ 8 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 db/23年7月.sql create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java diff --git a/db/23年7月.sql b/db/23年7月.sql new file mode 100644 index 00000000..4b8d9a9d --- /dev/null +++ b/db/23年7月.sql @@ -0,0 +1,2 @@ +ALTER TABLE `pay_working_group_subitem` + ADD COLUMN `label` varchar(50) NULL COMMENT '标签' AFTER `no_tax_amount`; \ No newline at end of file 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 575e298a..30b0ddc6 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 @@ -43,6 +43,7 @@ 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.SetLabelVO; import com.jero.project.vo.excel.PayWorkingGroupSubItemExcel; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; @@ -731,5 +732,31 @@ public class PayWorkingGroupSubItemController extends JeroController setLabel(@RequestBody SetLabelVO setLabelVO) { + payWorkingGroupSubItemService.setLabel(setLabelVO); + return Result.OK("设置标签成功！"); + } + /** + * 删除标签 + * + * @return + */ + @AutoLog(value = "删除标签",operateType = 2) + //@RequiresPermissions("") + @PostMapping(value = "/deleteLabel") + @ApiOperation(value = "工作组成员-删除标签") + public Result deleteLabel(@RequestBody SetLabelVO setLabelVO) { + payWorkingGroupSubItemService.deleteLabel(setLabelVO); + return Result.OK("设置标签成功！"); + } } 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 00f95412..64d73961 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 @@ -575,4 +575,8 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "未税金额") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal noTaxAmount; + + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private String label; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 433adc84..24e58bea 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -43,7 +43,8 @@ pwgs.update_by AS updateBy, pwgs.tax, pwgs.tax_rate, - pwgs.no_tax_amount + pwgs.no_tax_amount, + pwgs.label FROM pay_working_group_subitem pwgs LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id @@ -64,6 +65,9 @@ and pack = #{payWorkingGroupSubItem.pack} + + and label LIKE concat('%',#{payWorkingGroupSubItem.label},'%') + GROUP BY pwgs.id ORDER BY pwgs.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index b6ee4b86..a98157ae 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -8,6 +8,7 @@ import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.entity.PayWorkingGroupSubletSearch; import com.jero.project.vo.SetChargeInput; +import com.jero.project.vo.SetLabelVO; import com.jero.statistics.entity.AllMoney; import javax.servlet.http.HttpServletRequest; @@ -118,4 +119,8 @@ public interface IPayWorkingGroupSubItemService extends IService publishReminderList(Page page, PayWorkingGroupSubItem payWorkingGroupSubItem); + + void setLabel(SetLabelVO setLabelVO); + + void deleteLabel(SetLabelVO setLabelVO); } 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 6388cf01..a41db5bb 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 @@ -46,6 +46,7 @@ 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.SetLabelVO; import com.jero.statistics.entity.AllMoney; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -1009,6 +1010,25 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayWorkingGroupSubItem::getId,Arrays.asList(subIds.split(","))); + updateWrapper.set(PayWorkingGroupSubItem::getLabel,label); + payWorkingGroupSubItemMapper.update(null, updateWrapper); + } + + @Override + public void deleteLabel(SetLabelVO setLabelVO) { + String subIds = setLabelVO.getSubIds(); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayWorkingGroupSubItem::getId,Arrays.asList(subIds.split(","))); + updateWrapper.set(PayWorkingGroupSubItem::getLabel,null); + payWorkingGroupSubItemMapper.update(null, updateWrapper); + } + /** * @Description 删除项目打包关联，临时企业、联系信息 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java new file mode 100644 index 00000000..5910a2f4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java @@ -0,0 +1,20 @@ +package com.jero.project.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author liJiaRao + * @date 2023-07-12 15:16 + */ +@Data +public class SetLabelVO { + @NotBlank(message = "至少选择一个成员") + @ApiModelProperty(value = "成员ids") + private String subIds; + + @ApiModelProperty(value = "标签") + private String label; +} 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 4bd92799..43833878 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 @@ -291,4 +291,8 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "联系人10备注", width = 15) @ApiModelProperty(value = "联系人10备注") private String remarksTen; + + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private String label; } From f24dfb2531ca69c1ecd8a8327f8ae8bdb27f4afe Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 11:28:28 +0800 Subject: [PATCH 06/66] =?UTF-8?q?add=20=E5=98=89=E5=AE=BE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=BC=9A=E8=AE=AE=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月.sql | 2 - db/23年7月变更.sql | 20 ++++ .../CommitteeMeetingSituationController.java | 14 +++ .../PayMeetingSituationController.java | 36 ++++++ .../meeting/entity/PayMeetingGuestsFile.java | 66 +++++++++++ .../meeting/entity/PayMeetingSituation.java | 3 + .../mapper/PayMeetingGuestsFileMapper.java | 11 ++ .../mapper/xml/PayMeetingGuestsFileMapper.xml | 18 +++ .../service/IPayMeetingSituationService.java | 9 ++ .../service/PayMeetingGuestsFileService.java | 17 +++ .../service/impl/PayMeetingServiceImpl.java | 15 +++ .../impl/PayMeetingSituationServiceImpl.java | 105 ++++++++++++++++++ .../jero/meeting/vo/GuestsUploadFileVO.java | 24 ++++ .../meeting/vo/SetGuestsUploadFileVO.java | 27 +++++ 14 files changed, 365 insertions(+), 2 deletions(-) delete mode 100644 db/23年7月.sql create mode 100644 db/23年7月变更.sql create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingGuestsFile.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingGuestsFileMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingGuestsFileMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingGuestsFileService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/GuestsUploadFileVO.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java diff --git a/db/23年7月.sql b/db/23年7月.sql deleted file mode 100644 index 4b8d9a9d..00000000 --- a/db/23年7月.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `pay_working_group_subitem` - ADD COLUMN `label` varchar(50) NULL COMMENT '标签' AFTER `no_tax_amount`; \ No newline at end of file diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql new file mode 100644 index 00000000..ed999d5d --- /dev/null +++ b/db/23年7月变更.sql @@ -0,0 +1,20 @@ +ALTER TABLE `pay_working_group_subitem` + ADD COLUMN `label` varchar(50) NULL COMMENT '标签'; + +ALTER TABLE `pay_meeting_situation` + ADD COLUMN `guests_upload_file_flag` tinyint NULL COMMENT '嘉宾上传文件标识'; + +create table pay_meeting_guests_file +( + id varchar(36) not null comment 'id', + meeting_id varchar(50) null comment '会议id', + contacts_id varchar(50) null comment '联系人id', + file_id varchar(50) null comment '文件id', + constraint Index_1 + unique (id) +) + comment '会议嘉宾文件表'; + +alter table pay_meeting_guests_file + add primary key (id); + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 565b7d7d..00634947 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -233,4 +233,18 @@ public class CommitteeMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("合并开票成功!"); + } + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index 08541d35..fe6958a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -23,6 +23,7 @@ import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.entity.PayMeetingGuestsFile; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.service.IPayMeetingSituationService; @@ -376,4 +377,39 @@ public class PayMeetingSituationController extends JeroController guestsUploadFile(@RequestBody GuestsUploadFileVO guestsUploadFileVO) { + ValidUtil.validate(guestsUploadFileVO); + payMeetingSituationService.guestsUploadFile(guestsUploadFileVO); + return Result.OK("上传文件成功!"); + } + + /** + * 嘉宾上传文件列表 + */ + @AutoLog(value = "嘉宾上传文件列表") + @ApiOperation(value = "嘉宾上传文件", notes = "嘉宾上传文件") + @PostMapping(value = "/guestsUploadFileList") + public Result> guestsUploadFileList(@RequestBody GuestsUploadFileVO guestsUploadFileVO) { + List payMeetingGuestsFiles = payMeetingSituationService.guestsUploadFileList(guestsUploadFileVO); + return Result.OK(payMeetingGuestsFiles); + } + + /** + * 嘉宾删除文件 + */ + @AutoLog(value = "嘉宾删除文件") + @ApiOperation(value = "嘉宾删除文件", notes = "嘉宾删除文件") + @PostMapping(value = "/guestsDeleteFile") + public Result guestsDeleteFile(@RequestBody GuestsUploadFileVO guestsUploadFileVO) { + ValidUtil.validate(guestsUploadFileVO); + payMeetingSituationService.guestsDeleteFile(guestsUploadFileVO); + return Result.OK("删除文件成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingGuestsFile.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingGuestsFile.java new file mode 100644 index 00000000..0fc80619 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingGuestsFile.java @@ -0,0 +1,66 @@ +package com.jero.meeting.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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2023-07-13 10:35 + */ + +/** + * 会议嘉宾文件表 + */ +@ApiModel(description = "会议嘉宾文件表") +@Data +@TableName(value = "pay_meeting_guests_file") +public class PayMeetingGuestsFile { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + + /** + * 会议id + */ + @TableField(value = "meeting_id") + @ApiModelProperty(value = "会议id") + private String meetingId; + + /** + * 联系人id + */ + @TableField(value = "contacts_id") + @ApiModelProperty(value = "联系人id") + private String contactsId; + + /** + * 文件id + */ + @TableField(value = "file_id") + @ApiModelProperty(value = "文件id") + private String fileId; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 创建日期 + */ + @TableField(value = "create_time") + @ApiModelProperty(value = "创建日期") + private Date createTime; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index a3914f69..68b0723e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -514,4 +514,7 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "未税金额") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal noTaxAmount; + + @ApiModelProperty(value = "嘉宾上传文件标识") + private Integer guestsUploadFileFlag; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingGuestsFileMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingGuestsFileMapper.java new file mode 100644 index 00000000..4c2ff03a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingGuestsFileMapper.java @@ -0,0 +1,11 @@ +package com.jero.meeting.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.meeting.entity.PayMeetingGuestsFile; + +/** + * @author liJiaRao + * @date 2023-07-13 10:35 + */ +public interface PayMeetingGuestsFileMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingGuestsFileMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingGuestsFileMapper.xml new file mode 100644 index 00000000..431f180f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingGuestsFileMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + id, meeting_id, contacts_id, file_id, create_by, create_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index 56624685..61129e67 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -5,6 +5,7 @@ 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.meeting.entity.PayMeeting; +import com.jero.meeting.entity.PayMeetingGuestsFile; import com.jero.meeting.entity.PayMeetingSituation; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.*; @@ -93,4 +94,12 @@ public interface IPayMeetingSituationService extends IService guestsUploadFileList(GuestsUploadFileVO guestsUploadFileVO); + + void guestsDeleteFile(GuestsUploadFileVO guestsUploadFileVO); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingGuestsFileService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingGuestsFileService.java new file mode 100644 index 00000000..12befb5c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingGuestsFileService.java @@ -0,0 +1,17 @@ +package com.jero.meeting.service; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.meeting.entity.PayMeetingGuestsFile; +import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; +/** + * + *@author liJiaRao + *@date 2023-07-13 10:33 + */ +@Service +public class PayMeetingGuestsFileService extends ServiceImpl { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 757e99d8..98e594e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -36,6 +36,7 @@ import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; import com.jero.meeting.mapper.PayMeetingContactsMapper; +import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; import com.jero.meeting.mapper.PayMeetingMapper; import com.jero.meeting.service.*; import com.jero.meeting.valid.group.CaseCommitteeMeeting; @@ -131,6 +132,8 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingDataList = new ArrayList<>(); + String meetingData = meeting.getMeetingData(); + if (StringUtils.isNotBlank(meetingData)) { + meetingDataList.addAll(Arrays.asList(meetingData.split(","))); + } + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(PayMeetingGuestsFile::getMeetingId,meetingId); + List payMeetingGuestsFiles = meetingGuestsFileMapper.selectList(wrapper1); + List collect = payMeetingGuestsFiles.stream().map(PayMeetingGuestsFile::getFileId).collect(Collectors.toList()); + meetingDataList.addAll(collect); + meeting.setMeetingData(String.join(meetingData,",")); } return pageList; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 2c2ab78d..e16b5c37 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1,4 +1,5 @@ package com.jero.meeting.service.impl; +import java.util.Date; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; @@ -8,10 +9,12 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; 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.common.ProjectCommon; +import com.jero.common.constant.CommonConstant; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.enums.ManagementMessageEnums; @@ -47,7 +50,9 @@ import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingContacts; +import com.jero.meeting.entity.PayMeetingGuestsFile; import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.meeting.service.IPayMeetingContactsService; import com.jero.meeting.service.IPayMeetingService; @@ -146,6 +151,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl meetingSituationIdList = Arrays.asList(meetingSituationIds.split(",")); + List payMeetingSituations = this.listByIds(meetingSituationIdList); + for (PayMeetingSituation meetingSituation : payMeetingSituations) { + String meetingId1 = meetingSituation.getMeetingId(); + if (!meetingId.equals(meetingId1)){ + throw new JeroBootException("参会人选择错误"); + } + //只有嘉宾可以设置 + Integer identity = meetingSituation.getIdentity(); + if (!identity.equals(MeetingSubitemCommon.JIA_BIN)){ + throw new JeroBootException("只有嘉宾可以设置"); + } + } + Integer guestsUploadFileFlag = setGuestsUploadFileVO.getGuestsUploadFileFlag(); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(PayMeetingSituation::getGuestsUploadFileFlag, guestsUploadFileFlag); + updateWrapper.in(PayMeetingSituation::getId,meetingSituationIdList); + this.update(updateWrapper); + } + + @Override + public void guestsUploadFile(GuestsUploadFileVO guestsUploadFileVO) { + String meetingId = guestsUploadFileVO.getMeetingId(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String sysUserId = sysUser.getId(); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingSituation::getMeetingId,meetingId); + wrapper.eq(PayMeetingSituation::getContractId,sysUserId); + PayMeetingSituation meetingSituation = this.getOne(wrapper); + Integer identity = meetingSituation.getIdentity(); + if (!identity.equals(MeetingSubitemCommon.JIA_BIN)){ + throw new JeroBootException("只有嘉宾可以设置"); + } + Integer guestsUploadFileFlag = meetingSituation.getGuestsUploadFileFlag(); + if (!CommonConstant.DEL_FLAG_1.equals(guestsUploadFileFlag)){ + throw new JeroBootException("没有权限"); + } + String[] fileIdList = guestsUploadFileVO.getFileIds().split(","); + for (String fileId : fileIdList) { + PayMeetingGuestsFile payMeetingGuestsFile = new PayMeetingGuestsFile(); + payMeetingGuestsFile.setMeetingId(meetingId); + payMeetingGuestsFile.setContactsId(sysUserId); + payMeetingGuestsFile.setFileId(fileId); + meetingGuestsFileMapper.insert(payMeetingGuestsFile); + } + + + } + + @Override + public List guestsUploadFileList(GuestsUploadFileVO guestsUploadFileVO) { + String meetingId = guestsUploadFileVO.getMeetingId(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String sysUserId = sysUser.getId(); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingGuestsFile::getMeetingId,meetingId); + wrapper.eq(PayMeetingGuestsFile::getContactsId,sysUserId); + return meetingGuestsFileMapper.selectList(wrapper); + } + + @Override + public void guestsDeleteFile(GuestsUploadFileVO guestsUploadFileVO) { + String meetingId = guestsUploadFileVO.getMeetingId(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String sysUserId = sysUser.getId(); + String fileIds = guestsUploadFileVO.getFileIds(); + List fileIdList = Arrays.asList(fileIds.split(",")); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingGuestsFile::getMeetingId,meetingId); + wrapper.eq(PayMeetingGuestsFile::getContactsId,sysUserId); + wrapper.in(PayMeetingGuestsFile::getFileId,fileIdList); + meetingGuestsFileMapper.delete(wrapper); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/GuestsUploadFileVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/GuestsUploadFileVO.java new file mode 100644 index 00000000..ef455a6b --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/GuestsUploadFileVO.java @@ -0,0 +1,24 @@ +package com.jero.meeting.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author liJiaRao + * @date 2023-07-13 9:37 + */ +@Data +public class GuestsUploadFileVO { + /**会议id*/ + @ApiModelProperty(value = "会议id") + @NotBlank(message = "会议项目不能为空") + private String meetingId; + + @ApiModelProperty(value = "文件ids") + @NotBlank(message = "文件不能为空") + private String fileIds; + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java new file mode 100644 index 00000000..90081244 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java @@ -0,0 +1,27 @@ +package com.jero.meeting.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @author liJiaRao + * @date 2023-07-13 9:37 + */ +@Data +public class SetGuestsUploadFileVO { + /**会议id*/ + @ApiModelProperty(value = "会议id") + @NotBlank(message = "会议项目不能为空") + private String meetingId; + + @ApiModelProperty(value = "参会人ids") + @NotBlank(message = "参会人不能为空") + private String meetingSituationIds; + + @ApiModelProperty(value = "嘉宾上传文件标识") + @NotNull(message = "嘉宾上传文件标识不能为空") + private Integer guestsUploadFileFlag; +} From 60c040ed123fee8cfe52c6f8c856b629844f417d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 11:29:18 +0800 Subject: [PATCH 07/66] =?UTF-8?q?add=20=E5=98=89=E5=AE=BE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=BC=9A=E8=AE=AE=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 98e594e3..ee9237ab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1015,7 +1015,7 @@ public class PayMeetingServiceImpl extends ServiceImpl payMeetingGuestsFiles = meetingGuestsFileMapper.selectList(wrapper1); List collect = payMeetingGuestsFiles.stream().map(PayMeetingGuestsFile::getFileId).collect(Collectors.toList()); meetingDataList.addAll(collect); - meeting.setMeetingData(String.join(meetingData,",")); + meeting.setMeetingData(String.join(",",meetingDataList)); } return pageList; } From ff9f70380459e387609d951971cd592c9cb90d2e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 11:43:29 +0800 Subject: [PATCH 08/66] =?UTF-8?q?add=20=E9=80=9A=E8=BF=87Code=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysMessageTemplateController.java | 11 +++++++ .../mapper/SysMessageTemplateMapper.java | 5 +++ .../mapper/xml/SysMessageTemplateMapper.xml | 33 +++++++++++++++++++ .../service/ISysMessageTemplateService.java | 2 ++ .../impl/SysMessageTemplateServiceImpl.java | 5 +++ 5 files changed, 56 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index 2c9975ed..6314d580 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -144,6 +144,17 @@ public class SysMessageTemplateController extends JeroController queryByCode(@RequestParam(name = "code", required = true) String code) { + SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.queryByCode(code); + return Result.OK(sysMessageTemplate); + } + /** * 导出excel * diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageTemplateMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageTemplateMapper.java index 2d1851eb..be7e54f5 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageTemplateMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageTemplateMapper.java @@ -1,4 +1,5 @@ package com.jero.modules.message.mapper; +import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; @@ -15,4 +16,8 @@ import java.util.List; public interface SysMessageTemplateMapper extends BaseMapper { @Select("SELECT * FROM SYS_SMS_TEMPLATE WHERE TEMPLATE_CODE = #{code}") List selectByCode(String code); + + SysMessageTemplate selectOneByTemplateCode(@Param("templateCode")String templateCode); + + } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/xml/SysMessageTemplateMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/xml/SysMessageTemplateMapper.xml index aac7097a..46451a39 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/xml/SysMessageTemplateMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/xml/SysMessageTemplateMapper.xml @@ -1,5 +1,38 @@ + + template_code, + template_name, + template_content, + template_test_json, + template_type, + recipient, + id, + create_by, + create_time, + update_by, + update_time + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/service/ISysMessageTemplateService.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/service/ISysMessageTemplateService.java index 900aaa11..77bce9c4 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/service/ISysMessageTemplateService.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/service/ISysMessageTemplateService.java @@ -13,4 +13,6 @@ import com.jero.modules.message.entity.SysMessageTemplate; */ public interface ISysMessageTemplateService extends JeroService { List selectByCode(String code); + + SysMessageTemplate queryByCode(String code); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/service/impl/SysMessageTemplateServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/service/impl/SysMessageTemplateServiceImpl.java index f0943e6b..1492c147 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/service/impl/SysMessageTemplateServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/service/impl/SysMessageTemplateServiceImpl.java @@ -25,4 +25,9 @@ public class SysMessageTemplateServiceImpl extends JeroServiceImpl selectByCode(String code) { return sysMessageTemplateMapper.selectByCode(code); } + + @Override + public SysMessageTemplate queryByCode(String code) { + return sysMessageTemplateMapper.selectOneByTemplateCode(code); + } } From 66c4e1b189ed7b61a951f421ddd222d06a9ed771 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 15:06:45 +0800 Subject: [PATCH 09/66] =?UTF-8?q?add=20=E5=90=84=E7=A7=8D=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E7=B1=BB=E5=9E=8B=E9=83=BD=E5=8F=AF=E4=BB=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=98=89=E5=AE=BE=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CouncilMeetingSituationController.java | 12 ++++++++++++ .../InternalMeetingSituationController.java | 12 ++++++++++++ .../controller/OtherMeetingSituationController.java | 12 +++++++++++- .../StandardsMeetingSituationController.java | 12 +++++++++++- .../WorkGroupMeetingSituationController.java | 12 +++++++++++- 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index c44a32d4..812f44cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -17,6 +17,7 @@ import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.CheckVO; import com.jero.meeting.vo.MergePayBillVO; import com.jero.meeting.vo.PayMeetingSituationVO; +import com.jero.meeting.vo.SetGuestsUploadFileVO; import com.jero.project.common.PayProjectCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -211,4 +212,15 @@ public class CouncilMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("合并开票成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 469e2918..17dc59f9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -237,4 +237,16 @@ public class InternalMeetingSituationController extends JeroController checkMember(String companyName) { return Result.OK(payMeetingSituationService.checkMemberCompany(companyName)); } + + /** + * 设置嘉宾上传文件 + */ + @AutoLog(value = "设置嘉宾上传文件") + @ApiOperation(value = "设置嘉宾上传文件", notes = "设置嘉宾上传文件") + @PostMapping(value = "/setGuestsUploadFile") + public Result setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("合并开票成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index bd398fa0..81d53b84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -214,6 +214,16 @@ public class OtherMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("合并开票成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index cdfb15b8..6da81a61 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -214,5 +214,15 @@ public class StandardsMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("合并开票成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 1ceb4e37..ef8d574e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -215,5 +215,15 @@ public class WorkGroupMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("合并开票成功!"); + } } From 1d6b07ee416f9108c80f9dd518b5efc5a2ada2ba Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 15:08:13 +0800 Subject: [PATCH 10/66] =?UTF-8?q?add=20=E5=90=84=E7=A7=8D=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E7=B1=BB=E5=9E=8B=E9=83=BD=E5=8F=AF=E4=BB=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=98=89=E5=AE=BE=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/controller/CommitteeMeetingSituationController.java | 2 +- .../meeting/controller/CouncilMeetingSituationController.java | 2 +- .../meeting/controller/InternalMeetingSituationController.java | 2 +- .../meeting/controller/OtherMeetingSituationController.java | 2 +- .../meeting/controller/StandardsMeetingSituationController.java | 2 +- .../meeting/controller/WorkGroupMeetingSituationController.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 00634947..cbae3198 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -243,7 +243,7 @@ public class CommitteeMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { ValidUtil.validate(setGuestsUploadFileVO); payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); - return Result.OK("合并开票成功!"); + return Result.OK("设置嘉宾上传文件成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index 812f44cd..f30288ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -221,6 +221,6 @@ public class CouncilMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { ValidUtil.validate(setGuestsUploadFileVO); payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); - return Result.OK("合并开票成功!"); + return Result.OK("设置嘉宾上传文件成功!"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 17dc59f9..9d59e0bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -247,6 +247,6 @@ public class InternalMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { ValidUtil.validate(setGuestsUploadFileVO); payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); - return Result.OK("合并开票成功!"); + return Result.OK("设置嘉宾上传文件成功!"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index 81d53b84..0b4e3aa8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -223,7 +223,7 @@ public class OtherMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { ValidUtil.validate(setGuestsUploadFileVO); payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); - return Result.OK("合并开票成功!"); + return Result.OK("设置嘉宾上传文件成功!"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index 6da81a61..7f24ae2d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -223,6 +223,6 @@ public class StandardsMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { ValidUtil.validate(setGuestsUploadFileVO); payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); - return Result.OK("合并开票成功!"); + return Result.OK("设置嘉宾上传文件成功!"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index ef8d574e..5340cc2c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -224,6 +224,6 @@ public class WorkGroupMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { ValidUtil.validate(setGuestsUploadFileVO); payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); - return Result.OK("合并开票成功!"); + return Result.OK("设置嘉宾上传文件成功!"); } } From 891493acda1c3fd56ad66cd4dadc4cc05815f66a Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 13 Jul 2023 15:49:48 +0800 Subject: [PATCH 11/66] =?UTF-8?q?add=20=E5=B9=B3=E5=8F=B0=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8A=9F=E8=83=BD=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 2 + .../SystemSendMessageController.java | 5 +- .../SysAnnouncementSendController.java | 35 ++++++++ .../system/entity/SysAnnouncementSend.java | 5 ++ .../mapper/SysAnnouncementSendMapper.java | 5 ++ .../mapper/xml/SysAnnouncementSendMapper.xml | 81 ++++++++++--------- .../system/model/AnnouncementSendModel.java | 6 ++ .../service/ISysAnnouncementSendService.java | 4 + .../impl/SysAnnouncementSendServiceImpl.java | 8 ++ 9 files changed, 111 insertions(+), 40 deletions(-) diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index ed999d5d..3bc78639 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -18,3 +18,5 @@ create table pay_meeting_guests_file alter table pay_meeting_guests_file add primary key (id); +ALTER TABLE sys_announcement_send ADD deadline datetime COMMENT '截止时间'; + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java index 0004fb6e..894cca36 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java @@ -31,6 +31,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -80,7 +81,8 @@ public class SystemSendMessageController { @GetMapping(value = "/sendAllUserMessage") @RequiresPermissions("template:add:systemNotifications") @Transactional - public Result sendAllUserMessage(@RequestParam("content") String content) { + public Result sendAllUserMessage(@RequestParam("content") String content, + @RequestParam("deadline") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date deadline) { List listPayContactsManagement = payContactsManagementService.list(); if(!CollectionUtils.isEmpty(listPayContactsManagement)){ SysAnnouncement announcement = new SysAnnouncement(); @@ -118,6 +120,7 @@ public class SystemSendMessageController { announcementSend.setAnntId(anntId); announcementSend.setUserId(user.getId()); announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); + announcementSend.setDeadline(deadline); // 截止时间 sysAnnouncementSendService.save(announcementSend); JSONObject obj = new JSONObject(); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 08acef6e..d55ac14b 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -2,10 +2,12 @@ package com.jero.modules.system.controller; import java.util.Arrays; import java.util.Date; +import java.util.List; import javax.servlet.http.HttpServletRequest; import com.jero.common.aspect.annotation.AutoLog; +import io.swagger.annotations.ApiOperation; import org.apache.shiro.SecurityUtils; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; @@ -265,6 +267,39 @@ public class SysAnnouncementSendController { return result; } + /** + * @功能：企业端获取我的消息(截止时间未读消息) + * @return + */ + @GetMapping(value = "/getDeadlineUnreadSend") + @ApiOperation(value="企业端获取我的消息(截止时间未读消息)", notes="企业端获取我的消息(截止时间未读消息)") + public Result> getDeadlineUnreadSend(AnnouncementSendModel announcementSendModel) { + LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); + String userId = sysUser.getId(); + announcementSendModel.setUserId(userId); + announcementSendModel.setDeadline(new Date()); + announcementSendModel.setReadFlag(CommonConstant.NO_READ_FLAG); + List pageList = sysAnnouncementSendService.getDeadlineUnreadSend(announcementSendModel); + return Result.OK(pageList); + } + + /** + * @Remarks: 一键已读(截止时间未读消息) + **/ + @GetMapping(value = "/allReadDeadlineUnreadSend") + @ApiOperation(value="一键已读(截止时间未读消息)", notes="一键已读(截止时间未读消息)") + public Result allReadDeadlineUnreadSend(@RequestParam("anntIds") String anntIds) { + LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); + String userId = sysUser.getId(); + LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); + updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); + updateWrapper.set(SysAnnouncementSend::getReadTime, new Date()); + updateWrapper.in(SysAnnouncementSend::getAnntId, Arrays.asList(anntIds.split(","))); + updateWrapper.eq(SysAnnouncementSend::getUserId, userId); + sysAnnouncementSendService.update(updateWrapper); + return Result.OK("操作成功"); + } + /** * @功能：一键已读 * @return diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java index 36c32a32..99da0121 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java @@ -45,4 +45,9 @@ public class SysAnnouncementSend implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; + + /**截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date deadline; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java index bf116af7..1cec8242 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java @@ -28,4 +28,9 @@ public interface SysAnnouncementSendMapper extends BaseMapper getMyAnnouncementSendList(Page page,@Param("announcementSendModel") AnnouncementSendModel announcementSendModel); + /** + * @Remarks: 获取截止时间后未读的消息 + **/ + List getMyAnnouncementSendList(@Param("announcementSendModel") AnnouncementSendModel announcementSendModel); + } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index d0e4b4ff..96a7381b 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -24,53 +24,56 @@ \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java index 841fd7ce..c67bfb0f 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java @@ -8,6 +8,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * @Description: 用户通告阅读标记表 @@ -92,4 +93,9 @@ public class AnnouncementSendModel implements Serializable { * 跳转参数 */ private String jumpParameter; + + /** + * @Remarks: 截止时间 + **/ + private Date deadline; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java index 74413002..670fa7e4 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java @@ -25,4 +25,8 @@ public interface ISysAnnouncementSendService extends IService getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel); + /** + * @Remarks: 企业端获取我的消息(截止时间未读消息) + **/ + List getDeadlineUnreadSend(AnnouncementSendModel announcementSendModel); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index 52a65b6a..4ae90e72 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -36,4 +36,12 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl getDeadlineUnreadSend(AnnouncementSendModel announcementSendModel) { + return sysAnnouncementSendMapper.getMyAnnouncementSendList(announcementSendModel); + } + } From 7af322513ba8f234fc872a00ec56069998da6146 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 17:21:05 +0800 Subject: [PATCH 12/66] =?UTF-8?q?add=20=E5=98=89=E5=AE=BE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=90=8E=E5=8F=91=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingController.java | 4 +--- .../controller/CouncilMeetingController.java | 2 +- .../controller/InternalMeetingController.java | 4 +--- .../controller/OtherMeetingController.java | 4 +--- .../controller/PayMeetingController.java | 5 +--- .../StandardsMeetingController.java | 6 +---- .../WorkGroupMeetingController.java | 19 +-------------- .../meeting/service/IPayMeetingService.java | 2 +- .../service/impl/PayMeetingServiceImpl.java | 24 +++++++++++-------- .../impl/PayMeetingSituationServiceImpl.java | 10 +++++++- 10 files changed, 31 insertions(+), 49 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index 18724889..d69ae4b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -11,7 +11,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; import com.jero.company.service.IPayContactsManagementService; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; @@ -36,7 +35,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; -import java.util.stream.Collectors; /** @@ -205,7 +203,7 @@ public class CommitteeMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index 1783dd36..b31b0f02 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -190,7 +190,7 @@ public class CouncilMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index d291cc4f..e63fd060 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -10,7 +10,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; import com.jero.company.service.IPayContactsManagementService; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; @@ -35,7 +34,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; -import java.util.stream.Collectors; /** @@ -203,7 +201,7 @@ public class InternalMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index f2f17688..71f19fc5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -10,7 +10,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; import com.jero.company.service.IPayContactsManagementService; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; @@ -35,7 +34,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; -import java.util.stream.Collectors; /** @@ -203,7 +201,7 @@ public class OtherMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index facecc16..9ab8dcb6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; @@ -39,7 +38,6 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; 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.util.QrcodeUtil; @@ -51,7 +49,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -467,7 +464,7 @@ public class PayMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 7ed1c63e..3338acaa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -1,25 +1,21 @@ package com.jero.meeting.controller; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; import com.jero.company.service.IPayContactsManagementService; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.entity.PayMeetingStandard; -import com.jero.meeting.entity.Question; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.service.IPayMeetingStandardService; @@ -274,7 +270,7 @@ public class StandardsMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index 96358c43..ff35e297 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -1,26 +1,17 @@ package com.jero.meeting.controller; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; 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.enums.CompanyMessageEnums; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; 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.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; import com.jero.company.service.IPayContactsManagementService; -import com.jero.data.entity.PayCaseCommittee; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; @@ -30,20 +21,13 @@ import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; -import com.jero.meeting.vo.excel.*; -import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.service.IPayWorkingGroupService; -import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; -import com.jero.util.QrcodeUtil; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; @@ -52,7 +36,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; -import java.util.stream.Collectors; /** @@ -225,7 +208,7 @@ public class WorkGroupMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT, true); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index ce0accca..70530916 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -73,7 +73,7 @@ public interface IPayMeetingService extends IService { IPage queryMeetingSummary(MeetingSummary meetingSummary, Integer pageNo, Integer pageSize, HttpServletRequest req); - List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon); + List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean saveFileFlag); /** * 上传会议纪要 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index ee9237ab..6767e2c0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1105,22 +1105,26 @@ public class PayMeetingServiceImpl extends ServiceImpl uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon) { + public List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean saveFileFlag) { List listMsg = new ArrayList<>(); String id = uploadFileVO.getId(); - PayMeeting payMeeting = getOne( - new LambdaQueryWrapper() - .eq(PayMeeting::getId, id) - .eq(PayMeeting::getMeetingType, meetingCommon) - ); + LambdaQueryWrapper payMeetingLambdaQueryWrapper = new LambdaQueryWrapper<>(); + payMeetingLambdaQueryWrapper.eq(PayMeeting::getId, id); + if (meetingCommon != null){ + payMeetingLambdaQueryWrapper.eq(PayMeeting::getMeetingType, meetingCommon); + } + PayMeeting payMeeting = getOne(payMeetingLambdaQueryWrapper); if (Objects.isNull(payMeeting)) { throw new JeroBootException("会议不存在"); } + meetingCommon = payMeeting.getMeetingType(); String fileIds = uploadFileVO.getFileIds(); - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(PayMeeting::getId, id); - wrapper.set(PayMeeting::getMeetingData, fileIds); - update(wrapper); + if (saveFileFlag){ + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(PayMeeting::getId, id); + wrapper.set(PayMeeting::getMeetingData, fileIds); + update(wrapper); + } List meetingFileIdList = Arrays.asList(fileIds.split(",")); //如果过滤后为空则不发邮件 if (meetingFileIdList.isEmpty()) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index e16b5c37..13cc8a33 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1,4 +1,5 @@ package com.jero.meeting.service.impl; +import java.io.File; import java.util.Date; import cn.hutool.core.date.DateField; @@ -26,6 +27,7 @@ import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; @@ -72,6 +74,7 @@ import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.memberinfo.service.IMemberInfoService; +import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.util.ObjRecordUtil; @@ -1798,7 +1801,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Thu, 13 Jul 2023 17:29:38 +0800 Subject: [PATCH 13/66] =?UTF-8?q?update=20=E5=B9=B3=E5=8F=B0=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8A=9F=E8=83=BD=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 2 +- .../jero/system/controller/SystemSendMessageController.java | 2 +- .../com/jero/modules/system/entity/SysAnnouncement.java | 6 ++++++ .../com/jero/modules/system/entity/SysAnnouncementSend.java | 5 ----- .../modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index 3bc78639..14e5f1ce 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -18,5 +18,5 @@ create table pay_meeting_guests_file alter table pay_meeting_guests_file add primary key (id); -ALTER TABLE sys_announcement_send ADD deadline datetime COMMENT '截止时间'; +ALTER TABLE sys_announcement ADD deadline datetime COMMENT '截止时间'; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java index 894cca36..170f988a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java @@ -95,6 +95,7 @@ public class SystemSendMessageController { announcement.setSendTime(new Date()); announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); + announcement.setDeadline(deadline); // 截止时间 sysAnnouncementService.save(announcement); listPayContactsManagement.parallelStream().forEach(p->{ try { @@ -120,7 +121,6 @@ public class SystemSendMessageController { announcementSend.setAnntId(anntId); announcementSend.setUserId(user.getId()); announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); - announcementSend.setDeadline(deadline); // 截止时间 sysAnnouncementSendService.save(announcementSend); JSONObject obj = new JSONObject(); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java index 65678b78..79e7db40 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java @@ -11,6 +11,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * @Description: 系统通告表 @@ -158,4 +159,9 @@ public class SysAnnouncement implements Serializable { * 跳转参数 */ private String jumpParameter; + + /**截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date deadline; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java index 99da0121..36c32a32 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java @@ -45,9 +45,4 @@ public class SysAnnouncementSend implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; - - /**截止时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date deadline; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index 96a7381b..ba6ca002 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -47,7 +47,7 @@ and sa.del_flag = '0' and sas.user_id = #{announcementSendModel.userId} - and sas.deadline <= #{announcementSendModel.deadline} + and sa.deadline <= #{announcementSendModel.deadline} and sa.titile = #{announcementSendModel.titile} From 995ab6cb86a529a631cc06660e43574bd1e4c7a0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jul 2023 17:54:29 +0800 Subject: [PATCH 14/66] =?UTF-8?q?add=20=E6=A0=B9=E6=8D=AEtoken=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/CommonController.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index d6128b39..d9e63096 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -125,6 +125,56 @@ public class CommonController { return result; } + /** + * 文件上传统一方法 + * @param request + * @param response + * @return + */ + @PostMapping(value = "/uploadByToken") + public Result uploadByToken(HttpServletRequest request, HttpServletResponse response) { + Result result = new Result<>(); + String savePath = ""; + String bizPath = request.getParameter("biz"); + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + // 获取上传文件对象 + MultipartFile file = multipartRequest.getFile("file"); + // 文件类型是否处于黑名单 + if(CommonUtils.limitFileSuffix(file.getOriginalFilename(),fileSuffixLimits)){ + result.setMessage("该文件类型不允许上传"); + result.setSuccess(false); + result.setCode(0); + return result; + } + if(oConvertUtils.isEmpty(bizPath)){ + bizPath = ""; + } + if(CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)){ + // 本地上传 + savePath = CommonUtils.uploadLocal(file,bizPath,uploadpath); + }else{ + // minio上传 + savePath = CommonUtils.upload(file, bizPath, uploadType); + } + if(oConvertUtils.isNotEmpty(savePath)){ + //上传成功 进行数据库存储 + OSSFile ossFile = new OSSFile(); + // 文件名 + String fileName = file.getOriginalFilename(); + fileName = CommonUtils.getFileName(fileName); + ossFile.setFileName(fileName); + ossFile.setUrl(savePath); + ossFileService.save(ossFile); + result.setMessage(savePath); + result.setResult(ossFile); + result.setSuccess(true); + }else { + result.setMessage("上传失败！"); + result.setSuccess(false); + } + return result; + } + /** * 预览图片&下载文件 * From 4dfeab2d3488906caa61212865d90dcb75f5964e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 14 Jul 2023 09:52:19 +0800 Subject: [PATCH 15/66] =?UTF-8?q?fix=20=E5=98=89=E5=AE=BE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 13cc8a33..8d76203c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1791,7 +1791,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMeetingSituation::getMeetingId,meetingId); - wrapper.eq(PayMeetingSituation::getContractId,sysUserId); + wrapper.eq(PayMeetingSituation::getCompanyContactId,sysUserId); PayMeetingSituation meetingSituation = this.getOne(wrapper); Integer identity = meetingSituation.getIdentity(); if (!identity.equals(MeetingSubitemCommon.JIA_BIN)){ From 0c790723ccef8332f771d11455b792e879beb87d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 14 Jul 2023 14:57:17 +0800 Subject: [PATCH 16/66] =?UTF-8?q?fix=20=E5=98=89=E5=AE=BE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingController.java | 2 +- .../controller/CouncilMeetingController.java | 2 +- .../controller/InternalMeetingController.java | 2 +- .../controller/OtherMeetingController.java | 2 +- .../controller/PayMeetingController.java | 5 ++- .../StandardsMeetingController.java | 2 +- .../WorkGroupMeetingController.java | 2 +- .../meeting/service/IPayMeetingService.java | 2 +- .../service/impl/PayMeetingServiceImpl.java | 41 +++++++++++++------ .../impl/PayMeetingSituationServiceImpl.java | 15 ++++++- 10 files changed, 53 insertions(+), 22 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index d69ae4b9..b346d7fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -203,7 +203,7 @@ public class CommitteeMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index b31b0f02..7237062d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -190,7 +190,7 @@ public class CouncilMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index e63fd060..7195a689 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -201,7 +201,7 @@ public class InternalMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index 71f19fc5..f38a86c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -201,7 +201,7 @@ public class OtherMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 9ab8dcb6..4bde1fc3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -27,6 +27,7 @@ import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; +import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; import com.jero.meeting.service.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -101,6 +102,8 @@ public class PayMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 3338acaa..fe66ff2b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -270,7 +270,7 @@ public class StandardsMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index ff35e297..8cb8f75c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -208,7 +208,7 @@ public class WorkGroupMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 70530916..b75fb1aa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -73,7 +73,7 @@ public interface IPayMeetingService extends IService { IPage queryMeetingSummary(MeetingSummary meetingSummary, Integer pageNo, Integer pageSize, HttpServletRequest req); - List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean saveFileFlag); + List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean isGuestsUpload); /** * 上传会议纪要 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 6767e2c0..4fafe2fa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -59,6 +60,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.apache.shiro.util.CollectionUtils; import org.jetbrains.annotations.NotNull; @@ -1010,12 +1012,12 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(PayMeetingGuestsFile::getMeetingId,meetingId); - List payMeetingGuestsFiles = meetingGuestsFileMapper.selectList(wrapper1); - List collect = payMeetingGuestsFiles.stream().map(PayMeetingGuestsFile::getFileId).collect(Collectors.toList()); - meetingDataList.addAll(collect); - meeting.setMeetingData(String.join(",",meetingDataList)); + //LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + //wrapper1.eq(PayMeetingGuestsFile::getMeetingId,meetingId); + //List payMeetingGuestsFiles = meetingGuestsFileMapper.selectList(wrapper1); + //List collect = payMeetingGuestsFiles.stream().map(PayMeetingGuestsFile::getFileId).collect(Collectors.toList()); + //meetingDataList.addAll(collect); + //meeting.setMeetingData(String.join(",",meetingDataList)); } return pageList; } @@ -1105,7 +1107,7 @@ public class PayMeetingServiceImpl extends ServiceImpl uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean saveFileFlag) { + public List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean isGuestsUpload) { List listMsg = new ArrayList<>(); String id = uploadFileVO.getId(); LambdaQueryWrapper payMeetingLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -1119,13 +1121,26 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(PayMeeting::getId, id); - wrapper.set(PayMeeting::getMeetingData, fileIds); - update(wrapper); - } List meetingFileIdList = Arrays.asList(fileIds.split(",")); + if (isGuestsUpload){ + String meetingData = payMeeting.getMeetingData(); + if (StringUtils.isNotBlank(meetingData)) { + List oldMeetingDataList = Arrays.asList(meetingData.split(",")); + oldMeetingDataList.addAll(meetingFileIdList); + meetingFileIdList = oldMeetingDataList; + fileIds = String.join(",", meetingFileIdList); + } + } + //删除嘉宾文件 + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(PayMeetingGuestsFile::getMeetingId,id); + deleteWrapper.notIn(PayMeetingGuestsFile::getFileId,meetingFileIdList); + meetingGuestsFileMapper.delete(deleteWrapper); + + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(PayMeeting::getId, id); + wrapper.set(PayMeeting::getMeetingData, fileIds); + update(wrapper); //如果过滤后为空则不发邮件 if (meetingFileIdList.isEmpty()) { return listMsg; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 8d76203c..6dcaa4a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -80,6 +80,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.util.ObjRecordUtil; import com.jero.util.module.ObjRecordUtilModule; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -1815,7 +1816,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl meetingDataList = new ArrayList<>(); + if (StringUtils.isNotBlank(meetingData)){ + meetingDataList = Arrays.asList(meetingData.split(",")); + meetingDataList.removeAll(fileIdList); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(PayMeeting::getId, meetingId); + updateWrapper.set(PayMeeting::getMeetingData, String.join(",",meetingDataList)); + meetingService.update(updateWrapper); } } From 671e2293a994c1807118205d60b091f1201864dd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 14 Jul 2023 15:28:51 +0800 Subject: [PATCH 17/66] =?UTF-8?q?add=20=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommitteeMeetingSituationController.java | 1 + .../meeting/controller/CouncilMeetingSituationController.java | 1 + .../controller/InternalMeetingSituationController.java | 1 + .../meeting/controller/OtherMeetingSituationController.java | 1 + .../controller/StandardsMeetingSituationController.java | 1 + .../controller/WorkGroupMeetingSituationController.java | 1 + .../project/controller/PayWorkingGroupSubItemController.java | 4 ++-- 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index cbae3198..f596fe99 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -237,6 +237,7 @@ public class CommitteeMeetingSituationController extends JeroController setLabel(@RequestBody SetLabelVO setLabelVO) { @@ -752,7 +752,7 @@ public class PayWorkingGroupSubItemController extends JeroController deleteLabel(@RequestBody SetLabelVO setLabelVO) { From d06abcc897e6158d9422c6e618eba162a5eb56bf Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 14 Jul 2023 17:04:49 +0800 Subject: [PATCH 18/66] =?UTF-8?q?add=20=E5=85=AC=E5=91=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 12 ++++ .../controller/SysNoticeController.java | 72 +++++++++++++++++++ .../jero/modules/system/entity/SysNotice.java | 53 ++++++++++++++ .../system/mapper/SysNoticeMapper.java | 14 ++++ .../system/service/ISysNoticeService.java | 24 +++++++ .../service/impl/SysNoticeServiceImpl.java | 49 +++++++++++++ 6 files changed, 224 insertions(+) create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysNoticeMapper.java create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysNoticeService.java create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index 14e5f1ce..72129ecb 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -20,3 +20,15 @@ alter table pay_meeting_guests_file ALTER TABLE sys_announcement ADD deadline datetime COMMENT '截止时间'; +CREATE TABLE sys_notice ( + id VARCHAR(50) PRIMARY KEY COMMENT 'id', + notice_name VARCHAR(100) NULL COMMENT '公告名称', + notice_content VARCHAR(300) NULL COMMENT '公告内容', + notice_file VARCHAR(1000) NULL COMMENT '附件', + notice_status INT(1) NULL COMMENT '状态（1-启用，0-禁用）', + create_by VARCHAR(50) NULL COMMENT '创建人', + create_time datetime(0) NULL COMMENT '创建日期', + update_by VARCHAR(50) NULL COMMENT '更新人', + update_time datetime(0) NULL COMMENT '更新日期' +) COMMENT '公告管理表'; + diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java new file mode 100644 index 00000000..046d35b0 --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java @@ -0,0 +1,72 @@ +package com.jero.modules.system.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.modules.system.entity.SysNotice; +import com.jero.modules.system.service.ISysNoticeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Author: liao + * @Date: 2023/7/14 15:42 + * @remarks: 公告管理 + */ +@RestController +@RequestMapping("/sysNotice") +@Api(tags = "公告管理") +public class SysNoticeController { + + @Autowired + private ISysNoticeService sysNoticeService; + + @ApiOperation(value = "公告管理-添加", notes = "公告管理-添加") + @PostMapping(value = "/add") + @RequiresPermissions("sysNotice:add") + public Result add(@Validated @RequestBody SysNotice sysNotice) { + sysNoticeService.add(sysNotice); + return Result.OK(Result.OPERATING_SUCCESS); + } + + @ApiOperation(value = "公告管理-根据id删除", notes = "公告管理-根据id删除") + @GetMapping(value = "/deleteById") + @RequiresPermissions("sysNotice:deleteById") + public Result deleteById(@RequestParam(name = "id") String id) { + sysNoticeService.deleteById(id); + return Result.OK(Result.OPERATING_SUCCESS); + } + + @ApiOperation(value = "公告管理-根据ids批量删除", notes = "公告管理-根据ids批量删除") + @GetMapping(value = "/deleteBatch") + @RequiresPermissions("sysNotice:deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids") String ids) { + sysNoticeService.deleteBatch(ids); + return Result.OK(Result.OPERATING_SUCCESS); + } + + @ApiOperation(value = "公告管理-编辑", notes = "公告管理-编辑") + @PostMapping(value = "/edit") + @RequiresPermissions("sysNotice:edit") + public Result edit(@Validated @RequestBody SysNotice sysNotice) { + sysNoticeService.edit(sysNotice); + return Result.OK(Result.OPERATING_SUCCESS); + } + + @ApiOperation(value = "公告管理-分页查询", notes = "公告管理-分页查询") + @GetMapping(value = "/pageList") + @RequiresPermissions("sysNotice:pageList") + public Result> pageList(SysNotice sysNotice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = sysNoticeService.pageList(sysNotice, pageNo, pageSize, req); + return Result.OK(pageList); + } + +} diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java new file mode 100644 index 00000000..a63f3c5b --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java @@ -0,0 +1,53 @@ +package com.jero.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * @Author: liao + * @Date: 2023/7/14 14:31 + * @remarks: 公告管理表 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class SysNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + private String id; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + @ApiModelProperty("公告名称") + private String noticeName; + @ApiModelProperty("公告内容") + private String noticeContent; + @ApiModelProperty("附件") + private String noticeFile; + @ApiModelProperty("状态（1-启用，0-禁用）") + @NotNull(message = "状态不能为空") + private Integer noticeStatus; +} diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysNoticeMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysNoticeMapper.java new file mode 100644 index 00000000..add4d47c --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysNoticeMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.system.entity.SysNotice; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author: liao + * @Date: 2023/7/14 14:49 + * @remarks: 公告管理 + */ +@Mapper +public interface SysNoticeMapper extends BaseMapper { +} diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysNoticeService.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysNoticeService.java new file mode 100644 index 00000000..9234f167 --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysNoticeService.java @@ -0,0 +1,24 @@ +package com.jero.modules.system.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.system.entity.SysNotice; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Author: liao + * @Date: 2023/7/14 15:25 + * @remarks: 公告管理 + */ +public interface ISysNoticeService extends IService { + void add(SysNotice sysNotice); + + void deleteById(String id); + + void deleteBatch(String ids); + + void edit(SysNotice sysNotice); + + IPage pageList(SysNotice sysNotice, Integer pageNo, Integer pageSize, HttpServletRequest req); +} diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 00000000..8456983a --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,49 @@ +package com.jero.modules.system.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.system.entity.SysNotice; +import com.jero.modules.system.mapper.SysNoticeMapper; +import com.jero.modules.system.service.ISysNoticeService; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; + +/** + * @Author: liao + * @Date: 2023/7/14 15:41 + * @remarks: 公告管理 + */ +@Service +public class SysNoticeServiceImpl extends ServiceImpl implements ISysNoticeService { + @Override + public void add(SysNotice sysNotice) { + save(sysNotice); + } + + @Override + public void deleteById(String id) { + removeById(id); + } + + @Override + public void deleteBatch(String ids) { + removeByIds(Arrays.asList(ids.split(","))); + } + + @Override + public void edit(SysNotice sysNotice) { + updateById(sysNotice); + } + + @Override + public IPage pageList(SysNotice sysNotice, Integer pageNo, Integer pageSize, HttpServletRequest req) { + Page page = new Page<>(pageNo, pageSize); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysNotice, req.getParameterMap()); + return page(page, queryWrapper); + } +} From 9054e1a26ff42a753cb5e90a5a4a1bd328059349 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 14 Jul 2023 18:42:34 +0800 Subject: [PATCH 19/66] =?UTF-8?q?add=20=E5=85=AC=E5=91=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysNoticeController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java index 046d35b0..606fc0d6 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysNoticeController.java @@ -69,4 +69,14 @@ public class SysNoticeController { return Result.OK(pageList); } + @ApiOperation(value = "公告管理-企业端查询", notes = "公告管理-企业端查询") + @GetMapping(value = "/page") + public Result> page(SysNotice sysNotice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = sysNoticeService.pageList(sysNotice, pageNo, pageSize, req); + return Result.OK(pageList); + } + } From 4010b67e3cd5e8e504999836fa24ea998826cbac Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 17 Jul 2023 10:22:53 +0800 Subject: [PATCH 20/66] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MemberInfoServiceImpl.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java index cd977eb6..c3d7e204 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java @@ -51,19 +51,21 @@ public class MemberInfoServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MemberInfo::getId,company.getMemberId()); MemberInfo memberInfo = memberInfoMapper.selectOne(wrapper); - //解密 - String memberMobile = PasswordUtil.decrypt(memberInfo.getMobile()); - memberInfo.setMobile(memberMobile); - String memberEmail = PasswordUtil.decrypt(memberInfo.getEmail()); - memberInfo.setEmail(memberEmail); - String memberInfoPhone = PasswordUtil.decrypt(memberInfo.getPhone()); - memberInfo.setPhone(memberInfoPhone); - String standardMobile = PasswordUtil.decrypt(memberInfo.getStandardMobile()); - memberInfo.setStandardMobile(standardMobile); - String standardPhone = PasswordUtil.decrypt(memberInfo.getStandardPhone()); - memberInfo.setStandardPhone(standardPhone); - String standardEmail = PasswordUtil.decrypt(memberInfo.getStandardEmail()); - memberInfo.setStandardEmail(standardEmail); + if (memberInfo != null){ + //解密 + String memberMobile = PasswordUtil.decrypt(memberInfo.getMobile()); + memberInfo.setMobile(memberMobile); + String memberEmail = PasswordUtil.decrypt(memberInfo.getEmail()); + memberInfo.setEmail(memberEmail); + String memberInfoPhone = PasswordUtil.decrypt(memberInfo.getPhone()); + memberInfo.setPhone(memberInfoPhone); + String standardMobile = PasswordUtil.decrypt(memberInfo.getStandardMobile()); + memberInfo.setStandardMobile(standardMobile); + String standardPhone = PasswordUtil.decrypt(memberInfo.getStandardPhone()); + memberInfo.setStandardPhone(standardPhone); + String standardEmail = PasswordUtil.decrypt(memberInfo.getStandardEmail()); + memberInfo.setStandardEmail(standardEmail); + } //左侧秘书处信息 SysUser secretariat = memberInfoMapper.getBXGLZ(); From d730d67360092b9208278ed481c5c42bb4102ab9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 17 Jul 2023 10:38:39 +0800 Subject: [PATCH 21/66] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 4fafe2fa..23d42929 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1121,11 +1121,11 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingFileIdList = Arrays.asList(fileIds.split(",")); + List meetingFileIdList = new ArrayList<>(Arrays.asList(fileIds.split(","))); if (isGuestsUpload){ String meetingData = payMeeting.getMeetingData(); if (StringUtils.isNotBlank(meetingData)) { - List oldMeetingDataList = Arrays.asList(meetingData.split(",")); + List oldMeetingDataList = new ArrayList<>(Arrays.asList(meetingData.split(","))); oldMeetingDataList.addAll(meetingFileIdList); meetingFileIdList = oldMeetingDataList; fileIds = String.join(",", meetingFileIdList); From ce3be0e51a09650b0e18175d82fe27af2097a07f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 17 Jul 2023 16:09:53 +0800 Subject: [PATCH 22/66] =?UTF-8?q?update=20=E6=96=87=E4=BB=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=9B=9E=E6=98=BE=E4=B8=8A=E4=BC=A0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/controller/OSSFileController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index dcd5bc86..2b5ba144 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -6,6 +6,8 @@ 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.system.api.ISysBaseAPI; +import com.jero.common.system.vo.LoginUser; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; @@ -27,6 +29,8 @@ public class OSSFileController { @Autowired private IOSSFileService ossFileService; + @Autowired + private ISysBaseAPI sysBaseAPI; @ResponseBody @GetMapping("/page") @@ -87,6 +91,11 @@ public class OSSFileController { result.error500("未找到对应实体"); } else { + String createBy = file.getCreateBy(); + LoginUser loginUser = sysBaseAPI.getUserByName(createBy); + if (loginUser != null){ + file.setCreateBy(loginUser.getRealname()); + } result.setResult(file); result.setSuccess(true); } @@ -103,6 +112,13 @@ public class OSSFileController { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(OSSFile::getId ,Arrays.asList(ids.split(","))); List list = ossFileService.list(wrapper); + for (OSSFile file : list) { + String createBy = file.getCreateBy(); + LoginUser loginUser = sysBaseAPI.getUserByName(createBy); + if (loginUser != null){ + file.setCreateBy(loginUser.getRealname()); + } + } return Result.OK(list); } From 91445d8f067068243d278460ca56fbacf15e6d96 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 18 Jul 2023 14:50:49 +0800 Subject: [PATCH 23/66] =?UTF-8?q?update=20=E5=8F=96=E6=B6=88=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=AC=A1=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupDataFileServiceImpl.java | 24 +++++++++---------- .../system/controller/CommonController.java | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java index f36f266d..6acea41c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java @@ -76,19 +76,19 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl queryPayMeeting = new LambdaQueryWrapper<>(); - queryPayMeeting.like(PayMeeting::getMeetingData,fileId); - List listPayMeeting = payMeetingService.list(queryPayMeeting); + //LambdaQueryWrapper queryPayMeeting = new LambdaQueryWrapper<>(); + //queryPayMeeting.like(PayMeeting::getMeetingData,fileId); + //List listPayMeeting = payMeetingService.list(queryPayMeeting); // 验证会议文件下载次数是否达到上线 - if(!CollectionUtils.isEmpty(listPayMeeting)){ - LambdaQueryWrapper queryPayFileDownloadRecord = new LambdaQueryWrapper<>(); - queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getUserId,userId); - queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getFileId,fileId); - int count = payFileDownloadRecordService.count(queryPayFileDownloadRecord); - if(count >= PayProjectCommon.DOWNLOAD_COUNT){ - throw new JeroBootException("文件下载次数已达上线!"); - } - } + //if(!CollectionUtils.isEmpty(listPayMeeting)){ + // LambdaQueryWrapper queryPayFileDownloadRecord = new LambdaQueryWrapper<>(); + // queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getUserId,userId); + // queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getFileId,fileId); + // int count = payFileDownloadRecordService.count(queryPayFileDownloadRecord); + // if(count >= PayProjectCommon.DOWNLOAD_COUNT){ + // throw new JeroBootException("文件下载次数已达上线!"); + // } + //} OSSFile byId = iossFileService.getById(fileId); if(Objects.isNull(byId)){ throw new JeroBootException("没有找到文件!"); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index d9e63096..02152f4a 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -323,12 +323,12 @@ public class CommonController { ossFileService.updateById(ossFile); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (loginUser.getIsCompanyUser()) { - Integer integer = ossFileService.searchDownloadTimes(ossFile.getId(), loginUser.getId()); - if (integer >= 5) { - throw new JeroBootException("超出下载次数限制"); - } - } + //if (loginUser.getIsCompanyUser()) { + // Integer integer = ossFileService.searchDownloadTimes(ossFile.getId(), loginUser.getId()); + // if (integer >= 5) { + // throw new JeroBootException("超出下载次数限制"); + // } + //} ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId()); response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1")); From 6df6f44f606c12c4d0de963bdbdb353a1e3954e5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 19 Jul 2023 09:52:32 +0800 Subject: [PATCH 24/66] =?UTF-8?q?add=20=E6=97=A0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=BC=96=E8=BE=91=E4=BC=81=E4=B8=9A=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 15 +++- .../com/jero/config/shiro/ShiroConfig.java | 3 + .../PayCompanyManagementController.java | 13 +++ .../service/IPayCompanyManagementService.java | 3 + .../impl/PayCompanyManagementServiceImpl.java | 79 +++++++++++++++++++ .../jero/company/vo/UpdateInvoicePram.java | 68 ++++++++++++++++ .../meeting/entity/PayMeetingSituation.java | 38 +++++++++ 7 files changed, 215 insertions(+), 4 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/company/vo/UpdateInvoicePram.java diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index 72129ecb..d6688f65 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -1,8 +1,8 @@ -ALTER TABLE `pay_working_group_subitem` - ADD COLUMN `label` varchar(50) NULL COMMENT '标签'; +ALTER TABLE pay_working_group_subitem + ADD COLUMN label varchar(50) NULL COMMENT '标签'; -ALTER TABLE `pay_meeting_situation` - ADD COLUMN `guests_upload_file_flag` tinyint NULL COMMENT '嘉宾上传文件标识'; +ALTER TABLE pay_meeting_situation + ADD COLUMN guests_upload_file_flag tinyint NULL COMMENT '嘉宾上传文件标识'; create table pay_meeting_guests_file ( @@ -32,3 +32,10 @@ CREATE TABLE sys_notice ( update_time datetime(0) NULL COMMENT '更新日期' ) COMMENT '公告管理表'; +ALTER TABLE pay_meeting_situation + ADD COLUMN company_address varchar(100) NULL COMMENT '公司地址', + ADD COLUMN company_phone varchar(200) NULL COMMENT '公司电话', + ADD COLUMN opening_bank varchar(50) NULL COMMENT '开户行', + ADD COLUMN bank_account varchar(50) NULL COMMENT '银行账号', + ADD COLUMN duty_code varchar(50) NULL COMMENT '信用代码', + ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号'; \ No newline at end of file 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 13139b02..ab8cc735 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 @@ -189,6 +189,9 @@ public class ShiroConfig { filterChainDefinitionMap.put("/company/payContactsManagement/addMeeting","anon"); filterChainDefinitionMap.put("/company/payContactsManagement/queryByIdMeeting","anon"); filterChainDefinitionMap.put("/company/payContactsManagement/queryWXByCompany","anon"); + //无权限直接编辑企业发票信息 + filterChainDefinitionMap.put("/company/payCompanyManagement/updateInvoice","anon"); + //企业端注册个人 filterChainDefinitionMap.put("/home/registerSelf", "anon"); // 判断当前企业是否是内部企业 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 74bacf40..02daaf2c 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 @@ -25,6 +25,7 @@ import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; +import com.jero.company.vo.UpdateInvoicePram; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProjectSubitem; @@ -1004,4 +1005,16 @@ public class PayCompanyManagementController extends JeroController updateInvoice(@RequestBody UpdateInvoicePram updateInvoicePram) { + payCompanyManagementService.updateInvoice(updateInvoicePram); + return Result.OK("确认成功!"); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index eb116e07..fd2d2de6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -4,6 +4,7 @@ package com.jero.company.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.company.entity.PayCompanyAndContactsManagement; import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.vo.UpdateInvoicePram; import java.util.List; @@ -94,6 +95,8 @@ public interface IPayCompanyManagementService extends IService queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,companyName); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 企业名称存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),id)) { + throw new JeroBootException("企业名称已存在！"); + } + }catch (Exception e){ + throw new JeroBootException("企业名称已存在！"); + } + if(!StringUtils.isBlank(companyPhone)){ + try { + companyPhone = PasswordUtil.encrypt(companyPhone); + }catch (Exception e){ + throw new JeroBootException("公司电话加密异常！"); + } + } + // 会员企业编辑同步会员系统 + if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){ + if(!Objects.equals(payCompanyManagementOld.getCompanyName(),companyName)){ + throw new JeroBootException("会员企业名称不可修改!"); + } + // 调用会员项目接口 + MemberInfo memberInfo = new MemberInfo(); + memberInfo.setCompanyName(companyName); + memberInfo.setId(payCompanyManagementOld.getMemberId()); + memberInfo.setTaxNo(dutyCode); + memberInfo.setDepositBank(openingBank); + memberInfo.setBankAccount(bankAccount); + memberInfo.setInvoiceAddress(companyAddress); + memberInfo.setInvoicePhone(companyPhone); + memberInfo.setLinkBankNumber(linkBankNumber); + AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(PayCompanyManagement::getId,id); + updateWrapper.set(PayCompanyManagement::getCompanyName,companyName); + updateWrapper.set(PayCompanyManagement::getDutyCode,dutyCode); + //普通发票不set下面的 + if (!Objects.equals(needInvoice, 1)) { + updateWrapper.set( PayCompanyManagement::getCompanyAddress,companyAddress); + updateWrapper.set(PayCompanyManagement::getCompanyPhone,companyPhone); + updateWrapper.set(PayCompanyManagement::getOpeningBank,openingBank); + updateWrapper.set(PayCompanyManagement::getBankAccount,bankAccount); + updateWrapper.set(PayCompanyManagement::getLinkBankNumber,linkBankNumber); + } + payCompanyManagementService.update(updateWrapper); + } + @Override @Transactional(rollbackFor = JeroBootException.class) public void audit(String id) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/UpdateInvoicePram.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/UpdateInvoicePram.java new file mode 100644 index 00000000..71411913 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/UpdateInvoicePram.java @@ -0,0 +1,68 @@ +package com.jero.company.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.validation.constraints.*; + +/** + * @author liJiaRao + * @date 2023-07-18 16:28 + */ +@Data +public class UpdateInvoicePram { + /**主键*/ + @ApiModelProperty(value = "公司id") + private String id; + /**需要发票*/ + @ApiModelProperty(value = "需要发票") + @Min(0) + @Max(2) + @Dict(dicCode = "invoice_type") + private Integer needInvoice; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + @NotEmpty(message = "企业名称不能为空",groups = {needInvoice_1.class,needInvoice_2.class}) + @Size(max = 50, message = "企业名称长度不能大于50个字符",groups = {needInvoice_1.class,needInvoice_2.class}) + private String companyName; + /**信用代码*/ + @ApiModelProperty(value = "信用代码") + @NotEmpty(message = "信用代码不能为空",groups = {needInvoice_1.class,needInvoice_2.class}) + @Size(max = 18, message = "信用代码长度不能大于18个字符",groups = {needInvoice_1.class,needInvoice_2.class}) + @Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误",groups = {needInvoice_1.class,needInvoice_2.class}) + private String dutyCode; + /**公司地址*/ + @ApiModelProperty(value = "公司地址") + @NotEmpty(message = "公司地址不能为空",groups = needInvoice_2.class) + @Size(max = 50, message = "公司地址长度不能大于50个字符",groups = needInvoice_2.class) + private String companyAddress; + /**公司电话*/ + @ApiModelProperty(value = "公司电话") + @Size(max = 15, message = "公司电话长度不能大于15个字符",groups = needInvoice_2.class) + @Pattern(regexp = "^([0-9-]+)$",message = "公司电话格式错误",groups = needInvoice_2.class) + private String companyPhone; + /**开户行*/ + @ApiModelProperty(value = "开户行") + @NotEmpty(message = "开户行不能为空",groups = needInvoice_2.class) + @Size(max = 50, message = "开户行长度不能大于50个字符",groups = needInvoice_2.class) + private String openingBank; + /**银行账号*/ + @ApiModelProperty(value = "银行账号") + @NotEmpty(message = "银行账号不能为空",groups = needInvoice_2.class) + @Size(max = 50, message = "银行账号长度不能大于50个字符",groups = needInvoice_2.class) + private String bankAccount; + /**联行号*/ + @ApiModelProperty(value = "联行号") + @NotEmpty(message = "联行号不能为空",groups = needInvoice_2.class) + private String linkBankNumber; + + public @interface needInvoice_1 { + } + public @interface needInvoice_2 { + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 68b0723e..4aee665a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.*; +import com.jero.company.vo.UpdateInvoicePram; import com.jero.meeting.valid.group.CommonPeople; import com.jero.meeting.valid.group.Guest; import lombok.Data; @@ -517,4 +518,41 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "嘉宾上传文件标识") private Integer guestsUploadFileFlag; + + /**信用代码*/ + @ApiModelProperty(value = "信用代码") + @NotEmpty(message = "信用代码不能为空",groups = {UpdateInvoicePram.needInvoice_1.class, UpdateInvoicePram.needInvoice_2.class}) + @Size(max = 18, message = "信用代码长度不能大于18个字符",groups = {UpdateInvoicePram.needInvoice_1.class,UpdateInvoicePram.needInvoice_2.class}) + @Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误",groups = {UpdateInvoicePram.needInvoice_1.class,UpdateInvoicePram.needInvoice_2.class}) + private String dutyCode; + /**公司地址*/ + @ApiModelProperty(value = "公司地址") + @NotEmpty(message = "公司地址不能为空",groups = UpdateInvoicePram.needInvoice_2.class) + @Size(max = 50, message = "公司地址长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class) + private String companyAddress; + /**公司电话*/ + @ApiModelProperty(value = "公司电话") + @Size(max = 15, message = "公司电话长度不能大于15个字符",groups = UpdateInvoicePram.needInvoice_2.class) + @Pattern(regexp = "^([0-9-]+)$",message = "公司电话格式错误",groups = UpdateInvoicePram.needInvoice_2.class) + private String companyPhone; + /**开户行*/ + @ApiModelProperty(value = "开户行") + @NotEmpty(message = "开户行不能为空",groups = UpdateInvoicePram.needInvoice_2.class) + @Size(max = 50, message = "开户行长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class) + private String openingBank; + /**银行账号*/ + @ApiModelProperty(value = "银行账号") + @NotEmpty(message = "银行账号不能为空",groups = UpdateInvoicePram.needInvoice_2.class) + @Size(max = 50, message = "银行账号长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class) + private String bankAccount; + /**联行号*/ + @ApiModelProperty(value = "联行号") + @NotEmpty(message = "联行号不能为空",groups = UpdateInvoicePram.needInvoice_2.class) + private String linkBankNumber; + + /**发票项目*/ + @Dict(dicCode = "invoice_project") + @ApiModelProperty(value = "发票项目") + private Integer invoiceProject; + } From eec410247ed4b798bb03404c569e917f3114d12c Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 19 Jul 2023 10:09:26 +0800 Subject: [PATCH 25/66] =?UTF-8?q?update=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementServiceImpl.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index d7eb20d6..87fd1770 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -126,7 +126,8 @@ public class PayContactsManagementServiceImpl extends ServiceImpl Date: Wed, 19 Jul 2023 15:09:30 +0800 Subject: [PATCH 26/66] =?UTF-8?q?add=20=E5=8F=82=E4=BC=9A=E4=BA=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E7=A5=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 4 ++- .../com/jero/config/AutoPoiDictConfig.java | 4 ++- .../impl/PayCompanyManagementServiceImpl.java | 5 ++-- .../impl/PayMeetingSituationServiceImpl.java | 9 +++++++ .../vo/excel/InternationalSituationExcel.java | 4 --- .../meeting/vo/excel/SituationBaseExcel.java | 26 +++++++++++++++++++ 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index d6688f65..be52f652 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -38,4 +38,6 @@ ALTER TABLE pay_meeting_situation ADD COLUMN opening_bank varchar(50) NULL COMMENT '开户行', ADD COLUMN bank_account varchar(50) NULL COMMENT '银行账号', ADD COLUMN duty_code varchar(50) NULL COMMENT '信用代码', - ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号'; \ No newline at end of file + ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号'; +ALTER TABLE pay_meeting_situation + ADD COLUMN invoice_project tinyint(4) NULL COMMENT '发票项目'; diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java index 52608ae0..2b29b1ee 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java @@ -57,7 +57,9 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { } } if (dictReplaces != null && dictReplaces.size() != 0) { - log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); + if (oConvertUtils.isEmpty(dicTable)) { + log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); + } return dictReplaces.toArray(new String[dictReplaces.size()]); } return null; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 0d96e4bd..5c3a398b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -7,6 +7,7 @@ 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.extension.service.impl.ServiceImpl; +import com.jero.common.common.ProjectCommon; import com.jero.common.common.RoleCommon; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.ManagementMessageEnums; @@ -454,9 +455,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl Date: Thu, 20 Jul 2023 09:46:43 +0800 Subject: [PATCH 27/66] =?UTF-8?q?update=20=E5=8F=82=E4=BC=9A=E4=BA=BA?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=94=B9=E4=B8=BA=E5=85=AC=E5=85=B1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/meeting/vo/InternationalGuestVO.java | 6 +----- .../src/main/java/com/jero/meeting/vo/MeetingEntity.java | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java index 1ab335b4..6e2aedcb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java @@ -156,9 +156,5 @@ public class InternationalGuestVO { @Size(max = 50,message = "同行人最大为50字符") private String peer; - /**备注*/ - @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") - @Size(max = 200,message = "备注最大为200字符") - private String remark; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java index c2a6b270..6861b955 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java @@ -96,4 +96,10 @@ public class MeetingEntity implements Serializable { @ApiModelProperty(value = "实收金额") private BigDecimal paidAmount; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + @Size(max = 200,message = "备注最大为200字符") + private String remark; + } From 536df97fb7e6b365202c5388cfcd093079a65042 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 20 Jul 2023 10:27:32 +0800 Subject: [PATCH 28/66] =?UTF-8?q?update=20=E5=8F=82=E4=BC=9A=E4=BA=BA?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 21 +++++++++++-------- .../impl/PayMeetingSituationServiceImpl.java | 1 + .../com/jero/meeting/vo/CommonPeopleVO.java | 6 ++++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 23d42929..2c9caa21 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1,6 +1,5 @@ package com.jero.meeting.service.impl; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -60,7 +59,6 @@ import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.apache.shiro.util.CollectionUtils; import org.jetbrains.annotations.NotNull; @@ -159,11 +157,12 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeetingVO.getMeetingContactsList(); - addMeetingContactsList(meetingContactsList, payMeeting.getId()); + addMeetingContactsList(meetingContactsList, payMeeting.getId(),meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)); //新增会员系统标协会议 - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) { String directorId = payMeeting.getDirectorId(); LoginUser loginUser = sysBaseAPI.getUserById(directorId); payMeeting.setDirectorName(loginUser.getRealname()); @@ -260,9 +259,10 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeeting.getMeetingContactsList(); - addMeetingContactsList(meetingContactsList, payMeeting.getId()); + addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)); } public void delWithStandardForUpdate(PayMeeting payMeeting){ @@ -318,11 +318,12 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeetingVO.getMeetingContactsList(); - addMeetingContactsList(meetingContactsList, payMeeting.getId()); + addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)); //编辑标协会议 - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { String directorId = payMeeting.getDirectorId(); LoginUser loginUser = sysBaseAPI.getUserById(directorId); payMeeting.setDirectorName(loginUser.getRealname()); @@ -345,7 +346,7 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList, String meetingId) { + private void addMeetingContactsList(List meetingContactsList, String meetingId, boolean needPushStandard) { if (meetingContactsList == null) { return; @@ -374,7 +375,9 @@ public class PayMeetingServiceImpl extends ServiceImpl Date: Thu, 20 Jul 2023 14:30:58 +0800 Subject: [PATCH 29/66] =?UTF-8?q?fix=20=E4=BF=9D=E5=AD=98=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 2c9caa21..f950e796 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -259,10 +259,10 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeeting.getMeetingContactsList(); - addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)); + addMeetingContactsList(meetingContactsList, payMeeting.getId(), MeetingCommon.STANDARD_MEETING_INT.equals(meetingType)); } public void delWithStandardForUpdate(PayMeeting payMeeting){ From 8e1db4ef3255f4bf21d6f4377b72e74587338ad2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 20 Jul 2023 15:58:34 +0800 Subject: [PATCH 30/66] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E5=8F=82=E4=B8=8E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E9=82=AE=E5=AF=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 43 +++++ .../jero/mail/mapper/PayMailBillMapper.java | 3 +- .../mail/mapper/xml/PayMailBillMapper.xml | 178 ++++++++++++++++++ .../mail/service/IPayMailBillService.java | 2 + .../service/impl/PayMailBillServiceImpl.java | 5 + 5 files changed, 230 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 01d8e758..f954bfe8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -164,6 +164,49 @@ public class PayMailBillController extends JeroController contactsSearch(PayMailBillSearch payMailBillSearch, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + Page page = new Page<>(pageNo, pageSize); + if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(payMailBillSearch.getEndTime()); + calendar.add(Calendar.HOUR, 23);//时 + calendar.add(Calendar.MINUTE, 59);//时 + calendar.add(Calendar.SECOND, 59);//秒 + queryWrapper.ge("sendDate", payMailBillSearch.getStartTime()); + queryWrapper.le("sendDate", calendar.getTime()); + } else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())) { + queryWrapper.ge("sendDate", payMailBillSearch.getStartTime()); + } else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(payMailBillSearch.getEndTime()); + calendar.add(Calendar.HOUR, 23);//时 + calendar.add(Calendar.MINUTE, 59);//时 + calendar.add(Calendar.SECOND, 59);//秒 + queryWrapper.le("sendDate", calendar.getTime()); + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())) { + queryWrapper.like("projectName", oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName())); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + IPage pageList = payMailBillService.contactsSearchPageList(page, sysUser.getId(), queryWrapper); + getMobile(pageList.getRecords()); + return Result.OK(pageList); + } + /** * 邮寄票据-修改 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 68cf753d..bea13b8a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -12,7 +12,6 @@ import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillSearch; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; import java.util.List; /** @@ -78,4 +77,6 @@ public interface PayMailBillMapper extends BaseMapper { Integer updateTax(@Param("id") String id); Integer updateNoTaxAmount(@Param("id") String id); + + IPage contactsSearchPageList(Page page, @Param("userId") String userId, @Param("queryWrapper") QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index a4046a97..70e746e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -39,6 +39,8 @@ + + + select * + from ( + SELECT pmb.id, + project_name as projectName, + bill_no AS billNo, + pmb.invoice_amount as invoiceAmount, + principal_id, + su.phone as principal_phone, + principal_name as principalName, + charge_company_name as chargeCompanyName, + contact_name as contactName, + contact_mobile as contactMobile, + post_status as postStatus, + send_method as sendMethod, + pmbp.project_id as projectId, + pmbp.project_type, + pmb.create_time, + postal_code as postalCode, + mailer, + post_no as postNo, + send_date as sendDate, + contact_address as contactAddress, + pmb.remark + from pay_mail_bill pmb + left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) + left join pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pmbp.project_id + left join sys_user su on pmb.principal_id = su.id + where pwgsc.contacts_id = #{userId} + group by pmb.id + union all + SELECT pmb.id, + project_name as projectName, + bill_no AS billNo, + pmb.invoice_amount as invoiceAmount, + pmb.principal_id, + su.phone as principal_phone, + pmb.principal_name as principalName, + charge_company_name as chargeCompanyName, + contact_name as contactName, + contact_mobile as contactMobile, + post_status as postStatus, + send_method as sendMethod, + pmbp.project_id as projectId, + pmbp.project_type, + pmb.create_time, + postal_code as postalCode, + mailer, + post_no as postNo, + send_date as sendDate, + contact_address as contactAddress, + pmb.remark + from pay_mail_bill pmb + left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) + left join pay_common_project pcp on pcp.id = pmbp.project_id + left join sys_user su on pmb.principal_id = su.id + where pcp.contacts_id = #{userId} + group by pmb.id + union all + SELECT pmb.id, + project_name as projectName, + bill_no AS billNo, + pmb.invoice_amount as invoiceAmount, + pmb.principal_id, + su.phone as principal_phone, + pmb.principal_name as principalName, + charge_company_name as chargeCompanyName, + contact_name as contactName, + contact_mobile as contactMobile, + post_status as postStatus, + send_method as sendMethod, + pmbp.project_id as projectId, + pmbp.project_type, + pmb.create_time, + postal_code as postalCode, + mailer, + post_no as postNo, + send_date as sendDate, + contact_address as contactAddress, + pmb.remark + from pay_mail_bill pmb + left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) + left join pay_meeting_situation pms on pms.id = pmbp.project_id + left join sys_user su on pmb.principal_id = su.id + where pms.company_contact_id = #{userId} + group by pmb.id + union all + SELECT pmb.id, + project_name as projectName, + bill_no AS billNo, + pmb.invoice_amount as invoiceAmount, + pmb.principal_id, + su.phone as principal_phone, + pmb.principal_name as principalName, + charge_company_name as chargeCompanyName, + contact_name as contactName, + contact_mobile as contactMobile, + post_status as postStatus, + send_method as sendMethod, + pmbp.project_id as projectId, + pmbp.project_type, + pmb.create_time, + postal_code as postalCode, + mailer, + post_no as postNo, + send_date as sendDate, + contact_address as contactAddress, + pmb.remark + from pay_mail_bill pmb + left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) + left join pay_member_project_subitem pmps on pmps.id = pmbp.project_id + left join sys_user su on pmb.principal_id = su.id + where pmps.company_contact_id = #{userId} + group by pmb.id + union all + SELECT pmb.id, + project_name as projectName, + bill_no AS billNo, + pmb.invoice_amount as invoiceAmount, + pmb.principal_id, + su.phone as principal_phone, + pmb.principal_name as principalName, + charge_company_name as chargeCompanyName, + contact_name as contactName, + contact_mobile as contactMobile, + post_status as postStatus, + send_method as sendMethod, + pmbp.project_id as projectId, + pmbp.project_type, + pmb.create_time, + postal_code as postalCode, + mailer, + post_no as postNo, + send_date as sendDate, + contact_address as contactAddress, + pmb.remark + from pay_mail_bill pmb + left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) + left join tb_member_project_subitem tmps on tmps.id = pmbp.project_id + left join sys_user su on pmb.principal_id = su.id + where tmps.liaison_man_id = #{userId} + group by pmb.id + union all + SELECT pmb.id, + project_name as projectName, + bill_no AS billNo, + pmb.invoice_amount as invoiceAmount, + pmb.principal_id, + su.phone as principal_phone, + pmb.principal_name as principalName, + charge_company_name as chargeCompanyName, + contact_name as contactName, + contact_mobile as contactMobile, + post_status as postStatus, + send_method as sendMethod, + pmbp.project_id as projectId, + pmbp.project_type, + pmb.create_time, + postal_code as postalCode, + mailer, + post_no as postNo, + send_date as sendDate, + contact_address as contactAddress, + pmb.remark + from pay_mail_bill pmb + left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) + left join tb_certificate_payment tcp on tcp.id = pmbp.project_id + left join sys_user su on pmb.principal_id = su.id + where tcp.liaison_man_id = #{userId} + group by pmb.id + ) t + ${queryWrapper.customSqlSegment} + ORDER BY create_time + desc + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 5a1b6b92..bce85cba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -95,4 +95,6 @@ public interface IPayMailBillService extends IService { */ void updateContactByProjectId(String ContactId,String projectId); + IPage contactsSearchPageList(Page page, String userId, QueryWrapper queryWrapper); + } 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 2f67509b..7b989898 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 @@ -585,6 +585,11 @@ public class PayMailBillServiceImpl extends ServiceImpl contactsSearchPageList(Page page, String userId, QueryWrapper queryWrapper) { + return payMailBillMapper.contactsSearchPageList(page,userId,queryWrapper); + } + //校验不同项目是否属于同一个公司，开票金额是否大于当前未开票金额，企业名称是否审核 private String checkCompanyProject(List bmpList) { From ac298f4b4f31fcef948203d94e135c1b967274cc Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 21 Jul 2023 09:22:47 +0800 Subject: [PATCH 31/66] =?UTF-8?q?update=20=E5=85=AC=E5=91=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/entity/SysNotice.java | 12 ++++++++++++ .../system/service/impl/SysNoticeServiceImpl.java | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java index a63f3c5b..51234485 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java @@ -1,6 +1,7 @@ package com.jero.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -50,4 +51,15 @@ public class SysNotice implements Serializable { @ApiModelProperty("状态（1-启用，0-禁用）") @NotNull(message = "状态不能为空") private Integer noticeStatus; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @TableField(exist = false) + private Date startTime; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @TableField(exist = false) + private Date endTime; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java index 8456983a..28b0f25d 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java @@ -11,7 +11,11 @@ import com.jero.modules.system.service.ISysNoticeService; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; import java.util.Arrays; +import java.util.Objects; /** * @Author: liao @@ -44,6 +48,16 @@ public class SysNoticeServiceImpl extends ServiceImpl pageList(SysNotice sysNotice, Integer pageNo, Integer pageSize, HttpServletRequest req) { Page page = new Page<>(pageNo, pageSize); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysNotice, req.getParameterMap()); + if (!Objects.isNull(sysNotice.getStartTime())) { + queryWrapper.ge("create_time", sysNotice.getStartTime()); + } + if (!Objects.isNull(sysNotice.getEndTime())) { + // 将Date类型转换为LocalDateTime类型 + LocalDateTime endDateTime = sysNotice.getEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + // 获取当天最晚时间 + LocalDateTime endOfDay = endDateTime.with(LocalTime.MAX); + queryWrapper.le("create_time", endOfDay); + } return page(page, queryWrapper); } } From 42d47056b99ce4af5949042c2d977b18a76e547f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 21 Jul 2023 10:09:55 +0800 Subject: [PATCH 32/66] =?UTF-8?q?fix=20=E5=8F=82=E4=BC=9A=E4=BA=BA-?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=A1=B9=E7=9B=AE=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 4 +- .../meeting/vo/PayMeetingSituationVO.java | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index e30fa00a..71f8d43a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1181,7 +1181,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 21 Jul 2023 14:22:20 +0800 Subject: [PATCH 33/66] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E5=8F=91=E7=A5=A8=EF=BC=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/mail/mapper/PayMailBillMapper.java | 2 +- .../mail/mapper/xml/PayMailBillMapper.xml | 187 +++++++++--------- .../mail/service/IPayMailBillService.java | 2 +- .../service/impl/PayMailBillServiceImpl.java | 2 +- .../com/jero/mail/vo/MailBillProjectVO.java | 49 +++++ .../com/jero/mail/{ => vo}/PayMailBillVO.java | 2 +- .../PayPaymentRecordController.java | 2 +- 7 files changed, 148 insertions(+), 98 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java rename jero-boot-incoming-payment/src/main/java/com/jero/mail/{ => vo}/PayMailBillVO.java (98%) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index bea13b8a..664cdf9f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayContactsManagement; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillSearch; import org.apache.ibatis.annotations.Param; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 70e746e2..e8785161 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -65,7 +65,7 @@ WHERE pmb.id IN (SELECT bill_id FROM pay_mail_bill_project WHERE project_id=#{projectId}) - select pmb.id as id,pmbp.id as bmpId,pmb.project_name,pmbp.invoice_amount,pmb.bill_no,pmb.bill_date,pmbp.remark,pmbp.no_tax_amount,pmbp.tax,pmbp.tax_rate from pay_mail_bill pmb inner JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id @@ -251,57 +251,58 @@ where id = #{id} - select * from ( SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, principal_id, - su.phone as principal_phone, - principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) - left join pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pmbp.project_id + left join pay_working_group_subitem_contacts pwgsc + on pwgsc.working_group_sub_id = pmbp.project_id left join sys_user su on pmb.principal_id = su.id where pwgsc.contacts_id = #{userId} group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -311,25 +312,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -339,25 +340,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -367,25 +368,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -395,25 +396,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index bce85cba..f7fdd5ed 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.company.entity.PayContactsManagement; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.member.enums.StandardsTypeEnum; 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 7b989898..d3b6e431 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 @@ -25,7 +25,7 @@ import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.config.StaticConfig; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.BillingInfo; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java new file mode 100644 index 00000000..0bfdfd3c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java @@ -0,0 +1,49 @@ +package com.jero.mail.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillProject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.validation.constraints.DecimalMax; +import java.math.BigDecimal; +import java.util.List; + + +@Data +public class MailBillProjectVO extends PayMailBill { + /** + * 邮寄票据关联项目表 + */ + @TableField(exist = false) + List bmpList; + + /**邮寄票据关联项目表id*/ + @TableField(exist = false) + @ApiModelProperty(value = "bmpId") + private String bmpId; + + /**税率*/ + @ApiModelProperty(value = "税率") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") + private BigDecimal taxRate; + + /**税额*/ + @Excel(name = "税额", width = 15) + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/PayMailBillVO.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/PayMailBillVO.java index c2446906..14719b54 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/PayMailBillVO.java @@ -1,4 +1,4 @@ -package com.jero.mail; +package com.jero.mail.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; 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 cdeea96e..37a65374 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 @@ -9,7 +9,7 @@ import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.service.IPayMailBillService; import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem; From 031586c0ea8b81f772de3d92fb9e99e43bb572bb Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 21 Jul 2023 15:03:07 +0800 Subject: [PATCH 34/66] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E5=8F=91=E7=A5=A8=EF=BC=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/mail/controller/PayMailBillController.java | 2 +- .../src/main/java/com/jero/mail/mapper/PayMailBillMapper.java | 2 +- .../main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index f954bfe8..cf184dcf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -199,7 +199,7 @@ public class PayMailBillController extends JeroController pageList = payMailBillService.contactsSearchPageList(page, sysUser.getId(), queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 664cdf9f..def5eaab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -78,5 +78,5 @@ public interface PayMailBillMapper extends BaseMapper { Integer updateNoTaxAmount(@Param("id") String id); - IPage contactsSearchPageList(Page page, @Param("userId") String userId, @Param("queryWrapper") QueryWrapper queryWrapper); + IPage contactsSearchPageList(Page page, @Param("userId") String userId, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index e8785161..9df722ba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -423,7 +423,7 @@ where tcp.liaison_man_id = #{userId} group by pmb.id ) t - ${queryWrapper.customSqlSegment} + ${ew.customSqlSegment} ORDER BY create_time desc From 53fb82ae6c4fb6a3e3ccfda4e21c4ce875570bac Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 21 Jul 2023 15:51:57 +0800 Subject: [PATCH 35/66] =?UTF-8?q?add=20=E5=8F=82=E4=BC=9A=E4=BA=BA=20?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayMeetingSituationController.java | 22 +++++++++++++++++++ .../impl/PayMeetingSituationServiceImpl.java | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index fe6958a8..0b745288 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -151,6 +151,17 @@ public class PayMeetingSituationController extends JeroController contactsDelete(@RequestParam(name = "id") String id) { + payMeetingSituationService.deleteById(id); + return Result.OK("删除成功!"); + } + /** * 批量删除 */ @@ -163,6 +174,17 @@ public class PayMeetingSituationController extends JeroController contactsEdit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { + payMeetingSituationService.editById(payMeetingSituationVO,MEETING_TYPE); + return Result.OK("编辑成功!"); + } + /** * 通过id查询 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 71f8d43a..916fbf03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1428,8 +1428,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 0; - if (!b && !payMeeting.getDirectorId().equals(sysUserId)) { - throw new JeroBootException("只有会议负责人，会议联系人可以删除"); + if (!b && !payMeeting.getDirectorId().equals(sysUserId)&& !payMeetingSituation.getCompanyContactId().equals(sysUserId)) { + throw new JeroBootException("只有会议负责人，会议联系人，参会人可以删除"); } Integer inAccount = payMeetingSituation.getInAccount(); if (!inAccount.equals(PayProjectCommon.IN_ACCOUNT0)) { From 6dcf85419630949d4c3833c97bf4f900f67a921b Mon Sep 17 00:00:00 2001 From: liao Date: Mon, 24 Jul 2023 16:04:35 +0800 Subject: [PATCH 36/66] =?UTF-8?q?update=20=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B9=8B=E5=89=8D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index ba6ca002..2fff65b6 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -47,7 +47,7 @@ and sa.del_flag = '0' and sas.user_id = #{announcementSendModel.userId} - and sa.deadline <= #{announcementSendModel.deadline} + and sa.deadline >= #{announcementSendModel.deadline} and sa.titile = #{announcementSendModel.titile} From cabe6eb018ada17691708d606c4b80029f0fccbf Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 24 Jul 2023 17:43:55 +0800 Subject: [PATCH 37/66] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=88=E4=BB=A3=E4=BB=98=EF=BC=89=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayPaymentRecordMapper.xml | 125 ++++++++++++------ 1 file changed, 88 insertions(+), 37 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index 0223d476..20d87319 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -190,7 +190,9 @@ UNION ALL - select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5, + select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id, + if(tmsub.company_name = tmsub.header_name or tmsub.header_name is null, tmsub.company_name , concat(tmsub.company_name,'(代付)')) as company_name, + tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5, tmsub.invoice_amount,tmsub.post_contact_id,'' as register_check_result,tmsub.liaison_man,tmsub.payment_status,tmsub.company_id,tmsub.confirm_amount,tmsub.affirm_income from tb_member_project tmember inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id @@ -202,10 +204,14 @@ AND 1=2 - AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%')) + AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%') - AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + AND ( + tmsub.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%') + or + tmsub.header_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%') + ) AND tmsub.payment_status = #{payCommonProject.paymentStatus} @@ -225,7 +231,9 @@ UNION ALL - select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_id,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6, + select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_id, + if(tcp.company_name = tcp.header_name or tcp.header_name is null, tcp.company_name , concat(tcp.company_name,'(代付)')) as company_name, + tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6, tcp.invoice_amount,tcp.post_contact_id,'' as register_check_result,tcp.liaison_man,tcp.payment_status,tcp.company_id,tcp.confirm_amount,tcp.affirm_income from tb_member_project tmember inner join tb_certificate_payment tcp on tmember.id=tcp.project_id @@ -237,10 +245,14 @@ AND 1=2 - AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%')) + AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%') - AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + AND ( + tcp.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%') + or + tcp.header_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%') + ) AND tcp.payment_status = #{payCommonProject.paymentStatus} @@ -262,14 +274,14 @@ LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id where 1=1 - - AND p.receivable_amount between #{param2.startAmount} and #{param2.endAmount} + + AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount} - - AND p.receivable_amount #{param2.endAmount} + + AND p.receivable_amount #{payCommonProject.endAmount} - - AND p.receivable_amount =]]> #{param2.startAmount} + + AND p.receivable_amount =]]> #{payCommonProject.startAmount} AND p.projectType = #{projectType} @@ -282,12 +294,12 @@ select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files,c.charge_notice_no,c.charge_notice_id,c.year,c.mail_contacts_temporary_name,'' as mission_and_objectives - ,c.tax_rate,c.tax,c.no_tax_amount + ,c.tax_rate,c.tax,c.no_tax_amount,c.affirm_income from pay_common_project c left join sys_user su on c.principal_id = su.id @@ -16,7 +16,7 @@ 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 - ,gsub.tax_rate,gsub.tax,gsub.no_tax_amount + ,gsub.tax_rate,gsub.tax,gsub.no_tax_amount,affirm_income 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 @@ -28,7 +28,7 @@ UNION ALL select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_id,sit.pay_mode,'','','','','','' - ,sit.tax_rate,sit.tax,sit.no_tax_amount + ,sit.tax_rate,sit.tax,sit.no_tax_amount,affirm_income from pay_meeting meeting left join sys_user su on meeting.director_id = su.id inner join pay_meeting_situation sit on meeting.id = sit.meeting_id @@ -40,7 +40,7 @@ UNION ALL select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,'',msub.charge_notice_no,msub.charge_notice_file_id,pmp.particular_year,msub.post_contact_name,'' - ,msub.tax_rate,msub.tax,msub.no_tax_amount + ,msub.tax_rate,msub.tax,msub.no_tax_amount,affirm_income from pay_member_project pmp left join sys_user su on pmp.director_id = su.id inner join pay_member_project_subitem msub on pmp.id = msub.project_id @@ -52,7 +52,7 @@ UNION ALL select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','','',tmember.year,'','' - ,tmsub.tax_rate,tmsub.tax,tmsub.no_tax_amount + ,tmsub.tax_rate,tmsub.tax,tmsub.no_tax_amount,affirm_income from tb_member_project tmember left join sys_user su on tmember.director_id = su.id inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id @@ -64,7 +64,7 @@ UNION ALL select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,tmps.mobile,tmps.email,'','',tmps.company_id,tmps.payment_method,'','','',tmember.year,'','' - ,tmps.tax_rate,tmps.tax,tmps.no_tax_amount + ,tmps.tax_rate,tmps.tax,tmps.no_tax_amount,affirm_income from tb_member_project tmember left join sys_user su on tmember.director_id = su.id inner join tb_certificate_payment tmps on tmember.id=tmps.project_id diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java index d78f7bfc..9593d1f3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -25,6 +25,7 @@ import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; import com.jero.pack.vo.PayPackCompanyProjectInput; import com.jero.pack.vo.PayProjectExcel; +import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -164,18 +165,30 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); - query.eq(PayPackCompanyProject::getProjectId,payPackCompanyProject.getId()); + query.eq(PayPackCompanyProject::getProjectId, projectId); List listPayPackCompanyProject = payPackCompanyProjectService.list(query); if(CollectionUtils.isEmpty(listPayPackCompanyProject)){ throw new JeroBootException("不存在打包项目！"); } - if(Objects.equals(listPayPackCompanyProject.get(0).getCome(),PackCommon.COME1)){ + PayPackCompanyProject packCompanyProject = listPayPackCompanyProject.get(0); + Integer projectType = packCompanyProject.getProjectType(); + if (Objects.equals(projectType, Integer.parseInt(PayProjectCommon.PROJECT_TYPE5))|| + Objects.equals(projectType, Integer.parseInt(PayProjectCommon.PROJECT_TYPE6))){ + PayCommonProject payCommonProject = projectDetailMapper.queryProject(projectId); + Integer chargeWay = payCommonProject.getChargeWay(); + Integer affirmIncome = payCommonProject.getAffirmIncome(); + if(Objects.equals(chargeWay,PayProjectCommon.CHARGE_WAY2) && (1 == affirmIncome || 2 == affirmIncome)){ + throw new JeroBootException("已经确认收入的打包标协会员项目不允许取消打包"); + } + } + if(Objects.equals(packCompanyProject.getCome(),PackCommon.COME1)){ throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！"); } // 更新项目状态 - projectPackService.updateProjectStatus(listPayPackCompanyProject.get(0).getProjectId(),String.valueOf(listPayPackCompanyProject.get(0).getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId()); - payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId()); + projectPackService.updateProjectStatus(packCompanyProject.getProjectId(),String.valueOf(projectType),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId()); + payPackCompanyProjectService.removeById(packCompanyProject.getId()); } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index 93ee272a..8ef9cfa3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -79,6 +79,10 @@ public class PayProjectCommon { * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目） */ public final static String PROJECT_TYPE5 = "5"; + /** + * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：标协证书项目） + */ + public final static String PROJECT_TYPE6 = "6"; /** * 来款用途 ：1工作组是标准制定工作组经费 */ From e83acb2bf4730edf49328ac9988c98cb661c62e4 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 28 Jul 2023 10:39:11 +0800 Subject: [PATCH 51/66] =?UTF-8?q?fix=2074196=20=E5=8F=AA=E6=9C=89=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=E7=9A=84=E5=98=89=E5=AE=BE=E6=89=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E8=B5=84=E6=96=99=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingSituationServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 5d6b71e6..19264036 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1785,8 +1785,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 28 Jul 2023 10:42:20 +0800 Subject: [PATCH 52/66] =?UTF-8?q?fix=2074257=20=E6=8A=A5=E5=90=8D=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E5=B0=B1=E8=83=BD=E4=B8=8B=E8=BD=BD=E8=B5=84?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/controller/PayMeetingController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 4bde1fc3..57a067a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -562,12 +562,6 @@ public class PayMeetingController extends JeroController Date: Fri, 28 Jul 2023 11:30:31 +0800 Subject: [PATCH 53/66] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=20queryById?= =?UTF-8?q?=20=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/controller/PayCompanyManagementController.java | 3 +++ 1 file changed, 3 insertions(+) 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 02daaf2c..20f27cef 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 @@ -764,6 +764,9 @@ public class PayCompanyManagementController extends JeroController Date: Fri, 28 Jul 2023 16:31:29 +0800 Subject: [PATCH 54/66] =?UTF-8?q?fix=2074292=20=E5=8F=82=E4=BC=9A=E4=BA=BA?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E6=9C=89=E5=85=B6=E4=BB=96=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=80=BC=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/meeting/entity/PayMeetingSituation.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 141bd53c..a0267363 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -281,6 +281,7 @@ public class PayMeetingSituation implements Serializable { /**缴费方式*/ @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type") + @TableField(updateStrategy = FieldStrategy.IGNORED) @ApiModelProperty(value = "缴费方式") @NotNull(message = "缴费方式不能为空",groups = CommonPeople.class) @Dict(dicCode = "meeting_pay_type") @@ -521,37 +522,44 @@ public class PayMeetingSituation implements Serializable { /**信用代码*/ @ApiModelProperty(value = "信用代码") + @TableField(updateStrategy = FieldStrategy.IGNORED) @NotEmpty(message = "信用代码不能为空",groups = {UpdateInvoicePram.needInvoice_1.class, UpdateInvoicePram.needInvoice_2.class}) @Size(max = 18, message = "信用代码长度不能大于18个字符",groups = {UpdateInvoicePram.needInvoice_1.class,UpdateInvoicePram.needInvoice_2.class}) @Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误",groups = {UpdateInvoicePram.needInvoice_1.class,UpdateInvoicePram.needInvoice_2.class}) private String dutyCode; /**公司地址*/ @ApiModelProperty(value = "公司地址") + @TableField(updateStrategy = FieldStrategy.IGNORED) @NotEmpty(message = "公司地址不能为空",groups = UpdateInvoicePram.needInvoice_2.class) @Size(max = 50, message = "公司地址长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class) private String companyAddress; /**公司电话*/ @ApiModelProperty(value = "公司电话") + @TableField(updateStrategy = FieldStrategy.IGNORED) @Size(max = 15, message = "公司电话长度不能大于15个字符",groups = UpdateInvoicePram.needInvoice_2.class) @Pattern(regexp = "^([0-9-]+)$",message = "公司电话格式错误",groups = UpdateInvoicePram.needInvoice_2.class) private String companyPhone; /**开户行*/ @ApiModelProperty(value = "开户行") + @TableField(updateStrategy = FieldStrategy.IGNORED) @NotEmpty(message = "开户行不能为空",groups = UpdateInvoicePram.needInvoice_2.class) @Size(max = 50, message = "开户行长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class) private String openingBank; /**银行账号*/ @ApiModelProperty(value = "银行账号") + @TableField(updateStrategy = FieldStrategy.IGNORED) @NotEmpty(message = "银行账号不能为空",groups = UpdateInvoicePram.needInvoice_2.class) @Size(max = 50, message = "银行账号长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class) private String bankAccount; /**联行号*/ @ApiModelProperty(value = "联行号") + @TableField(updateStrategy = FieldStrategy.IGNORED) @NotEmpty(message = "联行号不能为空",groups = UpdateInvoicePram.needInvoice_2.class) private String linkBankNumber; /**发票项目*/ @Dict(dicCode = "invoice_project") + @TableField(updateStrategy = FieldStrategy.IGNORED) @ApiModelProperty(value = "发票项目") private Integer invoiceProject; From 9ad9f9c8165f7cbd88d1a813067973b5dfa604ff Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 28 Jul 2023 16:39:06 +0800 Subject: [PATCH 55/66] =?UTF-8?q?fix=2074131=20=E4=BC=9A=E8=AE=AE=E6=8F=90?= =?UTF-8?q?=E9=86=92=E4=B8=8D=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=8F=98=E6=9B=B4=E6=8F=90=E9=86=92=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 1c2b2077..dfb6ac48 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -9,6 +9,7 @@ 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.constant.CommonConstant; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; @@ -744,7 +745,8 @@ public class PayMeetingServiceImpl extends ServiceImpl Date: Fri, 28 Jul 2023 16:50:40 +0800 Subject: [PATCH 56/66] =?UTF-8?q?fix=2074289=20=E6=9D=A5=E6=AC=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E7=BC=96=E8=BE=91=E4=B8=80=E6=AC=A1--=E5=B0=B1?= =?UTF-8?q?=E5=A4=9A=E4=B8=80=E4=B8=AA=E4=BC=81=E4=B8=9A=EF=BC=88=E6=9C=AA?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 19264036..07d7df60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1191,6 +1191,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 28 Jul 2023 17:43:06 +0800 Subject: [PATCH 57/66] =?UTF-8?q?update=20=E5=8F=82=E4=BC=9A=E4=BA=BA?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=9C=89=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 07d7df60..92269519 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1439,6 +1439,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(PayIncomeContractAssociated::getProjectId, id); PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getOne(wrapper1); From eff63b6401decf0a9e8e6af346fc4bcda4f139c2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 28 Jul 2023 19:09:48 +0800 Subject: [PATCH 58/66] =?UTF-8?q?fix=2074286=20=E6=9D=A5=E6=AC=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E5=AF=BC=E5=87=BA--=E7=BC=B4=E8=B4=B9=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=B8=BA=E7=A9=BA=E6=98=BE=E7=A4=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 92269519..72d47be0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1346,7 +1346,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Mon, 31 Jul 2023 10:51:27 +0800 Subject: [PATCH 59/66] =?UTF-8?q?fix=2074230=20=E5=B7=B2=E7=BB=8F=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=9A=84=E6=89=93=E5=8C=85=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayPackCompanyProjectServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java index 9593d1f3..7b76bab5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -179,8 +179,14 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl Date: Mon, 31 Jul 2023 16:47:13 +0800 Subject: [PATCH 60/66] =?UTF-8?q?update=20=E5=85=AC=E5=91=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SysNoticeServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java index 28b0f25d..25d20eee 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java @@ -58,6 +58,7 @@ public class SysNoticeServiceImpl extends ServiceImpl Date: Mon, 31 Jul 2023 17:48:38 +0800 Subject: [PATCH 61/66] =?UTF-8?q?fix=2074459=20=E6=9D=A5=E6=AC=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E6=8A=A5=E5=90=8D=E5=90=8E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=82=E4=BC=9A=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 72d47be0..23c6a9d9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1088,6 +1088,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Mon, 31 Jul 2023 20:07:07 +0800 Subject: [PATCH 62/66] =?UTF-8?q?fix=2074482=20=E6=9D=A5=E6=AC=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF--=E5=88=86=E6=A0=87=E5=A7=94&=E7=90=86?= =?UTF-8?q?=E4=BA=8B=E4=BC=9A--=E6=89=B9=E9=87=8F&=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=86=E5=8F=91--=E7=BC=BA=E5=B0=91=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupDistributionRecordController.java | 2 ++ 1 file changed, 2 insertions(+) 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 824c1e1f..b8052077 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 @@ -237,6 +237,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< PayContactsManagement payContactsManagement = new PayContactsManagement(); payContactsManagement.setId(p.getContactsId()); payContactsManagement.setName(p.getContactsName()); + payContactsManagement.setCompanyName(p.getCompanyName()); listData.add(payContactsManagement); }); } @@ -249,6 +250,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< PayContactsManagement payContactsManagement = new PayContactsManagement(); payContactsManagement.setId(p.getContactsId()); payContactsManagement.setName(p.getContactsName()); + payContactsManagement.setCompanyName(p.getCompanyName()); listData.add(payContactsManagement); }); } From d0878e549e4d2ac6947ddac7fae0a955e3a0467b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 1 Aug 2023 11:06:50 +0800 Subject: [PATCH 63/66] =?UTF-8?q?add=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BC=9A=E8=AE=AE=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingController.java | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 57a067a2..58fcfb5f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -666,5 +666,75 @@ public class PayMeetingController extends JeroController wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); + wrapper.eq(PayCaseCommitteeSubitem::getContactsId, sysUserId); + + int count = payCaseCommitteeSubitemService.count(wrapper); + if (count > 0) { + isSubItem = true; + } + } else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCouncilSubitem::getCouncilId, payMeeting.getCouncilId()); + wrapper.eq(PayCaseCouncilSubitem::getContactsId, sysUserId); + int count = payCaseCouncilSubitemService.count(wrapper); + if (count > 0) { + isSubItem = true; + } + } + String meetingMinute = payMeeting.getMeetingMinute(); + String meetingData = payMeeting.getMeetingData(); + List fileList = new ArrayList<>(); + if(StringUtils.isNotBlank(meetingMinute)) { + fileList.addAll(Arrays.asList(meetingMinute.split(","))); + } + if(StringUtils.isNotBlank(meetingData)) { + fileList.addAll(Arrays.asList(meetingData.split(","))); + } + if(!fileList.contains(id)){ + throw new JeroBootException("会议无此文件.."); + } + BigDecimal meetingCosts = payMeeting.getMeetingCosts(); + //先判断非成员 + if (!isSubItem){ + //会议金额等于0并且是工作组会议（工作组会议金额为0时可以下载） + if (meetingCosts.compareTo(BigDecimal.ZERO) == 0 && meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ + + }else + + //在判断会议金额是否大于0 + if (meetingCosts.compareTo(BigDecimal.ZERO) > 0){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("meeting_id", meetingId); + queryWrapper1.eq("company_contact_id", sysUserId); + PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(queryWrapper1); + if (ObjectUtils.isEmpty(meetingSituation)) { + throw new JeroBootException("未报名会议。"); + } + } + } + + + } } From 6ce721899ae102e53def5e92ea39d0815417c98a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 1 Aug 2023 11:10:06 +0800 Subject: [PATCH 64/66] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BC=9A=E8=AE=AE=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/controller/PayMeetingController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 58fcfb5f..3700a76e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -25,7 +25,6 @@ import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; -import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; import com.jero.meeting.service.*; @@ -671,10 +670,11 @@ public class PayMeetingController extends JeroController userDownloadByApplet(@PathVariable String id, @PathVariable String meetingId, HttpServletResponse response, String type) { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); String sysUserId = sysUser.getId(); PayMeeting payMeeting = payMeetingService.getById(meetingId); @@ -733,7 +733,7 @@ public class PayMeetingController extends JeroController Date: Tue, 1 Aug 2023 14:23:38 +0800 Subject: [PATCH 65/66] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BC=9A=E8=AE=AE=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=82=AE=E4=BB=B6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupDataFileServiceImpl.java | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java index 6acea41c..4cb47146 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java @@ -76,19 +76,24 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl queryPayMeeting = new LambdaQueryWrapper<>(); - //queryPayMeeting.like(PayMeeting::getMeetingData,fileId); - //List listPayMeeting = payMeetingService.list(queryPayMeeting); - // 验证会议文件下载次数是否达到上线 - //if(!CollectionUtils.isEmpty(listPayMeeting)){ - // LambdaQueryWrapper queryPayFileDownloadRecord = new LambdaQueryWrapper<>(); - // queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getUserId,userId); - // queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getFileId,fileId); - // int count = payFileDownloadRecordService.count(queryPayFileDownloadRecord); - // if(count >= PayProjectCommon.DOWNLOAD_COUNT){ - // throw new JeroBootException("文件下载次数已达上线!"); - // } - //} + EmailSendMsgHandle emailHandle = null; + LambdaQueryWrapper queryPayMeeting = new LambdaQueryWrapper<>(); + queryPayMeeting.like(PayMeeting::getMeetingData,fileId); + List listPayMeeting = payMeetingService.list(queryPayMeeting); + String content = ""; + for (PayMeeting meeting : listPayMeeting) { + String directorId = meeting.getDirectorId(); + LoginUser loginUser = sysBaseAPI.getUserById(directorId); + String fromEmail = loginUser.getEmail(); + String fromEmailPassword = loginUser.getEmailPassword(); + if (StringUtils.isNotBlank(fromEmail) && StringUtils.isNotBlank(fromEmailPassword)){ + String fromEmailNew = PasswordUtil.decrypt(fromEmail); + String fromEmailPasswordNew = PasswordUtil.decrypt(fromEmailPassword); + emailHandle = new EmailSendMsgHandle(fromEmailNew,fromEmailPasswordNew); + } + content = meeting.getMeetingName(); + } + OSSFile byId = iossFileService.getById(fileId); if(Objects.isNull(byId)){ throw new JeroBootException("没有找到文件!"); @@ -102,15 +107,17 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl Date: Mon, 7 Aug 2023 14:34:09 +0800 Subject: [PATCH 66/66] =?UTF-8?q?add=20=E6=89=93=E5=8C=85=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayConfirmPaymentRecordController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java index f74d7de2..85daf193 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java @@ -58,7 +58,7 @@ public class PayConfirmPaymentRecordController extends JeroController> queryList(PayConfirmPaymentRecord payConfirmPaymentRecord, @@ -71,7 +71,7 @@ public class PayConfirmPaymentRecordController extends JeroController