fix(标准化活动): 完善

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<LawsStandardiz
 	 @AutoLog(value = "标准化活动-详情通过id查询")
 	 @ApiOperation(value="标准化活动-详情通过id查询", notes="标准化活动-详情通过id查询")
 	 @GetMapping(value = "/queryDetailById")
+	 @Translation
 	 public Result<StandardizationVO> queryDetailById(String id) {
 		 return Result.OK(lawsStandardizationService.queryDetailById(id));
 	 }

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;
-	/**参会人员*/
+    /**我司人员id*/
-	@Excel(name = "参会人员", width = 15)
+    @Excel(name = "我司人员id", width = 15)
-    @ApiModelProperty(value = "参会人员")
+    @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)
+	@Excel(name = "部门", width = 15)
-    @ApiModelProperty(value = "提出部门")
+    @ApiModelProperty(value = "部门")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @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;
 }

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

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

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)
+	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "整改状态")
+    @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;
 }

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<LawsStandardizat
 	private final ILawsStandardizationMeetingService lawsStandardizationMeetingService;
 	private final IOSSFileService ossFileService;
 	private final ILawsDataCenterFileService lawsDataCenterFileService;
+	private final ISysUserService sysUserService;
+	private final ISysDepartService sysDepartService;
 
 	public LawsStandardizationServiceImpl(@Lazy ILawsStandardizationService lawsStandardizationService,
 										  ILawsStandardizationGroupService lawsStandardizationGroupService,
@@ -47,7 +53,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 										  ILawsStandardizationPaymentService lawsStandardizationPaymentService,
 										  ILawsStandardizationMeetingService lawsStandardizationMeetingService,
 										  IOSSFileService ossFileService,
-										  ILawsDataCenterFileService lawsDataCenterFileService) {
+										  ILawsDataCenterFileService lawsDataCenterFileService,
+										  ISysUserService sysUserService,
+										  ISysDepartService sysDepartService) {
 		this.lawsStandardizationService = lawsStandardizationService;
 		this.lawsStandardizationGroupService = lawsStandardizationGroupService;
 		this.lawsStandardizationLiaisonService = lawsStandardizationLiaisonService;
@@ -55,6 +63,8 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		this.lawsStandardizationMeetingService = lawsStandardizationMeetingService;
 		this.ossFileService = ossFileService;
 		this.lawsDataCenterFileService = lawsDataCenterFileService;
+		this.sysUserService = sysUserService;
+		this.sysDepartService = sysDepartService;
 	}
 
 	/**
@@ -359,14 +369,32 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 						.eq(LawsStandardizationGroup::getStandardizationId, standardizationId)
 						.orderByDesc(LawsStandardizationGroup::getCreateTime));
 		for (LawsStandardizationGroup lawsStandardizationGroup : lawsStandardizationGroupList) {
+			// 人员信息
+			if (StringUtils.isNotBlank(lawsStandardizationGroup.getPersonnelId())){
+				// 我司人员
+				SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+						.eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()));
+				lawsStandardizationGroup.setPersonnel(sysUser.getRealname());
+				// 工号
+				lawsStandardizationGroup.setJobNum(sysUser.getUsername());
+				//部门
+				List<SysDepart> 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<OSSFile> ossFileList = ossFileService.list(
-				List<String> list = Arrays.asList(lawsStandardizationGroup.getFeeData().split(","));
+					new LambdaQueryWrapper<OSSFile>()
-				List<OSSFile> ossFileList = ossFileService.list(
+							.in(OSSFile::getConnectId, lawsStandardizationGroup.getId()));
-						new LambdaQueryWrapper<OSSFile>()
+
-								.in(OSSFile::getConnectId, list));
+			if (!ossFileList.isEmpty()){
-				String feeData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
+				String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
-				lawsStandardizationGroup.setFeeData(feeData);
+				lawsStandardizationGroup.setFeeData(fileIds);
 			}
 		}
 		return lawsStandardizationGroupList;
@@ -380,13 +408,13 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 						.orderByDesc(LawsStandardizationPayment::getCreateTime));
 		for (LawsStandardizationPayment lawsStandardizationPayment : lawsStandardizationPaymentList) {
 			// 文件信息
-			if (StringUtils.isNotBlank(lawsStandardizationPayment.getFeeData())){
+			List<OSSFile> ossFileList = ossFileService.list(
-				List<String> list = Arrays.asList(lawsStandardizationPayment.getFeeData().split(","));
+					new LambdaQueryWrapper<OSSFile>()
-				List<OSSFile> ossFileList = ossFileService.list(
+							.in(OSSFile::getConnectId, lawsStandardizationPayment.getId()));
-						new LambdaQueryWrapper<OSSFile>()
+
-								.in(OSSFile::getConnectId, list));
+			if (!ossFileList.isEmpty()){
-				String feeData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
+				String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
-				lawsStandardizationPayment.setFeeData(feeData);
+				lawsStandardizationPayment.setFeeData(fileIds);
 			}
 		}
 		return lawsStandardizationPaymentList;
@@ -399,14 +427,20 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 						.eq(LawsStandardizationMeeting::getStandardizationId, standardizationId)
 						.orderByDesc(LawsStandardizationMeeting::getCreateTime));
 		for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) {
+			// 人员信息
+			if (StringUtils.isNotBlank(lawsStandardizationMeeting.getPersonnelId())){
+				// 参会人员
+				List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(lawsStandardizationMeeting.getPersonnelId().split(",")));
+				lawsStandardizationMeeting.setPersonnel(sysUserList.stream().map(SysUser::getRealname).collect(Collectors.joining(",")));
+			}
 			// 文件信息
-			if (StringUtils.isNotBlank(lawsStandardizationMeeting.getMeetingData())){
+			List<OSSFile> ossFileList = ossFileService.list(
-				List<String> list = Arrays.asList(lawsStandardizationMeeting.getMeetingData().split(","));
+					new LambdaQueryWrapper<OSSFile>()
-				List<OSSFile> ossFileList = ossFileService.list(
+							.in(OSSFile::getConnectId, lawsStandardizationMeeting.getId()));
-						new LambdaQueryWrapper<OSSFile>()
+
-								.in(OSSFile::getConnectId, list));
+			if (!ossFileList.isEmpty()){
-				String meetingData = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
+				String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
-				lawsStandardizationMeeting.setMeetingData(meetingData);
+				lawsStandardizationMeeting.setMeetingData(fileIds);
 			}
 		}
 		return lawsStandardizationMeetingList;