springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -8,6 +8,7 @@ import com.panzhihua.sangeshenbian.annotation.DistributedLock; import com.panzhihua.sangeshenbian.model.dto.*; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; import com.panzhihua.sangeshenbian.model.query.ComplaintQuery; import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; import com.panzhihua.sangeshenbian.service.IComplaintService; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; /** * <p> @@ -64,6 +66,10 @@ public R<ComplaintVO> detail(@ApiParam(name = "id", value = "工单id", required = true) Long id) { return R.ok(complaintService.detail(id)); } @GetMapping("/progress/{complaintId}") public R<List<ComplaintProgress>> progress(@ApiParam(name = "complaintId", value = "诉求id", required = true) @PathVariable("complaintId") Long complaintId) { return R.ok(complaintService.progress(complaintId)); } @PostMapping("/saveProcess") @ApiOperation("办理进度录入") public R<?> saveProcess(@Valid @RequestBody ComplaintProcessDTO dto){ springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
@@ -7,6 +7,7 @@ import com.panzhihua.sangeshenbian.model.dto.*; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; import com.panzhihua.sangeshenbian.model.query.BasePage; import com.panzhihua.sangeshenbian.model.query.ComplaintQuery; import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO; @@ -58,6 +59,12 @@ void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO); /** * 办理进度列表 * @param complaintId * @return */ List<ComplaintProgress> progress(Long complaintId); /** * 诉求上报 */ void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO); @@ -93,4 +100,6 @@ * @return */ Page<ComplaintTodoVO> getTodoList(BasePage page, LoginUserInfoVO loginUserInfo); } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -152,7 +152,8 @@ detail.setComplaintFlows(list); } //查询办理进度 List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id).list(); List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id) .orderByAsc(ComplaintProgress::getCreateTime).list(); detail.setComplaintProgresses(list); return detail; } @@ -187,6 +188,17 @@ complaint.setCompletionTime(new Date()); this.updateById(complaint); } /** * 办理进度列表 * @param complaintId * @return */ @Override public List<ComplaintProgress> progress(Long complaintId) { //查询办理进度 return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId) .orderByAsc(ComplaintProgress::getCreateTime).list(); } @Override public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {