fix(流程): 完善

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/EsDeclareFlowController.java

@@ -3,12 +3,14 @@ package com.jero.modules.activiti.process.esdeclare.controller;
 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.util.MessageUtils;
 import com.jero.common.util.SnowflakeUtils;
 import com.jero.modules.activiti.process.esdeclare.service.IEsDeclareFlowService;
 import com.jero.modules.activiti.process.esdeclare.vo.EsDeclareFlowVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.*;
@@ -55,6 +57,20 @@ public class EsDeclareFlowController {
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
+    /**
+     * 标准宣贯流程-办理详情
+     * @param projectId 项目id
+     * @return 结果对象
+     */
+    @AutoLog(value = "标准宣贯流程-办理详情")
+    @ApiOperation(value="标准宣贯流程-办理详情", notes="标准宣贯流程-办理详情")
+    @GetMapping(value = "/queryDetailByProjectId")
+    @Translation
+    public Result<EsDeclareFlowVO> queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id")  String taskId) {
+        return Result.OK(esDeclareFlowService.queryDetailByProjectId(projectId, taskId));
+    }
+
+
     /**
      * 标准宣贯流程-流程保存
      * @param esDeclareFlowVO 标准宣贯流程VO对象

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java

@@ -49,7 +49,11 @@ public class ProcessEsDeclare extends BaseEntity {
 	/**宣贯人*/
 	@Excel(name = "宣贯人", width = 15)
     @ApiModelProperty(value = "宣贯人")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private java.lang.String declareUser;
+    /**宣贯人 翻译*/
+    @ApiModelProperty(value = "宣贯人 翻译")
+    private java.lang.String declareUserDictText;
 	/**主题*/
 	@Excel(name = "主题", width = 15)
     @ApiModelProperty(value = "主题")

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IEsDeclareFlowService.java

@@ -21,4 +21,12 @@ public interface IEsDeclareFlowService {
      * @param esDeclareFlowVO
      */
     void flowSave(EsDeclareFlowVO esDeclareFlowVO);
+
+    /**
+     * 标准宣贯流程-办理详情
+     * @param projectId
+     * @param taskId
+     * @return
+     */
+    EsDeclareFlowVO queryDetailByProjectId(String projectId, String taskId);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.SnowflakeUtils;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
@@ -93,6 +94,10 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
         // 再次设置map
         runtimeService.setVariables(processInstance.getId(), map);
 
+        // 保存业务表
+        ProcessEsDeclare processEsDeclares = esDeclareFlowVO.getProcessEsDeclare();
+        processEsDeclareService.saveOrUpdate(processEsDeclares);
+
         // 更新流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         processAll.setPrcType(Integer.valueOf(ProcessType.STANDARD_DECLARE.getValue()));
@@ -140,7 +145,7 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
                     new LambdaUpdateWrapper<OSSFile>()
                             .in(OSSFile::getId, list)
                             .set(OSSFile::getStandardId, enterpriseStandardDeclare.getStandardId())
-                            .set(OSSFile::getStandardNumber, enterpriseStandardDeclare.getStandardNo())
+                            .set(OSSFile::getStandardNo, enterpriseStandardDeclare.getStandardNo())
                             .set(OSSFile::getStandardFileType, "associated_file"));
         }
 
@@ -155,7 +160,7 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
 
         // 流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue()));
+        processAll.setPrcType(Integer.valueOf(ProcessType.STANDARD_DECLARE.getValue()));
         ProcessDraft processDraft = new ProcessDraft();
         // 属性拷贝
         BeanUtils.copyProperties(processAll, processDraft);
@@ -190,6 +195,56 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
         processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare());
     }
 
+    @Override
+    public EsDeclareFlowVO queryDetailByProjectId(String projectId, String taskId) {
+        EsDeclareFlowVO esDeclareFlowVO = new EsDeclareFlowVO();
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
+                .eq(ProcessAll::getProjectId, projectId), false);
+        ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
+
+        // 是否存在草稿
+        List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
+                .eq(ProcessDraft::getProjectId, projectId)
+                .eq(ProcessDraft::getUserId, loginUser.getId()));
+        if (!processDraftList.isEmpty()){
+            String id = "";
+            if(Objects.isNull(processAll)){
+                processAll = new ProcessAll();
+                id = String.valueOf(SnowflakeUtils.snowflake());
+            }else {
+                id = processAll.getId();
+            }
+            // 存在草稿
+            ProcessDraft processDraft = processDraftList.get(0);
+            // 属性拷贝
+            BeanUtils.copyProperties(processDraft, processAll);
+            processAll.setId(id);
+            if (StringUtils.isNotBlank(processDraft.getHandleFile())){
+                processApprovalRecord.setCommitFile(processDraft.getHandleFile());
+            }
+            if (StringUtils.isNotBlank(processDraft.getHandleText())){
+                processApprovalRecord.setCommitText(processDraft.getHandleText());
+            }
+            if (!Objects.isNull(processDraft.getProcessDueDate())){
+                processAll.setDueTime(processDraft.getProcessDueDate());
+            }
+            if (StringUtils.isNotBlank(processDraft.getProcessDescription())){
+                processAll.setPrcMes(processDraft.getProcessDescription());
+            }
+        }else {
+            // 不存在草稿
+            processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
+                            .eq(ProcessApprovalRecord::getProjectId, projectId)
+                            .eq(ProcessApprovalRecord::getUserId, loginUser.getId())
+                            .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
+                    , false);
+        }
+        esDeclareFlowVO.setProcessAll(processAll);
+        esDeclareFlowVO.setProcessApprovalRecord(processApprovalRecord);
+        return esDeclareFlowVO;
+    }
+
     private Map<String, Object> listToString(Map<String, Object> map) {
         Map<String, Object> stringObjectHashMap;
         stringObjectHashMap = map.entrySet().stream().map(v -> {

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/ProcessEsDeclareServiceImpl.java

@@ -12,17 +12,15 @@ import com.jero.modules.activiti.process.esdeclare.mapper.ProcessEsDeclareMapper
 import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
-import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.laws.system.service.ILawsContactManageService;
 import com.jero.modules.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 
 /**
@@ -37,11 +35,14 @@ public class ProcessEsDeclareServiceImpl extends ServiceImpl<ProcessEsDeclareMap
 
 	private final ISysUserService sysUserService;
 	private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
+	private final ILawsContactManageService lawsContactManageService;
 
 	public ProcessEsDeclareServiceImpl(ISysUserService sysUserService,
-									   ILawsEnterpriseStandardService lawsEnterpriseStandardService) {
+									   ILawsEnterpriseStandardService lawsEnterpriseStandardService,
+									   ILawsContactManageService lawsContactManageService) {
 		this.sysUserService = sysUserService;
 		this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
+		this.lawsContactManageService = lawsContactManageService;
 	}
 
 	/**
@@ -145,14 +146,10 @@ public class ProcessEsDeclareServiceImpl extends ServiceImpl<ProcessEsDeclareMap
 				processEsDeclare.setStandardId(lawsEnterpriseStandard.getId());
 				processEsDeclare.setStandardName(lawsEnterpriseStandard.getStandardName());
 			}
+			// 宣贯人
+			processEsDeclare.setDeclareUserDictText(sysUserService.dictByIdsOrUserNames(processEsDeclare.getDeclareUser(), ""));
 			// 联络人
-			List<String> list = Arrays.asList(processEsDeclare.getAttendUnit().split(","));
+			processEsDeclare.setInitiator(lawsContactManageService.queryByDepartIds(processEsDeclare.getAttendUnit()));
-			List<SysUser> userByDepIds = sysUserService.getUserByDepIds(list, "");
-			if (!userByDepIds.isEmpty()){
-				String userIds = userByDepIds.stream().map(SysUser::getId).collect(Collectors.joining(","));
-				// 翻译
-				processEsDeclare.setInitiator(sysUserService.dictByIdsOrUserNames(userIds, ""));
-			}
 		}
 		return processEsDeclare;
 	}

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/entity/ProcessEsPermissionApply.java

@@ -1,7 +1,9 @@
 package com.jero.modules.activiti.process.espermissionapply.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+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;
@@ -47,5 +49,10 @@ public class ProcessEsPermissionApply extends BaseEntity {
     /**用户id*/
     @Excel(name = "用户id", width = 15)
     @ApiModelProperty(value = "用户id")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String userId;
+    /**用户 翻译*/
+    @ApiModelProperty(value = "用户 翻译")
+    @TableField(exist = false)
+    private String userDictText;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java

@@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.espermissionapply.common.ProcessEsPermissionApplyCommon;
+import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
 import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService;
 import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
 import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO;
@@ -92,6 +93,10 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
         // 再次设置map
         runtimeService.setVariables(processInstance.getId(), map);
 
+        // 保存业务数据
+        ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply();
+        processEsPermissionApplyService.save(processEsPermissionApply);
+
         // 更新流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         processAll.setPrcType(Integer.valueOf(ProcessType.PERMISSION_APPLY_PROCESS.getValue()));
@@ -146,7 +151,7 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
 
         // 流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue()));
+        processAll.setPrcType(Integer.valueOf(ProcessType.PERMISSION_APPLY_PROCESS.getValue()));
         ProcessDraft processDraft = new ProcessDraft();
         // 属性拷贝
         BeanUtils.copyProperties(processAll, processDraft);
@@ -176,6 +181,10 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
                 .eq(ProcessDraft::getUserId, loginUser.getId()));
         // 保存新草稿
         processDraftService.save(processDraft);
+
+        // 保存业务数据
+        ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply();
+        processEsPermissionApplyService.saveOrUpdate(processEsPermissionApply);
     }
 
     @Override
@@ -262,6 +271,7 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
                 LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission();
                 lawsStandardTempPermission.setStandardIds(String.join(",", idList));
                 lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId());
+                lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate());
                 enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission);
             }
         }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java

@@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPer
 import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
+import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -33,9 +34,12 @@ import java.util.*;
 public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPermissionApplyMapper, ProcessEsPermissionApply> implements IProcessEsPermissionApplyService {
 
 	private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
+	private final ISysUserService sysUserService;
 
-	public ProcessEsPermissionApplyServiceImpl(ILawsEnterpriseStandardService lawsEnterpriseStandardService) {
+	public ProcessEsPermissionApplyServiceImpl(ILawsEnterpriseStandardService lawsEnterpriseStandardService,
+											   ISysUserService sysUserService) {
 		this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
+		this.sysUserService = sysUserService;
 	}
 
 	/**
@@ -149,6 +153,10 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPe
 			}
 			processEsPermissionApplyVO.setLawsEnterpriseStandardList(newList);
 		}
+		// 翻译
+		if (StringUtils.isNotBlank(processEsPermissionApplyVO.getUserId())){
+			processEsPermissionApplyVO.setUserDictText(sysUserService.dictByIdsOrUserNames(processEsPermissionApplyVO.getUserId(), ""));
+		}
 		return processEsPermissionApplyVO;
 	}
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java

@@ -2,11 +2,10 @@ package com.jero.modules.activiti.process.espermissionapply.vo;
 
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan;
+import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,7 +25,7 @@ public class EsPermissionApplyFlowVO {
     private ProcessApprovalRecord processApprovalRecord;
     /**业务基本信息*/
     @ApiModelProperty(value = "业务基本信息")
-    private List<ProcessEsInspectPlan> processEsInspectPlanList;
+    private ProcessEsPermissionApply processEsPermissionApply;
     /**map*/
     @ApiModelProperty(value = "map")
     private Map<String, Object> map;

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java

@@ -142,7 +142,7 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
 
         // 流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue()));
+        processAll.setPrcType(Integer.valueOf(ProcessType.MEETING_MANAGE.getValue()));
         ProcessDraft processDraft = new ProcessDraft();
         // 属性拷贝
         BeanUtils.copyProperties(processAll, processDraft);
@@ -266,17 +266,23 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
         if (task!= null) {
             // 完成任务
             taskService.complete(task.getId(), map);
+
+            // 查询业务表数据
+            ProcessMeetingManage processMeetingManage = processMeetingManageService.getOne(
+                    new LambdaQueryWrapper<ProcessMeetingManage>()
+                            .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()), false);
+
             // 保存参会人员
-            ProcessMeetingManagePersonnel processMeetingManagePersonnel = new ProcessMeetingManagePersonnel();
+            if (!meetingManageFlowVO.isNotAttend()){
-            processMeetingManagePersonnel.setPersonnelId(loginUser.getId());
+                ProcessMeetingManagePersonnel processMeetingManagePersonnel = new ProcessMeetingManagePersonnel();
-            processMeetingManagePersonnel.setFileId(meetingManageFlowVO.getFileIds());
+                processMeetingManagePersonnel.setProcessMeetingManageId(processMeetingManage.getId());
-            processMeetingManagePersonnelService.save(processMeetingManagePersonnel);
+                processMeetingManagePersonnel.setPersonnelId(loginUser.getId());
+                processMeetingManagePersonnel.setFileId(meetingManageFlowVO.getFileIds());
+                processMeetingManagePersonnelService.save(processMeetingManagePersonnel);
+            }
+
             // 流程结束
             if (isLastNode(processAll.getProcessInstanceId())){
-                // 保存到标准化活动
-                ProcessMeetingManage processMeetingManage = processMeetingManageService.getOne(
-                        new LambdaQueryWrapper<ProcessMeetingManage>()
-                                .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()), false);
                 // 查询参会人员信息
                 List<ProcessMeetingManagePersonnel> processMeetingManagePersonnelList = processMeetingManagePersonnelService.list(
                         new LambdaQueryWrapper<ProcessMeetingManagePersonnel>()

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java

@@ -32,4 +32,7 @@ public class MeetingManageFlowVO {
     /**文件id*/
     @ApiModelProperty(value = "文件id")
     private String fileIds;
+    /**未参加*/
+    @ApiModelProperty(value = "未参加")
+    private boolean notAttend;
 }

laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml

@@ -90,7 +90,10 @@
             AND id not in (select unique_relation_flag from laws_node_relation where node_code = #{vo.nodeCode})
         </if>
         <if test="vo.excludeStandardNumbers != null and vo.excludeStandardNumbers != ''">
-            AND standard_number NOT LIKE CONCAT('%', #{vo.excludeStandardNumbers}, '%')
+            AND
+            <foreach collection="vo.excludeStandardNumbers.split(',')" item="item" separator="and" open="(" close=")">
+                standard_number &lt;&gt; #{item}
+            </foreach>
         </if>
         </where>
         ORDER BY standard.create_time DESC

laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java

@@ -1,28 +1,28 @@
 package com.jero.modules.laws.system.controller;
 
-import java.util.Arrays;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.jero.common.api.vo.Result;
-import com.jero.common.util.MessageUtils;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.system.entity.LawsContactManage;
 import com.jero.modules.laws.system.service.ILawsContactManageService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
+
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
-import com.jero.common.aspect.annotation.AutoLog;
+import java.util.Arrays;
-import org.apache.commons.lang3.StringUtils;
+import java.util.List;
-import org.apache.poi.ss.formula.functions.T;
+import java.util.Map;
 
 
  /**
@@ -77,6 +77,19 @@ public class LawsContactManageController extends JeroController<LawsContactManag
         return Result.OK(list);
 	}
 
+	 /**
+	  * 联络人管理-根据部门查询
+	  *
+	  * @param deptIds
+	  * @return
+	  */
+	 @AutoLog(value = "联络人管理-根据部门ids查询")
+	 @ApiOperation(value="联络人管理-根据部门ids查询", notes="联络人管理-根据部门ids查询")
+	 @GetMapping(value = "/queryByDepartIds")
+	 public Result<String> queryByDepartIds(String deptIds) {
+		 return Result.OK(MessageUtils.getMessage(ResultCommon.OK), lawsContactManageService.queryByDepartIds(deptIds));
+	 }
+
 	/**
 	 *   添加
 	 *

laws-modules/src/main/java/com/jero/modules/laws/system/service/ILawsContactManageService.java

@@ -1,9 +1,10 @@
 package com.jero.modules.laws.system.service;
 
-import com.jero.modules.laws.system.entity.LawsContactManage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.laws.system.entity.LawsContactManage;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -87,4 +88,11 @@ public interface ILawsContactManageService extends IService<LawsContactManage> {
 	 * @return
 	 */
 	String findStandardEngineerByDept(String deptId);
+
+	/**
+	 * 联络人管理-根据部门查询
+	 * @param deptIds
+	 * @return
+	 */
+	String queryByDepartIds(String deptIds);
 }

laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java

@@ -2,19 +2,26 @@ package com.jero.modules.laws.system.service.impl;
 
 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.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.laws.system.entity.LawsContactManage;
 import com.jero.modules.laws.system.mapper.LawsContactManageMapper;
 import com.jero.modules.laws.system.service.ILawsContactManageService;
+import com.jero.modules.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.jero.common.exception.JeroBootException;
+
-import java.util.List;
+import javax.annotation.Resource;
-import java.util.Date;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.system.query.QueryGenerator;
 import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.ArrayList;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -27,6 +34,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 @Transactional(rollbackFor = JeroBootException.class)
 public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageMapper, LawsContactManage> implements ILawsContactManageService {
 
+	@Resource
+	private ISysUserService sysUserService;
 
     /**
      * 分页查询
@@ -79,9 +88,9 @@ public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageM
 	 */
 	@Override
     public void editById(LawsContactManage lawsContactManage) {
-    	Date now = new Date();
+		Date now = new Date();
         lawsContactManage.setUpdateTime(now);
-    	saveOrUpdate(lawsContactManage);
+		saveOrUpdate(lawsContactManage);
     }
 
 	/**
@@ -140,4 +149,16 @@ public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageM
 			return list.get(0).getEngineerId();
 		}
 	}
+
+	@Override
+	public String queryByDepartIds(String deptIds) {
+		List<LawsContactManage> lawsContactManageList = new ArrayList<>();
+		if (StringUtils.isNotBlank(deptIds)){
+			List<String> departIdList = Arrays.asList(deptIds.split(","));
+			lawsContactManageList = list(new LambdaQueryWrapper<LawsContactManage>()
+					.in(LawsContactManage::getDepartId, departIdList));
+		}
+		String contactIds = lawsContactManageList.stream().map(LawsContactManage::getContactId).collect(Collectors.joining(","));
+		return sysUserService.dictByIdsOrUserNames(contactIds, "");
+	}
 }