admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

应急-救援物资bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-22 17:57:48 +08:00
parent 96e402cc94
commit db660f1179
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyReliefGoodsController.java
View File

@ -74,8 +74,7 @@ public class XzEmergencyReliefGoodsController {
@ApiOperation(value = "添加星纵-应急-救援物资信息", notes = "添加星纵-应急-救援物资信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzEmergencyReliefGoods> 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<XzEmergencyReliefGoods> edit(@RequestBody XzEmergencyReliefGoods xzEmergencyReliefGoods) {
xzEmergencyReliefGoodsService.edit(xzEmergencyReliefGoods);
return Result.ok();
return Result.success(xzEmergencyReliefGoodsService.edit(xzEmergencyReliefGoods));
}
/**

3
src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java
View File

@ -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)

2
src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyReliefGoods.java
View File

@ -68,4 +68,6 @@ public class XzEmergencyReliefGoods implements Serializable {
*/
@ApiModelProperty(value = "更新时间")
private java.util.Date updateDate;
@ApiModelProperty(value = "详细地址")
private java.lang.String detailedAddress;
}

4
src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml
View File

@ -4,6 +4,7 @@
<sql id="selectColumn">
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
</sql>
<select id="queryList" resultType="com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyRecord">

4
src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/IXzEmergencyReliefGoodsService.java
View File

@ -19,9 +19,9 @@ public interface IXzEmergencyReliefGoodsService extends IService<XzEmergencyReli
List<XzEmergencyReliefGoods> queryList(HashMap<String, Object> paramMap);
void add(XzEmergencyReliefGoods xzEmergencyReliefGoods);
XzEmergencyReliefGoods add(XzEmergencyReliefGoods xzEmergencyReliefGoods);
void edit(XzEmergencyReliefGoods xzEmergencyReliefGoods);
XzEmergencyReliefGoods edit(XzEmergencyReliefGoods xzEmergencyReliefGoods);
void delete(String id);

6
src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyReliefGoodsServiceImpl.java
View File

@ -58,18 +58,20 @@ public class XzEmergencyReliefGoodsServiceImpl extends ServiceImpl<XzEmergencyRe
}
@Override
public void add(XzEmergencyReliefGoods xzEmergencyReliefGoods) {
public XzEmergencyReliefGoods add(XzEmergencyReliefGoods xzEmergencyReliefGoods) {
xzEmergencyReliefGoods.setId(null);
baseMapper.insert(xzEmergencyReliefGoods);
return xzEmergencyReliefGoods;
}
@Override
public void edit(XzEmergencyReliefGoods xzEmergencyReliefGoods) {
public XzEmergencyReliefGoods edit(XzEmergencyReliefGoods xzEmergencyReliefGoods) {
XzEmergencyReliefGoods oldXzEmergencyReliefGoods = baseMapper.selectById(xzEmergencyReliefGoods.getId());
if (oldXzEmergencyReliefGoods == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.updateById(xzEmergencyReliefGoods);
return xzEmergencyReliefGoods;
}
@Override