From 3328a49cee719273852c5458f5b88c136f141e9f Mon Sep 17 00:00:00 2001 From: glj Date: Thu, 4 May 2023 09:33:11 +0800 Subject: [PATCH] =?UTF-8?q?glj-=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 --- .../com/kening/vordm/vo/CallForHelpVo.java | 11 ++++++ .../com/kening/vordm/vo/DisasterInfoVo.java | 5 +++ .../controller/DisasterInfoController.java | 36 ++++++++----------- .../vordm/mapper/DisasterInfoMapper.xml | 11 ++---- .../kening/vordm/mapper/EntityDataMapper.xml | 3 ++ .../service/impl/PictureInfoServiceImpl.java | 4 +-- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java index 3af04e0..c9f3182 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -75,4 +75,15 @@ public class CallForHelpVo extends DisasterInfo { private Date reviewTime; + + + /** + * 级别-地震 + */ + private String disasterLevel; + + /** + * 完成时间 + */ + private Date respondedTime; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java index add4353..ad0716b 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java @@ -130,6 +130,11 @@ public class DisasterInfoVo implements Serializable { */ private String userName; + /** + * 结束时间 + */ + private Date respondedTime; + @TableField(exist = false) private static final long serialVersionUID = 1L; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index d9291b5..1eeed63 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -2,6 +2,7 @@ package com.kening.vordm.controller; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -122,26 +123,6 @@ public class DisasterInfoController { */ @GetMapping("/select-condition") public R> getSelectCondition(DisasterInfo disasterInfo) { -// String dateType = String.valueOf(params.get("dateTyle")); -// LocalDate date = LocalDate.now(); -// if(StringUtils.isNotBlank(dateType)){ -// switch (dateType){ -// case "1" : -// //Latest week 上一周 -// date = LocalDate.now().minusWeeks(1); -// break; -// case "2": -// //Latest month 上一个月 -// date = LocalDate.now().minusMonths(1); -// break; -// case "3": -// //Latest six month 上6个月 -// date = LocalDate.now().minusMonths(6); -// break; -// default: -// break; -// } -// } String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { disaster_time = DateUtil.format(disasterInfo.getDisasterTime(), "yyyy-MM-dd"); @@ -323,6 +304,9 @@ public class DisasterInfoController { DisasterInfo disasterInfo = new DisasterInfo(); BeanUtil.copyProperties(callForHelpVo, disasterInfo); disasterInfo.setUploadTime(new Date()); + if (callForHelpVo.getDisasterLevel() != null){ + disasterInfo.setDisasterLevel(callForHelpVo.getDisasterLevel()); + } Boolean flag3 = disasterInfoService.save(disasterInfo); @@ -339,8 +323,7 @@ public class DisasterInfoController { @PostMapping("review") public R review(@RequestBody DisasterInfo disasterInfo) { - - //审批通过 + //审批通过 响应状态，0未审批，1审批未通过。2审批通过并正在响应，3审批通过并且响应完成 if (disasterInfo.getRespondStatus() == 2) { String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType()); disasterInfo.setVordmId(numbering); @@ -374,6 +357,15 @@ public class DisasterInfoController { */ @PutMapping("/updateBatch") public R updateBatch(@RequestBody List disasterInfoList) { + disasterInfoList.stream().forEach(disasterInfo -> { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(GuestManageDisasterRef::getManagerId,disasterInfo.getId()); + GuestManageDisasterRef one = guestManageDisasterRefService.getOne(qw); + one.setStatus(1); + one.setManagerId(disasterInfo.getChiefId()); + guestManageDisasterRefService.updateById(one); + }); + return R.status(disasterInfoService.updateBatchById(disasterInfoList)); } 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 005356c..422b5a1 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 @@ -191,6 +191,7 @@ d.upload_time, d.geometry, d.respond_status, + d.responded_time, ud.review_time AS reviewTime, bdb.dict_value as dictValue From @@ -200,15 +201,7 @@ left join blade_dict_biz bdb on d.disaster_type = bdb.dict_key - - d.respond_status = 1 or d.respond_status = 0 - - - d.respond_status = 2 - - - d.respond_status = 2 or d.respond_status = 3 - + d.respond_status = #{callForHelpVo.respondStatus} and d.chief_id is null diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index dd1fbb6..73feec6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -55,6 +55,9 @@ and ed.visual_flag = #{entityData.visualFlag} + + and ed.is_publish = #{entityData.isPublish} + and ed.type = #{entityData.type} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java index bbeced8..e170f18 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java @@ -66,10 +66,10 @@ public class PictureInfoServiceImpl extends ServiceImpl