diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java
index 885e074..8bdf218 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java
@@ -137,6 +137,27 @@ public class BuildingInformation implements Serializable {
@TableField("sfydzk")
private Integer sfydzk;
+ /**
+ * 地基基础等级
+ */
+ @Excel(name = "地基基础等级")
+ @ApiModelProperty(value = "地基基础等级")
+ private String djjcdj;
+
+ /**
+ * 吊车情况
+ */
+ @Excel(name = "吊车情况")
+ @ApiModelProperty(value = "吊车情况")
+ private String dcqk;
+ /**
+ * 货梯情况
+ */
+ @Excel(name = "货梯情况")
+ @ApiModelProperty(value = "货梯情况")
+ private String htqk;
+
+
/**
* 是否有汽车盘道
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java
index ebf5d6e..80d14db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java
@@ -1,9 +1,6 @@
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.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.gysl.entity.baseModel.BaseModel;
@@ -74,4 +71,65 @@ public class Enterprise extends BaseModel implements Serializable {
@TableField("zjjg")
@Excel(name = "租金价格")
private Integer zjjg;
+
+ /**
+ * 注册地址
+ */
+ @ApiModelProperty(value = "注册地址")
+ @Excel(name = "注册地址")
+ private String zcdz;
+
+ /**
+ * 成立日期
+ */
+ @ApiModelProperty(value = "成立日期 yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "成立日期",dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime clrq;
+
+ /**
+ * 注册资本
+ */
+ @ApiModelProperty(value = "注册资本")
+ @Excel(name = "注册资本")
+ private String zczb;
+
+ /**
+ * 法定代表人
+ */
+ @ApiModelProperty(value = "法定代表人")
+ @Excel(name = "注册地址")
+ private String fddbr;
+
+ /**
+ * 企业类型
+ */
+ @ApiModelProperty(value = "企业类型")
+ @Excel(name = "企业类型")
+ private String qylx;
+
+
+ /**
+ * 经营范围
+ */
+ @ApiModelProperty(value = "经营范围")
+ @Excel(name = "经营范围")
+ private String jyfw;
+
+
+ /**
+ * 组织机构代码
+ */
+ @ApiModelProperty(value = "组织机构代码")
+ @Excel(name = "组织机构代码")
+ private String zzjgdm;
+
+ /**
+ * 税务登记号码
+ */
+ @ApiModelProperty(value = "税务登记号码")
+ @Excel(name = "税务登记号码")
+ private String swdjhm;
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java
index a68f514..0c2c478 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java
@@ -29,6 +29,15 @@ public class AllProjectResponse {
@ApiModelProperty("拟建数量")
private Integer allBuilding3;
+ @ApiModelProperty("总投资额")
+ private BigDecimal allInvest1;
+
+ @ApiModelProperty("计划投资额")
+ private BigDecimal allInvest2;
+
+ @ApiModelProperty("占地面积")
+ private BigDecimal allInvest3;
+
@ApiModelProperty("当年_新开工项目数")
private Integer currentYearProject;
@@ -44,4 +53,13 @@ public class AllProjectResponse {
@ApiModelProperty("当年_拟建数量")
private Integer currentBuilding3;
+
+ @ApiModelProperty("总投资额")
+ private BigDecimal currentAllInvest1;
+
+ @ApiModelProperty("计划投资额")
+ private BigDecimal currentAllInvest2;
+
+ @ApiModelProperty("占地面积")
+ private BigDecimal currentAllInvest3;
}
diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml
index f1aefea..115f37d 100644
--- a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml
@@ -8,6 +8,9 @@
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,
+ IFNULL(SUM(a.ztze), 0) AS allInvest1,
+ IFNULL(SUM(a.jhtze), 0) AS allInvest2,
+ IFNULL(SUM(b.zydmj), 0) AS allInvest3,
IFNULL(SUM(
CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN 1 ELSE 0 END
@@ -27,7 +30,41 @@
IFNULL(SUM(
CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) and a.xzfl = 3 THEN 1 ELSE 0 END
- ), 0) AS currentBuilding3
+ ), 0) AS currentBuilding3,
+
+ IFNULL(SUM(
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = #{years} THEN a.ztze ELSE 0 END
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN a.ztze ELSE 0 END
+
+
+ ), 0) AS currentAllInvest1,
+
+ IFNULL(SUM(
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = #{years} THEN a.jhtze ELSE 0 END
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN a.jhtze ELSE 0 END
+
+
+ ), 0) AS currentAllInvest2,
+
+ IFNULL(SUM(
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = #{years} THEN b.zydmj ELSE 0 END
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN b.zydmj ELSE 0 END
+
+
+ ), 0) AS currentAllInvest3
+
FROM gysl_basic_information a
LEFT JOIN gysl_plan_information b ON a.id = b.xm_id
where a.tyshxydm = #{userName}
diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
index 4e5a365..117bd4f 100644
--- a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
@@ -8,6 +8,9 @@
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,
+ IFNULL(SUM(a.ztze), 0) AS allInvest1,
+ IFNULL(SUM(a.jhtze), 0) AS allInvest2,
+ IFNULL(SUM(b.zydmj), 0) AS allInvest3,
IFNULL(SUM(
@@ -62,7 +65,41 @@
CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) and a.xzfl = 3 THEN 1 ELSE 0 END
- ), 0) AS currentBuilding3
+ ), 0) AS currentBuilding3,
+
+ IFNULL(SUM(
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = #{years} THEN a.ztze ELSE 0 END
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN a.ztze ELSE 0 END
+
+
+ ), 0) AS currentAllInvest1,
+
+ IFNULL(SUM(
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = #{years} THEN a.jhtze ELSE 0 END
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN a.jhtze ELSE 0 END
+
+
+ ), 0) AS currentAllInvest2,
+
+ IFNULL(SUM(
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = #{years} THEN b.zydmj ELSE 0 END
+
+
+ CASE WHEN LEFT(a.begain_time, 4) = YEAR(NOW()) THEN b.zydmj ELSE 0 END
+
+
+ ), 0) AS currentAllInvest3
+
FROM gysl_basic_information a
LEFT JOIN gysl_plan_information b ON a.id = b.xm_id