Browse Source

修改部门统计

anderx 3 years ago
parent
commit
a8634eddd6

+ 3 - 5
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -365,24 +365,22 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	}
 
 	@Override
-//	@Cacheable(cacheNames = "selectAllUser#500",key = "'selectAllUser:depId:'+#depId+'startTime:'+#startTime+" +
-//			"'endTime:'+#endTime+'aName:'+#aName")
+	@Cacheable(cacheNames = "selectAllUser#500",key = "'selectAllUser:depId:'+#depId+'startTime:'+#startTime+" +
+			"'endTime:'+#endTime+'aName:'+#aName")
 	public depCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
 		depCountBo acb=new depCountBo();
 		if (endTime!=null)endTime=endTime+" 23:59:59";
 		List<depCountBo >deps=new ArrayList<>();
 		if (depId==null) {
 			acb.setName("科德集团");
-//			organizationManagementMapper.getDepAll("科德集团",null,startTime,  endTime);
 			deps=organizationManagementMapper.selectBysuperName("科德集团");
-
 		}else {
 			OrganizationListOut oo=organizationManagementMapper.selectAllById(depId);
 			acb.setName(oo.getName());
 			acb.setId(depId);
 			deps=organizationManagementMapper.selectBysuperId(oo.getId());
 		}
-		List<AdminCustomerBo> list =organizationManagementMapper.testAlldepCount(startTime,  endTime);
+		List<AdminCustomerBo> list =organizationManagementMapper.AlldepCount(startTime,  endTime);
 		for (AdminCustomerBo ad : list) {
 			if (acb.getId().equals(ad.getDepId())){
 				acb.getaList().add(ad);

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -150,5 +150,5 @@ public interface OrganizationManagementMapper {
 			@Param("adminName")String adminName,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
 
-	List<AdminCustomerBo> testAlldepCount(@Param("startTime")String startTime, @Param("endTime")String endTime);
+	List<AdminCustomerBo> AlldepCount(@Param("startTime")String startTime, @Param("endTime")String endTime);
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -660,7 +660,7 @@
 	and d.id= #{depId}
 	</if>
 	</select>
-    <select id="testAlldepCount" resultType="com.goafanti.admin.bo.AdminCustomerBo">
+    <select id="AlldepCount" resultType="com.goafanti.admin.bo.AdminCustomerBo">
         select a.id aid,a.name aName ,a.department_id depId,c.name depName,ifnull(userCount,0)userCount,
         ifnull(channelCount,0)channelCount,ifnull(signCount,0)signCount,ifnull(newCount,0)newCount,
         ifnull(channelNewCount,0)channelNewCount,ifnull(receiveCount,0)receiveCount,ifnull(completeCount,0)completeCount,