springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -67,7 +67,7 @@ @PostMapping("/saveProcess") @ApiOperation("办理进度录入") public R<?> saveProcess(@Valid @RequestBody ComplaintProcessDTO dto){ complaintService.saveProcess(dto,getUserId()); complaintService.saveProcess(dto,getLoginUserInfo()); return R.ok(); } @PostMapping("/saveResult") @@ -91,6 +91,7 @@ * 诉求下派 */ @PostMapping("/saveDispatch") @ApiOperation("诉求下派") public R<?> saveDispatch(@RequestBody ComplaintDispatch dto){ complaintService.saveDispatch(dto, getLoginUserInfo()); return R.ok(); @@ -100,6 +101,7 @@ * 延期申请 */ @PostMapping("/saveDelay") @ApiOperation(value = "延期申请") public R<?> saveDelay(@RequestBody ComplaintDelayDTO dto){ complaintService.saveDelay(dto, getLoginUserInfo()); return R.ok(); springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java
@@ -59,5 +59,9 @@ @TableField("create_by") private Long createBy; @ApiModelProperty(value = "创建人") @TableField("create_by_name") private String createByName; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow; import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,4 +33,7 @@ @ApiModelProperty(value = "诉求流转记录") List<ComplaintFlow> complaintFlows; @ApiModelProperty(value = "办理进度") List<ComplaintProgress> complaintProgresses; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
@@ -4,7 +4,6 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO; import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.sangeshenbian.model.dto.*; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.baomidou.mybatisplus.extension.service.IService; @@ -44,10 +43,11 @@ ComplaintVO detail(Long id); /** * 保存办理进度 * * @param dto * @param userId * @param loginUserInfoVO */ void saveProcess(ComplaintProcessDTO dto, Long userId); void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO); /** * 办理结果录入 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -9,7 +9,6 @@ import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.sangeshenbian.enums.ReportTypeEnum; import com.panzhihua.sangeshenbian.model.dto.*; import com.panzhihua.sangeshenbian.model.entity.*; @@ -30,7 +29,6 @@ import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; import com.panzhihua.sangeshenbian.service.ISystemUserService; import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -38,7 +36,6 @@ import java.util.Date; import java.util.List; import java.util.Optional; import java.util.List; import static cn.hutool.core.util.ObjectUtil.isNull; @@ -154,6 +151,9 @@ List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list(); detail.setComplaintFlows(list); } //查询办理进度 List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id).list(); detail.setComplaintProgresses(list); return detail; } @@ -161,13 +161,14 @@ * 办理进度录入 * * @param dto * @param userId * @param loginUserInfoVO */ @Override public void saveProcess(ComplaintProcessDTO dto,Long userId) { public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) { ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class); complaintProgress.setCreateTime(new Date()); complaintProgress.setCreateBy(userId); complaintProgress.setCreateBy(loginUserInfoVO.getUserId()); complaintProgress.setCreateByName(loginUserInfoVO.getName()); complaintProgressService.save(complaintProgress); }