From 8f96bf08fa48b8269f91bbf161417af893dcf70a Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 22 Nov 2023 09:55:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E8=AE=A1=E5=88=92):=20=E4=B8=9A=E5=8A=A1=E8=A1=A8=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/ISysUserService.java | 19 +++-- .../service/impl/SysUserServiceImpl.java | 37 +++++++++- .../common/EsInspectPlanCommon.java | 21 +++--- .../ProcessEsInspectPlanController.java | 3 + .../entity/ProcessEsInspectPlan.java | 28 ++++++-- .../impl/EsInspectPlanFlowServiceImpl.java | 8 --- .../impl/ProcessEsInspectPlanServiceImpl.java | 71 ++++++++++--------- .../laws/documenttool/entity/BaseEntity.java | 12 ++++ 8 files changed, 134 insertions(+), 65 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 2daf2a11..1fbe3ebe 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -1,22 +1,23 @@ package com.jero.modules.system.service; -import java.util.*; - 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.metadata.IPage; 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.common.system.vo.SysUserCacheInfo; import com.jero.modules.system.entity.SysUser; - -import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.system.model.SysUserSysDepartModel; import org.apache.poi.ss.formula.functions.T; import org.springframework.transaction.annotation.Transactional; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** *

* 用户表 服务类 @@ -330,4 +331,12 @@ public interface ISysUserService extends IService { * 根据username"登陆账号"返回"用户名(工号)" */ String getNameNoByUsername(String userName); + + /** + * 通过 id 或 username 翻译 用户名（工号） + * @param ids ：“1,2,3” + * @param userNames：“admin,test” + * @return + */ + String dictByIdsOrUserNames(String ids, String userNames); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index b713e1e2..dccf5c32 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -375,7 +375,7 @@ public class SysUserServiceImpl extends ServiceImpl impl /** - * 校验用户是否有效 + * 校验用户是否有效 * @param sysUser * @return */ @@ -391,7 +391,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //情况2：根据用户信息查询，该用户已注销 //update-begin---author:王帅 Date:20200601 for：if条件永远为falsebug------------ if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) { - //update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------ + //update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------ baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null); return Result.error("该用户已注销"); } @@ -652,6 +652,39 @@ public class SysUserServiceImpl extends ServiceImpl impl return sysUser == null ? userName : sysUser.getRealname() + "（" + sysUser.getUsername() + "）"; } + @Override + public String dictByIdsOrUserNames(String ids, String userNames) { + List sysList = new ArrayList<>(); + if (StringUtils.isNotBlank(ids)){ + List list = Arrays.asList(ids.split(",")); + List sysUserList = list(new LambdaQueryWrapper() + .in(SysUser::getId, list)); + // 按顺序排序翻译 + for (String item : list) { + Optional optionalSysUser = sysUserList.stream().filter(v -> v.getId().equals(item)).findFirst(); + optionalSysUser.ifPresent(v -> sysList.add(v.getRealname() + "（" + v.getUsername() + "）")); + } + }else if (StringUtils.isNotBlank(userNames)){ + List list = Arrays.asList(userNames.split(",")); + List sysUserList = list(new LambdaQueryWrapper() + .in(SysUser::getUsername, list)); + // 按顺序排序翻译 + for (String item : list) { + Optional optionalSysUser = sysUserList.stream().filter(v -> v.getUsername().equals(item)).findFirst(); + optionalSysUser.ifPresent(v -> sysList.add(v.getRealname() + "（" + v.getUsername() + "）")); + } + }else { + return ""; + } + if (!sysList.isEmpty()){ + return String.join(",", sysList); + }else if (StringUtils.isNotBlank(ids)){ + return ids; + }else { + return userNames; + } + } + @Override @Transactional(rollbackFor = Exception.class) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java index 26716019..873bc4a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java @@ -23,20 +23,23 @@ public class EsInspectPlanCommon { public static final String NAME = "企业稽查计划"; /** - * 企业稽查计划流程开始节点 + * 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 */ - public static final String PROCESS_NODE_START = "稽查联络人发起计划"; + public static final String PROCESS_NODE_1 = "liaisons_start"; /** - * 企业稽查计划流程结束节点 + * 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 */ - public static final String PROCESS_NODE_END = "联络人主管级领导批准"; - + public static final String PROCESS_NODE_2 = "opinion_fill"; /** - *审批意见 1：通过 2：驳回 + * 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 */ - public static final String PROCESS_COMMIT_FLAG_1 = "1"; + public static final String PROCESS_NODE_3 = "liaisons_collect"; /** - *审批意见 1：通过 2：驳回 + * 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 */ - public static final String PROCESS_COMMIT_FLAG_2 = "2"; + public static final String PROCESS_NODE_4 = "involve_countersign"; + /** + * 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 + */ + public static final String PROCESS_NODE_5 = "leader_approval"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java index 955eb5b9..798b57c3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; 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.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; @@ -52,6 +53,7 @@ public class ProcessEsInspectPlanController extends JeroController> queryPageList(ProcessEsInspectPlan processEsInspectPlan, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @@ -68,6 +70,7 @@ public class ProcessEsInspectPlanController extends JeroController> queryList(ProcessEsInspectPlan processEsInspectPlan) { List list = processEsInspectPlanService.queryList(processEsInspectPlan); return Result.OK(list); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java index 43251977..8cdd4636 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java @@ -43,15 +43,17 @@ public class ProcessEsInspectPlan extends BaseEntity { /**计划稽查对象*/ @Excel(name = "计划稽查对象", width = 15) @ApiModelProperty(value = "计划稽查对象") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String inspectObject; + /**计划稽查对象 翻译*/ + @ApiModelProperty(value = "计划稽查对象 翻译") + @TableField(exist = false) + private String inspectObjectDictText; /**主责标准化工作组*/ @Excel(name = "主责标准化工作组", width = 15) @ApiModelProperty(value = "主责标准化工作组") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private String standardizationWorkGroup; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) + /**所属部门*/ + @Excel(name = "所属部门", width = 15) @ApiModelProperty(value = "所属部门") @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private String belongDept; @@ -69,18 +71,30 @@ public class ProcessEsInspectPlan extends BaseEntity { /**稽查负责人*/ @Excel(name = "稽查负责人", width = 15) @ApiModelProperty(value = "稽查负责人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String inspectUser; + /**稽查负责人 翻译*/ + @Excel(name = "稽查负责人", width = 15) + @ApiModelProperty(value = "稽查负责人 翻译") + @TableField(exist = false) + private String inspectUserDictText; /**标准化组对接人*/ @Excel(name = "标准化组对接人", width = 15) @ApiModelProperty(value = "标准化组对接人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String standardizationDockingUser; + /**标准化组对接人 翻译*/ + @Excel(name = "标准化组对接人", width = 15) + @ApiModelProperty(value = "标准化组对接人 翻译") + @TableField(exist = false) + private String standardizationDockingUserDictText; /**征求意见对象*/ @Excel(name = "征求意见对象", width = 15) @ApiModelProperty(value = "征求意见对象") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String objectOfConsultation; + /**征求意见对象 翻译*/ + @Excel(name = "征求意见对象", width = 15) + @ApiModelProperty(value = "征求意见对象 翻译") + @TableField(exist = false) + private String objectOfConsultationDictText; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 96f9befe..28ae60ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -253,14 +253,6 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) , false); } - - // 企标稽查计划业务表 - List processEsInspectPlanList = processEsInspectPlanService.list( - new LambdaQueryWrapper() - .eq(ProcessEsInspectPlan::getProjectId, projectId) - .eq(StringUtils.isNotBlank(taskId), ProcessEsInspectPlan::getObjectOfConsultation, loginUser.getId())); - - esInspectPlanFlowVO.setProcessEsInspectPlanList(processEsInspectPlanList); esInspectPlanFlowVO.setProcessAll(processAll); esInspectPlanFlowVO.setProcessApprovalRecord(processApprovalRecord); return esInspectPlanFlowVO; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index a04d9c70..b2977597 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -22,7 +22,6 @@ 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 org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -82,7 +81,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl queryWrapper = getProcessEsInspectPlanQueryWrapper(processEsInspectPlan); Page page = new Page<>(pageNo, pageSize); Page pages = page(page, queryWrapper); - fillOpinion(pages.getRecords()); + fillProperty(pages.getRecords()); return pages; } @@ -96,16 +95,28 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl queryList(ProcessEsInspectPlan processEsInspectPlan) { QueryWrapper queryWrapper = getProcessEsInspectPlanQueryWrapper(processEsInspectPlan); List list = list(queryWrapper); - fillOpinion(list); + fillProperty(list); return list; } - private void fillOpinion(List list) { + private void fillProperty(List list) { for (ProcessEsInspectPlan processEsInspectPlan : list) { List opinionList = iProcessEsInspectPlanOpinionService.list( new LambdaQueryWrapper() .eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId())); + for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) { + processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlanOpinion.getCreateBy(), "")); + processEsInspectPlanOpinion.setUpdateByDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlanOpinion.getUpdateBy(), "")); + } processEsInspectPlan.setProcessEsInspectPlanOpinionList(opinionList); + // 用户翻译 + processEsInspectPlan.setInspectObjectDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getInspectObject(), "")); + processEsInspectPlan.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getInspectUser(), "")); + processEsInspectPlan.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getStandardizationDockingUser(), "")); + processEsInspectPlan.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getStandardizationDockingUser(), "")); + processEsInspectPlan.setObjectOfConsultationDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getObjectOfConsultation(), "")); + processEsInspectPlan.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlan.getCreateBy())); + processEsInspectPlan.setUpdateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlan.getUpdateBy())); } } @@ -115,7 +126,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotBlank(processEsInspectPlan.getProjectId()), "project_id", processEsInspectPlan.getProjectId()); if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && "Activity_0mnt8n8".equals(processEsInspectPlan.getNodeId())){ - queryWrapper.eq(StringUtils.isNotBlank(processEsInspectPlan.getNodeId()), "object_of_consultation", loginUser.getId()); + queryWrapper.like(StringUtils.isNotBlank(processEsInspectPlan.getNodeId()), "object_of_consultation", loginUser.getId()); } queryWrapper.orderByDesc("create_time"); return queryWrapper; @@ -188,6 +199,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception { + String projectId = request.getParameter("projectId"); MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { @@ -206,6 +218,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl firstVerify = firstVerify(list.get(i)); List secondVerify = secondVerify(list.get(i)); @@ -333,11 +346,14 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl firstVerify(ProcessEsInspectPlan processEsInspectPlan) { List errorList = new ArrayList<>(); if (StringUtils.isNotBlank(processEsInspectPlan.getInspectNo())){ - List list = lawsEnterpriseStandardService.list(new LambdaQueryWrapper() - .eq(LawsEnterpriseStandard::getStandardNumber, processEsInspectPlan.getInspectNo())); - if (list.isEmpty()) { - errorList.add("稽查依据标准号不存在!"); - } + /** + * List list = lawsEnterpriseStandardService.list(new LambdaQueryWrapper() + * .eq(LawsEnterpriseStandard::getStandardNumber, processEsInspectPlan.getInspectNo())); + * if (list.isEmpty()) { + * errorList.add("稽查依据标准号不存在!"); + * } + */ + }else { errorList.add("稽查依据标准号不能为空!"); } @@ -350,33 +366,20 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl list = lawsEnterpriseStandardService.list(new LambdaQueryWrapper() - .eq(LawsEnterpriseStandard::getStandardNumber, processEsInspectPlan.getInspectNo()) - .eq(LawsEnterpriseStandard::getStandardName, processEsInspectPlan.getInspectName())); - if (list.isEmpty()) { - errorList.add("稽查依据标准号和稽查依据标准名称不匹配!"); - } - } + /** + * if (StringUtils.isNotBlank(processEsInspectPlan.getInspectNo()) + * && StringUtils.isNotBlank(processEsInspectPlan.getInspectName()) + * && errorList.isEmpty()){ + * List list = lawsEnterpriseStandardService.list(new LambdaQueryWrapper() + * .eq(LawsEnterpriseStandard::getStandardNumber, processEsInspectPlan.getInspectNo()) + * .eq(LawsEnterpriseStandard::getStandardName, processEsInspectPlan.getInspectName())); + * if (list.isEmpty()) { + * errorList.add("稽查依据标准号和稽查依据标准名称不匹配!"); + * }* } + */ return errorList; } - /** - * 获取对象ID - * - * @return - */ - private String getId(ProcessEsInspectPlan item) { - try { - return PropertyUtils.getProperty(item, "id").toString(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - /** * excel表头校验 * @param file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/BaseEntity.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/BaseEntity.java index 7fc64ac9..d16a2763 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/BaseEntity.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/BaseEntity.java @@ -1,9 +1,11 @@ package com.jero.modules.laws.documenttool.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,7 +31,12 @@ public class BaseEntity implements Serializable { /** 创建人 */ @ApiModelProperty(value = "创建人") // @Excel(name = "创建人", width = 15) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private java.lang.String createBy; + /** 创建人 翻译 */ + @ApiModelProperty(value = "创建人 翻译") + @TableField(exist = false) + private java.lang.String createByDictText; /** 创建时间 */ @ApiModelProperty(value = "创建时间") // @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @@ -39,7 +46,12 @@ public class BaseEntity implements Serializable { /** 更新人 */ @ApiModelProperty(value = "更新人") // @Excel(name = "更新人", width = 15) + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private java.lang.String updateBy; + /** 更新人 翻译 */ + @ApiModelProperty(value = "更新人 翻译") + @TableField(exist = false) + private java.lang.String updateByDictText; /** 更新时间 */ @ApiModelProperty(value = "更新时间") // @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")