1. 增加地块价值查询接口

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/resManager/catalog/controller/RescatalogController.java

@@ -86,8 +86,6 @@ public class RescatalogController extends JeecgController<Rescatalog, IRescatalo
         queryWrapper.eq(Rescatalog::getPid, pid).orderByAsc(Rescatalog::getDisplayorder);
         //查询pid=0的一级内容
         List<Rescatalog> resCatalogs = rescatalogService.list(queryWrapper);
-        System.out.println("##################################################################################################");
-        System.out.println(resCatalogs);
         if (resCatalogs.size() > 0) {
             String displayers = "";
             String analysistypes = "";

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/controller/QcSsgqzysytdqkGzvController.java

@@ -25,8 +25,10 @@ import org.jeecg.modules.zrzyqc.gzvhb.model.ResultCount;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqkzc;
+import org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz;
 import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqk1Service;
 import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkzcService;
+import org.jeecg.modules.zrzyqc.qcsb.service.SsDkzjService;
 import org.jeecg.modules.zrzyqc.qcsb.vo.QcSsgqzysytdqkGzvVo;
 import org.jeecg.modules.zrzyqc.qcsb.vo.QcSsgqzysytdqkVo;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
@@ -80,6 +82,8 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 	private IQcQyxxService qcQyxxService;
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
+	@Autowired
+	private SsDkzjService ssDkzjService;
 
 	/**
 	 * 分页列表查询
@@ -778,6 +782,9 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 				Vo.setPzytText(one.getPzyt());
 			}
 		}
+		//计算地价
+		List<SsDkjz> ssDkjz=ssDkzjService.queryList(DKBH);
+		Vo.setSsDkjz(ssDkjz);
 		return Result.OK("查询成功!", Vo);
 	}
 

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/entity/SsDkjz.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.zrzyqc.qcsb.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.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ */
+@Data
+@Accessors(chain = true)
+@TableName("ss_dkjz")
+@EqualsAndHashCode(callSuper = false)
+public class SsDkjz implements Serializable {
+    /**主键*/
+//    @TableId(type = IdType.INPUT)
+//    @ApiModelProperty(value = "主键")
+//    private long id;
+
+    @Excel(name = "地块编号", width = 15)
+    @ApiModelProperty(value = "地块编号")
+    private String dkbh;
+
+    @Excel(name = "地类编码", width = 15)
+    @ApiModelProperty(value = "地类编码")
+    private String dlbm;
+
+    @Excel(name = "地类名称", width = 15)
+    @ApiModelProperty(value = "地类名称")
+    private String dlmc;
+
+    @Excel(name = "行政区划代码", width = 15)
+    @ApiModelProperty(value = "行政区划代码")
+    private String xjxzqhdm;
+
+    @Excel(name = "行政区划名称", width = 15)
+    @ApiModelProperty(value = "行政区划名称")
+    private String xjxzqhmc;
+
+    @Excel(name = "面积", width = 15)
+    @ApiModelProperty(value = "面积")
+    private java.lang.Double mj;
+
+    @Excel(name = "平均价格", width = 15)
+    @ApiModelProperty(value = "平均价格")
+    private java.lang.Double pjjg;
+
+    @Excel(name = "最高价格", width = 15)
+    @ApiModelProperty(value = "最高价格")
+    private java.lang.Double zgjg;
+
+    @Excel(name = "最低价格", width = 15)
+    @ApiModelProperty(value = "最低价格")
+    private java.lang.Double zdjg;
+
+    @ApiModelProperty(value = "总价格")
+    private java.lang.Double zjg;
+
+    @ApiModelProperty(value = "价格区间")
+    private String jgqj;
+    @ApiModelProperty(value = "价值范围")
+    private String jzfw;
+}

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/mapper/SsDkjzMapper.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.zrzyqc.qcsb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz;
+
+import java.util.List;
+
+/**
+ * @Description: 省属国企占有使用土地情况调查
+ * @Author: jeecg-boot
+ * @Date:   2022-06-29
+ * @Version: V1.0
+ */
+public interface SsDkjzMapper extends BaseMapper<SsDkjz> {
+
+    List<SsDkjz> queryList(@Param("dkbh") String dkbh);
+}

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/mapper/xml/SsDkjzMapper.xml

@@ -0,0 +1,34 @@
+<?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="org.jeecg.modules.zrzyqc.qcsb.mapper.SsDkjzMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="resultMap" type="org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz">
+<!--        <id column="id" property="id"/>-->
+        <result column="dkbh" property="dkbh"/>
+        <result column="dlbm" property="dlbm"/>
+        <result column="dlmc" property="dlmc"/>
+        <result column="xjxzqhdm" property="xjxzqhdm"/>
+        <result column="xjxzqhmc" property="xjxzqhmc"/>
+        <result column="pjjg" property="pjjg"/>
+        <result column="zgjg" property="zgjg"/>
+        <result column="zdjg" property="zdjg"/>
+        <result column="mj" property="mj"/>
+        <result column="zjg" property="zjg"/>
+    </resultMap>
+    <select id="queryList" resultType="org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz">
+        SELECT dkbh,
+               dlbm,
+               dlmc,
+               xjxzqhmc,
+               ROUND(COALESCE(pjjg, 0)::numeric,4) AS pjjg,
+               ROUND(COALESCE(zgjg, 0)::numeric,4) AS zgjg,
+               ROUND(COALESCE(zdjg, 0)::numeric,4) AS zdjg,
+               ROUND(COALESCE(SUM(mj*0.0015), 0)::numeric,4) AS mj,
+               ROUND((COALESCE(SUM(mj*0.0015), 0) * COALESCE(pjjg, 0))::numeric,4) AS zjg,
+               zdjg|| '~'|| zgjg as jgqj,
+               ROUND((COALESCE(SUM(mj*0.0015), 0) * COALESCE(zdjg, 0))::numeric,4) || '~'|| ROUND((COALESCE(SUM(mj*0.0015), 0) * COALESCE(zgjg, 0))::numeric,4) as jzfw
+        FROM ss_dkjz
+        WHERE dkbh =#{dkbh}
+        GROUP BY dkbh, dlbm, dlmc, xjxzqhdm, xjxzqhmc, pjjg, zgjg, zdjg
+    </select>
+</mapper>

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/service/SsDkzjService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.zrzyqc.qcsb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz;
+
+import java.util.List;
+
+public interface SsDkzjService extends IService<SsDkjz> {
+    //    根据地块编号查询地块信息
+    List<SsDkjz> queryList(String dkbh);
+}

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/service/impl/SsDkjzServiceImpl.java

@@ -0,0 +1,35 @@
+package org.jeecg.modules.zrzyqc.qcsb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz;
+import org.jeecg.modules.zrzyqc.qcsb.mapper.SsDkjzMapper;
+import org.jeecg.modules.zrzyqc.qcsb.service.SsDkzjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 省属国企占有使用土地情况调查
+ * @Author: jeecg-boot
+ * @Date: 2022-06-29
+ * @Version: V1.0
+ */
+@Service
+public class SsDkjzServiceImpl extends ServiceImpl<SsDkjzMapper, SsDkjz> implements SsDkzjService {
+    @Autowired
+    private SsDkjzMapper ssDkjzMapper;
+
+    @Override
+    public List<SsDkjz> queryList(String dkbh) {
+        List<SsDkjz> ssDkjzs = ssDkjzMapper.queryList(dkbh);
+        for (SsDkjz ssDkjz : ssDkjzs) {
+            if (ssDkjz.getZjg()<=0){
+                ssDkjz.setJgqj("0");
+                ssDkjz.setJzfw("0");
+            }
+        }
+        return ssDkjzs;
+    }
+}
+

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/vo/QcSsgqzysytdqkGzvVo.java

@@ -11,11 +11,13 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 省属国企占有使用土地情况调查
@@ -562,6 +564,9 @@ public class QcSsgqzysytdqkGzvVo implements Serializable {
     @ApiModelProperty(value = "县区" )
     private String xq;
 
+    //地块价值
+    private List<SsDkjz> ssDkjz;
+
 
 //    /**总建筑面积(㎡)*/
 //    @Excel(name = "总建筑面积(㎡)", width = 15)