吉安感知网项目-后端
linwei
2026-01-21 bb65115d134810ebb413e48d7bb240de2f46b566
数据异议申请
3 files modified
1 files added
122 ■■■■■ changed files
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java 35 ●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/entity/GdDataObjectionEntity.java 7 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdDataObjectionDetailParam.java 74 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataObjectionVO.java 6 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java
@@ -29,8 +29,10 @@
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.orderdata.dto.GdDataObjectionDTO;
import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
import org.sxkj.gd.orderdata.param.GdDataObjectionDetailParam;
import org.sxkj.gd.orderdata.param.GdDataObjectionPageParam;
import org.sxkj.gd.orderdata.vo.GdDataObjectionVO;
import org.sxkj.gd.orderdata.wrapper.GdDataObjectionWrapper;
@@ -57,20 +59,10 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入gdDataObjection")
    public R<GdDataObjectionVO> detail(GdDataObjectionEntity gdDataObjection) {
        GdDataObjectionEntity detail = gdDataObjectionService.getOne(Condition.getQueryWrapper(gdDataObjection));
    public R<GdDataObjectionVO> detail(GdDataObjectionDetailParam gdDataObjection) {
        GdDataObjectionEntity detail = gdDataObjectionService.getOne(Condition.getQueryWrapper(GenericConverter.convert(gdDataObjection, GdDataObjectionEntity.class)));
        return R.data(GdDataObjectionWrapper.build().entityVO(detail));
    }
    /**
     * 数据异议申请表 分页
     */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入gdDataObjection")
    // public R<IPage<GdDataObjectionVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdDataObjection, Query query) {
    //     IPage<GdDataObjectionEntity> pages = gdDataObjectionService.page(Condition.getPage(query), Condition.getQueryWrapper(gdDataObjection, GdDataObjectionEntity.class));
    //     return R.data(GdDataObjectionWrapper.build().pageVO(pages));
    // }
    /**
     * 数据异议申请表 自定义分页
@@ -83,25 +75,6 @@
        return R.data(pages);
    }
//    /**
//     * 数据异议申请表 新增
//     */
//    @PostMapping("/save")
//    @ApiOperationSupport(order = 4)
//    @ApiOperation(value = "新增", notes = "传入gdDataObjection")
//    public R save(@Valid @RequestBody GdDataObjectionEntity gdDataObjection) {
//        return R.status(gdDataObjectionService.save(gdDataObjection));
//    }
//    /**
//     * 数据异议申请表 修改
//     */
//    @PostMapping("/update")
//    @ApiOperationSupport(order = 5)
//    @ApiOperation(value = "修改", notes = "传入gdDataObjection")
//    public R update(@Valid @RequestBody GdDataObjectionEntity gdDataObjection) {
//        return R.status(gdDataObjectionService.updateById(gdDataObjection));
//    }
    /**
     * 数据异议申请表 新增或修改
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/entity/GdDataObjectionEntity.java
@@ -97,11 +97,4 @@
     */
    @ApiModelProperty(value = "区域编码")
    private String areaCode;
    /**
     * 附件名称列表(逗号分隔)
     */
    @ApiModelProperty(value = "附件名称列表(逗号分隔)")
    private String attachNames;
}
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdDataObjectionDetailParam.java
New file
@@ -0,0 +1,74 @@
package org.sxkj.gd.orderdata.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class GdDataObjectionDetailParam {
    /**
     * 异议标题
     */
    @ApiModelProperty(value = "异议标题")
    private String title;
    /**
     * 异议类别(如“材料佐证&quot;)
     */
    @ApiModelProperty(value = "异议类别(如“材料佐证&quot;)")
    private String objectionType;
    /**
     * 异议状态(草稿/待处理/已反馈)
     */
    @ApiModelProperty(value = "异议状态(草稿/待处理/已反馈)")
    private String objectionStatus;
    /**
     * 目录/申请资源名称
     */
    @ApiModelProperty(value = "目录/申请资源名称")
    private String catalogResourceName;
    /**
     * 问题提交人
     */
    @ApiModelProperty(value = "问题提交人")
    private String submitter;
    /**
     * 提交人联系方式
     */
    @ApiModelProperty(value = "提交人联系方式")
    private String submitterContact;
    /**
     * 处理单位(如“应急部门&quot;)
     */
    @ApiModelProperty(value = "处理单位(如“应急部门&quot;)")
    private String handleUnit;
    /**
     * 异议描述
     */
    @ApiModelProperty(value = "异议描述")
    private String objectionDesc;
    /**
     * 异议依据
     */
    @ApiModelProperty(value = "异议依据")
    private String objectionBasis;
    /**
     * 其他异议详情
     */
    @ApiModelProperty(value = "其他异议详情")
    private String otherObjectionDetail;
    /**
     * 审核意见
     */
    @ApiModelProperty(value = "审核意见")
    private String reviewOpinion;
    /**
     * 区域编码
     */
    @ApiModelProperty(value = "区域编码")
    private String areaCode;
    /**
     * 附件名称列表(逗号分隔)
     */
    @ApiModelProperty(value = "附件名称列表(逗号分隔)")
    private String attachNames;
}
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataObjectionVO.java
@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.orderdata.vo;
import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
@@ -32,4 +33,9 @@
public class GdDataObjectionVO extends GdDataObjectionEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 附件名称列表(逗号分隔)
     */
    @ApiModelProperty(value = "附件名称列表(逗号分隔)")
    private String attachNames;
}