glj-代码提交
This commit is contained in:
glj
parent
e9d6776631
commit
3328a49cee
|
|
@ -75,4 +75,15 @@ public class CallForHelpVo extends DisasterInfo {
|
|||
|
||||
|
||||
private Date reviewTime;
|
||||
|
||||
|
||||
/**
|
||||
* 级别-地震
|
||||
*/
|
||||
private String disasterLevel;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
private Date respondedTime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,6 +130,11 @@ public class DisasterInfoVo implements Serializable {
|
|||
*/
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private Date respondedTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<List<GroupByUse>> 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<Boolean> 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<DisasterInfo> disasterInfoList) {
|
||||
disasterInfoList.stream().forEach(disasterInfo -> {
|
||||
LambdaQueryWrapper<GuestManageDisasterRef> 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));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
<where>
|
||||
<if test="callForHelpVo.respondStatus!=null">
|
||||
<if test="callForHelpVo.respondStatus == 0 or callForHelpVo.respondStatus == '0'">
|
||||
d.respond_status = 1 or d.respond_status = 0
|
||||
</if>
|
||||
<if test="callForHelpVo.respondStatus != 0 and callForHelpVo.respondStatus != '0' and callForHelpVo.respondStatus != 3 and callForHelpVo.respondStatus != '3'">
|
||||
d.respond_status = 2
|
||||
</if>
|
||||
<if test="callForHelpVo.respondStatus == 3 or callForHelpVo.respondStatus == '3'">
|
||||
d.respond_status = 2 or d.respond_status = 3
|
||||
</if>
|
||||
d.respond_status = #{callForHelpVo.respondStatus}
|
||||
</if>
|
||||
<if test="callForHelpVo.chiefId != null">
|
||||
and d.chief_id is null
|
||||
|
|
|
|||
|
|
@ -55,6 +55,9 @@
|
|||
<if test="entityData.visualFlag != null">
|
||||
and ed.visual_flag = #{entityData.visualFlag}
|
||||
</if>
|
||||
<if test="entityData.isPublish != null">
|
||||
and ed.is_publish = #{entityData.isPublish}
|
||||
</if>
|
||||
<if test="entityData.type != null and entityData.type != ''">
|
||||
and ed.type = #{entityData.type}
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@ public class PictureInfoServiceImpl extends ServiceImpl<PictureInfoMapper, Pictu
|
|||
PictureInfo pictureInfo = new PictureInfo();
|
||||
pictureInfo.setLink(bladeFile.getLink());
|
||||
pictureInfo.setDisasterId(otherData.getDisasterId());
|
||||
if (otherData.getTitle() != null) {
|
||||
if (otherData.getTitle() != null && !otherData.getTitle().equals("null")) {
|
||||
pictureInfo.setName(otherData.getTitle());
|
||||
} else {
|
||||
pictureInfo.setName(bladeFile.getName());
|
||||
pictureInfo.setName(bladeFile.getOriginalName());
|
||||
}
|
||||
pictureInfo.setSize(multipartFile.getSize());
|
||||
pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
|
||||
|
|
|
|||
Loading…
Reference in New Issue