From ef56f943f7c056c2debe8980c8d346d00d2b163e Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期二, 12 九月 2023 17:22:24 +0800
Subject: [PATCH] 违章
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java | 9 +-
/dev/null | 15 ---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/WorkRegistrationQuery.java | 17 ++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java | 53 +++++++++++++
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/WorkRegistrationService.java | 3
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java | 25 +++---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationMapper.java | 4
exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml | 7 +
exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java | 8 +
exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java | 21 ++--
exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationMapper.java | 21 +++++
exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml | 40 ++++++++++
12 files changed, 176 insertions(+), 47 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java
index 6cc44dc..47f4115 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java
@@ -34,13 +34,12 @@
/**
* 分页查询所有数据
*
- * @param page 分页对象
- * @param violationRegistration 查询实体
+ * @param query 查询实体
* @return 所有数据
*/
- @GetMapping
- public TableDataInfo selectAll(Page<ViolationRegistration> page, ViolationRegistration violationRegistration) {
- return getDataTable(this.violationRegistrationService.page(page, new QueryWrapper<>(violationRegistration)));
+ @GetMapping("page/list")
+ public TableDataInfo listByPage(ViolationRegistrationQuery query) {
+ return getDataTable(this.violationRegistrationService.listByPage(page, new QueryWrapper<>(violationRegistration)));
}
/**
@@ -50,7 +49,7 @@
* @return 单条数据
*/
@GetMapping("get/{id}")
- public AjaxResult selectOne(@PathVariable Serializable id) {
+ public AjaxResult selectOne(@PathVariable Long id) {
return success(this.violationRegistrationService.getById(id));
}
@@ -60,7 +59,7 @@
* @param violationRegistration 实体对象
* @return 新增结果
*/
- @PostMapping
+ @PostMapping()
public AjaxResult insert(@RequestBody ViolationRegistration violationRegistration) {
return success(this.violationRegistrationService.save(violationRegistration));
}
@@ -79,12 +78,12 @@
/**
* 删除数据
*
- * @param idList 主键结合
+ * @param workIds 主键结合
* @return 删除结果
*/
- @DeleteMapping
- public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
- return success(this.violationRegistrationService.removeByIds(idList));
+ @DeleteMapping("/del/batch/{workIds}")
+ public AjaxResult delete(@PathVariable("workIds") List<Long> workIds) {
+ return success(this.violationRegistrationService.removeByIds(workIds));
}
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java
index c993f3f..f03aac4 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java
@@ -7,6 +7,7 @@
import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
import com.gkhy.exam.noncoalmine.model.addForm.WorkRegistrationAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.WorkRegistrationModForm;
+import com.gkhy.exam.noncoalmine.model.query.WorkRegistrationQuery;
import com.gkhy.exam.noncoalmine.service.WorkRegistrationService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,13 +37,13 @@
/**
* 分页查询所有数据
*
- * @param workRegistration 查询实体
+ * @param query 查询实体
* @return 所有数据
*/
- @GetMapping()
- public TableDataInfo listByPage( WorkRegistration workRegistration) {
+ @GetMapping("/list/page")
+ public TableDataInfo listByPage(WorkRegistrationQuery query) {
startPage();
- return getDataTable(this.workRegistrationService.listByPage(workRegistration));
+ return getDataTable(this.workRegistrationService.listByPage(query));
}
/**
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java
index dcfb011..cc9c6cb 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java
@@ -2,7 +2,9 @@
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -42,12 +44,14 @@
private String remark;
//删除标识（0未删除，1删除）
private Byte delFlag;
-
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
-
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
+ @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationDao.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationMapper.java
similarity index 65%
rename from exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationDao.java
rename to exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationMapper.java
index bd77cd6..aaf9060 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationDao.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/ViolationRegistrationMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.noncoalmine.entity.ViolationRegistration;
+import org.apache.ibatis.annotations.Mapper;
/**
* (ViolationRegistration)表数据库访问层
@@ -9,7 +10,8 @@
* @author makejava
* @since 2023-09-11 16:59:05
*/
-public interface ViolationRegistrationDao extends BaseMapper<ViolationRegistration> {
+@Mapper
+public interface ViolationRegistrationMapper extends BaseMapper<ViolationRegistration> {
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationDao.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationDao.java
deleted file mode 100644
index 440933d..0000000
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gkhy.exam.noncoalmine.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
-
-/**
- * (WorkRegistration)表数据库访问层
- *
- * @author makejava
- * @since 2023-09-11 16:59:58
- */
-public interface WorkRegistrationDao extends BaseMapper<WorkRegistration> {
-
-}
-
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationMapper.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationMapper.java
new file mode 100644
index 0000000..11b04d5
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/mapper/WorkRegistrationMapper.java
@@ -0,0 +1,21 @@
+package com.gkhy.exam.noncoalmine.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
+import com.gkhy.exam.noncoalmine.model.query.WorkRegistrationQuery;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * (WorkRegistration)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-09-11 16:59:58
+ */
+@Mapper
+public interface WorkRegistrationMapper extends BaseMapper<WorkRegistration> {
+
+ List<WorkRegistration> listByPage(WorkRegistrationQuery query);
+}
+
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/WorkRegistrationQuery.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/WorkRegistrationQuery.java
new file mode 100644
index 0000000..0bd6d96
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/WorkRegistrationQuery.java
@@ -0,0 +1,17 @@
+package com.gkhy.exam.noncoalmine.model.query;
+
+import lombok.Data;
+
+/**
+ * @email 1603559716@qq.com
+ * @author: zf
+ * @date: 2023/9/12
+ * @time: 16:48
+ */
+@Data
+public class WorkRegistrationQuery {
+ private String dept;
+ private String name;
+ private String idCard;
+ private Long operateTypeId;
+}
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java
new file mode 100644
index 0000000..b904495
--- /dev/null
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java
@@ -0,0 +1,53 @@
+package com.gkhy.exam.noncoalmine.model.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (WorkRegistration)表实体类
+ *
+ * @author makejava
+ * @since 2023-09-11 16:59:58
+ */
+@Data
+public class WorkRegistrationVO {
+ //主键
+ private Long workId;
+ //姓名
+ private String name;
+ //身份证
+ private String idCard;
+ //电子证号
+ private String electNum;
+ //IC卡编号
+ private String icNum;
+ //作业时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date violationTime;
+ //所属单位
+ private String dept;
+ //操作类型id
+ private Long operateTypeId;
+ //是否为煤矿：0为非，1是
+ private Byte isCm;
+ //描述
+ private String remark;
+
+ private String createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ private String qualificationType;
+
+ private String jobCategory;
+
+ private String operationItems;
+}
+
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/WorkRegistrationService.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/WorkRegistrationService.java
index ba046ea..8477d3d 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/WorkRegistrationService.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/WorkRegistrationService.java
@@ -4,6 +4,7 @@
import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
import com.gkhy.exam.noncoalmine.model.addForm.WorkRegistrationAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.WorkRegistrationModForm;
+import com.gkhy.exam.noncoalmine.model.query.WorkRegistrationQuery;
import java.util.List;
@@ -15,7 +16,7 @@
*/
public interface WorkRegistrationService extends IService<WorkRegistration> {
- List<WorkRegistration> listByPage(WorkRegistration workRegistration);
+ List<WorkRegistration> listByPage(WorkRegistrationQuery query);
int add(WorkRegistrationAddForm addForm);
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
index d10b6fe..3df6821 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
@@ -1,16 +1,15 @@
package com.gkhy.exam.noncoalmine.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.exam.noncoalmine.mapper.WorkRegistrationDao;
import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
+import com.gkhy.exam.noncoalmine.mapper.WorkRegistrationMapper;
import com.gkhy.exam.noncoalmine.model.addForm.WorkRegistrationAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.WorkRegistrationModForm;
+import com.gkhy.exam.noncoalmine.model.query.WorkRegistrationQuery;
import com.gkhy.exam.noncoalmine.service.WorkRegistrationService;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.Date;
import java.util.List;
/**
@@ -20,11 +19,17 @@
* @since 2023-09-11 16:59:58
*/
@Service("workRegistrationService")
-public class WorkRegistrationServiceImpl extends ServiceImpl<WorkRegistrationDao, WorkRegistration> implements WorkRegistrationService {
+public class WorkRegistrationServiceImpl extends ServiceImpl<WorkRegistrationMapper, WorkRegistration> implements WorkRegistrationService {
+ @Autowired
+ private WorkRegistrationMapper workRegistrationMapper;
@Override
- public List<WorkRegistration> listByPage(WorkRegistration workRegistration) {
- return null;
+ public List<WorkRegistration> listByPage(WorkRegistrationQuery query) {
+ List<WorkRegistration> workRegistrations = workRegistrationMapper.listByPage(query);
+// workRegistrations.stream().map(workRegistration -> {
+//
+// }).collect(Collectors.toList());
+ return workRegistrations;
}
/**
@@ -37,10 +42,6 @@
WorkRegistration workRegistration = new WorkRegistration();
BeanUtils.copyProperties(addForm,workRegistration);
workRegistration.setDelFlag((byte) 0);
- workRegistration.setCreateBy(SecurityUtils.getUsername());
- workRegistration.setCreateTime(new Date());
- workRegistration.setUpdateBy(SecurityUtils.getUsername());
- workRegistration.setUpdateTime(new Date());
return baseMapper.insert(workRegistration);
}
/**
@@ -52,8 +53,6 @@
public int mod(WorkRegistrationModForm modForm) {
WorkRegistration workRegistration = new WorkRegistration();
BeanUtils.copyProperties(modForm,workRegistration);
- workRegistration.setUpdateBy(SecurityUtils.getUsername());
- workRegistration.setUpdateTime(new Date());
return baseMapper.updateById(workRegistration);
}
}
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml
new file mode 100644
index 0000000..23f40e9
--- /dev/null
+++ b/exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gkhy.exam.noncoalmine.mapper.ViolationRegistrationMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml
new file mode 100644
index 0000000..2407edd
--- /dev/null
+++ b/exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gkhy.exam.noncoalmine.mapper.WorkRegistrationMapper">
+ <select id="listByPage" resultType="com.gkhy.exam.noncoalmine.entity.WorkRegistration">
+ select
+ work_id,
+ name,
+ id_card,
+ elect_num,
+ ic_num,
+ work_time,
+ dept,
+ operate_type_id,
+ is_cm,
+ remark,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time
+ from work_registration
+ where del_flag = 0
+ <if test="query.dept != null and query.dept = ''">
+ and dept like concat('%', #{query.dept}, '%')
+ </if>
+ <if test="query.name != null and query.name = ''">
+ and name like concat('%', #{query.name}, '%')
+ </if>
+ <if test="query.idCard != null and query.idCard = ''">
+ and id_card like concat('%', #{query.idCard}, '%')
+ </if>
+ <if test="query.operateTypeId != null and query.operateTypeId != 0">
+ and (operate_type_id = #{query.operateTypeId} OR operate_type_id IN ( SELECT t.id FROM sys_operate_type t WHERE find_in_set(#{query.operateTypeId}, ancestors)))
+ </if>
+
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.2