From db660f1179672fc46a2558f11424cca675d7841a Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 22 May 2024 17:57:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5-=E6=95=91=E6=8F=B4=E7=89=A9?= =?UTF-8?q?=E8=B5=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzEmergencyReliefGoodsController.java | 6 ++---- .../xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java | 3 +++ .../modules/xz/emergency/entity/XzEmergencyReliefGoods.java | 2 ++ .../xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml | 4 +++- .../emergency/service/IXzEmergencyReliefGoodsService.java | 4 ++-- .../service/impl/XzEmergencyReliefGoodsServiceImpl.java | 6 ++++-- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyReliefGoodsController.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyReliefGoodsController.java index 5d7353cce..ce8feec51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyReliefGoodsController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyReliefGoodsController.java @@ -74,8 +74,7 @@ public class XzEmergencyReliefGoodsController { @ApiOperation(value = "添加星纵-应急-救援物资信息", notes = "添加星纵-应急-救援物资信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate XzEmergencyReliefGoods xzEmergencyReliefGoods) { - xzEmergencyReliefGoodsService.add(xzEmergencyReliefGoods); - return Result.ok(); + return Result.success(xzEmergencyReliefGoodsService.add(xzEmergencyReliefGoods)); } /** @@ -87,8 +86,7 @@ public class XzEmergencyReliefGoodsController { @ApiOperation(value = "编辑星纵-应急-救援物资信息", notes = "编辑星纵-应急-救援物资信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody XzEmergencyReliefGoods xzEmergencyReliefGoods) { - xzEmergencyReliefGoodsService.edit(xzEmergencyReliefGoods); - return Result.ok(); + return Result.success(xzEmergencyReliefGoodsService.edit(xzEmergencyReliefGoods)); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java index 1c02903fd..fe34b1ae8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java @@ -125,6 +125,9 @@ public class XzEmergencyRecord implements Serializable { @ApiModelProperty(value = "班组名称") private java.lang.String teamName; @TableField(exist = false) + @ApiModelProperty(value = "部门名称") + private java.lang.String departmentName; + @TableField(exist = false) @ApiModelProperty(value = "应急类型名称") private String emergencyTypeName; @TableField(exist = false) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyReliefGoods.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyReliefGoods.java index 6ccc2dae9..1b65f1248 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyReliefGoods.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyReliefGoods.java @@ -68,4 +68,6 @@ public class XzEmergencyReliefGoods implements Serializable { */ @ApiModelProperty(value = "更新时间") private java.util.Date updateDate; + @ApiModelProperty(value = "详细地址") + private java.lang.String detailedAddress; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml index f2538c3a5..3e67acc05 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml @@ -4,6 +4,7 @@ t.*, ti.team_name, + di.department_name, ei.id as enterprise_id, ei.enterprise_name, wi.worker_name as alarmPersonName, @@ -16,7 +17,8 @@ from xz_emergency_record t left join xz_emergency_type et on et.id = t.emergency_type_id left join worker_info wi on wi.id = t.alarm_person_id - left join team_info ti on ti.id = wi.team_id + left join team_info ti on ti.id = wi.team_id and wi.person_type=1 + left join department_info di on di.id = wi.department_id and wi.person_type=2 left join enterprise_info ei on ei.id = wi.enterprise_id