From 4b164610f2ea0dadcfe4ec2d5fd4246be2f4d910 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 10:42:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kening/vordm/entity/AdminManager.java | 6 ++++++ .../src/main/java/com/kening/vordm/vo/UserVo.java | 4 ++++ .../kening/vordm/controller/AdminManagerController.java | 9 +++++---- .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 7 ++----- .../kening/vordm/mapper/GuestManageDisasterRefMapper.xml | 9 ++++++++- .../vordm/service/impl/DisasterInfoServiceImpl.java | 3 ++- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java index f2c70a1..acd4b0f 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java @@ -2,6 +2,8 @@ package com.kening.vordm.entity; import lombok.Data; +import java.util.Date; + /** * 返回页面管理员数据实体 * @author liyuchen @@ -20,4 +22,8 @@ public class AdminManager extends DisasterInfo{ private String occupation; private String researchField; + + private Date reviewTime; + + private Date applyTime; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java index f596c27..d86fcca 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -82,6 +82,10 @@ public class UserVo { * 职业 */ private String occupation; + /** + * 职业 + */ + private String roleId; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java index c492382..982ed30 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; import java.util.Map; @@ -32,6 +33,7 @@ public class AdminManagerController { */ @GetMapping("/pages") public R pages(Query query, @RequestParam Map params){ + return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params)); } @@ -41,10 +43,9 @@ public class AdminManagerController { */ @PostMapping("/audit") public R audit(@RequestBody List guestManageDisasterRef){ - - - - + guestManageDisasterRef.stream().forEach(guestManageDisasterRef1 -> { + guestManageDisasterRef1.setReviewTime(new Date()); + }); return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef)); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index c665bf9..458c670 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -46,8 +46,8 @@ - insert into blade_user (tenant_id, password, email, status, is_deleted) - values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0); + insert into blade_user (tenant_id, password, email, status, is_deleted, role_id) + values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0,#{userVo.roleId}); @@ -219,9 +219,6 @@ email = #{email} - - d.chief_id = #{callForHelpVo.chiefId} - diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml index 9626c4e..eef1bb7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml @@ -24,6 +24,8 @@ gmdr.manager_id, gmdr.disaster_id, gmdr.status, + gmdr.review_time, + gmdr.apply_time, bu.name as managerName, bu.research_field as researchField, bu.occupation, @@ -38,7 +40,12 @@ left join blade_user bu on gmdr.manager_id = bu.id left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type - and gmdr.status = 0 + + and gmdr.status = 0 or gmdr.status = 1 + + + and gmdr.status = #{params.status} + and bu.name like concat('%',#{params.managerName},'%') diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index e5cb3e5..7d1cb8e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -172,7 +172,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl 0); }