20 changed files with 203 additions and 107 deletions
@ -0,0 +1,44 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* 工作端:话题转议题申请详情- 审核历史查询 |
||||
|
* |
||||
|
* @author yinzuomei@elink-cn.com |
||||
|
* @date 2020/11/18 17:31 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ApplicationHistoryResDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -2680819847652745103L; |
||||
|
/** |
||||
|
* =id |
||||
|
*/ |
||||
|
private String historyId; |
||||
|
|
||||
|
/** |
||||
|
* under_auditing:待审核; |
||||
|
* approved:审核通过; |
||||
|
* rejected:驳回; |
||||
|
*/ |
||||
|
private String actionType; |
||||
|
|
||||
|
/** |
||||
|
* createdTime 对应时间戳 |
||||
|
*/ |
||||
|
private Long operateTime; |
||||
|
|
||||
|
/** |
||||
|
* 审核时的说明 |
||||
|
*/ |
||||
|
private String reason; |
||||
|
|
||||
|
/** |
||||
|
* 工作端人员姓名 |
||||
|
*/ |
||||
|
private String staffName; |
||||
|
|
||||
|
|
||||
|
} |
@ -0,0 +1,41 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* 待审核|| 已驳回 列表 |
||||
|
* |
||||
|
* @author yinzuomei@elink-cn.com |
||||
|
* @date 2020/11/18 17:22 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class IssueApplicationResDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -1452471134719960837L; |
||||
|
/** |
||||
|
* 申请id |
||||
|
*/ |
||||
|
private String issueApplicationId; |
||||
|
|
||||
|
/** |
||||
|
* 议题名称 |
||||
|
*/ |
||||
|
private String issueTitle; |
||||
|
|
||||
|
/** |
||||
|
* 对应issue_application.UPDATED_TIME 对应的秒级时间戳 |
||||
|
*/ |
||||
|
private Long latestTime; |
||||
|
|
||||
|
/** |
||||
|
* 建议 |
||||
|
*/ |
||||
|
private String suggestion; |
||||
|
|
||||
|
/** |
||||
|
* 审核状态。under_auditing:审核中,approved:通过,rejected:驳回 |
||||
|
*/ |
||||
|
private String applyStatus; |
||||
|
|
||||
|
} |
@ -0,0 +1,57 @@ |
|||||
|
package com.epmet.controller; |
||||
|
|
||||
|
import com.epmet.commons.tools.utils.Result; |
||||
|
import com.epmet.commons.tools.validator.ValidatorUtils; |
||||
|
import com.epmet.dto.form.IssueAppQueryFormDTO; |
||||
|
import com.epmet.dto.form.IssueApplicationIdFormDTO; |
||||
|
import com.epmet.dto.result.ApplicationHistoryResDTO; |
||||
|
import com.epmet.dto.result.IssueApplicationResDTO; |
||||
|
import com.epmet.service.IssueApplicationHistoryService; |
||||
|
import com.epmet.service.IssueApplicationService; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* 基层治理-议题管理 议题审核相关API |
||||
|
* |
||||
|
* @author yinzuomei@elink-cn.com |
||||
|
* @date 2020/11/18 17:13 |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("issueaudit") |
||||
|
public class IssueAuditController { |
||||
|
@Autowired |
||||
|
private IssueApplicationService issueApplicationService; |
||||
|
@Autowired |
||||
|
private IssueApplicationHistoryService issueApplicationHistoryService; |
||||
|
|
||||
|
/** |
||||
|
* @param formDTO |
||||
|
* @author yinzuomei |
||||
|
* @description 待审核|| 已驳回 列表 |
||||
|
* @Date 2020/11/18 17:28 |
||||
|
**/ |
||||
|
@PostMapping("applicationlist") |
||||
|
public Result<List<IssueApplicationResDTO>> queryIssueAppliationList(@RequestBody IssueAppQueryFormDTO formDTO) { |
||||
|
ValidatorUtils.validateEntity(formDTO,IssueAppQueryFormDTO.Required.class,IssueAppQueryFormDTO.GovFormDTO.class); |
||||
|
return new Result<List<IssueApplicationResDTO>>().ok(issueApplicationService.listIssueApp(formDTO)); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @param formDTO |
||||
|
* @author yinzuomei |
||||
|
* @description 话题转议题申请详情- 审核历史查询 |
||||
|
* @Date 2020/11/18 17:40 |
||||
|
**/ |
||||
|
@PostMapping("applicationhistory") |
||||
|
public Result<List<ApplicationHistoryResDTO>> queryApplicationHistory(@RequestBody IssueApplicationIdFormDTO formDTO){ |
||||
|
ValidatorUtils.validateEntity(formDTO); |
||||
|
return new Result<List<ApplicationHistoryResDTO>>().ok(issueApplicationHistoryService.queryByIssueApplicationId(formDTO.getIssueApplicationId())); |
||||
|
} |
||||
|
} |
Loading…
Reference in new issue