From 767a340bc8aaa251a76170a62e9e16f90f9a7302 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 21 Dec 2021 19:00:53 +0800
Subject: [PATCH] 派遣单位查询修改，统计查询修改，日志输出修改
---
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java | 2
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java | 2
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 20 +++++++++
src/main/resources/log/logback-dev.xml | 13 +++---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 14 +++---
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 20 +++++++++
6 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index 0edfe32..64e2c70 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -44,7 +44,25 @@
and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
</if>
<if test="dispatcher.deptId!=null">
- and sd.dept_id = #{dispatcher.deptId}
+ and sd.dept_id in
+ (
+ select id from blade_dept where id = #{dispatcher.deptId}
+ union
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{dispatcher.deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
</if>
<if test="dispatcher.dispatch!=null and dispatcher.dispatch!=''">
and sd.status = #{dispatcher.dispatch}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index 161e31b..d39ef92 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -40,7 +40,25 @@
and (sj.id = #{dispatcherUnit.jurisdiction} or sj.parent_id = #{dispatcherUnit.jurisdiction})
</if>
<if test="dispatcherUnit.deptId!=null and dispatcherUnit.deptId!=''">
- and sdu.dept_id = #{dispatcherUnit.deptId}
+ and sdu.dept_id in
+ (
+ select id from blade_dept where id = #{dispatcherUnit.deptId}
+ union
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{dispatcherUnit.deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
</if>
<if test="dispatcherUnit.district!=null">
and sdu.district = #{dispatcherUnit.district}
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index 66c3bb6..0886fa8 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -59,7 +59,7 @@
List<DispatcherUnitVO> dispatcherUnitVOS = baseMapper.selectDispatcherUnitPage(page, dispatcherUnitVO);
dispatcherUnitVOS.forEach(dispatcherUnitVO1 -> {
//查询派遣记录条数
- dispatcherUnitVO1.setNum(dispatcherService.getDispatcherCount(dispatcherUnitVO1));
+ dispatcherUnitVO1.setSnum(dispatcherService.getDispatcherCount(dispatcherUnitVO1));
});
return page.setRecords(dispatcherUnitVOS);
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
index b548edf..72b708b 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -46,7 +46,7 @@
/**
* 派遣人数
*/
- private Integer num;
+ private Integer snum;
/**
* 开始时间
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 9f7c51b..b736049 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -89,7 +89,7 @@
and is_deleted = 0
and role_id = '1412226235153731586'
AND status=1
- AND dispatch=0
+ AND dispatch='0'
GROUP BY dept_id
) C
ON C.dept_id = i.departmentid
@@ -573,7 +573,7 @@
and status = 1
and is_deleted = 0
and role_id = "1412226235153731586"
- and dispatch = 0
+ and dispatch = '0'
GROUP BY
dept_id
) F
@@ -869,7 +869,7 @@
bu.`status` = 1
AND bu.is_deleted = 0
AND bu.role_id = '1412226235153731586'
- AND bu.dispatch = 0
+ AND bu.dispatch = '0'
GROUP BY
bu.dept_id
) C ON C.dept_id = A.departmentid
@@ -883,7 +883,7 @@
bu.`status` = 1
AND bu.is_deleted = 0
AND bu.role_id = '1412226235153731586'
- AND bu.dispatch = 1
+ AND (bu.dispatch = '1' or bu.dispatch is null or bu.dispatch = '')
GROUP BY
bu.dept_id
) D ON D.dept_id = A.departmentid
@@ -1039,7 +1039,7 @@
bu.`status` = 1
AND bu.is_deleted = 0
AND bu.role_id = '1412226235153731586'
- AND bu.dispatch = 0
+ AND bu.dispatch = '0'
GROUP BY
bu.dept_id
) C ON C.dept_id = A.departmentid
@@ -1053,7 +1053,7 @@
bu.`status` = 1
AND bu.is_deleted = 0
AND bu.role_id = '1412226235153731586'
- AND bu.dispatch = 1
+ AND (bu.dispatch = '1' or bu.dispatch is null or dispatch='')
GROUP BY
bu.dept_id
) D ON D.dept_id = A.departmentid
@@ -1215,7 +1215,7 @@
and status = 1
and is_deleted = 0
and role_id = "1412226235153731586"
- and dispatch = 0
+ and dispatch = '0'
GROUP BY
dept_id
) F
diff --git a/src/main/resources/log/logback-dev.xml b/src/main/resources/log/logback-dev.xml
index e8d1a31..3149863 100644
--- a/src/main/resources/log/logback-dev.xml
+++ b/src/main/resources/log/logback-dev.xml
@@ -26,8 +26,9 @@
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件输出的文件名 -->
- <FileNamePattern>/home/zhongsong/log/warn/info-%d{yyyy-MM-dd}.log</FileNamePattern>
- <maxHistory>30</maxHistory>
+ <!-- 日志文件输出的文件名 -->
+ <FileNamePattern>/home/zhongsong/log/info/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <maxHistory>10</maxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -41,18 +42,18 @@
</appender>
<!-- 生成日志文件 -->
- <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件输出的文件名 -->
- <FileNamePattern>/home/zhongsong/log/warn/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
- <maxHistory>30</maxHistory>
+ <FileNamePattern>/home/zhongsong/log/error/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <maxHistory>10</maxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
</encoder>
<!-- 打印日志级别 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>WARN</level>
+ <level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
--
Gitblit v1.9.3