diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java index 0a7a4088..3c04d7d7 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java @@ -2,14 +2,17 @@ package com.jero.modules.system.service; import java.util.List; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUserDepart; import com.jero.modules.system.model.DepartIdModel; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.shiro.SecurityUtils; /** *

@@ -51,4 +54,6 @@ public interface ISysUserDepartService extends IService { */ IPage queryDepartUserPageList(String departId, String username, String realname, int pageSize, int pageNo); + + String getFirstDeptIdByUserId(String userId); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java index a5855565..b490db9c 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java @@ -153,4 +153,10 @@ public class SysUserDepartServiceImpl extends ServiceImpl departIdModels = this.queryDepartIdsOfUser(userId); + List departIds = departIdModels.stream().map(DepartIdModel::getKey).collect(Collectors.toList()); + return departIds.get(0); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/EsChangeOpinion.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/EsChangeOpinion.java index f4aa56f9..9454ecdb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/EsChangeOpinion.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/EsChangeOpinion.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -89,6 +90,20 @@ public class EsChangeOpinion implements Serializable { @ApiModelProperty(value = "修改理由") private String updateReason; + /** + * 提出人 + */ + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + @ApiModelProperty(value = "提出人") + private String createUser; + + /** + * 提出部门 + */ + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + @ApiModelProperty(value = "提出部门") + private String createUnit; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java index 8d4e2e40..fde05bff 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java @@ -9,6 +9,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -58,6 +59,7 @@ public class ProcessEsChange implements Serializable { /** * 所属部门 */ + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "所属部门") private String orgCode; @@ -140,18 +142,21 @@ public class ProcessEsChange implements Serializable { /** * 零部件名称 */ + @Dict(dicCode = "part_name") @ApiModelProperty(value = "零部件名称") private String partName; /** * 主起草人 */ + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @ApiModelProperty(value = "主起草人") private String mainDraftingUser; /** * 主起草单位 */ + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java index 89c51d92..5799b6bf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java @@ -25,6 +25,8 @@ import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeService; import com.jero.modules.sys.utils.UserUtils; +import com.jero.modules.system.model.DepartIdModel; +import com.jero.modules.system.service.ISysUserDepartService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.ProcessInstance; @@ -33,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * @author ThinkBook @@ -57,6 +60,9 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl opinion.setBusinessId(esChange.getId())); + opinionList.forEach(opinion -> { + opinion.setBusinessId(esChange.getId()); + if (StrUtil.isBlank(opinion.getCreateUser())) opinion.setCreateUser(userId); + if (StrUtil.isBlank(opinion.getCreateUnit())) opinion.setCreateUnit(deptId); + }); esChangeOpinionService.saveOrUpdateBatch(opinionList); } // 保存选人信息 @@ -125,6 +136,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl opinionList = esChange.getList(); @@ -132,8 +144,13 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl opinion.setBusinessId(esChange.getId())); + opinionList.forEach(opinion -> { + opinion.setBusinessId(esChange.getId()); + if (StrUtil.isBlank(opinion.getCreateUser())) opinion.setCreateUser(userId); + if (StrUtil.isBlank(opinion.getCreateUnit())) opinion.setCreateUnit(deptId); + }); esChangeOpinionService.saveOrUpdateBatch(opinionList); } actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_CHANGE, esChange.getId());