数据异议申请

linwei

2026-01-21 bc7b6fe334d195b107a21201e55bb0e13bdfc409

数据异议申请

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/IAttachService.java

@@ -22,6 +22,7 @@
import org.sxkj.common.model.ResponseResult;
import org.sxkj.resource.dto.WaylineJobInfoQueryParam;
import org.sxkj.resource.entity.Attach;
import org.sxkj.resource.param.AttachPageParam;
import org.sxkj.resource.vo.*;
import org.sxkj.system.vo.TreeVo;

@@ -44,7 +45,7 @@
     * @param attach
     * @return
     */
    IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach);
    IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachPageParam attach);

    /**
     * ai图片

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java

@@ -31,7 +31,9 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.orderdata.dto.GdApplicationInnovationDTO;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import org.sxkj.gd.orderdata.wrapper.GdApplicationInnovationWrapper;
@@ -76,7 +78,7 @@
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入gdApplicationInnovation")
    public R<IPage<GdApplicationInnovationVO>> page(GdApplicationInnovationVO gdApplicationInnovation, Query query) {
    public R<IPage<GdApplicationInnovationVO>> page(GdApplicationInnovationPageParam gdApplicationInnovation, Query query) {
        IPage<GdApplicationInnovationVO> pages = gdApplicationInnovationService.selectGdApplicationInnovationPage(Condition.getPage(query), gdApplicationInnovation);
        return R.data(pages);
    }
@@ -88,8 +90,9 @@
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入gdApplicationInnovation")
    public R submit(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
        return R.status(gdApplicationInnovationService.saveOrUpdate(gdApplicationInnovation));
    public R submit(@Valid @RequestBody GdApplicationInnovationDTO gdApplicationInnovation) {
        GdApplicationInnovationEntity gdApplicationInnovationEntity = GdApplicationInnovationWrapper.build().entityDTO(gdApplicationInnovation);
        return R.status(gdApplicationInnovationService.saveOrUpdate(gdApplicationInnovationEntity));
    }

    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java

@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;

import javax.validation.Valid;

import org.springblade.core.mp.support.Condition;
@@ -60,8 +61,8 @@
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入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));
        GdDataObjectionVO gdDataObjectionVO = gdDataObjectionService.getDetail(gdDataObjection);
        return R.data(gdDataObjectionVO);
    }

    /**
@@ -105,9 +106,9 @@
//    @ApiOperation(value = "导出数据", notes = "传入gdDataObjection")
//    public void exportGdDataObjection(@ApiIgnore @RequestParam Map<String, Object> gdDataObjection, BladeUser bladeUser, HttpServletResponse response) {
//        QueryWrapper<GdDataObjectionEntity> queryWrapper = Condition.getQueryWrapper(gdDataObjection, GdDataObjectionEntity.class);
        //if (!AuthUtil.isAdministrator()) {
        //    queryWrapper.lambda().eq(GdDataObjection::getTenantId, bladeUser.getTenantId());
        //}
    // if (!AuthUtil.isAdministrator()) {
    //    queryWrapper.lambda().eq(GdDataObjection::getTenantId, bladeUser.getTenantId());
    //}
//        queryWrapper.lambda().eq(GdDataObjectionEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
//        List<GdDataObjectionExcel> list = gdDataObjectionService.exportGdDataObjection(queryWrapper);
//        ExcelUtil.export(response, "数据异议申请表数据" + DateUtil.time(), "数据异议申请表数据表", list, GdDataObjectionExcel.class);

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdDataObjectionDTO.java

@@ -34,6 +34,9 @@
public class GdDataObjectionDTO {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * 异议标题
     */

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.java

@@ -17,6 +17,7 @@
package org.sxkj.gd.orderdata.mapper;

import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@
     * @param gdApplicationInnovation
     * @return
     */
    List<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage page, GdApplicationInnovationVO gdApplicationInnovation);
    List<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage page, GdApplicationInnovationPageParam gdApplicationInnovation);


    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml

@@ -25,7 +25,18 @@


    <select id="selectGdApplicationInnovationPage" resultMap="gdApplicationInnovationResultMap">
        select * from ja_gd_application_innovation where is_deleted = 0
        select * from ja_gd_application_innovation
        <where>
            <if test="param2.caseName != null and param2.caseName != ''">
                and case_name like concat('%',#{param2.caseName},'%')
            </if>
            <if test="param2.innovationStatus != null and param2.innovationStatus != ''">
                and innovation_status = #{param2.innovationStatus}
            </if>
            is_deleted = 0
        </where>


    </select>



 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.java

@@ -17,6 +17,7 @@
package org.sxkj.gd.orderdata.mapper;

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.excel.GdDataObjectionExcel;
@@ -52,4 +53,10 @@
     */
    List<GdDataObjectionExcel> exportGdDataObjection(@Param("ew") Wrapper<GdDataObjectionEntity> queryWrapper);

    /**
     *
     * @param gdDataObjection
     * @return
     */
    GdDataObjectionVO getDetail(GdDataObjectionDetailParam gdDataObjection);
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml

@@ -48,4 +48,16 @@
        SELECT * FROM ja_gd_data_objection ${ew.customSqlSegment}
    </select>

    <select id="getDetail" resultType="org.sxkj.gd.orderdata.vo.GdDataObjectionVO">
        select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names
        from ja_gd_data_objection do
        left join ja_gd_data_objection_attachment da on do.id = da.objection_id
        <where>
            <if test="id != null ">
                and do.id = #{id}
            </if>
        </where>
        group by do.id
    </select>

</mapper>

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java

New file
@@ -0,0 +1,20 @@
package org.sxkj.gd.orderdata.param;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class GdApplicationInnovationPageParam {

    /**
     * 案例名称
     */
    @ApiModelProperty(value = "案例名称")
    private String caseName;
    /**
     * 应用创新状态（审核中/审核通过/审核不通过）
     */
    @ApiModelProperty(value = "应用创新状态（审核中/审核通过/审核不通过）")
    private String innovationStatus;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdDataObjectionDetailParam.java

@@ -5,70 +5,8 @@

@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;
    @ApiModelProperty(value = "主键")
     private Long id;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/IGdApplicationInnovationService.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,7 +39,7 @@
     * @param gdApplicationInnovation
     * @return
     */
    IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationVO gdApplicationInnovation);
    IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation);


    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/IGdDataObjectionService.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.excel.GdDataObjectionExcel;
@@ -59,4 +60,11 @@
     * @return
     */
    boolean saveOrUpdateDataObjection(@Valid GdDataObjectionDTO gdDataObjectionDTO);

    /**
     * 获取详情
     * @param gdDataObjection
     * @return
     */
    GdDataObjectionVO getDetail(GdDataObjectionDetailParam gdDataObjection);
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java

@@ -17,6 +17,7 @@
package org.sxkj.gd.orderdata.service.impl;

import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import org.sxkj.gd.orderdata.mapper.GdApplicationInnovationMapper;
@@ -37,7 +38,7 @@
public class GdApplicationInnovationServiceImpl extends BaseServiceImpl<GdApplicationInnovationMapper, GdApplicationInnovationEntity> implements IGdApplicationInnovationService {

    @Override
    public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationVO gdApplicationInnovation) {
    public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation) {
        return page.setRecords(baseMapper.selectGdApplicationInnovationPage(page, gdApplicationInnovation));
    }


 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java

@@ -20,6 +20,7 @@
import org.sxkj.gd.orderdata.dto.GdDataObjectionDTO;
import org.sxkj.gd.orderdata.entity.GdDataObjectionAttachmentEntity;
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.service.IGdDataObjectionAttachmentService;
import org.sxkj.gd.orderdata.vo.GdDataObjectionVO;
@@ -65,14 +66,26 @@
    @Override
    public boolean saveOrUpdateDataObjection(GdDataObjectionDTO gdDataEvaluationDTO) {
        GdDataObjectionEntity gdDataObjectionEntity = GdDataObjectionWrapper.build().entityDTO(gdDataEvaluationDTO);
        List<GdDataObjectionAttachmentEntity> gdDataObjectionAttachmentEntities = GdSupplyDemandAuditAttachmentWrapper.build().entityDTO(gdDataEvaluationDTO.getAttachmentList());
        boolean result = saveOrUpdate(gdDataObjectionEntity);
        if (result) {
            gdDataObjectionAttachmentEntities.forEach(gdDataObjectionAttachmentEntity -> {
                gdDataObjectionAttachmentEntity.setObjectionId(gdDataObjectionEntity.getId());
            });
            return gdDataObjectionAttachmentService.saveOrUpdateBatch(gdDataObjectionAttachmentEntities);
            if (gdDataEvaluationDTO.getAttachmentList() != null) {
                List<GdDataObjectionAttachmentEntity> gdDataObjectionAttachmentEntities = GdSupplyDemandAuditAttachmentWrapper.build().entityDTO(gdDataEvaluationDTO.getAttachmentList());
                gdDataObjectionAttachmentEntities.forEach(gdDataObjectionAttachmentEntity -> {
                    gdDataObjectionAttachmentEntity.setObjectionId(gdDataObjectionEntity.getId());
                });
                return gdDataObjectionAttachmentService.saveOrUpdateBatch(gdDataObjectionAttachmentEntities);
            }
            return true;
        }
        return false;
    }

    /**
     * @param gdDataObjection
     * @return
     */
    @Override
    public GdDataObjectionVO getDetail(GdDataObjectionDetailParam gdDataObjection) {
        return baseMapper.getDetail(gdDataObjection);
    }
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/wrapper/GdApplicationInnovationWrapper.java

@@ -18,7 +18,10 @@

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.sxkj.gd.orderdata.dto.GdApplicationInnovationDTO;
import org.sxkj.gd.orderdata.dto.GdDataObjectionDTO;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import java.util.Objects;

@@ -46,5 +49,9 @@
        return gdApplicationInnovationVO;
    }

    public GdApplicationInnovationEntity entityDTO(GdApplicationInnovationDTO gdApplicationInnovationDTO) {
        return Objects.requireNonNull(BeanUtil.copy(gdApplicationInnovationDTO, GdApplicationInnovationEntity.class));
    }


}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java

@@ -34,7 +34,7 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键id")
    private Integer id;
    private Long id;

    @ApiModelProperty(value = "设备型号")
    private String deviceName;