更新中图代码

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/SanYaController.java

@@ -155,7 +155,10 @@ public class SanYaController extends BaseController {
             }
             benchmarkLandPriceReport.setBenchmarkLandPriceTotalList(benchmarkLandPriceTotals);
 
-
+            Double ParticipationAreaSum=benchmarkLandPriceTotals.stream().mapToDouble(BenchmarkLandPriceTotal::getJStotalArea).sum();
+            DecimalFormat decimalFormat = new DecimalFormat("#.##");
+            String ParticipationArea = decimalFormat.format(ParticipationAreaSum);
+            benchmarkLandPriceReport.setParticipationArea(ParticipationArea);
 
             //导入表格渲染配置
             Configure configure = Configure.builder()

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtBillboardmodellistController.java

@@ -77,6 +77,17 @@ public class ZtBillboardmodellistController extends BaseController
         return toAjax(ztBillboardmodellistService.insertZtBillboardmodellist(ztBillboardmodellist));
     }
 
+
+    /**
+     * 批量新增广告模型信息
+     */
+    @Log(title = "广告模型信息", businessType = BusinessType.INSERT)
+    @PostMapping("/adds")
+    public AjaxResult adds(@RequestBody List<ZtBillboardmodellist> ztBillboardmodellist)
+    {
+        return toAjax(ztBillboardmodellistService.insertZtBillboardmodellists(ztBillboardmodellist));
+    }
+
     /**
      * 修改广告模型信息
      */

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/ZDAnalyseController.java

@@ -104,7 +104,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < gysyqs.size(); i++) {
             Gysyq feature1 = gysyqs.get(i);
             String qsdwmc =feature1.getRightOwne();
-            Polygon geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
+            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
             Integer index = -1;
             for (Integer j = 0; j < gyUData.size(); j++) {
@@ -130,7 +130,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < jtowners.size(); i++) {
             Jtowner feature1 = jtowners.get(i);
             String qsdwmc =feature1.getQlr();
-            Polygon geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
+            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
             Integer index = -1;
             for (Integer j = 0; j < gyUData.size(); j++) {
@@ -157,7 +157,7 @@ public class ZDAnalyseController extends BaseController {
             Jtuse feature1 = jtuses.get(i);
 
             String qsdwmc =feature1.getSyqr();
-            Polygon geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
+            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
             Integer index = -1;
             for (Integer j = 0; j < gyUData.size(); j++) {
@@ -193,7 +193,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < dltbs.size(); i++) {
             Dltb feature=dltbs.get(i);
             String dlmc=feature.getDlmc();
-            Polygon geom = SpatialOperate.createPolygonByWkt(feature.getGeom());
+            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature.getGeom());
             instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
             if(instertArea==0)
                 continue;;

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/ZtBillboardmodellistMapper.java

@@ -35,6 +35,7 @@ public interface ZtBillboardmodellistMapper
      */
     public int insertZtBillboardmodellist(ZtBillboardmodellist ztBillboardmodellist);
 
+
     /**
      * 修改广告模型信息
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IZtBillboardmodellistService.java

@@ -35,6 +35,15 @@ public interface IZtBillboardmodellistService
      */
     public int insertZtBillboardmodellist(ZtBillboardmodellist ztBillboardmodellist);
 
+    /**
+     * 批量新增广告模型信息
+     *
+     * @param ztBillboardmodellist 广告模型信息
+     * @return 结果
+     */
+    public int insertZtBillboardmodellists(List<ZtBillboardmodellist> ztBillboardmodellist);
+
+
     /**
      * 修改广告模型信息
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/ZtBillboardmodellistServiceImpl.java

@@ -56,6 +56,23 @@ public class ZtBillboardmodellistServiceImpl implements IZtBillboardmodellistSer
         ztBillboardmodellist.setCreateTime(DateUtils.getNowDate());
         return ztBillboardmodellistMapper.insertZtBillboardmodellist(ztBillboardmodellist);
     }
+    /**
+     * 批量新增广告模型信息
+     *
+     * @param ztBillboardmodellist 广告模型信息
+     * @return 结果
+     */
+    @Override
+    public int insertZtBillboardmodellists(List<ZtBillboardmodellist> ztBillboardmodellist)
+    {
+        int count = 0;
+        for (ZtBillboardmodellist ztBillboardmodel:ztBillboardmodellist){
+            ztBillboardmodel.setCreateTime(DateUtils.getNowDate());
+            count+=ztBillboardmodellistMapper.insertZtBillboardmodellist(ztBillboardmodel);
+        }
+        return count;
+    }
+
 
     /**
      * 修改广告模型信息

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/utils/SpatialOperate.java

@@ -199,12 +199,14 @@ public class SpatialOperate {
      * @return
      * @throws ParseException
      */
-    public static Polygon createPolygonByWkt(String wkt) throws ParseException, org.locationtech.jts.io.ParseException {
+    public static Geometry createPolygonByWkt(String wkt) throws ParseException, org.locationtech.jts.io.ParseException {
+      Geometry geometry=null;
         WKTReader reader = new WKTReader();
         Integer index = wkt.indexOf(";");
         if (index > -1)
             wkt = wkt.substring(index + 1);
-        Polygon geometry = (Polygon) reader.read(wkt);
+        geometry=reader.read(wkt);
+
         return geometry;
     }
 

onemap-modules/onemap-model/src/main/resources/mapper/sanya/ZtBillboardinfolistMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="datasourcename != null  and datasourcename != ''"> and datasourcename like concat('%', #{datasourcename}, '%')</if>
             <if test="datasetname != null  and datasetname != ''"> and datasetname like concat('%', #{datasetname}, '%')</if>
         </where>
+        order by "create_time" desc
     </select>
     
     <select id="selectZtBillboardinfolistById" parameterType="String" resultMap="ZtBillboardinfolistResult">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/ZtBillboardmodellistMapper.xml

@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="templateCentre != null  and templateCentre != ''"> and "templateCentre" = #{templateCentre}::jsonb</if>
             <if test="templateBottom != null  and templateBottom != ''"> and "templateBottom" = #{templateBottom}::jsonb</if>
         </where>
+        order by "create_time" desc
     </select>
     
     <select id="selectZtBillboardmodellistById" parameterType="String" resultMap="ZtBillboardmodellistResult">
@@ -116,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+
     <update id="updateZtBillboardmodellist" parameterType="com.onemap.sanya.domain.business.ZtBillboardmodellist">
         update "zt_billboardModelList"
         <trim prefix="SET" suffixOverrides=",">

onemap-modules/onemap-model/src/main/resources/template/word/03-征收补偿预估报告-03.docx

@@ -60,7 +60,7 @@
                                {{zdBcbz.azbcf}}
 {{zdBcbz.bchj}}
    征地补偿费预估
-  集体土地共{{zdreslut.totalZDMJ}}亩，预计征地补偿费用合计{{zdreslut.totalPay}}万元，其中：土地补偿费共{{zdreslut.totalZDPay}}万元；安置补偿费共{{zdreslut.totalAZPay}}万元。
+  集体土地共{{zdResult.totalZDMJ}}亩，预计征地补偿费用合计{{zdResult.totalPay}}万元，其中：土地补偿费共{{zdResult.totalZDPay}}万元；安置补偿费共{{zdResult.totalAZPay}}万元。
   土地现状情况如下：
                        {{zdResult.jtdlData}}现状地类
                                 面积（亩）
@@ -92,6 +92,7 @@
   预计拆迁房屋共{{cqResult.jtCount}}个，总建筑面积{{cqResult.jtJZMJ}}平方米，房屋拆迁补偿费用共{{cqResult.totalPay}}万元，平均补偿费用{{cqResult.average}}元/平方米。
   各个房屋补偿情况如下表。
                        {{cqResult.jtFWData}}房屋结构
+                                 房屋级别
                           拆迁补偿费用(万元)
                                     层数
                              占地面积（m²）
@@ -99,6 +100,7 @@
                                    （m²）
                                 土地权属人
                                      [jg]
+                                    [grade]
                                      [pay]
                                     [floor]
                                     [zdmj]
@@ -113,6 +115,6 @@
                                 {{qmBcbz.jjzw}}
                                  {{qmBcbz.sm}}
    青苗补偿费预估
-  预计青苗补偿费用合计{{qmResult.toatalPay}}万元，其中：农作物补偿{{qmResult.nzwMJ}}亩，共{{qmResult.nzwPay}}万元；经济作物补偿{{qmResult.jjzwMJ}}亩，共{{qmResult.jjzwPay}}万元；林木{{qmResult.smMJ}}亩，补偿共{{qmResult.smPay}}万元。
+  预计青苗补偿费用合计{{qmResult.totalPay}}万元，其中：农作物补偿{{qmResult.nzwMJ}}亩，共{{qmResult.nzwPay}}万元；经济作物补偿{{qmResult.jjzwMJ}}亩，共{{qmResult.jjzwPay}}万元；林木{{qmResult.smMJ}}亩，补偿共{{qmResult.smPay}}万元。
   
   

onemap-modules/onemap-model/src/main/resources/template/word/04-基准地价报告-02.docx

@@ -1,6 +1,6 @@
 基准地价报告
 1 基准地价内涵
-  根据2020年《三亚市国有建设用地土地定级与基准地价》和《三亚市集体建设用地土地定级与基准地价》编制成果，实现指定范围内国有建设用地和集体建设用的基准地价预估。国有建设用地和集体建设用地基准地价内涵说明如下表。
+  基于三亚市控制性详细规划数据和2020年《三亚市国有建设用地土地定级与基准地价》编制成果，实现指定范围内国有建设用地的基准地价预估。国有建设用地基准地价内涵说明如下表。
                                     内涵
                                  商服用地
                                  住宅用地
@@ -52,6 +52,8 @@
 {{buildUnit}}
 分析面积（亩）
 {{analysisArea}}
+计算地价面积（亩）
+{{ParticipationArea}}
 总地价（万元）
 {{totalLandPrice}}
 分析范围