From 04bfcfb721c487296ce2feb8b3307c372d50502f Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 15 Dec 2023 16:16:38 +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):=2079316?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/SysUserMapper.java | 2 ++ .../system/mapper/xml/SysUserMapper.xml | 4 +++ .../system/service/ISysUserService.java | 7 +++++ .../service/impl/SysUserServiceImpl.java | 5 ++++ .../ProcessEsInspectPlanController.java | 9 ++++++ .../entity/ProcessEsInspectPlan.java | 4 +-- .../service/IProcessEsInspectPlanService.java | 7 +++++ .../impl/EsInspectPlanFlowServiceImpl.java | 2 +- .../impl/ProcessEsInspectPlanServiceImpl.java | 30 ++++++++++++++++--- 9 files changed, 63 insertions(+), 7 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 7395b9e2..c167de11 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -24,6 +24,8 @@ import java.util.List; */ public interface SysUserMapper extends BaseMapper { + SysUser findUserByCalcNameWorkNo(@Param("inspectUser") String inspectUser); + /** * 分页查询用户，可支持组织机构检索 * @return diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 81c4dea2..6ba5f6af 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -228,4 +228,8 @@ ) + + 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 c3280781..0fe46d20 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 @@ -346,4 +346,11 @@ public interface ISysUserService extends IService { * @return */ String dictByIdsOrUserNames(String ids, String userNames); + + /** + * 通过 用户名（工号）查询用户 + * @param inspectUser + * @return + */ + SysUser findUserByCalcNameWorkNo(String inspectUser); } 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 8bbcd09a..4e2935b7 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 @@ -690,6 +690,11 @@ public class SysUserServiceImpl extends ServiceImpl impl } } + @Override + public SysUser findUserByCalcNameWorkNo(String inspectUser) { + return userMapper.findUserByCalcNameWorkNo(inspectUser); + } + @Override @Transactional(rollbackFor = Exception.class) 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 2a77d45d..f76a1f2c 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 @@ -166,6 +166,15 @@ public class ProcessEsInspectPlanController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception; + + /** + * 下载导入模板 + * @return + */ + ModelAndView templateDownload(); } 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 4dda3ec5..e5b11f9c 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 @@ -387,7 +387,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { } private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map map, Task task) { - if (EsInspectPlanCommon.PROCESS_NODE_3.equals(task.getTaskDefinitionKey()) && map.containsKey("pass") && (boolean) map.get("pass")){ + if (map.containsKey("pass") && (boolean) map.get("pass")){ if (StringUtils.isNotBlank(esInspectPlanFlowVO.getCountersign())){ map.put(COUNTERSIGN, esInspectPlanFlowVO.getCountersign()); } 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 2fe91d76..79c7145e 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 @@ -24,14 +24,20 @@ 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.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -237,7 +243,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl()); + return mv; + } + private List sixthVerify(ProcessEsInspectPlan processEsInspectPlan) { List errorList = new ArrayList<>(); if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationDockingUser())){ - SysUser sysUser = sysUserService.getUserByName(processEsInspectPlan.getStandardizationDockingUser()); + SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getStandardizationDockingUser()); if (Objects.isNull(sysUser)){ errorList.add("标准化组对接人不存在!"); }else { @@ -265,7 +287,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl