From d39e15a3fb45f40e8bf0a52a73ded86158d6e0bd Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 17 Aug 2021 17:40:44 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 1
src/main/java/org/springblade/modules/permit/entity/Permit.java | 7
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml | 6
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 347 +++++++++++++++++++++++++++++++++++++++++--
src/main/java/org/springblade/modules/information/service/IInformationService.java | 5
src/main/java/org/springblade/modules/information/controller/InformationController.java | 74 +++++++++
src/main/java/org/springblade/modules/system/entity/User.java | 1
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 5
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 25 +++
src/main/resources/application.yml | 1
10 files changed, 452 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index ab4bf2e..17940e8 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -330,6 +330,14 @@
Integer lnum = 0;
//这个月人数数量
Integer tnum = 0;
+ //上个月派遣人数
+ Integer tpznum = 0;
+ //这个月人数数量
+ Integer lpznum = 0;
+ //上个月总人数
+ Integer tznum = 0;
+ //这个月总人数
+ Integer lznum = 0;
//上个月金额
Double lmount = 0.0;
//这个月金额
@@ -350,11 +358,27 @@
String thisamounts = list.get(i).get("thisamount").toString();
Double thisamount = Double.parseDouble(thisamounts);
tmount += thisamount;
+ String userthismouth = list.get(i).get("userthismouth").toString();
+ Integer userthismouths = Integer.parseInt(userthismouth);
+ lpznum += userthismouths;
+ String userlastmouth = list.get(i).get("userlastmouth").toString();
+ Integer userlastmouths = Integer.parseInt(userlastmouth);
+ tpznum += userlastmouths;
+ String userpcthismouth = list.get(i).get("userpcthismouth").toString();
+ Integer userpcthismouths = Integer.parseInt(userpcthismouth);
+ lznum += userpcthismouths;
+ String userpclastmouth = list.get(i).get("userpclastmouth").toString();
+ Integer userpclastmouths = Integer.parseInt(userpclastmouth);
+ tznum += userpclastmouths;
}
map.put("lastmonth", lnum);
map.put("thismouth", tnum);
map.put("lastamount", lmount);
map.put("thisamount", tmount);
+ map.put("userlastmouth", tpznum);
+ map.put("userthismouth", lpznum);
+ map.put("userpcthismouth", lznum);
+ map.put("userpclastmouth", tznum);
lists.add(map);
return R.data(lists);
}
@@ -370,6 +394,20 @@
Calendar cal = Calendar.getInstance();
String year = String.valueOf(cal.get(Calendar.YEAR));
Map<String, String> map = informationService.queryYearSoil(year, jurisdiction, deptid);
+ map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
+ return R.data(map);
+ }
+
+ /**
+ * 查询本年所有月份派遣人数
+ *
+ * @return
+ */
+ @GetMapping("/queryYearPz")
+ public R queryYearPz(String jurisdiction, String deptid) {
+ Calendar cal = Calendar.getInstance();
+ String year = String.valueOf(cal.get(Calendar.YEAR));
+ Map<String, String> map = informationService.queryYearPz(year, jurisdiction, deptid);
map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
return R.data(map);
}
@@ -793,4 +831,40 @@
return R.data(list);
}
+ /**
+ * 公司运营情况进入图表
+ */
+ @PostMapping("/selectTb")
+ public R selectTb(String jurisdiction,String enterpriseName) {
+ List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName);
+ return R.data(list);
+ }
+
+ /**
+ * 公司经济情况进入图表
+ */
+ @PostMapping("/selectJj")
+ public R selectJj(String jurisdiction,String enterpriseName) {
+ List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName);
+ return R.data(list);
+ }
+
+ /**
+ * 业务统计情况
+ */
+ @PostMapping("/selectYw")
+ public R selectYw(String jurisdiction, String deptid) {
+ List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid);
+ return R.data(list);
+ }
+
+ /**
+ * 保安员详情
+ */
+ @PostMapping("/selectUIn")
+ public R selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil) {
+ List<Map<Object, Object>> list = informationService.selectUIn(deptid, name, hold, photo, examinationtype, dispatch,soil);
+ return R.data(list);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 324434d..b773dd0 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -50,6 +50,7 @@
List<Map<String, Object>> selectCs(String jurisdiction,String deptid);
List<Map<String, Object>> selectTo(String jurisdiction,String deptid);
Map<String, String> queryYearSoil(String year,String jurisdiction,String deptid);
+ Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
Map<String, String> queryYearAn(String year,String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountB(String jurisdiction,String deptid);
List<Map<Object,Object>> selectLi(String jurisdiction,String deptid);
@@ -58,6 +59,8 @@
List<Map<Object,Object>> queryCountSb(String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountKh(String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountPq(String jurisdiction,String deptid);
+ List<Map<Object,Object>> selectYw(String jurisdiction,String deptid);
+ List<Map<Object,Object>> selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
List<Map<Object,Object>> selectJur();
int selectExtypeUser();
List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid,String type);
@@ -66,6 +69,8 @@
String seCountUm(String jurisdiction,String deptid);
String seCountUg(String jurisdiction,String deptid);
List<Map<Object,Object>> selectIn(String jurisdiction);
+ List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName);
+ List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName);
Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);
Map<String, String> queryYearZc(String year,String jurisdiction,String deptid);
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 220ac1c..68aa145 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -66,7 +66,7 @@
IFNULL(C.staff, 0) AS staff,
IFNULL(D.security, 0) AS security,
IFNULL(E.armed, 0) AS armed,
- IFNULL(F.region, 0) AS region
+ IFNULL(F.region, 0) AS region
FROM (SELECT jurisdiction FROM sys_information GROUP BY jurisdiction) A
LEFT JOIN (SELECT COUNT(stats) AS confess, jurisdiction
FROM sys_information
@@ -157,7 +157,11 @@
SELECT IFNULL(A.lastmonth, 0) AS lastmonth,
IFNULL(B.thismouth, 0) AS thismouth,
IFNULL(A.amount, 0) AS lastamount,
- IFNULL(B.amount, 0) AS thisamount
+ IFNULL(B.amount, 0) AS thisamount,
+ IFNULL( C.userthismouth, 0 ) AS userthismouth,
+ IFNULL( D.userlastmouth, 0 ) AS userlastmouth,
+ IFNULL( E.userpcthismouth, 0 ) AS userpcthismouth,
+ IFNULL( F.userpclastmouth, 0 ) AS userpclastmouth
FROM (
SELECT COUNT(*) AS lastmonth,
amount,
@@ -200,6 +204,108 @@
amount,
deptid
) B ON A.deptid = B.deptid
+ LEFT JOIN (
+ SELECT COUNT(*) AS userthismouth,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ dept_id IN (
+ SELECT
+ i.departmentid
+ FROM
+ sys_information i
+ LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and i.jurisdiction =#{jurisdiction}
+ </if>
+ GROUP BY
+ i.departmentid
+ )
+ AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND status=1
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{deptid}
+ </if>
+ GROUP BY
+ dept_id
+ ) C ON C.dept_id = A.deptid
+ LEFT JOIN(
+ SELECT COUNT(*) AS userlastmouth,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ dept_id IN (
+ SELECT
+ i.departmentid
+ FROM
+ sys_information i
+ LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and i.jurisdiction =#{jurisdiction}
+ </if>
+ GROUP BY
+ i.departmentid
+ )
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND status=1
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{deptid}
+ </if>
+ GROUP BY
+ dept_id
+ ) D ON D.dept_id = A.deptid
+ LEFT JOIN (
+ SELECT COUNT(*) AS userpcthismouth,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ dept_id IN (
+ SELECT
+ i.departmentid
+ FROM
+ sys_information i
+ LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and i.jurisdiction =#{jurisdiction}
+ </if>
+ GROUP BY
+ i.departmentid
+ )
+ AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND dispatch=0
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{deptid}
+ </if>
+ GROUP BY
+ dept_id
+ ) E ON E.dept_id = A.deptid
+ LEFT JOIN(
+ SELECT COUNT(*) AS userpclastmouth,dept_id
+ FROM
+ blade_user
+ WHERE
+ dept_id IN (
+ SELECT i.departmentid
+ FROM
+ sys_information i
+ LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and i.jurisdiction =#{jurisdiction}
+ </if>
+ GROUP BY
+ i.departmentid
+ )
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND dispatch=0
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{deptid}
+ </if>
+ GROUP BY
+ dept_id
+ ) F ON F.dept_id = A.deptid
</select>
@@ -231,6 +337,33 @@
i.departmentid )
<if test="deptid!=null and deptid!=''">
and deptid =#{deptid}
+ </if>
+ </select>
+
+
+ <!--查询本年所有月份的派遣人数量-->
+ <select id="queryYearPz" resultType="java.util.HashMap">
+ SELECT COUNT(CASE WHEN MONTH ( s.update_time ) = 1 THEN s.dispatch END ) AS '1', COUNT(CASE WHEN MONTH (
+ s.update_time ) = 2 THEN s.dispatch END ) AS '2', COUNT(CASE WHEN MONTH ( s.update_time ) = 3 THEN s.dispatch
+ END ) AS '3', COUNT(CASE WHEN MONTH ( s.update_time ) = 4 THEN s.dispatch END ) AS '4', COUNT(CASE WHEN MONTH (
+ s.update_time ) = 5 THEN s.dispatch END ) AS '5', COUNT(CASE WHEN MONTH ( s.update_time ) = 6 THEN s.dispatch
+ END ) AS '6', COUNT(CASE WHEN MONTH ( s.update_time ) = 7 THEN s.dispatch END ) AS '7', COUNT(CASE WHEN MONTH (
+ s.update_time ) = 8 THEN s.dispatch END ) AS '8', COUNT(CASE WHEN MONTH ( s.update_time ) = 9 THEN s.dispatch
+ END ) AS '9', COUNT(CASE WHEN MONTH ( s.update_time ) = 10 THEN s.dispatch END ) AS '10', COUNT(CASE WHEN MONTH
+ ( s.update_time ) = 11 THEN s.dispatch END ) AS '11', COUNT(CASE WHEN MONTH ( s.update_time ) = 12 THEN
+ s.dispatch END ) AS '12'
+ FROM blade_user AS s
+ WHERE
+ YEAR ( s.update_time ) =#{year}
+ AND dispatch = 0
+ AND dept_id IN ( SELECT i.departmentid FROM sys_information i LEFT JOIN sys_jurisdiction j ON j.id =
+ i.jurisdiction where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and i.jurisdiction =#{jurisdiction}
+ </if>
+ GROUP BY i.departmentid )
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{deptid}
</if>
</select>
<!--查询本年所有月份的保安派遣的数量-->
@@ -776,8 +909,7 @@
</select>
<select id="selectExtypeUser" resultType="java.lang.Integer">
- SELECT
- COUNT( CASE WHEN ( examination_mx IS NOT NULL OR examination_mx != "" ) THEN 1 END ) AS sum
+ SELECT COUNT(CASE WHEN (examination_mx IS NOT NULL OR examination_mx != "") THEN 1 END) AS sum
FROM
blade_user
WHERE
@@ -823,7 +955,9 @@
</if>
</select>
<delete id="deleteDept">
- delete from blade_dept where id=#{ids}
+ delete
+ from blade_dept
+ where id = #{ids}
</delete>
@@ -833,7 +967,7 @@
IFNULL( B.cznum, 0 ) AS cznum,
IFNULL( C.paiqnum, 0 ) AS paiqnum,
IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
- IFNULL( E.caijnum, 0 ) AS caijnum,
+ IFNULL( E.sbnum, 0 ) AS sbnum,
IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
IFNULL( G.yicnum, 0 ) AS yicnum,
A.dept_id,
@@ -885,19 +1019,8 @@
jurisdiction
) D ON D.dept_id = A.dept_id
LEFT JOIN (
- SELECT
- COUNT( * ) AS caijnum,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586'
- AND photo=0
- GROUP BY
- dept_id,
- jurisdiction
- ) E ON E.dept_id = A.dept_id
+ SELECT COUNT( * ) AS sbnum, deptid, jurisdiction FROM sys_socil GROUP BY deptid, jurisdiction
+ ) E ON E.deptid = A.dept_id
LEFT JOIN (
SELECT
COUNT( * ) AS wcaijnum,
@@ -966,4 +1089,190 @@
AND jurisdiction=#{jurisdiction}
</if>
</select>
+
+ <!--公司运营情况进入图表-->
+ <select id="selectTb" resultType="java.util.HashMap">
+ SELECT
+ J.*
+ FROM
+ (
+ SELECT A.enterpriseName,
+ A.departmentid,
+ A.jurisdiction,
+ A.dept_name AS jurname,
+ IFNULL(B.znum, 0) AS znum,
+ IFNULL(C.zcnum, 0) AS zcnum,
+ IFNULL(D.cznum, 0) AS cznum,
+ IFNULL(E.sbnum, 0) AS sbnum,
+ IFNULL(F.ghnum, 0) AS ghnum,
+ IFNULL(G.pcnum, 0) AS pcnum
+ FROM (
+ SELECT i.enterpriseName,
+ i.departmentid,
+ i.jurisdiction,
+ j.dept_name
+ FROM sys_information i
+ LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
+ ) A
+ LEFT JOIN (SELECT COUNT(*) AS znum, dept_id, jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ GROUP BY dept_id, jurisdiction) B ON A.departmentid = B.dept_id
+ LEFT JOIN (
+ SELECT COUNT(*) AS zcnum,
+ dept_id,
+ jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ AND examination_type = 0
+ GROUP BY dept_id,
+ jurisdiction
+ ) C ON A.departmentid = C.dept_id
+ LEFT JOIN (
+ SELECT COUNT(*) AS cznum,
+ dept_id,
+ jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ AND hold = 0
+ GROUP BY dept_id,
+ jurisdiction
+ ) D ON A.departmentid = D.dept_id
+ LEFT JOIN (SELECT COUNT(*) AS sbnum, deptid, jurisdiction
+ FROM sys_socil
+ GROUP BY deptid, jurisdiction) E ON A.departmentid = E.deptid
+ LEFT JOIN (
+ SELECT COUNT(*) AS ghnum,
+ dept_id,
+ jurisdiction
+ FROM sys_dispatcher
+ GROUP BY dept_id, jurisdiction) F ON A.departmentid = F.dept_id
+ LEFT JOIN (SELECT SUM(num) AS pcnum,
+ dept_id,
+ jurisdiction
+ FROM sys_dispatcher
+ GROUP BY dept_id, jurisdiction) G ON A.departmentid = G.dept_id ) J
+ WHERE 1=1
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ and J.jurisdiction =#{jurisdiction}
+ </if>
+ <if test="enterpriseName!=null and enterpriseName!=''">
+ and J.enterpriseName like concat('%', #{enterpriseName},'%')
+ </if>
+ GROUP BY J.enterpriseName,
+ J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction
+ </select>
+
+ <!--公司经济情况进入图表-->
+ <select id="selectJj" resultType="java.util.HashMap">
+ SELECT J.*
+ FROM (
+ SELECT A.enterpriseName,
+ A.departmentid,
+ A.jurisdiction,
+ A.dept_name AS jurname,
+ IFNULL(B.sbcount, 0) AS sbcount,
+ IFNULL(C.sbnum, 0) AS sbnum,
+ IFNULL(D.pcnum, 0) AS pcnum,
+ IFNULL(E.znum, 0) AS znum,
+ TRUNCATE(znum / sbnum, 2) as zb
+ FROM (
+ SELECT i.enterpriseName,
+ i.departmentid,
+ i.jurisdiction,
+ j.dept_name
+ FROM sys_information i
+ LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
+ ) A
+ LEFT JOIN (SELECT SUM(amount) AS sbcount, deptid FROM sys_socil GROUP BY deptid) B
+ ON A.departmentid = B.deptid
+ LEFT JOIN (
+ SELECT COUNT(*) AS sbnum,
+ deptid
+ FROM sys_socil
+ GROUP BY deptid
+ ) C ON A.departmentid = C.deptid
+ LEFT JOIN (
+ SELECT COUNT(*) AS pcnum,
+ dept_id,
+ jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ AND dispatch = 0
+ GROUP BY dept_id,
+ jurisdiction
+ ) D ON A.departmentid = D.dept_id
+ LEFT JOIN (SELECT COUNT(*) AS znum, dept_id, jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ GROUP BY dept_id, jurisdiction) E ON A.departmentid = E.dept_id) J
+ WHERE 1=1
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ and J.jurisdiction =#{jurisdiction}
+ </if>
+ <if test="enterpriseName!=null and enterpriseName!=''">
+ and J.enterpriseName like concat('%', #{enterpriseName},'%')
+ </if>
+ GROUP BY J.departmentid, J.enterpriseName, J.jurisdiction, J.jurname, J.pcnum, J.sbcount, J.sbnum, J.zb, J.znum
+ </select>
+
+
+ <!--业务统计情况-->
+ <select id="selectYw" resultType="java.util.HashMap">
+ SELECT
+ A.enterpriseName,
+ A.dept_name as jurname,
+ IFNULL( B.num, 0 ) AS fwnum,
+ IFNULL( C.znum, 0 ) AS znum
+ FROM
+ (
+ SELECT
+ i.enterpriseName,
+ i.departmentid,
+ j.dept_name
+ FROM
+ sys_information i
+ LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
+ WHERE
+ i.enterpriseName IS NOT NULL
+ ) A
+ LEFT JOIN ( SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id ) B ON A.departmentid =
+ B.dept_id
+ LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY
+ dept_id ) C ON A.departmentid = C.dept_id
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ AND A.jurisdiction=#{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ and A.departmentid=#{deptid}
+ </if>
+ </select>
+
+ <!--保安人员详情-->
+ <select id="selectUIn" resultType="java.util.HashMap">
+ SELECT real_name,securitynumber,cardid,phone,hold,soil,photo,examination_type,dispatch FROM blade_user WHERE
+ role_id='1412226235153731586'
+ <if test="deptid!=null and deptid!=''">
+ and dept_id=#{deptid}
+ </if>
+ <if test="name!=null and name!=''">
+ and real_name like concat('%', #{name},'%')
+ </if>
+ <if test="hold!=null and hold!=''">
+ and hold=#{hold}
+ </if>
+ <if test="photo!=null and photo!=''">
+ and photo=#{photo}
+ </if>
+ <if test="examinationtype!=null and examinationtype!=''">
+ and examination_type=#{examinationtype}
+ </if>
+ <if test="dispatch!=null and dispatch!=''">
+ and dispatch=#{dispatch}
+ </if>
+ <if test="soil !=null and soil !=''">
+ and soil =#{soil}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index 77538e3..a1bc606 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -74,4 +74,9 @@
List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
String seCountUm(String jurisdiction,String deptid);
String seCountUg(String jurisdiction,String deptid);
+ Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
+ List<Map<Object,Object>> selectTb(String jurisdiction,String enterpriseName);
+ List<Map<Object,Object>> selectJj(String jurisdiction,String enterpriseName);
+ List<Map<Object,Object>> selectYw(String jurisdiction,String deptid);
+ List<Map<Object,Object>> selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
}
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index 8495187..67f11f4 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -205,5 +205,30 @@
return baseMapper.seCountUg(jurisdiction, deptid);
}
+ @Override
+ public Map<String, String> queryYearPz(String year, String jurisdiction, String deptid) {
+ return baseMapper.queryYearPz(year, jurisdiction, deptid);
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectTb(String jurisdiction,String enterpriseName) {
+ return baseMapper.selectTb(jurisdiction, enterpriseName);
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectJj(String jurisdiction,String enterpriseName) {
+ return baseMapper.selectJj(jurisdiction, enterpriseName);
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectYw(String jurisdiction, String deptid) {
+ return baseMapper.selectYw(jurisdiction, deptid);
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectUIn(String deptid, String name, String hold, String photo, String examinationtype, String dispatch,String soil) {
+ return baseMapper.selectUIn(deptid, name, hold, photo, examinationtype, dispatch,soil);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/permit/entity/Permit.java b/src/main/java/org/springblade/modules/permit/entity/Permit.java
index f2ad030..6190644 100644
--- a/src/main/java/org/springblade/modules/permit/entity/Permit.java
+++ b/src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -135,6 +135,11 @@
private Integer id;
private String deptid;
private String ptype;
-
+ private String storage;
+ private String cardid;
+ private String representativecell;
+ private String contacts;
+ private String contactscell;
+ private String approve;
}
diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
index 2b426d0..00fa2ab 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -23,6 +23,12 @@
<result column="permitime" property="permitime"/>
<result column="deptid" property="deptid"/>
<result column="ptype" property="ptype"/>
+ <result column="storage" property="storage"/>
+ <result column="cardid" property="cardid"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
+ <result column="approve" property="approve"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index c523951..4a12332 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -168,6 +168,7 @@
*/
@TableField("my_picture")
private String myPicture;
+ private String soil;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index c266386..bac4a38 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -43,6 +43,7 @@
<result column="photo" property="photo"/>
<result column="dispatch" property="dispatch"/>
<result column="my_picture" property="myPicture"/>
+ <result column="soil" property="soil"/>
</resultMap>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d935c8d..7a248a1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -68,6 +68,7 @@
logic-not-delete-value: 0
configuration:
map-underscore-to-camel-case: true
+ call-setters-on-nulls: true
cache-enabled: false
#knife4j配置
--
Gitblit v1.9.3