施工图纸提交

src/main/java/com/zhgd/xmgl/constant/Cts.java

@@ -83,6 +83,7 @@ public interface Cts {
      * 忽略数据权限查询条件
      */
     String IGNORE_DATA_SCOPE_CONDITION = " and 'ignoreDataScope' = 'ignoreDataScope' ";
+    String IGNORE_DATA_SCOPE_CONDITION_APPLY = " 'ignoreDataScope' = 'ignoreDataScope' ";
 
     String DOT = ".";
     /**

src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionConstructionDrawController.java

@@ -0,0 +1,143 @@
+package com.zhgd.xmgl.modules.quality.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zhgd.annotation.OperLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParams;
+import java.util.HashMap;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.jeecg.common.util.oConvertUtils;
+import org.apache.commons.collections.MapUtils;
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
+import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionConstructionDrawVo;
+import com.zhgd.xmgl.modules.quality.entity.dto.QualityRegionConstructionDrawDto;
+import com.zhgd.xmgl.modules.quality.service.IQualityRegionConstructionDrawService;
+import org.springframework.context.annotation.Lazy;
+
+import org.simpleframework.xml.core.Validate;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+
+ /**
+ * @Title: Controller
+ * @Description: 区域施工图纸
+ * @author： pds
+ * @date：   2025-11-24
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/xmgl/qualityRegionConstructionDraw")
+@Slf4j
+@Api(tags = "区域施工图纸相关Api")
+public class QualityRegionConstructionDrawController {
+    @Lazy
+	@Autowired
+	private IQualityRegionConstructionDrawService qualityRegionConstructionDrawService;
+
+	/**
+	  * 分页列表查询
+	 * @return
+	 */
+    @OperLog(operModul = "区域施工图纸管理", operType = "分页查询", operDesc = "分页列表查询区域施工图纸信息")
+	@ApiOperation(value = "分页列表查询区域施工图纸信息", notes = "分页列表查询区域施工图纸信息", httpMethod="GET")
+	@ApiImplicitParams({
+                @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
+                @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
+        })
+	@GetMapping(value = "/page")
+	public Result<IPage<QualityRegionConstructionDrawVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
+		return Result.success(qualityRegionConstructionDrawService.queryPageList(param));
+	}
+
+	/**
+	  * 列表查询
+	 * @return
+	 */
+    @OperLog(operModul = "区域施工图纸管理", operType = "列表查询", operDesc = "列表查询区域施工图纸信息")
+	@ApiOperation(value = "列表查询区域施工图纸信息", notes = "列表查询区域施工图纸信息", httpMethod="GET")
+	@GetMapping(value = "/list")
+	public Result<List<QualityRegionConstructionDrawVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
+			return Result.success(qualityRegionConstructionDrawService.queryList(param));
+	}
+
+	/**
+	  *   添加
+	 * @param qualityRegionConstructionDrawDto
+	 * @return
+	 */
+    @OperLog(operModul = "区域施工图纸管理", operType = "添加", operDesc = "添加区域施工图纸信息")
+	@ApiOperation(value = "添加区域施工图纸信息", notes = "添加区域施工图纸信息" , httpMethod="POST")
+	@PostMapping(value = "/add")
+	public Result<QualityRegionConstructionDrawVo> add(@RequestBody @Validate QualityRegionConstructionDrawDto qualityRegionConstructionDrawDto) {
+	    qualityRegionConstructionDrawService.add(qualityRegionConstructionDrawDto);
+		return Result.ok();
+	}
+
+	/**
+	  *  编辑
+	 * @param qualityRegionConstructionDrawDto
+	 * @return
+	 */
+    @OperLog(operModul = "区域施工图纸管理", operType = "编辑", operDesc = "编辑区域施工图纸信息")
+	@ApiOperation(value = "编辑区域施工图纸信息", notes = "编辑区域施工图纸信息" , httpMethod="POST")
+	@PostMapping(value = "/edit")
+	public Result<QualityRegionConstructionDraw> edit(@RequestBody QualityRegionConstructionDrawDto qualityRegionConstructionDrawDto) {
+	    qualityRegionConstructionDrawService.edit(qualityRegionConstructionDrawDto);
+		return Result.ok();
+	}
+
+	/**
+	  *   通过id删除
+	 * @return
+	 */
+    @OperLog(operModul = "区域施工图纸管理", operType = "删除", operDesc = "删除区域施工图纸信息")
+	 @ApiOperation(value = "删除区域施工图纸信息", notes = "删除区域施工图纸信息" , httpMethod="POST")
+     @ApiImplicitParam(name = "id", value = "区域施工图纸ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
+	@PostMapping(value = "/delete")
+	public Result<QualityRegionConstructionDraw> delete(@ApiIgnore @RequestBody HashMap<String ,Object> map) {
+	    qualityRegionConstructionDrawService.delete(MapUtils.getString(map, "id"));
+        return Result.ok();
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+    @OperLog(operModul = "区域施工图纸管理", operType = "通过id查询", operDesc = "通过id查询区域施工图纸信息")
+	 @ApiOperation(value = "通过id查询区域施工图纸信息", notes = "通过id查询区域施工图纸信息" , httpMethod="GET")
+     @ApiImplicitParam(name = "id", value = "区域施工图纸ID", paramType = "query", required = true, dataType = "Integer")
+	@GetMapping(value = "/queryById")
+	public Result<QualityRegionConstructionDrawVo> queryById(@RequestParam(name="id",required=true) String id) {
+		return Result.success(qualityRegionConstructionDrawService.queryById(id));
+	}
+
+}

src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java

@@ -1,14 +1,25 @@
 package com.zhgd.xmgl.modules.quality.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.xmgl.modules.quality.entity.ConstructionDrawTreeVo;
 import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
 import com.zhgd.xmgl.modules.quality.entity.dto.QualityRegionDto;
+import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionConstructionDrawVo;
 import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionVo;
 import com.zhgd.xmgl.modules.quality.entity.vo.TodoRegionCountVo;
+import com.zhgd.xmgl.modules.quality.service.IQualityRegionConstructionDrawService;
 import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
 import com.zhgd.xmgl.util.MapBuilder;
+import com.zhgd.xmgl.util.TreeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -16,10 +27,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -36,7 +49,9 @@ import java.util.*;
 public class QualityRegionController {
     @Autowired
     private IQualityRegionService qualityRegionService;
-
+    @Lazy
+    @Autowired
+    private IQualityRegionConstructionDrawService qualityRegionConstructionDrawService;
 
     @OperLog(operModul = "区域管理", operType = "查询", operDesc = "树形列表查询区域信息")
     @ApiOperation(value = "树形列表查询区域信息", notes = "树形列表查询区域信息", httpMethod = "POST")
@@ -65,7 +80,6 @@ public class QualityRegionController {
         return Result.success(qualityRegionService.queryList(map));
     }
 
-
     /**
      * 添加
      *
@@ -109,7 +123,6 @@ public class QualityRegionController {
         return Result.ok();
     }
 
-
     /**
      * 通过id查询
      *
@@ -131,7 +144,6 @@ public class QualityRegionController {
         return Result.success(qualityRegionService.queryBindRegion());
     }
 
-
     @OperLog(operModul = "区域管理", operType = "查询", operDesc = "查询区域人数")
     @ApiOperation(value = "查询区域人数", notes = "查询区域人数", httpMethod = "POST")
     @PostMapping(value = "/queryRegionWorker")
@@ -146,7 +158,6 @@ public class QualityRegionController {
         return Result.success(qualityRegionService.queryBindRegions());
     }
 
-
     @OperLog(operModul = "区域管理", operType = "查询", operDesc = "分页树形列表查询区域信息")
     @ApiOperation(value = "分页树形列表查询区域信息", notes = "分页树形列表查询区域信息", httpMethod = "POST")
     @ApiImplicitParams({
@@ -246,4 +257,45 @@ public class QualityRegionController {
         vo.setHalfYearNum(regionVos5.size());
         return Result.success(vo);
     }
+
+    @ApiOperation(value = "树形列表查询区域和施工图纸", notes = "树形列表查询区域和施工图纸", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "name", value = "名称", paramType = "body", required = false, dataType = "String"),
+    })
+    @PostMapping(value = "/constructionDraw/tree/list")
+    public Result<List<ConstructionDrawTreeVo>> treeList(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        String projectSn = MapUtils.getString(paramMap, "projectSn");
+        String name = MapUtils.getString(paramMap, "name");
+        List<QualityRegion> voList = qualityRegionService.list(new LambdaQueryWrapper<QualityRegion>()
+                .eq(QualityRegion::getProjectSn, projectSn));
+        List<QualityRegionConstructionDraw> drawVos = qualityRegionConstructionDrawService.list(new LambdaQueryWrapper<QualityRegionConstructionDraw>()
+                .eq(QualityRegionConstructionDraw::getProjectSn, projectSn));
+        List<ConstructionDrawTreeVo> allList = new ArrayList<>();
+        String regionPre = "r";
+        List<ConstructionDrawTreeVo> voList1 = voList.stream().map(o -> {
+            ConstructionDrawTreeVo vo1 = new ConstructionDrawTreeVo();
+            vo1.setTableId(o.getId());
+            vo1.setType(1);
+            vo1.setId(regionPre + Convert.toStr(o.getId()));
+            vo1.setParentId(regionPre + Convert.toStr(o.getParentRegion()));
+            vo1.setName(o.getRegionName());
+            return vo1;
+        }).collect(Collectors.toList());
+        allList.addAll(voList1);
+        List<ConstructionDrawTreeVo> voList2 = drawVos.stream().map(o -> {
+            ConstructionDrawTreeVo vo1 = new ConstructionDrawTreeVo();
+            vo1.setTableId(o.getId());
+            vo1.setType(2);
+            vo1.setId("d" + Convert.toStr(o.getId()));
+            vo1.setParentId(regionPre + Convert.toStr(o.getQualityRegionId()));
+            vo1.setName(o.getDrawingName());
+            return vo1;
+        }).collect(Collectors.toList());
+        allList.addAll(voList2);
+        JSONArray jsonArray = TreeUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(allList)), "id", "parentId", "children", "name", name);
+        // 使用JSON直接转换回对象列表，保持children结构
+        List<ConstructionDrawTreeVo> result = JSON.parseArray(jsonArray.toJSONString(), ConstructionDrawTreeVo.class);
+        return Result.success(result);
+    }
 }

src/main/java/com/zhgd/xmgl/modules/quality/entity/ConstructionDrawTreeVo.java

@@ -0,0 +1,37 @@
+package com.zhgd.xmgl.modules.quality.entity;
+
+import com.zhgd.xmgl.modules.xz.security.entity.vo.TopProjectClassifyTypeRecordTreeVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ConstructionDrawTreeVo {
+    /**
+     * 区域id或区域施工图纸id
+     */
+    @ApiModelProperty(value = "区域id或区域施工图纸id")
+    private Long tableId;
+    /**
+     *1区域2区域施工图纸
+     */
+    @ApiModelProperty("1区域2区域施工图纸")
+    private Integer type;
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * 父级id
+     */
+    @ApiModelProperty(value = "父级id")
+    private String parentId;
+    private String name;
+    /**
+     *children
+     */
+    @ApiModelProperty("children")
+    private List<ConstructionDrawTreeVo> children;
+}

src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegionConstructionDraw.java

@@ -0,0 +1,63 @@
+package com.zhgd.xmgl.modules.quality.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+/**
+ * @Description: 区域施工图纸
+ * @author： pds
+ * @date：   2025-11-24
+ * @version： V1.0
+ */
+@Data
+@TableName("quality_region_construction_draw")
+@ApiModel(value="QualityRegionConstructionDraw实体类",description="QualityRegionConstructionDraw")
+public class QualityRegionConstructionDraw implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	   @TableId(type = IdType.ASSIGN_ID)
+   @ApiModelProperty(value="id")
+	private Long id  ;
+	/**区域id*/
+   @ApiModelProperty(value="区域id")
+	private Long qualityRegionId  ;
+	/**图纸名称*/
+   @ApiModelProperty(value="图纸名称")
+	private String drawingName  ;
+	/**上传时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+   @ApiModelProperty(value="上传时间")
+	private Date uploadTime  ;
+	/**上传人名称*/
+   @ApiModelProperty(value="上传人名称")
+	private String uploaderName  ;
+	/**fileUrl*/
+   @ApiModelProperty(value="fileUrl")
+	private String fileUrl  ;
+	/**文件大小*/
+   @ApiModelProperty(value="文件大小")
+	private String fileSize  ;
+	/**项目sn*/
+	@ApiModelProperty(value="项目sn")
+	private String projectSn  ;
+	/**创建时间 yyyy-MM-dd HH:mm:ss*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+   @ApiModelProperty(value="创建时间 yyyy-MM-dd HH:mm:ss")
+	private Date createTime  ;
+	/**更新时间 yyyy-MM-dd HH:mm:ss*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+   @ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss")
+	private Date updateTime  ;
+}

src/main/java/com/zhgd/xmgl/modules/quality/entity/dto/QualityRegionConstructionDrawDto.java

@@ -0,0 +1,11 @@
+package com.zhgd.xmgl.modules.quality.entity.dto;
+
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value="QualityRegionConstructionDrawDto实体类",description="QualityRegionConstructionDrawDto实体类")
+public class QualityRegionConstructionDrawDto extends QualityRegionConstructionDraw {
+
+}

src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityRegionConstructionDrawVo.java

@@ -0,0 +1,11 @@
+package com.zhgd.xmgl.modules.quality.entity.vo;
+
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value="QualityRegionConstructionDrawVo实体类",description="QualityRegionConstructionDrawVo实体类")
+public class QualityRegionConstructionDrawVo extends QualityRegionConstructionDraw {
+
+}

src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionConstructionDrawMapper.java

@@ -0,0 +1,44 @@
+package com.zhgd.xmgl.modules.quality.mapper;
+
+import java.util.List;
+import java.util.HashMap;
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
+import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionConstructionDrawVo;
+import com.zhgd.xmgl.modules.quality.entity.dto.QualityRegionConstructionDrawDto;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 区域施工图纸
+ * @author： pds
+ * @date：   2025-11-24
+ * @version： V1.0
+ */
+@Mapper
+public interface QualityRegionConstructionDrawMapper extends BaseMapper<QualityRegionConstructionDraw> {
+
+  /**
+     * 分页列表查询区域施工图纸信息
+     *
+     * @param page
+     * @param queryWrapper
+     * @param param
+     * @return
+     */
+    IPage<QualityRegionConstructionDrawVo> queryList(Page<QualityRegionConstructionDrawVo> page, @Param(Constants.WRAPPER) QueryWrapper<QualityRegionConstructionDrawVo> queryWrapper, @Param("param") HashMap<String, Object> param);
+
+    /**
+     * 列表查询区域施工图纸信息
+     *
+     * @param queryWrapper
+     * @param param
+     * @return
+     */
+    List<QualityRegionConstructionDrawVo> queryList(@Param(Constants.WRAPPER) QueryWrapper<QualityRegionConstructionDrawVo> queryWrapper, @Param("param") HashMap<String, Object> param);
+
+}

src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionConstructionDrawMapper.xml

@@ -0,0 +1,11 @@
+<?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.zhgd.xmgl.modules.quality.mapper.QualityRegionConstructionDrawMapper">
+    <select id="queryList" resultType="com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionConstructionDrawVo">
+        select * from (
+        select t.*
+        from quality_region_construction_draw t
+        )t
+        ${ew.customSqlSegment}
+    </select>
+</mapper>

src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionConstructionDrawService.java

@@ -0,0 +1,55 @@
+package com.zhgd.xmgl.modules.quality.service;
+
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
+import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionConstructionDrawVo;
+import com.zhgd.xmgl.modules.quality.entity.dto.QualityRegionConstructionDrawDto;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Description: 区域施工图纸
+ * @author： pds
+ * @date：   2025-11-24
+ * @version： V1.0
+ */
+public interface IQualityRegionConstructionDrawService extends IService<QualityRegionConstructionDraw> {
+    /**
+     * 分页列表查询区域施工图纸信息
+     * @param param 参数map
+     * @return
+     */
+    IPage<QualityRegionConstructionDrawVo> queryPageList(HashMap<String, Object> param);
+    /**
+     * 列表查询区域施工图纸信息
+     * @param param 参数map
+     * @return
+     */
+    List<QualityRegionConstructionDrawVo> queryList(HashMap<String, Object> param);
+    /**
+     * 添加区域施工图纸信息
+     * @param qualityRegionConstructionDrawDto 区域施工图纸
+     * @return
+     */
+    void add(QualityRegionConstructionDrawDto qualityRegionConstructionDrawDto);
+    /**
+     * 编辑区域施工图纸信息
+     * @param qualityRegionConstructionDrawDto 区域施工图纸
+     * @return
+     */
+    void edit(QualityRegionConstructionDrawDto qualityRegionConstructionDrawDto);
+    /**
+     * 根据id删除区域施工图纸信息
+     * @param id 区域施工图纸的id
+     * @return
+     */
+    void delete(String id);
+    /**
+     * 根据id查询区域施工图纸信息
+     * @param id 区域施工图纸的id
+     * @return
+     */
+    QualityRegionConstructionDrawVo queryById(String id);
+
+}

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionConstructionDrawServiceImpl.java

@@ -0,0 +1,95 @@
+package com.zhgd.xmgl.modules.quality.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.xmgl.modules.quality.entity.QualityRegionConstructionDraw;
+import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionConstructionDrawVo;
+import com.zhgd.xmgl.modules.quality.entity.dto.QualityRegionConstructionDrawDto;
+import com.zhgd.xmgl.modules.quality.mapper.QualityRegionConstructionDrawMapper;
+import com.zhgd.xmgl.modules.quality.service.IQualityRegionConstructionDrawService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.util.MapBuilder;
+import com.zhgd.xmgl.util.PageUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.HashMap;
+import java.util.List;
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 区域施工图纸
+ * @author： pds
+ * @date：   2025-11-24
+ * @version： V1.0
+ */
+@Service
+public class QualityRegionConstructionDrawServiceImpl extends ServiceImpl<QualityRegionConstructionDrawMapper, QualityRegionConstructionDraw> implements IQualityRegionConstructionDrawService {
+    @Autowired
+    private QualityRegionConstructionDrawMapper qualityRegionConstructionDrawMapper;
+    @Override
+    public IPage<QualityRegionConstructionDrawVo> queryPageList(HashMap<String, Object> param) {
+        QueryWrapper<QualityRegionConstructionDrawVo> queryWrapper = this.getQueryWrapper(param);
+        Page<QualityRegionConstructionDrawVo> page = PageUtil.getPage(param);
+        IPage<QualityRegionConstructionDrawVo> pageList = baseMapper.queryList(page, queryWrapper,param);
+        pageList.setRecords(this.dealList(pageList.getRecords()));
+        return pageList;
+    }
+
+    @Override
+    public List<QualityRegionConstructionDrawVo> queryList(HashMap<String, Object> param) {
+        QueryWrapper<QualityRegionConstructionDrawVo> queryWrapper = getQueryWrapper(param);
+        return dealList(baseMapper.queryList(queryWrapper,param));
+    }
+
+    private QueryWrapper<QualityRegionConstructionDrawVo> getQueryWrapper(HashMap<String, Object> param) {
+        QueryWrapper<QualityRegionConstructionDrawVo> queryWrapper = QueryGenerator.initPageQueryWrapper(QualityRegionConstructionDrawVo.class, param, true);
+        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(QualityRegionConstructionDrawVo::getId));
+        return queryWrapper;
+    }
+
+    private List<QualityRegionConstructionDrawVo> dealList(List<QualityRegionConstructionDrawVo> list) {
+        return list;
+    }
+
+    @Override
+    public void add(QualityRegionConstructionDrawDto qualityRegionConstructionDrawDto) {
+        qualityRegionConstructionDrawDto.setId(null);
+        baseMapper.insert(qualityRegionConstructionDrawDto);
+    }
+
+    @Override
+    public void edit(QualityRegionConstructionDrawDto qualityRegionConstructionDrawDto) {
+        QualityRegionConstructionDraw oldQualityRegionConstructionDraw = baseMapper.selectById(qualityRegionConstructionDrawDto.getId());
+        if(oldQualityRegionConstructionDraw==null) {
+            throw new OpenAlertException("未找到对应实体");
+        }
+        baseMapper.updateById(qualityRegionConstructionDrawDto);
+    }
+
+    @Override
+    public void delete(String id) {
+        QualityRegionConstructionDraw qualityRegionConstructionDraw = baseMapper.selectById(id);
+        if(qualityRegionConstructionDraw==null) {
+            throw new OpenAlertException("未找到对应实体");
+        }
+        baseMapper.deleteById(id);
+    }
+
+    @Override
+    public QualityRegionConstructionDrawVo queryById(String id) {
+        List<QualityRegionConstructionDrawVo> list = this.queryList(new MapBuilder<String, Object>()
+                    .put("id", id)
+                    .build());
+        QualityRegionConstructionDrawVo entity = CollUtil.getFirst(list);
+        if (entity == null) {
+            throw new OpenAlertException("未找到对应实体");
+        }
+        return entity;
+    }
+
+}

src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecord.java

@@ -295,6 +295,21 @@ public class XzSecurityQualityInspectionRecord implements Serializable {
      */
     @ApiModelProperty(value = "草稿id")
     private Long draftId;
+    /**
+     * 区域施工图纸id
+     */
+    @ApiModelProperty(value = "区域施工图纸id")
+    private Long regionDrawId;
+    /**
+     *图纸名称
+     */
+    @ApiModelProperty("图纸名称")
+    private String drawingName;
+    /**
+     *图纸点位数据
+     */
+    @ApiModelProperty("图纸点位数据")
+    private String drawingPointData;
     /**
      * 分部工程名称
      */

src/main/resources/application.properties

@@ -220,7 +220,7 @@ sada.host=http://api.e.v1.i-sada.net
 rengzhicekong.hj212.port=24041
 #上传文件限制
 # 文件上传允许的扩展名
-file.upload.allowed-extensions=jpg,jpeg,png,gif,bmp,webp,svg,tiff,ico,pdf,doc,docx,xls,xlsx,ppt,pptx,txt,rtf,csv,mp4,avi,mov,wmv,flv,mkv,webm,m4v,3gp,mp3,wav,ogg,flac,aac,wma,m4a,zip,rar,7z,tar,gz,apk,html,htm
+file.upload.allowed-extensions=jpg,jpeg,png,gif,bmp,webp,svg,tiff,ico,pdf,doc,docx,xls,xlsx,ppt,pptx,txt,rtf,csv,mp4,avi,mov,wmv,flv,mkv,webm,m4v,3gp,mp3,wav,ogg,flac,aac,wma,m4a,zip,rar,7z,tar,gz,apk,html,htm,dwg,dxf,dwt,dwf,stl,step,stp,iges,igs,sat,obj,3ds,skp,plt
-file.upload.allowed-mime-types=image/jpeg,image/png,image/gif,image/bmp,image/webp,image/svg+xml,image/tiff,image/x-icon,application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,text/plain,application/rtf,text/csv,video/mp4,video/x-msvideo,video/quicktime,video/x-ms-wmv,video/x-flv,video/x-matroska,video/webm,video/3gpp,audio/mpeg,audio/wav,audio/ogg,audio/flac,audio/aac,audio/x-ms-wma,audio/mp4,application/zip,application/x-rar-compressed,application/x-7z-compressed,application/x-tar,application/gzip,application/vnd.android.package-archive,text/html#mcs8下载选择的是http内网、外网
+# 文件上传允许的MIME类型
-#mcs8下载选择的是http内网、外网
+file.upload.allowed-mime-types=image/jpeg,image/png,image/gif,image/bmp,image/webp,image/svg+xml,image/tiff,image/x-icon,application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,text/plain,application/rtf,text/csv,video/mp4,video/x-msvideo,video/quicktime,video/x-ms-wmv,video/x-flv,video/x-matroska,video/webm,video/3gpp,audio/mpeg,audio/wav,audio/ogg,audio/flac,audio/aac,audio/x-ms-wma,audio/mp4,application/zip,application/x-rar-compressed,application/x-7z-compressed,application/x-tar,application/gzip,application/vnd.android.package-archive,text/html,application/acad,application/x-acad,application/autocad_dwg,image/vnd.dwg,application/dxf,application/x-dxf,application/octet-stream#mcs8下载选择的是http内网、外网
 mcs8.download.http.type=

src/main/resources/init/data/xzSecurityDangerField.json

@@ -204,6 +204,18 @@
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
     "sort": 8
   },
+  {
+    "companyProjectType": 1,
+    "displayFieldName": "施工图纸",
+    "fieldName": "regionDrawId",
+    "isEnabled": 0,
+    "isPinned": 0,
+    "isRequired": 0,
+    "originalFieldName": "施工图纸",
+    "recordType": 1,
+    "sn": "2e07f0e2569c43fb835ae2082d1d314f",
+    "sort": 9
+  },
   {
     "companyProjectType": 1,
     "displayFieldName": "紧急程度",
@@ -214,7 +226,7 @@
     "originalFieldName": "紧急程度",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 9
+    "sort": 10
   },
   {
     "companyProjectType": 1,
@@ -227,7 +239,7 @@
     "originalFieldName": "检查时间",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 10
+    "sort": 11
   },
   {
     "companyProjectType": 1,
@@ -239,7 +251,7 @@
     "originalFieldName": "分包单位",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 11
+    "sort": 12
   },
   {
     "companyProjectType": 1,
@@ -251,7 +263,7 @@
     "originalFieldName": "整改时限",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 12
+    "sort": 13
   },
   {
     "companyProjectType": 1,
@@ -263,7 +275,7 @@
     "originalFieldName": "整改人",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 13
+    "sort": 14
   },
   {
     "companyProjectType": 1,
@@ -275,7 +287,7 @@
     "originalFieldName": "复查人",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 14
+    "sort": 15
   },
   {
     "companyProjectType": 1,
@@ -288,7 +300,7 @@
     "originalFieldName": "核验人",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 15
+    "sort": 16
   },
   {
     "companyProjectType": 1,
@@ -300,7 +312,7 @@
     "originalFieldName": "隐患图片",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 16
+    "sort": 17
   },
   {
     "companyProjectType": 1,
@@ -312,7 +324,7 @@
     "originalFieldName": "上传附件",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 17
+    "sort": 18
   },
   {
     "companyProjectType": 1,
@@ -324,7 +336,7 @@
     "originalFieldName": "现场整改",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 18
+    "sort": 19
   },
   {
     "companyProjectType": 1,
@@ -336,7 +348,7 @@
     "originalFieldName": "整改后图片",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 19
+    "sort": 20
   },
   {
     "companyProjectType": 1,
@@ -348,6 +360,6 @@
     "originalFieldName": "责任专业",
     "recordType": 1,
     "sn": "2e07f0e2569c43fb835ae2082d1d314f",
-    "sort": 20
+    "sort": 21
   }
 ]