fix(流程): 完善

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 java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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 com.jero.common.aspect.annotation.AutoLog;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+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 java.util.Date;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.system.query.QueryGenerator;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.ArrayList;
+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, "");
+	}
 }