Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java

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

@@ -27,11 +27,11 @@ import java.time.LocalDateTime;
 @TableName("building_information")
 @ApiModel(value = "BuildingInformation")
 public class BuildingInformation implements Serializable {
-    private static final long serialVersionUID = -28824019069166362L;
+
 
     @ApiModelProperty(value = "id}")
     @TableId(value = "id", type = IdType.AUTO)
-    @TableField("id")
+
     private Integer id;
 
     /**

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

@@ -1,6 +1,8 @@
 package com.ruoyi.gysl.entity;
 
+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.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -23,13 +25,13 @@ import java.time.LocalDateTime;
 @TableName("enterprise")
 @ApiModel(value = "Enterprise", description = "企业基本信息")
 public class Enterprise implements Serializable {
-    private static final long serialVersionUID = -87535476195722857L;
+
 
     /**
      * 主键id
      */
     @ApiModelProperty(value = "主键id")
-    @TableField("id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicRequest.java

@@ -0,0 +1,82 @@
+package com.ruoyi.gysl.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @author dong
+ * @since 2025/2/26 9:20
+ */
+@Data
+@ApiModel("基本信息导出类")
+public class BasicRequest implements Serializable {
+
+    @Excel(name = "序号")
+    private Integer id;
+
+
+    //项目名称
+    @Excel(name = "项目名称")
+    @ApiModelProperty("项目名称")
+    private String name;
+
+
+    //项目法人单位
+    @Excel(name = "项目法人单位")
+    @ApiModelProperty("项目法人单位")
+    private String xmfrdwxz;
+
+
+
+    //总投资额
+    @Excel(name = "总投资额(万元）")
+    @ApiModelProperty("总投资额")
+    private BigDecimal ztze;
+
+
+    //所属功能区
+    @Excel(name = "所属功能区")
+    @ApiModelProperty("所属功能区")
+    private Integer ssgnq;
+
+
+    //建设开始时间
+    @Excel(name = "建设开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("建设开始时间")
+    private LocalDateTime begainTime;
+
+
+    //建设结束时间
+    @Excel(name = "建设结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("建设结束时间")
+    private LocalDateTime endTime;
+
+    //现状分类
+    @Excel(name = "现状分类")
+    @ApiModelProperty("现状分类")
+    private Integer xzfl;
+
+
+    /**
+     * 总用地面积
+     */
+    @ApiModelProperty(value = "总用地面积（平方米）")
+    @Excel(name = "总用地面积")
+    private BigDecimal zydmj;
+
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.gysl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.gysl.entity.Ml;
+
+/**
+ * 目录管理(Ml)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-02-25 14:21:08
+ */
+public interface MlDao extends BaseMapper<Ml> {
+
+}
+

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

@@ -0,0 +1,15 @@
+package com.ruoyi.gysl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.gysl.entity.QyrzInformation;
+
+/**
+ * (QyrzInformation)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-02-25 14:45:29
+ */
+public interface QyrzInformationDao extends BaseMapper<QyrzInformation> {
+
+}
+

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

@@ -0,0 +1,15 @@
+package com.ruoyi.gysl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.gysl.entity.Xmpjqd;
+
+/**
+ * 项目评价清单(Xmpjqd)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-02-25 14:19:33
+ */
+public interface XmpjqdDao extends BaseMapper<Xmpjqd> {
+
+}
+

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

@@ -0,0 +1,15 @@
+package com.ruoyi.gysl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.gysl.entity.Xmxl;
+
+/**
+ * 项目巡礼(Xmxl)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-02-25 14:17:35
+ */
+public interface XmxlDao extends BaseMapper<Xmxl> {
+
+}
+

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java

@@ -7,11 +7,13 @@ import com.ruoyi.gysl.entity.response.WysmxResponse;
 
 import java.util.List;
 
+import java.util.List;
+
 /**
  * 五要素模型信息(WysmxInformation)表服务接口
  *
  * @author makejava
- * @since 2025-02-24 14:29:58
+ * @since 2025-02-26 11:09:31
  */
 public interface WysmxInformationService extends IService<WysmxInformation> {
 

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

@@ -0,0 +1,7 @@
+<?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.ruoyi.gysl.mapper.WysmxInformationDao">
+
+</mapper>