提交管理员管理灾害代码-liyuchen
This commit is contained in:
parent
78a8d14a18
commit
cfc85721db
|
@ -116,6 +116,11 @@ public class DisasterInfo implements Serializable {
|
||||||
*/
|
*/
|
||||||
private String sponsorOrganization;
|
private String sponsorOrganization;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 灾害管理者id
|
||||||
|
*/
|
||||||
|
private Long chiefId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 管理用户
|
* 管理用户
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -38,6 +38,11 @@ public class CallForHelpVo extends DisasterInfo {
|
||||||
*/
|
*/
|
||||||
private String researchField;
|
private String researchField;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 灾害管理员id-查询条件
|
||||||
|
*/
|
||||||
|
private Long chiefIdEquals;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -338,4 +338,24 @@ public class DisasterInfoController {
|
||||||
public R statistics(){
|
public R statistics(){
|
||||||
return R.data(disasterInfoService.statistics());
|
return R.data(disasterInfoService.statistics());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量更新灾害的chief管理者
|
||||||
|
* @param disasterInfoList
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/updateBatch")
|
||||||
|
public R updateBatch(@RequestBody List<DisasterInfo> disasterInfoList){
|
||||||
|
return R.status(disasterInfoService.updateBatchById(disasterInfoList));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量更新灾害的chief管理者
|
||||||
|
* @param disasterInfoList
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/removeManage")
|
||||||
|
public R removeManage(@RequestBody List<DisasterInfo> disasterInfoList){
|
||||||
|
return R.status(disasterInfoService.removeManage(disasterInfoList));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -145,22 +145,37 @@
|
||||||
d.disaster_type,
|
d.disaster_type,
|
||||||
d.disaster_time,
|
d.disaster_time,
|
||||||
d.disaster_keyword,
|
d.disaster_keyword,
|
||||||
|
d.disaster_country,
|
||||||
|
d.disaster_level,
|
||||||
d.upload_time,
|
d.upload_time,
|
||||||
d.geometry,
|
d.geometry,
|
||||||
d.respond_status
|
d.respond_status,
|
||||||
|
bdb.dict_value as dictValue
|
||||||
From
|
From
|
||||||
guest_manage_disaster_ref ud join
|
guest_manage_disaster_ref ud join
|
||||||
guest_info u on u.id = ud.sponsor_id JOIN
|
guest_info u on u.id = ud.sponsor_id JOIN
|
||||||
disaster_info d on d.id = ud.disaster_id
|
disaster_info d on d.id = ud.disaster_id
|
||||||
|
left join blade_dict_biz bdb on d.disaster_type = bdb.dict_key
|
||||||
<where>
|
<where>
|
||||||
<if test="callForHelpVo.respondStatus == 0 or callForHelpVo.respondStatus == '0'" >
|
<if test="callForHelpVo.respondStatus!=null">
|
||||||
d.respond_status = 1 or d.respond_status = 0
|
<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>
|
||||||
</if>
|
</if>
|
||||||
<if test="callForHelpVo.respondStatus != 0 and callForHelpVo.respondStatus != '0' and callForHelpVo.respondStatus != 3 and callForHelpVo.respondStatus != '3'" >
|
<if test="callForHelpVo.chiefId != null" >
|
||||||
d.respond_status = 2
|
and d.chief_id is null
|
||||||
</if>
|
</if>
|
||||||
<if test="callForHelpVo.respondStatus == 3 or callForHelpVo.respondStatus == '3'" >
|
<if test="callForHelpVo.chiefIdEquals != null" >
|
||||||
d.respond_status = 2 or d.respond_status = 3
|
and d.chief_id = #{callForHelpVo.chiefIdEquals}
|
||||||
|
</if>
|
||||||
|
<if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''" >
|
||||||
|
and bdb.dict_value like concat('%', #{callForHelpVo.disasterType},'%')
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by d.upload_time desc
|
order by d.upload_time desc
|
||||||
|
|
|
@ -61,4 +61,6 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Map<String,Object> statistics();
|
Map<String,Object> statistics();
|
||||||
|
|
||||||
|
boolean removeManage(List<DisasterInfo> disasterInfoList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.kening.vordm.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.kening.vordm.entity.DisasterData;
|
import com.kening.vordm.entity.DisasterData;
|
||||||
|
@ -168,6 +169,20 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
|
||||||
return R.status(integer > 0);
|
return R.status(integer > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 移除管理灾害权限
|
||||||
|
* @param disasterInfoList
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean removeManage(List<DisasterInfo> disasterInfoList) {
|
||||||
|
for (DisasterInfo disasterInfo : disasterInfoList) {
|
||||||
|
update(Wrappers.<DisasterInfo>lambdaUpdate()
|
||||||
|
.eq(DisasterInfo::getId, disasterInfo.getId())
|
||||||
|
.set(DisasterInfo::getChiefId, null));
|
||||||
|
}
|
||||||
|
return Boolean.TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 后台管理系统-控制台灾害各项统计
|
* 后台管理系统-控制台灾害各项统计
|
||||||
|
|
Loading…
Reference in New Issue