ソースを参照

修改部门统计

anderx 3 年 前
コミット
34bc7f5936

+ 2 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -369,7 +369,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			"'endTime:'+#endTime+'aName:'+#aName")
 	public depCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
 		depCountBo acb=new depCountBo();
-		endTime=endTime+" 23:59:59";
+		if (endTime!=null)endTime=endTime+" 23:59:59";
 		List<depCountBo >deps=new ArrayList<>();
 		if (depId==null) {
 			acb.setName("科德集团");
@@ -386,6 +386,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		//计算顶层
 		acb.setaList(organizationManagementMapper.getDepAll(depId,aName,startTime,  endTime));
 		sumCount(acb,0);
+		//
 		return acb;
 	}
 

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

@@ -150,5 +150,4 @@ public interface OrganizationManagementMapper {
 			@Param("adminName")String adminName,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
 
-	void selectByAidGetDep(String aid);
 }

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

@@ -652,7 +652,7 @@
         </if>
         group by a.aid ) y on x.aid=y.aid)b on a.id=b.aid
         left join department d on a.department_id=d.id
-        where  1=1
+        where  a.status='正常'  and a.type=1
         <if test="adminName !=null">
 	and a.name  like concat('%',#{adminName},'%')
 	</if>

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20