From c6f2b7fb231ff48e39ec71bd1de0dfacc75fa59d Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 27 七月 2022 17:40:08 +0800
Subject: [PATCH] 工伤申报
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoDetailDO.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java | 26 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java | 24 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java | 2
/dev/null | 117 ----------------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyEmergencyWorkApproveServiceImpl.java | 117 ++++++++++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyEmergencyWorkApproveServiceImpl.java | 48 ++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java | 25 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java | 27 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java | 2
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml | 10
16 files changed, 267 insertions(+), 143 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/WorkApproveController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
similarity index 66%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/WorkApproveController.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
index 08b5a30..00db525 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/WorkApproveController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
@@ -4,11 +4,11 @@
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.emergency.model.dto.req.WorkApproveReqDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApproveDetailRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApprovePageRespDTO;
-import com.gkhy.safePlatform.emergency.query.WorkApproveQuery;
-import com.gkhy.safePlatform.emergency.service.WorkApproveService;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApproveDetailRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApprovePageRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyWorkApproveQuery;
+import com.gkhy.safePlatform.emergency.service.EmergencyWorkApproveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
@@ -17,16 +17,16 @@
@RestController
@RequestMapping("/WorkApprove")
-public class WorkApproveController {
+public class EmergencyWorkApproveController {
@Autowired
- private WorkApproveService workApproveService;
+ private EmergencyWorkApproveService workApproveService;
/**
* 应急预案列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
- private ResultVO<List<WorkApprovePageRespDTO>> list (@RequestBody PageQuery<WorkApproveQuery> pageQuery){
+ private ResultVO<List<EmergencyWorkApprovePageRespDTO>> list (@RequestBody PageQuery<EmergencyWorkApproveQuery> pageQuery){
PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
return workApproveService.selectWorkApproveList(pageQuery);
}
@@ -35,16 +35,16 @@
* 应急预案新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addWorkApprove(Authentication authentication, @RequestBody WorkApproveReqDTO WorkApproveReqDTO) {
+ public ResultVO addWorkApprove(Authentication authentication, @RequestBody EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return workApproveService.addWorkApprove(currentUser.getUid(), WorkApproveReqDTO);
+ return workApproveService.addWorkApprove(currentUser.getUid(), EmergencyWorkApproveReqDTO);
}
/**
* 应急预案详情
*/
@RequestMapping(value = "//{id}",method = RequestMethod.GET)
- public ResultVO<WorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){
+ public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){
return workApproveService.getWorkApproveById(id);
}
@@ -52,9 +52,9 @@
* 应急预案修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateWorkApprove(Authentication authentication, @RequestBody WorkApproveReqDTO WorkApproveReqDTO) {
+ public ResultVO updateWorkApprove(Authentication authentication, @RequestBody EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return workApproveService.updateWorkApprove(currentUser.getUid(), WorkApproveReqDTO);
+ return workApproveService.updateWorkApprove(currentUser.getUid(), EmergencyWorkApproveReqDTO);
}
/**
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
similarity index 98%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfo.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
index 70a09e0..a89b2d9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
@@ -7,7 +7,7 @@
import java.util.Date;
@TableName("work_approve")
-public class WorkApproveInfo {
+public class EmergencyWorkApproveInfo {
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoDetailDO.java
similarity index 98%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoDetailDO.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoDetailDO.java
index 3ffbe35..92e3cbf 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoDetailDO.java
@@ -7,7 +7,7 @@
import java.util.Date;
@TableName("work_approve")
-public class WorkApproveInfoDetailDO {
+public class EmergencyWorkApproveInfoDetailDO {
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
similarity index 98%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoPageDO.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
index 79d1184..86b06d9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
@@ -7,7 +7,7 @@
import java.util.Date;
@TableName("work_approve")
-public class WorkApproveInfoPageDO {
+public class EmergencyWorkApproveInfoPageDO {
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/WorkApproveReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
similarity index 98%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/WorkApproveReqDTO.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
index b99a25c..6428061 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/WorkApproveReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
@@ -1,6 +1,6 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
-public class WorkApproveReqDTO {
+public class EmergencyWorkApproveReqDTO {
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
similarity index 97%
copy from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java
copy to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
index 8b944c6..5da969f 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
@@ -1,6 +1,6 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
-public class WorkApprovePageRespDTO {
+public class EmergencyWorkApproveDetailRespDTO {
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
similarity index 98%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
index 8b944c6..9022bbb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -1,6 +1,6 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
-public class WorkApprovePageRespDTO {
+public class EmergencyWorkApprovePageRespDTO {
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApproveDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApproveDetailRespDTO.java
deleted file mode 100644
index 790e565..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApproveDetailRespDTO.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.gkhy.safePlatform.emergency.model.dto.resp;
-
-public class WorkApproveDetailRespDTO {
-
- private Long id;
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批人ID/外键
- private Long approvePersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
- //审批意见
- private Boolean approveResult;
- //审批意见
- private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
- private Integer relateType;
- //关联的审批对象表ID
- private Long relateId;
- //关联业务说明
- private String relateDesc;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
- public Long getApprovePersonId() {
- return approvePersonId;
- }
-
- public void setApprovePersonId(Long approvePersonId) {
- this.approvePersonId = approvePersonId;
- }
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
- public Boolean getApproveResult() {
- return approveResult;
- }
-
- public void setApproveResult(Boolean approveResult) {
- this.approveResult = approveResult;
- }
-
- public String getApproveMemo() {
- return approveMemo;
- }
-
- public void setApproveMemo(String approveMemo) {
- this.approveMemo = approveMemo;
- }
-
- public Integer getRelateType() {
- return relateType;
- }
-
- public void setRelateType(Integer relateType) {
- this.relateType = relateType;
- }
-
- public Long getRelateId() {
- return relateId;
- }
-
- public void setRelateId(Long relateId) {
- this.relateId = relateId;
- }
-
- public String getRelateDesc() {
- return relateDesc;
- }
-
- public void setRelateDesc(String relateDesc) {
- this.relateDesc = relateDesc;
- }
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/WorkApproveQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
similarity index 90%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/WorkApproveQuery.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
index 4ca1c85..4f53fcf 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/WorkApproveQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
@@ -4,7 +4,7 @@
import java.util.Date;
-public class WorkApproveQuery {
+public class EmergencyWorkApproveQuery {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtCreate;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/WorkApproveDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
similarity index 89%
rename from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/WorkApproveDBQuery.java
rename to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
index e679622..53a57cd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/WorkApproveDBQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
@@ -4,7 +4,7 @@
import java.util.Date;
-public class WorkApproveDBQuery {
+public class EmergencyWorkApproveDBQuery {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtCreate;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java
new file mode 100644
index 0000000..3c80c25
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java
@@ -0,0 +1,27 @@
+package com.gkhy.safePlatform.emergency.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EmergencyWorkApproveInfoRepository extends BaseMapper<EmergencyWorkApproveInfo> {
+
+ List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, @Param("query") EmergencyWorkApproveDBQuery emergencyWorkApproveDBQuery);
+
+ void addWorkApprove(EmergencyWorkApproveInfo emergencyWorkApproveInfo);
+
+ EmergencyWorkApproveInfoDetailDO selectWorkApproveById(@Param("id") Long id);
+
+ void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo);
+
+ void deleteWorkApproveById(@Param("id") Long id);
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/WorkApproveInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/WorkApproveInfoRepository.java
deleted file mode 100644
index bc60094..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/WorkApproveInfoRepository.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gkhy.safePlatform.emergency.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfo;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfoPageDO;
-import com.gkhy.safePlatform.emergency.query.db.WorkApproveDBQuery;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface WorkApproveInfoRepository extends BaseMapper<WorkApproveInfo> {
-
- List<WorkApproveInfoPageDO> selectWorkApproveList(Page<WorkApproveInfoPageDO> page, @Param("query") WorkApproveDBQuery workApproveDBQuery);
-
- void addWorkApprove(WorkApproveInfo workApproveInfo);
-
- WorkApproveInfoDetailDO selectWorkApproveById(@Param("id") Long id);
-
- void updateWorkApprove(WorkApproveInfo WorkApproveInfo);
-
- void deleteWorkApproveById(@Param("id") Long id);
-
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java
new file mode 100644
index 0000000..1544ae7
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java
@@ -0,0 +1,25 @@
+package com.gkhy.safePlatform.emergency.service;
+
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApproveDetailRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApprovePageRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyWorkApproveQuery;
+
+import java.util.List;
+
+public interface EmergencyWorkApproveService {
+
+ SearchResultVO<List<EmergencyWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<EmergencyWorkApproveQuery> query);
+
+ ResultVO addWorkApprove(Long valueOf, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO);
+
+ ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id);
+
+ ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO);
+
+ ResultVO batchDeleteWorkApprove(String ids);
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/WorkApproveService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/WorkApproveService.java
deleted file mode 100644
index f5e5033..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/WorkApproveService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gkhy.safePlatform.emergency.service;
-
-import com.gkhy.safePlatform.commons.query.PageQuery;
-import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.commons.vo.SearchResultVO;
-import com.gkhy.safePlatform.emergency.model.dto.req.WorkApproveReqDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApproveDetailRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApprovePageRespDTO;
-import com.gkhy.safePlatform.emergency.query.WorkApproveQuery;
-
-import java.util.List;
-
-public interface WorkApproveService {
-
- SearchResultVO<List<WorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<WorkApproveQuery> query);
-
- ResultVO addWorkApprove(Long valueOf, WorkApproveReqDTO WorkApproveReqDTO);
-
- ResultVO<WorkApproveDetailRespDTO> getWorkApproveById(Long id);
-
- ResultVO updateWorkApprove(Long uid, WorkApproveReqDTO WorkApproveReqDTO);
-
- ResultVO batchDeleteWorkApprove(String ids);
-
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
new file mode 100644
index 0000000..680e29c
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
@@ -0,0 +1,24 @@
+package com.gkhy.safePlatform.emergency.service.baseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
+
+import java.util.List;
+
+
+public interface EmergencyWorkApproveInfoService extends IService<EmergencyWorkApproveInfo> {
+
+ List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, EmergencyWorkApproveDBQuery emergencyWorkApproveDBQuery);
+
+ void addWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo);
+
+ EmergencyWorkApproveInfoDetailDO selectWorkApproveById(Long id);
+
+ void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo);
+
+ void deleteWorkApproveById(Long teamId);
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/WorkApproveInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/WorkApproveInfoService.java
deleted file mode 100644
index 47abbbe..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/WorkApproveInfoService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gkhy.safePlatform.emergency.service.baseService;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfo;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfoPageDO;
-import com.gkhy.safePlatform.emergency.query.db.WorkApproveDBQuery;
-
-import java.util.List;
-
-
-public interface WorkApproveInfoService extends IService<WorkApproveInfo> {
-
- List<WorkApproveInfoPageDO> selectWorkApproveList(Page<WorkApproveInfoPageDO> page, WorkApproveDBQuery workApproveDBQuery);
-
- void addWorkApprove(WorkApproveInfo WorkApproveInfo);
-
- WorkApproveInfoDetailDO selectWorkApproveById(Long id);
-
- void updateWorkApprove(WorkApproveInfo WorkApproveInfo);
-
- void deleteWorkApproveById(Long teamId);
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyEmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyEmergencyWorkApproveServiceImpl.java
new file mode 100644
index 0000000..571f55b
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyEmergencyWorkApproveServiceImpl.java
@@ -0,0 +1,48 @@
+package com.gkhy.safePlatform.emergency.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
+import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
+import com.gkhy.safePlatform.emergency.repository.EmergencyWorkApproveInfoRepository;
+import com.gkhy.safePlatform.emergency.service.baseService.EmergencyWorkApproveInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("workApproveInfoService")
+public class EmergencyEmergencyWorkApproveServiceImpl extends ServiceImpl<EmergencyWorkApproveInfoRepository, EmergencyWorkApproveInfo> implements EmergencyWorkApproveInfoService {
+
+ @Autowired
+ private EmergencyWorkApproveInfoRepository EmergencyWorkApproveInfoRepository;
+
+ @Override
+ public List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, EmergencyWorkApproveDBQuery EmergencyWorkApproveDBQuery) {
+ return EmergencyWorkApproveInfoRepository.selectWorkApproveList(page, EmergencyWorkApproveDBQuery);
+ }
+
+ @Override
+ public void addWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) {
+ EmergencyWorkApproveInfoRepository.addWorkApprove(EmergencyWorkApproveInfo);
+ }
+
+ @Override
+ public EmergencyWorkApproveInfoDetailDO selectWorkApproveById(Long id) {
+ return EmergencyWorkApproveInfoRepository.selectWorkApproveById(id);
+ }
+
+ @Override
+ public void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) {
+ EmergencyWorkApproveInfoRepository.updateWorkApprove(EmergencyWorkApproveInfo);
+ }
+
+ @Override
+ public void deleteWorkApproveById(Long teamId) {
+ EmergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId);
+ }
+
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/WorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/WorkApproveServiceImpl.java
deleted file mode 100644
index 2c0e9b7..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/WorkApproveServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gkhy.safePlatform.emergency.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfo;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.emergency.entity.WorkApproveInfoPageDO;
-import com.gkhy.safePlatform.emergency.query.db.WorkApproveDBQuery;
-import com.gkhy.safePlatform.emergency.repository.WorkApproveInfoRepository;
-import com.gkhy.safePlatform.emergency.service.baseService.WorkApproveInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("workApproveInfoService")
-public class WorkApproveServiceImpl extends ServiceImpl<WorkApproveInfoRepository, WorkApproveInfo> implements WorkApproveInfoService {
-
- @Autowired
- private WorkApproveInfoRepository WorkApproveInfoRepository;
-
- @Override
- public List<WorkApproveInfoPageDO> selectWorkApproveList(Page<WorkApproveInfoPageDO> page, WorkApproveDBQuery WorkApproveDBQuery) {
- return WorkApproveInfoRepository.selectWorkApproveList(page,WorkApproveDBQuery);
- }
-
- @Override
- public void addWorkApprove(WorkApproveInfo WorkApproveInfo) {
- WorkApproveInfoRepository.addWorkApprove(WorkApproveInfo);
- }
-
- @Override
- public WorkApproveInfoDetailDO selectWorkApproveById(Long id) {
- return WorkApproveInfoRepository.selectWorkApproveById(id);
- }
-
- @Override
- public void updateWorkApprove(WorkApproveInfo WorkApproveInfo) {
- WorkApproveInfoRepository.updateWorkApprove(WorkApproveInfo);
- }
-
- @Override
- public void deleteWorkApproveById(Long teamId) {
- WorkApproveInfoRepository.deleteWorkApproveById(teamId);
- }
-
-
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyEmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyEmergencyWorkApproveServiceImpl.java
new file mode 100644
index 0000000..fcedc40
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyEmergencyWorkApproveServiceImpl.java
@@ -0,0 +1,117 @@
+package com.gkhy.safePlatform.emergency.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.utils.StringUtils;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
+import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
+import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApproveDetailRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApprovePageRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyWorkApproveQuery;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
+import com.gkhy.safePlatform.emergency.service.EmergencyWorkApproveService;
+import com.gkhy.safePlatform.emergency.service.baseService.EmergencyWorkApproveInfoService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("workApproveService")
+public class EmergencyEmergencyWorkApproveServiceImpl implements EmergencyWorkApproveService {
+
+ @Autowired
+ private EmergencyWorkApproveInfoService workApproveInfoService;
+
+ @Override
+ public SearchResultVO<List<EmergencyWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<EmergencyWorkApproveQuery> query) {
+ Long pageIndex = query.getPageIndex();
+ Long pageSize = query.getPageSize();
+ Page<EmergencyWorkApproveInfoPageDO> page = new Page<>(pageIndex, pageSize);
+
+ EmergencyWorkApproveDBQuery EmergencyWorkApproveDBQuery = new EmergencyWorkApproveDBQuery();
+ if (query.getSearchParams() != null) {
+ BeanUtils.copyProperties(query.getSearchParams(), EmergencyWorkApproveDBQuery);
+ }
+
+ List<EmergencyWorkApproveInfoPageDO> emergencyWorkApproveInfoPageDOList = workApproveInfoService.selectWorkApproveList(page, EmergencyWorkApproveDBQuery);
+ List<EmergencyWorkApprovePageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyWorkApproveInfoPageDOList, EmergencyWorkApprovePageRespDTO.class);
+
+ return new SearchResultVO<>(
+ true,
+ pageIndex,
+ pageSize,
+ page.getTotal(),
+ respList,
+ ResultCodes.OK
+ );
+ }
+
+ @Override
+ public ResultVO addWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
+
+ Date nowDate = new Date();
+ //1.新增应急队伍
+ EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
+ BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo);
+ EmergencyWorkApproveInfo.setDelFlag(false);
+ EmergencyWorkApproveInfo.setCreateUid(uid);
+ EmergencyWorkApproveInfo.setGmtCreate(nowDate);
+ EmergencyWorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus());
+ workApproveInfoService.addWorkApprove(EmergencyWorkApproveInfo);
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id) {
+
+ EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id);
+ EmergencyWorkApproveDetailRespDTO emergencyWorkApproveDetailRespDTO = new EmergencyWorkApproveDetailRespDTO();
+ BeanUtils.copyProperties(EmergencyWorkApproveInfoDetailDO, emergencyWorkApproveDetailRespDTO);
+
+ return new ResultVO<>(ResultCodes.OK, emergencyWorkApproveDetailRespDTO);
+ }
+
+ @Override
+ public ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
+ Date nowDate = new Date();
+ //查询是否存在
+ EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(EmergencyWorkApproveReqDTO.getId());
+ if (EmergencyWorkApproveInfoDetailDO == null) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
+ } else {
+ EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
+ BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo);
+ EmergencyWorkApproveInfo.setUpdateUid(uid);
+ EmergencyWorkApproveInfo.setGmtModitify(nowDate);
+ workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo);
+ return new ResultVO(ResultCodes.OK);
+ }
+ }
+
+ @Override
+ public ResultVO batchDeleteWorkApprove(String ids) {
+ if (!StringUtils.isBlank(ids)) {
+ String[] idArr = ids.split(",");
+ for (String id : idArr) {
+ deleteWorkApprove(Long.valueOf(id));
+ }
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+
+
+ private void deleteWorkApprove(Long id) {
+ workApproveInfoService.deleteWorkApproveById(id);
+ }
+
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/WorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/WorkApproveServiceImpl.java
deleted file mode 100644
index 24fe59b..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/WorkApproveServiceImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.gkhy.safePlatform.emergency.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.commons.enums.ResultCodes;
-import com.gkhy.safePlatform.commons.query.PageQuery;
-import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
-import com.gkhy.safePlatform.commons.utils.StringUtils;
-import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.commons.vo.SearchResultVO;
-import com.gkhy.safePlatform.emergency.entity.*;
-import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
-import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
-import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
-import com.gkhy.safePlatform.emergency.model.dto.req.WorkApproveReqDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApproveDetailRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApprovePageRespDTO;
-import com.gkhy.safePlatform.emergency.query.WorkApproveQuery;
-import com.gkhy.safePlatform.emergency.query.db.WorkApproveDBQuery;
-import com.gkhy.safePlatform.emergency.service.WorkApproveService;
-import com.gkhy.safePlatform.emergency.service.baseService.WorkApproveInfoService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service("workApproveService")
-public class WorkApproveServiceImpl implements WorkApproveService {
-
- @Autowired
- private WorkApproveInfoService workApproveInfoService;
-
- @Override
- public SearchResultVO<List<WorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<WorkApproveQuery> query) {
- Long pageIndex = query.getPageIndex();
- Long pageSize = query.getPageSize();
- Page<WorkApproveInfoPageDO> page = new Page<>(pageIndex, pageSize);
-
- WorkApproveDBQuery WorkApproveDBQuery = new WorkApproveDBQuery();
- if (query.getSearchParams() != null) {
- BeanUtils.copyProperties(query.getSearchParams(), WorkApproveDBQuery);
- }
-
- List<WorkApproveInfoPageDO> WorkApproveInfoPageDOList = workApproveInfoService.selectWorkApproveList(page, WorkApproveDBQuery);
- List<WorkApprovePageRespDTO> respList = BeanCopyUtils.copyBeanList(WorkApproveInfoPageDOList, WorkApprovePageRespDTO.class);
-
- return new SearchResultVO<>(
- true,
- pageIndex,
- pageSize,
- page.getTotal(),
- respList,
- ResultCodes.OK
- );
- }
-
- @Override
- public ResultVO addWorkApprove(Long uid, WorkApproveReqDTO WorkApproveReqDTO) {
-
- Date nowDate = new Date();
- //1.新增应急队伍
- WorkApproveInfo WorkApproveInfo = new WorkApproveInfo();
- BeanUtils.copyProperties(WorkApproveReqDTO, WorkApproveInfo);
- WorkApproveInfo.setDelFlag(false);
- WorkApproveInfo.setCreateUid(uid);
- WorkApproveInfo.setGmtCreate(nowDate);
- WorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus());
- workApproveInfoService.addWorkApprove(WorkApproveInfo);
- return new ResultVO(ResultCodes.OK);
- }
-
- @Override
- public ResultVO<WorkApproveDetailRespDTO> getWorkApproveById(Long id) {
-
- WorkApproveInfoDetailDO WorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id);
- WorkApproveDetailRespDTO workApproveDetailRespDTO = new WorkApproveDetailRespDTO();
- BeanUtils.copyProperties(WorkApproveInfoDetailDO, workApproveDetailRespDTO);
-
- return new ResultVO<>(ResultCodes.OK, workApproveDetailRespDTO);
- }
-
- @Override
- public ResultVO updateWorkApprove(Long uid, WorkApproveReqDTO WorkApproveReqDTO) {
- Date nowDate = new Date();
- //查询是否存在
- WorkApproveInfoDetailDO WorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(WorkApproveReqDTO.getId());
- if (WorkApproveInfoDetailDO == null) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
- } else {
- WorkApproveInfo WorkApproveInfo = new WorkApproveInfo();
- BeanUtils.copyProperties(WorkApproveReqDTO, WorkApproveInfo);
- WorkApproveInfo.setUpdateUid(uid);
- WorkApproveInfo.setGmtModitify(nowDate);
- workApproveInfoService.updateWorkApprove(WorkApproveInfo);
- return new ResultVO(ResultCodes.OK);
- }
- }
-
- @Override
- public ResultVO batchDeleteWorkApprove(String ids) {
- if (!StringUtils.isBlank(ids)) {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteWorkApprove(Long.valueOf(id));
- }
- }
- return new ResultVO(ResultCodes.OK);
- }
-
-
- private void deleteWorkApprove(Long id) {
- workApproveInfoService.deleteWorkApproveById(id);
- }
-
-
-}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/WorkApproveInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
similarity index 92%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/WorkApproveInfoMapper.xml
rename to emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
index 11f7398..e2c5cb8 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/WorkApproveInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gkhy.safePlatform.emergency.repository.WorkApproveInfoRepository">
+<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyWorkApproveInfoRepository">
- <resultMap type="com.gkhy.safePlatform.emergency.entity.WorkApproveInfoPageDO" id="WorkApproveInfoPageDOResult">
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO" id="WorkApproveInfoPageDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="team_level" property="teamLevel"/>
<result column="team_name" property="teamName"/>
@@ -18,7 +18,7 @@
<if test="query.teamLevel != null and query.teamLevel != ''">and `team_level` = #{query.teamLevel}</if>
</select>
- <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.WorkApproveInfo"
+ <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo"
keyProperty="id" useGeneratedKeys="true">
insert into emergency_team
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -53,7 +53,7 @@
</trim>
</insert>
- <resultMap type="com.gkhy.safePlatform.emergency.entity.WorkApproveInfoDetailDO"
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO"
id="WorkApproveInfoDetailDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="principal_uid" property="principalUid"/>
@@ -70,7 +70,7 @@
from emergency_team where del_flag = 0 and id = #{id}
</select>
- <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.WorkApproveInfo">
+ <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo">
update emergency_team
<trim prefix="SET" suffixOverrides=",">
<if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
--
Gitblit v1.9.2