From a841e7d34df4edf9955da8e1db09ed8de079ad95 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 19:23:44 +0800
Subject: [PATCH] 1.现场检查新增字段 2.用户表新增是否缴纳保险字段 3.统计接口新增，修改
---
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java | 6 +
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java | 16 ++
src/main/java/org/springblade/modules/FTP/monitor.java | 2
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 23 +++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 171 ++++++++++++++++++++++++----
src/main/java/org/springblade/modules/information/vo/InformationVO.java | 11 +
src/main/java/org/springblade/modules/system/entity/User.java | 13 ++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 10 +
src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java | 7 +
src/main/java/org/springblade/modules/information/service/IInformationService.java | 16 ++
src/main/java/org/springblade/modules/information/controller/InformationsController.java | 38 +++++-
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 22 +++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 9 +
13 files changed, 302 insertions(+), 42 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index b11bcb7..2aae5eb 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -19,7 +19,7 @@
//private static String fileName = "nsql.json";
- @Scheduled(cron = "*/30 * * * * ?")
+// @Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
diff --git a/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java b/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
index e123f50..22eebba 100644
--- a/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
+++ b/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
@@ -85,5 +85,12 @@
@ApiModelProperty(value = "检查结果")
private String results;
+ private String url;
+ /**
+ * 处理结果
+ */
+ @TableField("handler_result")
+ private String handlerResult;
+
}
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 942e603..cb2d2d4 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -16,7 +16,10 @@
<!--派遣记录分页数据-->
<select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
select
- sd.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid idCardNo
+ sd.*,
+ bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid idCardNo,bu.phone securityPhone,
+ bd.dept_name deptName,
+ sdu.linkman,sdu.phone
from
sys_dispatcher sd
left join
@@ -27,6 +30,10 @@
blade_user bu
on
bu.id = sd.user_ids
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
where 1=1
<if test="dispatcher.dispatcherUnitId!=null">
and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
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 fa68e96..827e15d 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,13 +5,21 @@
<!--派遣公司分页信息-->
<select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
select
- sdu.*,bt.dept_name tenantName
+ sdu.*,bt.dept_name tenantName,bu.real_name realName
from
- sys_dispatcher_unit sdu
+ sys_dispatcher_unit sdu
LEFT JOIN
- blade_dept bt
+ blade_dept bt
ON
- sdu.dept_id = bt.id
+ sdu.dept_id = bt.id
+ left join
+ sys_dispatcher sd
+ on
+ sdu.id = sd.dispatcher_unit_id
+ left join
+ blade_user bu
+ on
+ sd.user_ids = bu.id
WHERE
1=1
<if test="dispatcherUnit.tenantName!=null and dispatcherUnit.tenantName!=''">
@@ -41,6 +49,13 @@
<if test="dispatcherUnit.district!=null">
and sdu.district = #{dispatcherUnit.district}
</if>
+ <if test="dispatcherUnit.isExpire==1">
+ and sdu.start_time <= now()
+ and sdu.end_time > now()
+ </if>
+ <if test="dispatcherUnit.isExpire==2">
+ and sdu.end_time <= now()
+ </if>
</select>
<!--自定义树-->
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 32abc87..87188f5 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -40,4 +40,10 @@
* 派遣单位名称
*/
private String dispatcherUnitName;
+
+
+ /**
+ * 合同是否到期 1：否 2：是
+ */
+ private Integer isExpire;
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
index f566fd3..d5d28e0 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
@@ -69,4 +69,20 @@
*/
private String dispatch;
+ /**
+ * 联系人
+ */
+ private String linkman;
+
+ /**
+ * 联系电话
+ */
+ private String phone;
+
+
+ /**
+ * 联系电话
+ */
+ private String securityPhone;
+
}
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationsController.java b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
index 5e0822a..a72081d 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -63,8 +63,8 @@
* @param information 查询条件
* @return
*/
- @GetMapping("/getSecurityUnitHoldLess50Page")
- public R<IPage<InformationVO>> getSecurityUnitHoldLess50Page(InformationVO information, Query query){
+ @GetMapping("/getSecurityUnitHoldLessPage")
+ public R<IPage<InformationVO>> getSecurityUnitHoldLessPage(InformationVO information, Query query){
return R.data(informationService.getSecurityUnitHoldLess50Page(Condition.getPage(query), information));
}
@@ -74,8 +74,8 @@
* @param information 查询条件
* @return
*/
- @GetMapping("/getSecurityUnitDispatcherLess50Page")
- public R<IPage<InformationVO>> getSecurityUnitDispatcherLess50Page(InformationVO information, Query query){
+ @GetMapping("/getSecurityUnitDispatcherLessPage")
+ public R<IPage<InformationVO>> getSecurityUnitDispatcherLessPage(InformationVO information, Query query){
return R.data(informationService.getSecurityUnitDispatcherLess50Page(Condition.getPage(query), information));
}
@@ -85,9 +85,20 @@
* @param information 查询条件
* @return
*/
- @GetMapping("/getSecurityUnitSoilLess50Page")
- public R<IPage<InformationVO>> getSecurityUnitSoilLess50Page(InformationVO information, Query query){
+ @GetMapping("/getSecurityUnitSoilLessPage")
+ public R<IPage<InformationVO>> getSecurityUnitSoilLessPage(InformationVO information, Query query){
return R.data(informationService.getSecurityUnitSoilLess50Page(Condition.getPage(query), information));
+ }
+
+ /**
+ * 根据辖区查询统计保安公司保险缴纳率低于90%的保安公司个数及保安公司分页信息（本市保安公司，分公司）
+ * @param query 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @GetMapping("/getSecurityUnitInsuranceLessPage")
+ public R<IPage<InformationVO>> getSecurityUnitInsuranceLessPage(InformationVO information, Query query){
+ return R.data(informationService.getSecurityUnitInsuranceLessPage(Condition.getPage(query), information));
}
/**
@@ -96,8 +107,8 @@
* @param information 查询条件
* @return
*/
- @GetMapping("/getSecurityUnitExamLess50Page")
- public R<IPage<InformationVO>> getSecurityUnitExamLess50Page(InformationVO information, Query query){
+ @GetMapping("/getSecurityUnitExamLessPage")
+ public R<IPage<InformationVO>> getSecurityUnitExamLessPage(InformationVO information, Query query){
return R.data(informationService.getSecurityUnitExamLess50Page(Condition.getPage(query), information));
}
@@ -111,4 +122,15 @@
public R<IPage<InformationVO>> getSubstationWarnInfoPage(InformationVO information, Query query){
return R.data(informationService.getSubstationWarnInfoPage(Condition.getPage(query), information));
}
+
+ /**
+ * 根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息
+ * @param query 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @GetMapping("/getSecurityUnitServerLessPage")
+ public R<IPage<InformationVO>> getSecurityUnitServerLessPage(InformationVO information, Query query){
+ return R.data(informationService.getSecurityUnitServerLess2Page(Condition.getPage(query), information));
+ }
}
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 6ea1ddc..9f8cf4d 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -119,7 +119,7 @@
List<InformationVO> getSecurityUnitHoldInfoPage(IPage<InformationVO> page,@Param("information") InformationVO information);
/**
- * 根据辖区查询统计保安公司(1:持证率低于50%, 2:派遣率低于50% 3：缴纳社保率低于50% 的保安公司个数及保安公司分页信息（本市保安公司，分公司）
+ * 根据辖区查询统计保安公司(1:持证率低于50%, 2:派遣率低于50% 3：缴纳社保率低于50% 4：保险缴纳 的保安公司个数及保安公司分页信息（本市保安公司，分公司）
* @param page 分页条件
* @param information 查询条件
* @return
@@ -144,4 +144,12 @@
*/
@SqlParser(filter = true)
List<InformationVO> getSubstationWarnInfoPage(IPage<InformationVO> page,@Param("information") InformationVO information);
+
+ /**
+ * 根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息
+ * @param page 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ List<InformationVO> getSecurityUnitServerLess2Page(IPage<InformationVO> page,@Param("information") InformationVO information);
}
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 e9880b8..f35fe24 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1079,6 +1079,8 @@
IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
IFNULL( E.sbnum, 0 ) AS sbnum,
IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
+ IFNULL( H.ycaijzpnum, 0 ) AS ycaijzpnum,
+ IFNULL( I.ycaijzwnum, 0 ) AS ycaijzwnum,
IFNULL( G.yicnum, 0 ) AS yicnum,
A.dept_id,
d.enterpriseName AS deptname,
@@ -1132,21 +1134,56 @@
) D ON D.dept_id = A.dept_id
LEFT JOIN (
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,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=1
- GROUP BY
- dept_id,
- jurisdiction
- ) F ON F.dept_id = A.dept_id
+ ) E
+ ON E.deptid = A.dept_id
+ LEFT JOIN
+ (
+ SELECT
+ COUNT( * ) AS wcaijnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586' and status=1 AND is_deleted=0
+ AND photo=1
+ GROUP BY
+ dept_id,
+ jurisdiction
+ ) F
+ ON F.dept_id = A.dept_id
+ LEFT JOIN
+ (
+ SELECT
+ COUNT( * ) AS ycaijzpnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586' and status=1 AND is_deleted=0
+ AND photo=0
+ GROUP BY
+ dept_id,
+ jurisdiction
+ ) H
+ ON H.dept_id = A.dept_id
+ LEFT JOIN
+ (
+ SELECT
+ COUNT( * ) AS ycaijzwnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586' and status=1 AND is_deleted=0
+ AND fingerprint=0
+ GROUP BY
+ dept_id,
+ jurisdiction
+ ) I
+ ON I.dept_id = A.dept_id
LEFT JOIN (
SELECT
COUNT( * ) AS yicnum,
@@ -1387,7 +1424,10 @@
A.jurisdiction,
A.dept_name as jurname,
IFNULL( B.num, 0 ) AS fwnum,
- IFNULL( C.znum, 0 ) AS znum
+ IFNULL( C.znum, 0 ) AS znum,
+ IFNULL( D.dqnum, 0 ) AS dqnum,
+ IFNULL( E.cznum, 0 ) AS cznum,
+ IFNULL( F.pqnum, 0 ) AS pqnum
FROM
(
SELECT
@@ -1402,11 +1442,36 @@
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' and
- status=1 GROUP BY
- dept_id ) C ON A.departmentid = C.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit
+ where
+ start_time <= now() and end_time > now()
+ 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'
+ and status=1
+ GROUP BY dept_id
+ ) C
+ ON A.departmentid = C.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS dqnum, dept_id FROM sys_dispatcher_unit where end_time < now() GROUP BY dept_id
+ ) D
+ ON A.departmentid = D.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS cznum, dept_id FROM blade_user where hold = 1 GROUP BY dept_id
+ ) E
+ ON A.departmentid = E.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS pqnum, dept_id FROM blade_user where dispatch = 0 GROUP BY dept_id
+ ) F
+ ON A.departmentid = F.dept_id
where 1=1
<if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
AND A.jurisdiction in(${jurisdiction})
@@ -1793,7 +1858,7 @@
where 1=1
and (stats = 2 or stats = 4)
<if test="information.jurisdiction!=null and information.jurisdiction!=''">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and sj.id = #{information.jurisdiction}
</if>
</select>
@@ -1847,7 +1912,7 @@
where 1=1
and (si.stats = 2 or si.stats = 4)
<if test="information.jurisdiction!=null and information.jurisdiction!=''">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and sj.id = #{information.jurisdiction}
</if>
</select>
@@ -1879,6 +1944,9 @@
<if test="type==3">
and bu.soil = 0
</if>
+ <if test="type==4">
+ and bu.insurance = 0
+ </if>
group by dept_id
) b
on
@@ -1890,11 +1958,16 @@
c.jurisdiction = sj.id
where 1=1
and (c.stats = 2 or c.stats = 4)
- and pnum < 50
+ and pnum < #{information.proportion}
<if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and sj.id = #{information.jurisdiction}
+ </if>
+ <if test="information.departmentid!=null and information.departmentid!=''">
+ and c.departmentid = #{information.departmentid}
</if>
</select>
+
+ <!-- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})-->
<!--根据辖区查询统计保安公司考试通过率低于50%的保安公司个数及保安公司分页信息（本市保安公司，分公司）-->
<select id="getSecurityUnitExamLess50Page" resultType="org.springblade.modules.information.vo.InformationVO">
@@ -1981,9 +2054,9 @@
d.jurisdiction = sj.id
where 1=1
and (d.stats = 2 or d.stats = 4)
- and pnum < 50
+ and pnum < #{information.proportion}
<if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and sj.id = #{information.jurisdiction}
</if>
</select>
@@ -2082,4 +2155,48 @@
and (a.id = #{information.jurisdiction} or a.parent_id = #{information.jurisdiction})
</if>
</select>
+
+ <!--根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息-->
+ <select id="getSecurityUnitServerLess2Page" resultType="org.springblade.modules.information.vo.InformationVO">
+ select * from
+ (
+ select
+ DISTINCT
+ si.id,
+ si.departmentid,
+ si.jurisdiction,
+ si.enterprisename,
+ sj.dept_name jurisdictionName,
+ ifnull(a.count,0) znum,
+ sdu.name dispatchUnitName,
+ sdu.end_time
+ from sys_information si
+ left join
+ sys_dispatcher_unit sdu
+ on
+ si.departmentid = sdu.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
+ (
+ select ifnull(count(*),0) count,dept_id from sys_dispatcher_unit
+ where 1=1
+ and start_time <= now()
+ and end_time > now()
+ GROUP BY dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ where 1=1
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and sj.id = #{information.jurisdiction}
+ </if>
+ ) b
+ where b.znum < 2
+ <if test="information.departmentid!=null and information.departmentid!=''">
+ and b.departmentid = #{information.departmentid}
+ </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 88edae9..ec7e670 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -154,4 +154,20 @@
* @return
*/
IPage<InformationVO> getSubstationWarnInfoPage(IPage<InformationVO> page, InformationVO information);
+
+ /**
+ * 根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息
+ * @param page 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ IPage<InformationVO> getSecurityUnitServerLess2Page(IPage<InformationVO> page, InformationVO information);
+
+ /**
+ * 根据辖区查询统计保安公司保险缴纳率低于90%的保安公司个数及保安公司分页信息（本市保安公司，分公司）
+ * @param page 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ IPage<InformationVO> getSecurityUnitInsuranceLessPage(IPage<InformationVO> page, InformationVO information);
}
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 3f40c11..ae2ad24 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
@@ -371,4 +371,26 @@
public IPage<InformationVO> getSubstationWarnInfoPage(IPage<InformationVO> page, InformationVO information) {
return page.setRecords(baseMapper.getSubstationWarnInfoPage(page, information));
}
+
+ /**
+ * 根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息
+ * @param page 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @Override
+ public IPage<InformationVO> getSecurityUnitServerLess2Page(IPage<InformationVO> page, InformationVO information) {
+ return page.setRecords(baseMapper.getSecurityUnitServerLess2Page(page, information));
+ }
+
+ /**
+ * 根据辖区查询统计保安公司保险缴纳率低于90%的保安公司个数及保安公司分页信息（本市保安公司，分公司）
+ * @param page 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @Override
+ public IPage<InformationVO> getSecurityUnitInsuranceLessPage(IPage<InformationVO> page, InformationVO information) {
+ return page.setRecords(baseMapper.getSecurityUnitLess50Page(page,4, information));
+ }
}
diff --git a/src/main/java/org/springblade/modules/information/vo/InformationVO.java b/src/main/java/org/springblade/modules/information/vo/InformationVO.java
index f31597b..a5504fa 100644
--- a/src/main/java/org/springblade/modules/information/vo/InformationVO.java
+++ b/src/main/java/org/springblade/modules/information/vo/InformationVO.java
@@ -46,4 +46,15 @@
* 明细
*/
private String detail;
+
+ /**
+ * 派遣单位名称
+ */
+ private String dispatchUnitName;
+
+
+ /**
+ * 占比
+ */
+ private Integer proportion;
}
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 bf6d8dd..2f01aa8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -190,10 +190,23 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField("paper_time")
private Date paperTime;
+
+ /**
+ * 离职原因
+ */
+ @TableField("reason_for_leav")
+ private String reasonForLeav;
+
private String holdv;
+
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date holdvtime;
+ /**
+ * 是否缴纳保险 0：是 1：否
+ */
+ private Integer insurance;
+
}
--
Gitblit v1.9.3