From 4905719a650c7108fd690aa54bc61f66b025ba35 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 7 Nov 2023 13:35:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardizationController.java | 2 + .../entity/LawsStandardizationGroup.java | 31 ++++---- .../entity/LawsStandardizationLiaison.java | 4 - .../entity/LawsStandardizationMeeting.java | 13 ++-- .../entity/LawsStandardizationPayment.java | 14 ++-- .../impl/LawsStandardizationServiceImpl.java | 78 +++++++++++++------ 6 files changed, 87 insertions(+), 55 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java index e59ba1e9..d9c71b58 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.standardization.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; @@ -161,6 +162,7 @@ public class LawsStandardizationController extends JeroController queryDetailById(String id) { return Result.OK(lawsStandardizationService.queryDetailById(id)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java index 9043a8fc..3779262f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java @@ -35,35 +35,40 @@ public class LawsStandardizationGroup extends BaseEntity { @ApiModelProperty(value = "我司在工作组排名顺序") @TableField(updateStrategy = FieldStrategy.IGNORED) private java.lang.String sort; - /**参会人员*/ - @Excel(name = "参会人员", width = 15) - @ApiModelProperty(value = "参会人员") + /**我司人员id*/ + @Excel(name = "我司人员id", width = 15) + @ApiModelProperty(value = "我司人员id") @TableField(updateStrategy = FieldStrategy.IGNORED) + private java.lang.String personnelId; + /**我司人员*/ + @Excel(name = "我司人员", width = 15) + @ApiModelProperty(value = "我司人员") + @TableField(exist = false) private java.lang.String personnel; /**工号*/ @Excel(name = "工号", width = 15) @ApiModelProperty(value = "工号") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(exist = false) private java.lang.String jobNum; /**单位*/ @Excel(name = "单位", width = 15) @ApiModelProperty(value = "单位") @TableField(updateStrategy = FieldStrategy.IGNORED) private java.lang.String unit; - /**提出部门*/ - @Excel(name = "提出部门", width = 15) - @ApiModelProperty(value = "提出部门") - @TableField(updateStrategy = FieldStrategy.IGNORED) + /**部门*/ + @Excel(name = "部门", width = 15) + @ApiModelProperty(value = "部门") + @TableField(exist = false) private java.lang.String department; /**电话*/ @Excel(name = "电话", width = 15) @ApiModelProperty(value = "电话") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(exist = false) private java.lang.String phone; /**邮箱*/ @Excel(name = "邮箱", width = 15) @ApiModelProperty(value = "邮箱") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(exist = false) private java.lang.String mailbox; /**身份*/ @Excel(name = "身份", width = 15) @@ -73,10 +78,6 @@ public class LawsStandardizationGroup extends BaseEntity { /**资料*/ @Excel(name = "资料", width = 15) @ApiModelProperty(value = "资料") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(updateStrategy = FieldStrategy.IGNORED, exist = false) private java.lang.String feeData; - /**部门code*/ - @Excel(name = "部门code", width = 15) - @ApiModelProperty(value = "部门code") - private java.lang.String orgCode; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java index 6e9c3b62..c3981320 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java @@ -55,8 +55,4 @@ public class LawsStandardizationLiaison extends BaseEntity { @ApiModelProperty(value = "邮箱") @TableField(updateStrategy = FieldStrategy.IGNORED) private String mailbox; - /**部门code*/ - @Excel(name = "部门code", width = 15) - @ApiModelProperty(value = "部门code") - private String orgCode; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java index bb9088e3..fe45bbc9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java @@ -46,18 +46,19 @@ public class LawsStandardizationMeeting extends BaseEntity { @ApiModelProperty(value = "会议名称") @TableField(updateStrategy = FieldStrategy.IGNORED) private String name; + /**参会人员id*/ + @Excel(name = "参会人员id", width = 15) + @ApiModelProperty(value = "参会人员id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private java.lang.String personnelId; /**参会人员*/ @Excel(name = "参会人员", width = 15) @ApiModelProperty(value = "参会人员") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(exist = false) private String personnel; /**会议资料*/ @Excel(name = "会议资料", width = 15) @ApiModelProperty(value = "会议资料") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(exist = false) private String meetingData; - /**部门code*/ - @Excel(name = "部门code", width = 15) - @ApiModelProperty(value = "部门code") - private String orgCode; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java index e9bbba1d..eb8ad3b5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.standardization.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -40,10 +41,11 @@ public class LawsStandardizationPayment extends BaseEntity { @ApiModelProperty(value = "年份") @TableField(updateStrategy = FieldStrategy.IGNORED) private String year; - /**整改状态*/ - @Excel(name = "整改状态", width = 15) - @ApiModelProperty(value = "整改状态") + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") @TableField(updateStrategy = FieldStrategy.IGNORED) + @Dict(dicCode = "pay_state") private String state; /**计划内*/ @Excel(name = "计划内", width = 15) @@ -63,10 +65,6 @@ public class LawsStandardizationPayment extends BaseEntity { /**资料*/ @Excel(name = "资料", width = 15) @ApiModelProperty(value = "资料") - @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableField(exist = false) private String feeData; - /**部门code*/ - @Excel(name = "部门code", width = 15) - @ApiModelProperty(value = "部门code") - private String orgCode; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index 3764e3a6..e9a84414 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -13,6 +13,10 @@ import com.jero.modules.laws.standardization.service.*; import com.jero.modules.laws.standardization.vo.StandardizationVO; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; @@ -40,6 +44,8 @@ public class LawsStandardizationServiceImpl extends ServiceImpl() + .eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId())); + lawsStandardizationGroup.setPersonnel(sysUser.getRealname()); + // 工号 + lawsStandardizationGroup.setJobNum(sysUser.getUsername()); + //部门 + List sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); + String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); + lawsStandardizationGroup.setDepartment(departNames); + // 电话 + lawsStandardizationGroup.setPhone(sysUser.getPhone()); + // 邮箱 + lawsStandardizationGroup.setMailbox(sysUser.getEmail()); + } + // 文件信息 - if (StringUtils.isNotBlank(lawsStandardizationGroup.getFeeData())){ - List list = Arrays.asList(lawsStandardizationGroup.getFeeData().split(",")); - List ossFileList = ossFileService.list( - new LambdaQueryWrapper() - .in(OSSFile::getConnectId, list)); - String feeData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); - lawsStandardizationGroup.setFeeData(feeData); + List ossFileList = ossFileService.list( + new LambdaQueryWrapper() + .in(OSSFile::getConnectId, lawsStandardizationGroup.getId())); + + if (!ossFileList.isEmpty()){ + String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); + lawsStandardizationGroup.setFeeData(fileIds); } } return lawsStandardizationGroupList; @@ -380,13 +408,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl list = Arrays.asList(lawsStandardizationPayment.getFeeData().split(",")); - List ossFileList = ossFileService.list( - new LambdaQueryWrapper() - .in(OSSFile::getConnectId, list)); - String feeData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); - lawsStandardizationPayment.setFeeData(feeData); + List ossFileList = ossFileService.list( + new LambdaQueryWrapper() + .in(OSSFile::getConnectId, lawsStandardizationPayment.getId())); + + if (!ossFileList.isEmpty()){ + String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); + lawsStandardizationPayment.setFeeData(fileIds); } } return lawsStandardizationPaymentList; @@ -399,14 +427,20 @@ public class LawsStandardizationServiceImpl extends ServiceImpl sysUserList = sysUserService.listByIds(Arrays.asList(lawsStandardizationMeeting.getPersonnelId().split(","))); + lawsStandardizationMeeting.setPersonnel(sysUserList.stream().map(SysUser::getRealname).collect(Collectors.joining(","))); + } // 文件信息 - if (StringUtils.isNotBlank(lawsStandardizationMeeting.getMeetingData())){ - List list = Arrays.asList(lawsStandardizationMeeting.getMeetingData().split(",")); - List ossFileList = ossFileService.list( - new LambdaQueryWrapper() - .in(OSSFile::getConnectId, list)); - String meetingData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); - lawsStandardizationMeeting.setMeetingData(meetingData); + List ossFileList = ossFileService.list( + new LambdaQueryWrapper() + .in(OSSFile::getConnectId, lawsStandardizationMeeting.getId())); + + if (!ossFileList.isEmpty()){ + String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); + lawsStandardizationMeeting.setMeetingData(fileIds); } } return lawsStandardizationMeetingList;