111

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -24,6 +24,8 @@ public interface DepartmentMapper {
 
 	List<TabHaobanDepartment> listByParentId(@Param("parentId")String parentId);
 
+	List<TabHaobanDepartment> listStoreLikeName(@Param("departmentName")String departmentName);
+
 	int selectMaxSort(@Param("parentDepartmentId")String parentDepartmentId);
 
 	List<TabHaobanDepartment> selectByRelatedId(@Param("relatedId")String relatedId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -25,6 +25,8 @@ public interface StaffMapper {
 	
 	List<TabHaobanStaff> listByIds(@Param("staffIds")List<String> staffIds);
 	
+	List<TabHaobanStaff> listLikeName(@Param("staffName")String staffName);
+
 	Page<TabHaobanStaff> pageStaff(@Param("staffIds")Set<String> staffIds, @Param("activeFlag")Integer activeFlag, @Param("keyword")String keyword);
 
 	TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId")String userId,@Param("wxEnterpriseId")String wxEnterpriseId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -3,17 +3,25 @@ package com.gic.haoban.manage.service.service.out.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.AuditDTO;
 import com.gic.haoban.manage.api.service.AuditApiService;
+import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper;
+import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanAudit;
+import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.github.pagehelper.PageHelper;
 
 /**
@@ -23,12 +31,25 @@ import com.github.pagehelper.PageHelper;
 public class AuditApiServiceImpl implements AuditApiService{
 	@Autowired
 	private TabHaobanAuditMapper auditMapper;
+	@Autowired
+	private DepartmentMapper departmentMapper;
+	@Autowired
+	private StaffMapper staffMapper;
 	@Override
 	public Page<AuditDTO> page(Integer auditType, String search,
 			String enterpriseId,Integer auditStatus, BasePageInfo pageInfo) {
-		//TODO 通过search模糊查找storeIds,和staffIds
 		List<String> storeIds = new ArrayList<>();
 		List<String> staffIds = new ArrayList<>();
+		if(StringUtils.isNotEmpty(search)){
+			List<TabHaobanDepartment> storeList = departmentMapper.listStoreLikeName(search);
+			if(CollectionUtil.isNotEmpty(storeList)){
+				storeIds = storeList.stream().map(s->s.getRelatedId()).collect(Collectors.toList());
+			}
+			List<TabHaobanStaff> staffList = staffMapper.listLikeName(search);
+			if(CollectionUtil.isNotEmpty(staffList)){
+				staffIds = staffList.stream().map(s->s.getStaffId()).collect(Collectors.toList());
+			}
+		}
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
 		com.github.pagehelper.Page<TabHaobanAudit> page = auditMapper.page(auditType, storeIds, staffIds, enterpriseId,auditStatus);
 		return PageUtil.changePageHelperToCurrentPage( page,AuditDTO.class);

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -244,6 +244,15 @@
     order by sort desc
   </select>
   
+  <select id="listStoreLikeName" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_department
+    where department_name like contact('%',#{departmentName,jdbcType=VARCHAR},'%')
+    and status_flag = 1
+    and is_store =1
+  </select>
+  
   <select id="selectMaxSort" resultType="java.lang.Integer" parameterType="java.lang.String" >
     select 
     ifnull(max(sort),0)

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -283,6 +283,13 @@
     </if>
   </select>
   
+   <select id="listLikeName" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff
+    where status_flag = 1
+         and  staff_name like contact('%',#{staffName,jdbcType=VARCHAR},'%')
+  </select>
   
   <select id="selectByUserIdAndEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select