From c6a33ee7ab133b3bcf5f377456b473c7bd4b9a77 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 19:57:38 +0800
Subject: [PATCH] 1.保安单位，保安人员现场检查字段修改，接口修改 2.成绩查询接口修改 3.保安员资格审查接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 6 +
src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java | 3
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 6 +
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java | 3
src/main/java/org/springblade/modules/coinspect/vo/CoinspectVO.java | 26 ++++
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml | 50 +++++++-
src/main/java/org/springblade/modules/seinspect/vo/SeinspectVO.java | 29 ++++
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 19 +-
src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java | 10 +
src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java | 21 ++-
src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java | 65 ++++------
src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml | 71 +++++++++--
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 16 ++
src/main/java/org/springblade/modules/system/vo/UserVO.java | 10 +
14 files changed, 258 insertions(+), 77 deletions(-)
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..a31aaf5 100644
--- a/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
+++ b/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
@@ -52,20 +52,21 @@
/**
* 检查人姓名
*/
- @ApiModelProperty(value = "检查人姓名")
- private String name;
+ @ApiModelProperty(value = "检查人id")
+ @TableField("examiner_id")
+ private String examinerId;
/**
* 被检查单位名称
*/
- @ApiModelProperty(value = "被检查单位名称")
- @TableField("sName")
- private String sname;
+ @ApiModelProperty(value = "被检查单位名称ID")
+ @TableField("reviewed_dept_id")
+ private String reviewedDeptId;
/**
* 检查人单位
*/
- @ApiModelProperty(value = "检查人单位")
- @TableField("deptName")
- private String deptname;
+ @ApiModelProperty(value = "检查人单位ID")
+ @TableField("examiner_dept_id")
+ private String examinerDeptId;
/**
* 检查日期
*/
@@ -86,4 +87,8 @@
private String results;
+ private String url;
+
+
+
}
diff --git a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java
index aa0ef85..c90bf19 100644
--- a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java
+++ b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.coinspect.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.coinspect.entity.Coinspect;
import org.springblade.modules.coinspect.vo.CoinspectVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,6 +38,6 @@
* @param coinspect
* @return
*/
- List<CoinspectVO> selectCoinspectPage(IPage page, CoinspectVO coinspect);
+ List<CoinspectVO> selectCoinspectPage(IPage page, @Param("coinspect") CoinspectVO coinspect);
}
diff --git a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
index ee0b701..9081ab9 100644
--- a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
@@ -3,19 +3,57 @@
<mapper namespace="org.springblade.modules.coinspect.mapper.CoinspectMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="coinspectResultMap" type="org.springblade.modules.coinspect.entity.Coinspect">
+ <resultMap id="coinspectResultMap" type="org.springblade.modules.coinspect.vo.CoinspectVO">
<id column="id" property="id"/>
- <result column="name" property="name"/>
- <result column="sName" property="sname"/>
- <result column="deptName" property="deptname"/>
+ <result column="examiner_id" property="examinerId"/>
+ <result column="reviewed_dept_id" property="reviewedDeptId"/>
+ <result column="examiner_dept_id" property="examinerDeptId"/>
<result column="reviewTime" property="reviewtime"/>
<result column="insid" property="insid"/>
<result column="results" property="results"/>
+ <result column="url" property="url"/>
</resultMap>
- <select id="selectCoinspectPage" resultMap="coinspectResultMap">
- select * from sys_coinspect where is_deleted = 0
+ <select id="selectCoinspectPage" resultType="org.springblade.modules.coinspect.vo.CoinspectVO">
+ select
+ sc.*,
+ bu.real_name realName,
+ bd.dept_name examinerDeptName,
+ bd1.dept_name reviewedDeptName
+ from
+ sys_coinspect sc
+ left join
+ blade_user bu
+ on
+ bu.id = sc.examiner_id
+ left join
+ blade_dept bd
+ on
+ bd.id = sc.examiner_dept_id
+ left join
+ blade_dept bd1
+ on
+ bd1.id = sc.reviewed_dept_id
+ where 1 = 1
+ <if test="coinspect.realName!=null and coinspect.realName!=''">
+ bu.real_name like concat('%',#{coinspect.realName},'%')
+ </if>
+ <if test="coinspect.examinerDeptName!=null and coinspect.examinerDeptName!=''">
+ bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
+ </if>
+ <if test="coinspect.reviewedDeptName!=null and coinspect.reviewedDeptName!=''">
+ bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
+ </if>
+ <if test="coinspect.results!=null and coinspect.results!=''">
+ sc.results like concat('%',#{coinspect.results},'%')
+ </if>
+ <if test="coinspect.startTime!=null and coinspect.startTime!=''">
+ and sc.reviewTime >= #{coinspect.startTime}
+ </if>
+ <if test="coinspect.endTime!=null and coinspect.endTime!=''">
+ and sc.reviewTime <= #{coinspect.endTime}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/coinspect/vo/CoinspectVO.java b/src/main/java/org/springblade/modules/coinspect/vo/CoinspectVO.java
index fdd18b9..b7380de 100644
--- a/src/main/java/org/springblade/modules/coinspect/vo/CoinspectVO.java
+++ b/src/main/java/org/springblade/modules/coinspect/vo/CoinspectVO.java
@@ -33,4 +33,30 @@
public class CoinspectVO extends Coinspect {
private static final long serialVersionUID = 1L;
+
+ /**
+ * 检查人名称
+ */
+ private String realName;
+
+ /**
+ * 检查人单位名称
+ */
+ private String examinerDeptName;
+
+ /**
+ * 被检查单位名称
+ */
+ private String reviewedDeptName;
+
+ /**
+ * 搜索现场检查开始时间
+ */
+ private String startTime;
+
+ /**
+ * 搜索现场检查结束时间
+ */
+ private String endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 16500f9..ddffbc8 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -1,9 +1,11 @@
package org.springblade.modules.exam.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -15,6 +17,7 @@
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -129,4 +132,17 @@
//返回
return R.data(detail);
}
+
+ /**
+ * 导出成绩
+ */
+// @GetMapping("export-examScore")
+// @ApiOperationSupport(order = 14)
+// @ApiOperation(value = "导出成绩")
+// public void exportExamScore(HttpServletResponse response, ExamScoreVO examScoreVO) {
+// //按条件查询成绩数据
+// List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
+// //导出成绩集合数据
+// ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+// }
}
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index e30a281..83c4608 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -43,6 +43,12 @@
<if test="examScore.qualified!=null">
and es.qualified = #{examScore.qualified}
</if>
+ <if test="examScore.startTime!=null and examScore.startTime!=''">
+ and es.exam_time >= #{examScore.startTime}
+ </if>
+ <if test="examScore.endTime!=null and examScore.endTime!=''">
+ and es.exam_time <= #{examScore.endTime}
+ </if>
order by es.id desc
</select>
diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
index e1189f0..cbfca78 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
@@ -29,4 +29,14 @@
* 考勤提交的结果
*/
private List<ExamResultVO> examResultVOS;
+
+ /**
+ * 开始时间
+ */
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ private String endTime;
}
diff --git a/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java b/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
index a994b1f..756d507 100644
--- a/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
+++ b/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
@@ -44,61 +44,54 @@
@TableName("sys_seinspect")
@ApiModel(value = "Seinspect对象", description = "Seinspect对象")
public class Seinspect implements Serializable {
-
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- /**
- * 保安员姓名
- */
- @ApiModelProperty(value = "保安员姓名")
- @TableField("realName")
- private String realname;
- /**
- * 保安员身份证号
- */
- @ApiModelProperty(value = "保安员身份证号")
- private String carid;
- /**
- * 保安员单位
- */
- @ApiModelProperty(value = "保安员单位")
- @TableField("sName")
- private String sname;
- /**
- * 检查人姓名
- */
- @ApiModelProperty(value = "检查人姓名")
- private String inspectman;
- /**
- * 检查人单位
- */
- @ApiModelProperty(value = "检查人单位")
- @TableField("deptName")
- private String deptname;
+
/**
* 检查日期
*/
@ApiModelProperty(value = "检查日期")
@TableField("reviewTime")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date reviewtime;
+
/**
* 检查内容
*/
@ApiModelProperty(value = "检查内容")
- private String insid;
+ private String content;
/**
* 检查结果
*/
@ApiModelProperty(value = "检查结果")
- private String examinationType;
- private String jid;
- private String deptid;
- private String jurisdiction;
+ private String result;
+
private String url;
+ /**
+ * 检查人单位id
+ */
+ @TableField("examiner_dept_id")
+ private String examinerDeptId;
+
+ /**
+ * 检查人id
+ */
+ @TableField("examiner_id")
+ private String examinerId;
+
+ private String jurisdiction;
+
+ /**
+ * 保安员姓名
+ */
+ @ApiModelProperty(value = "保安员姓名")
+ @TableField("security_id")
+ private String securityId;
+
+
}
diff --git a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java
index 68b422c..8b00f70 100644
--- a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java
+++ b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.seinspect.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.seinspect.entity.Seinspect;
import org.springblade.modules.seinspect.vo.SeinspectVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,6 +38,6 @@
* @param seinspect
* @return
*/
- List<SeinspectVO> selectSeinspectPage(IPage page, SeinspectVO seinspect);
+ List<SeinspectVO> selectSeinspectPage(IPage page,@Param("seinspect") SeinspectVO seinspect);
}
diff --git a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
index d15ce89..cc71959 100644
--- a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -3,25 +3,62 @@
<mapper namespace="org.springblade.modules.seinspect.mapper.SeinspectMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="seinspectResultMap" type="org.springblade.modules.seinspect.entity.Seinspect">
- <id column="id" property="id"/>
- <result column="realName" property="realname"/>
- <result column="carid" property="carid"/>
- <result column="sName" property="sname"/>
- <result column="inspectman" property="inspectman"/>
- <result column="deptName" property="deptname"/>
- <result column="reviewTime" property="reviewtime"/>
- <result column="insid" property="insid"/>
- <result column="examination_type" property="examinationType"/>
- <result column="jid" property="jid"/>
- <result column="deptid" property="deptid"/>
- <result column="jurisdiction" property="jurisdiction"/>
- <result column="url" property="url"/>
- </resultMap>
+<!-- <resultMap id="seinspectResultMap" type="org.springblade.modules.seinspect.entity.Seinspect">-->
+<!-- <id column="id" property="id"/>-->
+<!-- <result column="realName" property="realname"/>-->
+<!-- <result column="carid" property="carid"/>-->
+<!-- <result column="sName" property="sname"/>-->
+<!-- <result column="inspectman" property="inspectman"/>-->
+<!-- <result column="deptName" property="deptname"/>-->
+<!-- <result column="reviewTime" property="reviewtime"/>-->
+<!-- <result column="insid" property="insid"/>-->
+<!-- <result column="examination_type" property="examinationType"/>-->
+<!-- <result column="jid" property="jid"/>-->
+<!-- <result column="deptid" property="deptid"/>-->
+<!-- <result column="jurisdiction" property="jurisdiction"/>-->
+<!-- <result column="url" property="url"/>-->
+<!-- </resultMap>-->
- <select id="selectSeinspectPage" resultMap="seinspectResultMap">
- select * from sys_seinspect where is_deleted = 0
+ <select id="selectSeinspectPage" resultType="org.springblade.modules.seinspect.vo.SeinspectVO">
+ select
+ ss.*,
+ bu.real_name realName,
+ bd.dept_name examinerDeptName,
+ bu1.real_name securityName
+ from
+ sys_seinspect ss
+ left join
+ blade_user bu
+ on
+ bu.id = ss.examiner_id
+ left join
+ blade_dept bd
+ on
+ bd.id = ss.examiner_dept_id
+ left join
+ blade_user bu1
+ on
+ bu1.id = ss.security_id
+ where 1 = 1
+ <if test="seinspect.realName!=null and seinspect.realName!=''">
+ bu.real_name like concat('%',#{seinspect.realName},'%')
+ </if>
+ <if test="seinspect.examinerDeptName!=null and seinspect.examinerDeptName!=''">
+ bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
+ </if>
+ <if test="seinspect.securityName!=null and seinspect.securityName!=''">
+ bu1.real_name like concat('%',#{seinspect.securityName},'%')
+ </if>
+ <if test="seinspect.result!=null and seinspect.result!=''">
+ ss.result like concat('%',#{seinspect.result},'%')
+ </if>
+ <if test="seinspect.startTime!=null and seinspect.startTime!=''">
+ and ss.reviewTime >= #{seinspect.startTime}
+ </if>
+ <if test="seinspect.endTime!=null and seinspect.endTime!=''">
+ and ss.reviewTime <= #{seinspect.endTime}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/seinspect/vo/SeinspectVO.java b/src/main/java/org/springblade/modules/seinspect/vo/SeinspectVO.java
index 7eabc90..ab1d7db 100644
--- a/src/main/java/org/springblade/modules/seinspect/vo/SeinspectVO.java
+++ b/src/main/java/org/springblade/modules/seinspect/vo/SeinspectVO.java
@@ -33,4 +33,33 @@
public class SeinspectVO extends Seinspect {
private static final long serialVersionUID = 1L;
+ /**
+ * 检查人名称
+ */
+ private String realName;
+
+ /**
+ * 检查人单位名称
+ */
+ private String examinerDeptName;
+
+ /**
+ * 被检查人姓名
+ */
+ private String securityName;
+
+ /**
+ * 被检查人单位名称
+ */
+ private String reviewedDeptName;
+
+ /**
+ * 搜索现场检查开始时间
+ */
+ private String startTime;
+
+ /**
+ * 搜索现场检查结束时间
+ */
+ private String endTime;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 3478a6c..d1ff6bd 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -410,7 +410,11 @@
blade_dept
where is_deleted = 0
and
- (id = 1413470343230877697 or id = 1425366663452196865 or id = 1418458374477549569 or id = 1420222768149966850)
+ (id = 1413470343230877697
+ or id = 1425366663452196865
+ or id = 1418458374477549569
+ or id = 1420222768149966850
+ or id = 1426354978959691778)
)
union
(
@@ -435,17 +439,16 @@
sys_information si
on
si.departmentid = dept.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
WHERE
1=1
and si.stats != 4
AND dept.is_deleted = 0
- and dept.id !=1420222961377357825
- and dept.parent_id!=1420222961377357825
- and dept.parent_id!=1425365577303621633
- and dept.id != 1425365577303621633
- and dept.id != 1432625856013971457
- <if test="param1!=null and param1!='' and param1!='1372091709474910209'">
- and si.jurisdiction = #{param1}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
)
</select>
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 a8bf60c..96ae4de 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -251,6 +251,12 @@
<if test="user.deptId!=null and user.deptId!=''">
and bu.dept_id =#{user.deptId}
</if>
+ <if test="user.startTime!=null and user.startTime!=''">
+ and bu.paper_time >= #{user.startTime}
+ </if>
+ <if test="user.endTime!=null and user.endTime!=''">
+ and bu.paper_time <= #{user.endTime}
+ </if>
<if test="user.useName==null or user.useName==''">
order by bu.id
</if>
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index 2205592..47a0c67 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -94,4 +94,14 @@
* 年龄
*/
private Integer age;
+
+ /**
+ * 开始时间
+ */
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ private String endTime;
}
--
Gitblit v1.9.3