Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 35168aa5267f61747fe4dbb4a35f0e1a7bdbd7e1

Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java

@@ -187,6 +187,17 @@
        complaintComment.setUpdateTime(new Date());
        complaintComment.setDelFlag(0);
        complaintCommentService.save(complaintComment);
        Complaint complaint = complaintService.getById(complaintComment.getComplaintId());
        complaint.setStatus(8);
        complaintService.updateById(complaint);
        return R.ok();
    }


    @GetMapping("/getComplaintCommentInfo/{id}")
    @ApiOperation(value = "获取诉求评价")
    public R<ComplaintComment> getComplaintCommentInfo(@PathVariable("id") Long id){
        ComplaintComment one = complaintCommentService.getOne(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, id).eq(ComplaintComment::getDelFlag, 0));
        return R.ok(one);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java

@@ -94,7 +94,7 @@
    @TableField("videos")
    private String videos;

    @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核")
    @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核 8-已评价")
    @TableField("status")
    private Integer status;