修改导入导出

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java

@@ -249,14 +249,15 @@ public class BasicInformationController extends BaseController {
     }
 
     /**
-     * 动态导出基本信息
+     * 动态导出基本信息(基本信息,建筑，规划)
      */
     @PreAuthorize("@ss.hasAnyRoles('admin,common')")
-    @ApiOperation("动态导出基本信息")
+    @ApiOperation("动态导出基本信息(基本信息,建筑，规划)")
     @PostMapping("/exportInfo")
     public void exportInfo(HttpServletResponse response, @RequestParam List<Long> idList) throws NoSuchFieldException, IOException, IllegalAccessException {
         //获取对应的基本信息的列表
         List<ProjectExcelInfo> info = basicInformationService.selectList(idList);
+
         System.out.println(info);
         //excel 第一层单元格
         List<String> yc = new ArrayList<>();
@@ -275,6 +276,9 @@ public class BasicInformationController extends BaseController {
         // 遍历除了建筑获取其他字段注解
         for (int i = 0; i < info.size(); i++) {
             if (i == 0) {
+                if(info.get(i).getXmjzxx().isEmpty()){
+                    throw new ServiceException("请选择有楼栋的项目!");
+                }
                 for (Field field : clazz.getDeclaredFields()) {
                     Excel excelColumn = field.getAnnotation(Excel.class);
                     if (excelColumn != null) {
@@ -420,5 +424,18 @@ public class BasicInformationController extends BaseController {
         ExcelUtil<BasicInformation> util = new ExcelUtil<>(BasicInformation.class);
         util.importTemplateExcel(response, "项目数据");
     }
+
+    /**
+     * 根据条件导出基本信息
+     */
+    @ApiOperation(value = "根据条件导出基本信息")
+    @PostMapping(value = "/export")
+    public void export(HttpServletResponse response, @RequestParam Long xmid) throws Exception {
+        List<BasicInformation> filteredList = new ArrayList<>();
+        BasicInformation a1 = basicInformationService.getById(xmid);
+        filteredList.add(a1);
+        ExcelUtil<BasicInformation> util = new ExcelUtil<>(BasicInformation.class);
+        util.exportExcel(response, filteredList, "基本信息");
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.Serializable;
 import java.util.List;
@@ -126,5 +127,26 @@ public class BuildingInformationController extends BaseController {
         }
         return AjaxResult.success(successMsg);
     }
+
+    /**
+     * 根据条件导出所有楼栋信息
+     */
+    @ApiOperation(value = "根据条件导出所有楼栋信息")
+    @PostMapping(value = "/export")
+    public void export(HttpServletResponse response, @Valid ZwIdPageReq zwIdPageReq) throws Exception {
+        List<BuildingInformation> filteredList = buildingInformationService.selectAll(zwIdPageReq);
+        ExcelUtil<BuildingInformation> util = new ExcelUtil<>(BuildingInformation.class);
+        util.exportExcel(response, filteredList, "楼栋信息");
+    }
+
+    /**
+     * 模板信息
+     */
+    @ApiOperation("导出建筑信息模板")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<BuildingInformation> util = new ExcelUtil<>(BuildingInformation.class);
+        util.importTemplateExcel(response, "建筑信息模板");
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java

@@ -4,7 +4,10 @@ package com.ruoyi.gysl.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gysl.entity.BasicInformation;
 import com.ruoyi.gysl.entity.PlanInformation;
+import com.ruoyi.gysl.entity.request.BasicInformationPageReq;
 import com.ruoyi.gysl.entity.request.ZwIdPageReq;
 import com.ruoyi.gysl.service.BasicInformationService;
 import com.ruoyi.gysl.service.PlanInformationService;
@@ -14,7 +17,10 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 规划信息(PlanInformation)表控制层
@@ -22,7 +28,7 @@ import javax.validation.Valid;
  * @author makejava
  * @since 2025-02-24 14:21:57
  */
-@Api(tags = "规划信息 no")
+@Api(tags = "规划信息")
 @RestController
 @RequestMapping("/gysl/planInformation")
 public class PlanInformationController extends BaseController {
@@ -82,5 +88,18 @@ public class PlanInformationController extends BaseController {
         basicInformationService.testXmId(planInformation.getXmId());
         return success(planInformationService.updateById(planInformation));
     }
+
+    /**
+     * 根据条件导出规划信息
+     */
+    @ApiOperation(value = "根据条件导出规划信息")
+    @PostMapping(value = "/export")
+    public void export(HttpServletResponse response, @Valid ZwIdPageReq zwIdPageReq) throws Exception {
+        List<PlanInformation> a1 = new ArrayList<>();
+        PlanInformation filteredList = planInformationService.selectAll(zwIdPageReq);
+        a1.add(filteredList);
+        ExcelUtil<PlanInformation> util = new ExcelUtil<>(PlanInformation.class);
+        util.exportExcel(response, a1, "基本信息");
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java

@@ -96,7 +96,7 @@ public class ProjectOtherInfoController extends BaseController {
      */
     @ApiOperation(value = "根据条件导出项目其他信息")
     @PostMapping(value = "/export")
-    public void export(HttpServletResponse response, ZwIdPageReq zwIdPageReq) throws Exception {
+    public void export(HttpServletResponse response,@Valid ZwIdPageReq zwIdPageReq) throws Exception {
         List<ProjectOtherInfo> filteredList = projectOtherInfoService.searchId(zwIdPageReq);
         ExcelUtil<ProjectOtherInfo> util = new ExcelUtil<>(ProjectOtherInfo.class);
         util.exportExcel(response, filteredList, "项目其他信息");

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java

@@ -10,12 +10,12 @@ import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * 基本信息(BasicInformation)表实体类
@@ -33,100 +33,114 @@ public class BasicInformation extends BaseModel {
     private Long id;
 
 
-    @Excel(name = "统一社会信用代码*", sort = 2,required = true)
+    @Excel(name = "统一社会信用代码*", sort = 2, required = true, type = Excel.Type.ALL,headerBackgroundColor= IndexedColors.RED1)
     @ApiModelProperty("统一社会信用代码")
     private String tyshxydm;
 
 
     @NotBlank
-    @Excel(name = "项目名称*", sort = 2,required = true)
+    @Excel(name = "项目名称*", sort = 2, required = true, type = Excel.Type.ALL,headerBackgroundColor= IndexedColors.RED1)
     @ApiModelProperty("项目名称")
     private String name;
 
     @ApiModelProperty("总用地面积")
-    @Excel(name = "总用地面积", sort = 8)
+    @Excel(name = "总用地面积", sort = 8,type= Excel.Type.ALL)
     @TableField(exist = false)
     private BigDecimal zydmj;
 
     @ApiModelProperty("总建筑面积")
+    @Excel(name = "总建筑面积",type = Excel.Type.EXPORT)
     @TableField(exist = false)
     private BigDecimal zjzmj;
 
 
     @NotBlank
-    @Excel(name = "项目法人单位", sort = 4,required = true)
+    @Excel(name = "项目法人单位", sort = 4, required = true,type= Excel.Type.ALL)
     @ApiModelProperty("项目法人单位")
     private String xmfrdwxz;
 
 
     @NotBlank
     @ApiModelProperty("项目法人单位性质")
+    @Excel(name = "项目法人单位性质",dictType = "xmfrdwxz",comboReadDict = true,type = Excel.Type.EXPORT)
     private Integer nature;
 
     @ApiModelProperty("施工单位")
+    @Excel(name = "施工单位",type = Excel.Type.EXPORT)
     private String sgdw;
 
     @ApiModelProperty("设计单位")
+    @Excel(name = "设计单位",type = Excel.Type.EXPORT)
     private String sjdw;
 
     @ApiModelProperty("总投资额")
-    @Excel(name = "总投资额", sort = 7)
+    @Excel(name = "总投资额", sort = 7,type= Excel.Type.ALL)
     private BigDecimal ztze;
 
     @NotBlank
     @ApiModelProperty("所属功能区")
+    @Excel(name = "所属功能区",dictType = "ssgnq",comboReadDict = true,type = Excel.Type.EXPORT)
     private Integer ssgnq;
 
 
     @ApiModelProperty("建设开始时间")
-    @Excel(name = "建设开始时间", dateFormat = "yyyy-MM-dd", sort = 5)
+    @Excel(name = "建设开始时间", dateFormat = "yyyy-MM-dd", sort = 5,type= Excel.Type.ALL)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate begainTime;
 
     @ApiModelProperty("建设结束时间")
-    @Excel(name = "建设结束时间", dateFormat = "yyyy-MM-dd", sort = 6)
+    @Excel(name = "建设结束时间", dateFormat = "yyyy-MM-dd", sort = 6,type= Excel.Type.ALL)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endTime;
 
     @NotBlank
-    @Excel(name = "现状分类", sort = 3, dictType = "xzfl", comboReadDict = true)
+    @Excel(name = "现状分类", sort = 3, dictType = "xzfl", comboReadDict = true,type= Excel.Type.ALL)
     @ApiModelProperty("现状分类")
     private Integer xzfl;
 
     @NotBlank
+    @Excel(name = "建设地点",type = Excel.Type.EXPORT)
     @ApiModelProperty("建设地点")
     private String jsdd;
 
     @NotBlank
+    @Excel(name = "重点发展产业",type = Excel.Type.EXPORT)
     @ApiModelProperty("重点发展产业")
     private String prioritize;
 
     @NotBlank
+    @Excel(name = "建设模式",dictType = "jsms",comboReadDict = true,type = Excel.Type.EXPORT)
     @ApiModelProperty("建设模式")
     private Integer jsms;
 
     @ApiModelProperty("项目标签")
+    @Excel(name = "项目标签",type = Excel.Type.EXPORT)
     private String label;
 
     @NotBlank
     @ApiModelProperty("项目负责人")
+    @Excel(name = "项目负责人",type = Excel.Type.EXPORT)
     private String projectLeader;
 
     @NotBlank
     @ApiModelProperty("联系方式")
+    @Excel(name = "联系方式",type = Excel.Type.EXPORT)
     private String phone;
 
 
     @ApiModelProperty("施工许可证发放时间")
+    @Excel(name = "施工许可证发放时间",type = Excel.Type.EXPORT)
     private String issuingTime;
 
-    @ApiModelProperty("施工许可证发放时间")
+    @ApiModelProperty("竣工验收时间")
+    @Excel(name = "竣工验收时间",type = Excel.Type.EXPORT)
     private String acceptanceTime;
 
 
     @ApiModelProperty("建设进度")
+    @Excel(name = "建设进度",type = Excel.Type.EXPORT)
     private String jsjd;
 
     @NotBlank
@@ -141,8 +155,11 @@ public class BasicInformation extends BaseModel {
     private String fj;
 
     @ApiModelProperty("经度")
+    @Excel(name = "经度",type = Excel.Type.EXPORT)
     private String longitude;
 
+
+    @Excel(name = "纬度",type = Excel.Type.EXPORT )
     @ApiModelProperty("纬度")
     private String latitude;
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -36,7 +37,7 @@ public class BuildingInformation implements Serializable {
     /**
      * 楼栋名称
      */
-    @Excel(name = "楼栋名称")
+    @Excel(name = "楼栋名称",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "楼栋名称")
     @TableField("name")
     private String name;
@@ -51,7 +52,7 @@ public class BuildingInformation implements Serializable {
     /**
      * 层数
      */
-    @Excel(name = "层数")
+    @Excel(name = "层数",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "层数")
     @TableField("floor")
     private Integer floor;
@@ -59,7 +60,7 @@ public class BuildingInformation implements Serializable {
     /**
      * 总建筑高度
      */
-    @Excel(name = "总建筑高度")
+    @Excel(name = "总建筑高度",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "总建筑高度")
     @TableField("total_building_height")
     private BigDecimal totalBuildingHeight;
@@ -67,7 +68,7 @@ public class BuildingInformation implements Serializable {
     /**
      * 首层高度
      */
-    @Excel(name = "首层高度")
+    @Excel(name = "首层高度",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "首层高度")
     @TableField("scgd")
     private BigDecimal scgd;

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java

@@ -9,6 +9,7 @@ import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import java.io.Serializable;
 
@@ -27,15 +28,15 @@ public class Ml extends BaseModel implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @Excel(name = "上楼目录类别", dictType = "shangloumulu", comboReadDict = true)
+    @Excel(name = "上楼目录类别", dictType = "shangloumulu", comboReadDict = true,headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty("上楼目录类别")
     private Integer slmllb;
 
-    @Excel(name = "工业大类")
+    @Excel(name = "工业大类",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty("工业大类")
     private String gydl;
 
-    @Excel(name = "产业")
+    @Excel(name = "产业",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty("产业")
     private String cy;
 }

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -41,76 +43,88 @@ public class PlanInformation extends BaseModel implements Serializable {
     /**
      * 总用地面积
      */
+    @Excel(name = "总用地面积",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "总用地面积 ")
     private BigDecimal zydmj;
 
     /**
      * 容积率
      */
+    @Excel(name = "容积率",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "容积率")
     private BigDecimal rjl;
 
     /**
      * 总建筑面积
      */
+    @Excel(name = "总建筑面积",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "总建筑面积 ")
     private BigDecimal zjzmj;
 
     /**
      * 标准层建筑面积
      */
+    @Excel(name = "标准层建筑面积",headerBackgroundColor= IndexedColors.RED1,required = true)
     @ApiModelProperty(value = "标准层建筑面积")
     private BigDecimal bzcjzmj;
 
     /**
      * 计容积率建筑面积
-     * 
+     * 
      */
+    @Excel(name = "计容积率建筑面积")
     @ApiModelProperty(value = "计容积率建筑面积")
     private BigDecimal jrjljzmj;
 
     /**
      * 建筑密度
      */
+    @Excel(name = "建筑密度")
     @ApiModelProperty(value = "建筑密度")
     private BigDecimal jzmd;
 
     /**
      * 绿地率
      */
+    @Excel(name = "绿地率")
     @ApiModelProperty(value = "绿地率")
     private BigDecimal ldl;
 
     /**
      * 建筑栋数
-     * 
+     * 
      */
+    @Excel(name = "建筑栋数")
     @ApiModelProperty(value = "建筑栋数")
     private Integer jzds;
 
     /**
      * 地上建筑面积
-     * 
+     * 
      */
+    @Excel(name = "地上建筑面积")
     @ApiModelProperty(value = "地上建筑面积")
     private BigDecimal dsjzmj;
 
     /**
      * 地下建筑面积
-     * 
+     * 
      */
+    @Excel(name = "地下建筑面积")
     @ApiModelProperty(value = "地下建筑面积")
     private BigDecimal dxjzmj;
 
     /**
      * 最高建筑层数
      */
+    @Excel(name = "最高建筑层数")
     @ApiModelProperty(value = "最高建筑层数")
     private Integer zgjzcs;
 
     /**
      * 最高建筑高度
      */
+    @Excel(name = "最高建筑高度")
     @ApiModelProperty(value = "最高建筑高度")
     private BigDecimal zgjzgd;
 
@@ -118,12 +132,14 @@ public class PlanInformation extends BaseModel implements Serializable {
      * 机动车停车位
      *
      */
+    @Excel(name = "机动车停车位")
     @ApiModelProperty(value = "机动车停车位")
     private Integer jdctcw;
 
     /**
      * 非机动车停车位
      */
+    @Excel(name = "非机动车停车位")
     @ApiModelProperty(value = "非机动车停车位")
     private Integer fjdctcw;
 
@@ -136,6 +152,7 @@ public class PlanInformation extends BaseModel implements Serializable {
     /**
      * 防火等级
      */
+    @Excel(name = "防火等级")
     @ApiModelProperty(value = "防火等级")
     private String fhdj;
 }

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import java.io.Serializable;
 
@@ -32,9 +34,11 @@ public class ProjectOtherInfo  extends BaseModel implements Serializable {
     private Long xmId;
 
     @ApiModelProperty("键")
+    @Excel(name = "字段名称",headerBackgroundColor= IndexedColors.RED1,required = true)
     private String zdname;
 
     @ApiModelProperty("值")
+    @Excel(name = "字段内容",headerBackgroundColor= IndexedColors.RED1,required = true)
     private String zdinfor;
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java

@@ -9,6 +9,7 @@ import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import java.io.Serializable;
 
@@ -28,11 +29,11 @@ public class Xfcygl extends BaseModel implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "产业类别")
-    @Excel(name = "产业类别", dictType = "cylb", comboReadDict = true)
+    @Excel(name = "产业类别", dictType = "cylb", comboReadDict = true,headerBackgroundColor= IndexedColors.RED1,required = true)
     private String cylb;
 
     @ApiModelProperty(value = "产业细分")
-    @Excel(name = "产业细分")
+    @Excel(name = "产业细分",headerBackgroundColor= IndexedColors.RED1,required = true)
     private String cyxf;
 
     @ApiModelProperty(value = "原材料及生产环节")

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectExcelInfo.java

@@ -28,7 +28,7 @@ public class ProjectExcelInfo {
     @ApiModelProperty("项目法人单位")
     private String xmfrdwxz;
 
-    @Excel(name = "项目法人单位性质",group = "项目基础信息")
+    @Excel(name = "项目法人单位性质",group = "项目基础信息",dictType = "xmfrdwxz")
     @ApiModelProperty("项目法人单位性质")
     private Integer nature;
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxDetail/WysmxDetail.java

@@ -11,6 +11,9 @@ import lombok.Data;
 @Data
 public class WysmxDetail {
 
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
     @ApiModelProperty("键")
     private String zdname;
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java

@@ -30,7 +30,6 @@ public interface BasicInformationMapper extends BaseMapper<BasicInformation> {
      * @return 所有数据
      */
     Page<BasicInformation> page(Page<BasicInformation> page, @Param("req") BasicInformationPageReq req);
-
     /**
      * 有经纬度的项目列表
      */

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java

@@ -121,6 +121,8 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
         return baseMapper.page(page, req);
     }
 
+
+
     /**
      * 根据基本信息的id列表来查找
      */
@@ -403,10 +405,11 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
         baseMapper.delete4(req.getBasicInformation().getId());
         baseMapper.delete5(req.getBasicInformation().getId());
 
-
         baseMapper.insert1(req.getBasicInformation());
         baseMapper.insert2(req.getPlanInformation());
+
         req.getWysmxInformations().forEach(x -> baseMapper.insert3(x));
+
         baseMapper.insert4(req.getQyrzInformation());
         req.getProjectOtherInfos().forEach(x -> baseMapper.insert5(x));
         return req.getBasicInformation().getId();

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java

@@ -73,6 +73,7 @@ public class WysmxInformationServiceImpl extends ServiceImpl<WysmxInformationMap
                             List<WysmxDetail> itemList = list.stream().map(e -> {
                                 WysmxDetail item = new WysmxDetail();
                                 item.setZdname(e.getZdname());
+                                item.setId(e.getId());
                                 item.setZdinfor(e.getZdinfor());
                                 return item;
                             }).collect(Collectors.toList());

ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml

@@ -343,6 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
+
     <select id="projectList" resultType="com.ruoyi.gysl.entity.BasicInformation">
         SELECT a.*,
             ROUND( IFNULL( SUM( b.zjzmj ), 0 ) / 10000, 2 ) AS zjzmj
@@ -350,4 +351,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.longitude is not null and a.latitude is not null
     </select>
 
+
+
 </mapper>

ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml

@@ -8,18 +8,18 @@
                IFNULL(SUM(CASE WHEN a.xzfl = 1 THEN 1 ELSE 0 END), 0)                        AS allBuilding1,
                IFNULL(SUM(CASE WHEN a.xzfl = 2 THEN 1 ELSE 0 END), 0)                        AS allBuilding2,
                IFNULL(SUM(CASE WHEN a.xzfl = 3 THEN 1 ELSE 0 END), 0)                        AS allBuilding3,-- 当前年度统计
-               COUNT(CASE WHEN YEAR ( a.create_time ) = YEAR ( CURRENT_DATE ()) THEN 1 END ) AS currentYearProject,
+               COUNT(CASE WHEN YEAR ( a.begain_time ) = YEAR ( CURRENT_DATE ()) THEN 1 END ) AS currentYearProject,
                ROUND(
-                           IFNULL(SUM(CASE WHEN YEAR ( a.create_time ) = YEAR ( CURRENT_DATE ()) THEN b.zjzmj END ), 0) /
+                           IFNULL(SUM(CASE WHEN YEAR ( a.begain_time ) = YEAR ( CURRENT_DATE ()) THEN b.zjzmj END ), 0) /
                            10000,
                            2
                )                                                                             AS currentYearGrossArea,
                IFNULL(
-                       SUM(CASE WHEN a.xzfl = 1 AND YEAR ( a.create_time ) = YEAR ( CURRENT_DATE ()) THEN 1 ELSE 0 END ),
+                       SUM(CASE WHEN a.xzfl = 1 AND YEAR ( a.begain_time ) = YEAR ( CURRENT_DATE ()) THEN 1 ELSE 0 END ),
                        0
                )                                                                             AS currentYearBuilding1,
                IFNULL(
-                       SUM(CASE WHEN a.xzfl = 2 AND YEAR ( a.create_time ) = YEAR ( CURRENT_DATE ()) THEN 1 ELSE 0 END ),
+                       SUM(CASE WHEN a.xzfl = 2 AND YEAR ( a.begain_time ) = YEAR ( CURRENT_DATE ()) THEN 1 ELSE 0 END ),
                        0
                )                                                                             AS currentYearBuilding2
         FROM gysl_basic_information a

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ChangeExcelUtil.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.utils.poi;
 
-import com.ruoyi.common.annotation.Excel;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -11,7 +10,6 @@ import org.apache.poi.xssf.usermodel.XSSFFont;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import java.lang.reflect.Field;
 import java.util.Map;
 
 /**
@@ -21,10 +19,6 @@ import java.util.Map;
  */
 public class ChangeExcelUtil<T> {
 
-
-
-
-
     public static void extracted(XSSFSheet sheet, Map<String, Integer> s, int i,int jzxx) {
         // todo: 合并参数分别为： 起始行，结束行，起始列，结束列
         sheet.addMergedRegion(new CellRangeAddress(0, 2, 0, 0));