This commit is contained in:
parent
b7510eb960
commit
623ffe1a49
|
@ -50,6 +50,7 @@ public class DisasterInfoController {
|
||||||
private final DownloadRecordService downloadRecordService;
|
private final DownloadRecordService downloadRecordService;
|
||||||
|
|
||||||
private final DisasterInfoVoService disasterInfoVoService;
|
private final DisasterInfoVoService disasterInfoVoService;
|
||||||
|
|
||||||
@ApiOperationSupport(order = 1)
|
@ApiOperationSupport(order = 1)
|
||||||
@ApiOperation(value = "分页", notes = "传入Tool")
|
@ApiOperation(value = "分页", notes = "传入Tool")
|
||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
|
@ -61,8 +62,10 @@ public class DisasterInfoController {
|
||||||
IPage<CallForHelpVo> pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo);
|
IPage<CallForHelpVo> pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo);
|
||||||
return R.data(pages);
|
return R.data(pages);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 首页数据,轮播和定位相关
|
* 首页数据,轮播和定位相关
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/indexData")
|
@GetMapping("/indexData")
|
||||||
|
@ -79,6 +82,7 @@ public class DisasterInfoController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害查询条件,时间,类型,灾害联动
|
* 灾害查询条件,时间,类型,灾害联动
|
||||||
|
*
|
||||||
* @param disasterInfo
|
* @param disasterInfo
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
@ -129,8 +133,6 @@ public class DisasterInfoController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害信息统计 国家/灾害类型 左边栏
|
* 灾害信息统计 国家/灾害类型 左边栏
|
||||||
*
|
*
|
||||||
|
@ -293,6 +295,7 @@ public class DisasterInfoController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取用户所以得机构
|
* 获取用户所以得机构
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/getUserTenant")
|
@GetMapping("/getUserTenant")
|
||||||
|
@ -302,7 +305,6 @@ public class DisasterInfoController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* call for help
|
* call for help
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
@PostMapping("Call-for-help")
|
@PostMapping("Call-for-help")
|
||||||
public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) {
|
public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) {
|
||||||
|
@ -316,16 +318,15 @@ public class DisasterInfoController {
|
||||||
GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef();
|
GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef();
|
||||||
GuestManageDisasterRef.setId(IdWorker.getId());
|
GuestManageDisasterRef.setId(IdWorker.getId());
|
||||||
GuestManageDisasterRef.setSponsorId(guestInfo.getId());
|
GuestManageDisasterRef.setSponsorId(guestInfo.getId());
|
||||||
String vordm_id="test";
|
|
||||||
GuestManageDisasterRef.setDisasterId(disasterInfo.getId());
|
GuestManageDisasterRef.setDisasterId(disasterInfo.getId());
|
||||||
Boolean flag1 = guestInfoService.save(guestInfo);
|
Boolean flag1 = guestInfoService.save(guestInfo);
|
||||||
Boolean flag2 = guestManageDisasterRefService.save(GuestManageDisasterRef);
|
Boolean flag2 = guestManageDisasterRefService.save(GuestManageDisasterRef);
|
||||||
Boolean flag3 = disasterInfoService.save(disasterInfo);
|
Boolean flag3 = disasterInfoService.save(disasterInfo);
|
||||||
Boolean callForHelp= flag1&flag2&flag3;
|
Boolean callForHelp = flag1 && flag2 && flag3;
|
||||||
// callForHelpVo.setId(IdWorker.getId());
|
|
||||||
// Boolean insertFlag=accountInfoService.save(accountInfo);
|
|
||||||
return R.data(callForHelp);
|
return R.data(callForHelp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("review")
|
@PostMapping("review")
|
||||||
public R<Boolean> review(String id) {
|
public R<Boolean> review(String id) {
|
||||||
DisasterInfo disasterInfo = new DisasterInfo();
|
DisasterInfo disasterInfo = new DisasterInfo();
|
||||||
|
|
|
@ -44,14 +44,13 @@
|
||||||
gi.username AS sponsorName,
|
gi.username AS sponsorName,
|
||||||
gi.organization AS sponsorOrganization,
|
gi.organization AS sponsorOrganization,
|
||||||
bu.name AS managerName,
|
bu.name AS managerName,
|
||||||
bt.tenant_name AS managerOrganization,
|
bu.organization AS managerOrganization,
|
||||||
bdb.dict_value AS dictValue
|
bdb.dict_value AS dictValue
|
||||||
from disaster_info di
|
from disaster_info di
|
||||||
left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
|
left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
|
||||||
left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type
|
left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type
|
||||||
left join guest_info gi on gi.id = gmdr.sponsor_id
|
left join guest_info gi on gi.id = gmdr.sponsor_id
|
||||||
left join blade_user bu on bu.id = gmdr.manager_id
|
left join blade_user bu on bu.id = gmdr.manager_id
|
||||||
left join blade_tenant bt on bt.id = bu.organization
|
|
||||||
<where>
|
<where>
|
||||||
<if test="id != null and id != ''">
|
<if test="id != null and id != ''">
|
||||||
di.id = #{id}
|
di.id = #{id}
|
||||||
|
|
Loading…
Reference in New Issue