Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -27,7 +27,7 @@ public interface StaffApiService {
 
 	public List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
-	public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
+	public Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
 
 	public void del(String staffDepartmentStaffRelatedId);
 

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

@@ -40,7 +40,7 @@ public interface StaffDepartmentRelatedMapper {
 
 	TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
 
-	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentId")String departmentId, @Param("keyword")String keyword);
+	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentIds")List<String> departmentIds, @Param("keyword")String keyword);
 
 	int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffDepartmentRelatedService.java

@@ -24,7 +24,7 @@ public interface StaffDepartmentRelatedService {
 
 	int countByDepartmentId(String departmentId);
 
-	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword);
+	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentId, String keyword);
 	
 	List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId);
 

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

 package com.gic.haoban.manage.service.service.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -81,8 +82,11 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	}
 
 	@Override
-	public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword) {
-		return mapper.listByDepartmentIdByKeyword(departmentId,keyword);
+	public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentIds, String keyword) {
+		if(departmentIds == null || departmentIds.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
+		return mapper.listByDepartmentIdByKeyword(departmentIds,keyword);
 	}
 	@Override
 	public StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId) {

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

@@ -145,7 +145,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 	public String audit(String batchId,String auditId,String auditName) {
 		TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);
 		if(tab==null){
-			return "1";
+			return "审核项目不存在";
 		}
 		int auditType = tab.getAuditType();
 		tab.setAuditId(auditId);
@@ -184,7 +184,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,AuditRsultType.fail.getCode(),tab);
 				}
-				return "0";
+				return "该成员在该门店下已经绑定过一个导购了";
 			}
 			
 			ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId());
@@ -195,7 +195,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,AuditRsultType.fail.getCode(),tab);
 				}
-				return "0";
+				return "gic已删除该导购";
 			}else{
 				if(staffClerkRelation == null){
 					staffClerkRelation = new StaffClerkRelationDTO();
@@ -221,11 +221,12 @@ public class AuditApiServiceImpl implements AuditApiService{
 			if(!flag){
 				//失败
 				tab.setAuditStatus(5);
+				tab.setAuditReason("gic新增导购失败");
 				auditMapper.updateByPrimaryKeySelective(tab);	
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab);
 				}		
-				return "0";
+				return "gic新增导购失败";
 			}else{
 				//成功
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){

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

@@ -208,8 +208,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 	}
 
 	@Override
-	public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo) {
-		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentIdByKeyword(departmentId,keyword);
+	public Page<StaffDTO> pageStaff(List<String> departmentIds, Integer activeFlag, String keyword, BasePageInfo pageInfo) {
+		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentIdByKeyword(departmentIds,keyword);
 		Set<String> staffIds = new HashSet<String>();
 		for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : list) {
 			staffIds.add(tabHaobanStaffDepartmentRelated.getStaffId());

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

@@ -280,11 +280,16 @@
     <include refid="Base_Column_List" />
     from tab_haoban_staff_department_related
     where 1
-    and department_id = #{departmentId}
     and status_flag = 1
     <if test="keyword != null and keyword != ''">
     and (clerk_code  like CONCAT('%',#{keyword},'%') or phone_number  like CONCAT('%',#{keyword},'%') or staff_name  like CONCAT('%',#{keyword},'%'))
     </if>
+    <if test="departmentIds != null and departmentIds.size() > 0">
+    and department_id in 
+    <foreach collection="departmentIds" item="id" index="index" open="(" close=")" separator=",">
+      #{id,jdbcType=VARCHAR}
+    </foreach>
+    </if>
   </select>
   
   <select id="countByDepartmentIds" resultType="java.lang.Integer"  >

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

@@ -301,7 +301,7 @@
 	          and audit_status = 0
 			 </if>
 			<if test = "auditFlag != null and auditFlag != 0">
-	          and audit_status in (1,2)
+	          and audit_status in (1,2,5)
 			 </if>
 			 <if test = "auditStatus != null">
 	          and audit_status = #{auditStatus,jdbcType=INTEGER}
@@ -329,7 +329,7 @@
 	          and audit_status = 0
 			 </if>
 			<if test = "auditFlag != null and auditFlag != 0">
-	          and audit_status in (1,2)
+	          and audit_status in (1,2,5)
 			 </if>
 			 <if test = "auditStatus != null">
 	          and audit_status = #{auditStatus,jdbcType=INTEGER}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -197,8 +197,14 @@ public class AuditController extends WebBaseController{
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		auditApiService.audit("",auditId,auditName);
+		String result = auditApiService.audit("",auditId,auditName);
+		if(StringUtils.isEmpty(result)){
 			return resultResponse(HaoBanErrCode.ERR_1);
+		}else{
+			HaoBanErrCode errCode= HaoBanErrCode.ERR_DEFINE;
+            errCode.setMsg(result);
+            return resultResponse(errCode);
+		}
 	}
 	
 	//批量审核详情

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -112,28 +112,21 @@ public class StaffController extends WebBaseController{
 	
 	@RequestMapping("staff-list")
 	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyWord,BasePageInfo pageInfo){
-		Page<StaffDTO> page = staffApiService.pageStaff(departmentId,activeFlag,keyWord,pageInfo);
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+		List<String> departmentIdSet = new ArrayList<>();
+		departmentIdSet.add(departmentId);
+		List<DepartmentDTO> sonDepartmentList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
+		List<String> departmentIds = sonDepartmentList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
+		Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,activeFlag,keyWord,pageInfo);
 		List<StaffDTO> list = page.getResult();
-//		if(list != null) {
-//			for (StaffDTO staffDTO : list) {
-//				logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
-//				StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
-//				logger.info("【成员列表】related={}",JSON.toJSONString(related));
-//				if(related != null) {
-//					staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
-//					staffDTO.setClerkCode(related.getClerkCode());
-//				}
-//			}
-//		}
-		
-		logger.info("【员工列表】page={}",JSON.toJSONString(page));
+		
 		PageResult<StaffDTO> pageVo = new PageResult<>();
         pageVo.setList(list);
         pageVo.setPageNum(page.getCurrentPage());
         pageVo.setPages(page.getPages());
         pageVo.setPageSize(page.getPageSize());
         pageVo.setTotal(page.getTotalCount());
-        logger.info("【员工列表】page={}",1);
         return resultResponse(HaoBanErrCode.ERR_1, pageVo);
 	}
 	

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -103,6 +103,7 @@ public enum HaoBanErrCode {
     
     ERR_100015(100015,"暂存部门不能删除"),
     
+    ERR_100016(100016,"审核失败"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");