提交 63d452b7 authored 作者: 宋文杰's avatar 宋文杰

feat(emergency event): add the time line of event detail

上级 e87b8102
...@@ -35,6 +35,16 @@ public class EvendealController extends BaseController { ...@@ -35,6 +35,16 @@ public class EvendealController extends BaseController {
return new R<>(evendealService.page(page,Wrappers.query(evendeal))); return new R<>(evendealService.page(page,Wrappers.query(evendeal)));
} }
/**
* 列表查询
* @param evendeal 事件处置表
* @return
*/
@GetMapping("/list")
public R getEvendealList(Evendeal evendeal) {
return new R<>(evendealService.list(Wrappers.query(evendeal)));
}
/** /**
* 通过id查询事件处置表 * 通过id查询事件处置表
...@@ -54,7 +64,7 @@ public class EvendealController extends BaseController { ...@@ -54,7 +64,7 @@ public class EvendealController extends BaseController {
@SysLog("新增事件处置表") @SysLog("新增事件处置表")
@PostMapping @PostMapping
public R save(@RequestBody Evendeal evendeal){ public R save(@RequestBody Evendeal evendeal){
return new R<>(evendealService.save(evendeal)); return new R<>(evendealService.saveEventDeal(evendeal));
} }
/** /**
......
...@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
/** /**
* 事件处置表 * 事件处置表
...@@ -20,7 +22,6 @@ import java.time.LocalDateTime; ...@@ -20,7 +22,6 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class Evendeal extends Model<Evendeal> { public class Evendeal extends Model<Evendeal> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* *
*/ */
...@@ -41,7 +42,8 @@ private static final long serialVersionUID = 1L; ...@@ -41,7 +42,8 @@ private static final long serialVersionUID = 1L;
/** /**
* 处置时间 * 处置时间
*/ */
private LocalDateTime dealTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
private Date dealTime;
/** /**
* 处置人id * 处置人id
*/ */
...@@ -50,5 +52,12 @@ private static final long serialVersionUID = 1L; ...@@ -50,5 +52,12 @@ private static final long serialVersionUID = 1L;
* 处置人 * 处置人
*/ */
private String user; private String user;
/**
* 处理部门id
*/
private Integer deptId;
/**
* 处理部门
*/
private String dept;
} }
...@@ -11,4 +11,5 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Evendeal ...@@ -11,4 +11,5 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Evendeal
*/ */
public interface EvendealService extends IService<Evendeal> { public interface EvendealService extends IService<Evendeal> {
boolean saveEventDeal(Evendeal eventdeal);
} }
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Evendeal; import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Evendeal;
import com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper.EvendealMapper; import com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper.EvendealMapper;
import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EvendealService; import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EvendealService;
import com.elephant.framework.galaxy.aroad.module.system.service.DeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -14,5 +16,14 @@ import org.springframework.stereotype.Service; ...@@ -14,5 +16,14 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class EvendealServiceImpl extends ServiceImpl<EvendealMapper, Evendeal> implements EvendealService { public class EvendealServiceImpl extends ServiceImpl<EvendealMapper, Evendeal> implements EvendealService {
@Autowired
private DeptService deptService;
public boolean saveEventDeal(Evendeal eventdeal){
int reportingDeptId = eventdeal.getDeptId();
String dept = deptService.getDeptName(reportingDeptId);
eventdeal.setDept(dept);
return save(eventdeal);
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论