springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sangeshenbian/SystemUserVo.java
@@ -1,8 +1,5 @@ package com.panzhihua.common.model.vos.sangeshenbian; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,120 +16,100 @@ /** * 主键 */ @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "数据ID") private Integer id; /** * 姓名 */ @TableField("name") @ApiModelProperty(value = "姓名", required = true) private String name; /** * 手机号 */ @TableField("phone") @ApiModelProperty(value = "手机号", required = true) private String phone; /** * 密码 */ @TableField("password") @ApiModelProperty(value = "密码", required = true) private String password; /** * 一级单位id */ @TableField("one_department_id") @ApiModelProperty(value = "一级单位id", required = true) private Integer oneDepartmentId; /** * 二级单位id */ @TableField("two_department_id") @ApiModelProperty(value = "二级单位id") private Integer twoDepartmentId; /** * 三级单位id */ @TableField("three_department_id") @ApiModelProperty(value = "三级单位id") private Integer threeDepartmentId; /** * 四级单位id */ @TableField("four_department_id") @ApiModelProperty(value = "四级单位id") private Integer fourDepartmentId; /** * 是否是管理员(0=否,1=是) */ @TableField("is_admin") @ApiModelProperty(value = "是否是管理员(0=否,1=是)", required = true) private Integer isAdmin; /** * 职位id */ @TableField("system_post_id") @ApiModelProperty(value = "职位id", required = true) private Integer systemPostId; /** * 角色id */ @TableField("system_role_id") @ApiModelProperty(value = "角色id", required = true) private Integer systemRoleId; /** * 账号层级(1=市级账号,2=区县账号,3=街道账号,4=社区账号) */ @TableField("account_level") @ApiModelProperty(value = "账号层级(1=市级账号,2=区县账号,3=街道账号,4=社区账号)", required = true) private Integer accountLevel; /** * 所属区县 */ @TableField("districts") @ApiModelProperty(value = "所属区县") private String districts; /** * 区县编号 */ @TableField("districts_code") @ApiModelProperty(value = "区县编号") private String districtsCode; /** * 街道 */ @TableField("street") @ApiModelProperty(value = "街道") private String street; /** * 街道编号 */ @TableField("street_code") @ApiModelProperty(value = "街道编号") private String streetCode; /** * 社区 */ @TableField("community") @ApiModelProperty(value = "社区") private String community; /** * 社区编号 */ @TableField("community_code") @ApiModelProperty(value = "社区编号") private String communityCode; /** * 状态(1=正常,2=冻结,3=删除) */ @TableField("status") private Integer status; /** * 添加时间 */ @TableField("create_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createTime; springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/ServiceDlzApplication.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/controller/CommonController.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintAuditRecordController.java
New file @@ -0,0 +1,20 @@ package com.panzhihua.sangeshenbian.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * 诉求上报、延期申请审核表 前端控制器 * </p> * * @author * @since 2025-02-23 */ @RestController @RequestMapping("/complaint-audit-record") public class ComplaintAuditRecordController { } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -6,13 +6,13 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.sangeshenbian.annotation.DistributedLock; import com.panzhihua.sangeshenbian.dto.ComplaintReport; import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO; import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO; 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.service.IComplaintService; import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; import com.panzhihua.sangeshenbian.service.IComplaintService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -22,7 +22,6 @@ 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 javax.validation.Valid; @@ -77,4 +76,15 @@ complaintService.saveResult(dto,getLoginUserInfo()); return R.ok(); } /** * 问题上报 */ @PostMapping("/report") @ApiOperation(value = "问题上报") public void report(@RequestBody ComplaintReport complaintReport) { // TODO } } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintAuditRecordMapper.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.sangeshenbian.dao; import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * 诉求上报、延期申请审核表 Mapper 接口 * </p> * * @author * @since 2025-02-23 */ public interface ComplaintAuditRecordMapper extends BaseMapper<ComplaintAuditRecord> { } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dto/ComplaintReport.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.sangeshenbian.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "诉求上报") public class ComplaintReport { @ApiModelProperty(value = "诉求id") private Long id; @ApiModelProperty(value = "诉求内容") private String descriptionContent; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java
New file @@ -0,0 +1,81 @@ package com.panzhihua.sangeshenbian.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * <p> * 诉求上报、延期申请审核表 * </p> * * @author * @since 2025-02-23 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("sgsb_complaint_audit_record") @ApiModel(value="ComplaintAuditRecord对象", description="诉求上报、延期申请审核表") public class ComplaintAuditRecord implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @TableId(value = "id", type = IdType.NONE) private Long id; @ApiModelProperty(value = "诉求id") @TableField("complaint_id") private Long complaintId; @ApiModelProperty(value = "审核人id") @TableField("auditor_id") private Long auditorId; @ApiModelProperty(value = "审核类型(1:延期申请, 2:上报申请)") @TableField("audit_type") private Boolean auditType; @ApiModelProperty(value = "审核状态 (0:待审核 1:审核通过 2:审核驳回)") @TableField("audit_status") private Boolean auditStatus; @ApiModelProperty(value = "上报说明/延期申请说明") @TableField("comment") private String comment; @ApiModelProperty(value = "图片") @TableField("images") private String images; @ApiModelProperty(value = "视频") @TableField("videos") private String videos; @ApiModelProperty(value = "创建人") @TableField("create_by") private Long createBy; @ApiModelProperty(value = "创建时间") @TableField("create_time") private LocalDateTime createTime; @ApiModelProperty(value = "修改人") @TableField("update_by") private Long updateBy; @ApiModelProperty(value = "修改时间") @TableField("update_time") private LocalDateTime updateTime; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintAuditRecordService.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.sangeshenbian.service; import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * 诉求上报、延期申请审核表 服务类 * </p> * * @author * @since 2025-02-23 */ public interface IComplaintAuditRecordService extends IService<ComplaintAuditRecord> { } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintAuditRecordServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.panzhihua.sangeshenbian.service.impl; import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord; import com.panzhihua.sangeshenbian.dao.ComplaintAuditRecordMapper; import com.panzhihua.sangeshenbian.service.IComplaintAuditRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * 诉求上报、延期申请审核表 服务实现类 * </p> * * @author * @since 2025-02-23 */ @Service public class ComplaintAuditRecordServiceImpl extends ServiceImpl<ComplaintAuditRecordMapper, ComplaintAuditRecord> implements IComplaintAuditRecordService { } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintAuditRecordMapper.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.panzhihua.sangeshenbian.dao.ComplaintAuditRecordMapper"> </mapper>