中图代码更新

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

@@ -96,28 +96,33 @@ public class JZDJAnalyseController extends BaseController {
 
         List<Ghdk> GhdkList = ghdkService.selectByPolygon(str);
         for (Ghdk ghdk : GhdkList) {
-            if(!ghdk.getSmgeometry().isEmpty()){
-                ghdk.setSmgeometry("SRID=4490;"+ghdk.getSmgeometry());
+            if(!ghdk.getGeom().isEmpty()){
+                ghdk.setGeom("SRID=4490;"+ghdk.getGeom());
             }
             GHDKInfo ghdkInfo = new GHDKInfo();
             ghdkInfo.setId(UUID.randomUUID().toString());
-            List<FldInfo> fldInfos = getFieldAnnotation(ghdk);
+            List<FldInfo> fldInfos = getFieldAnnotationJZDJ(ghdk);
             List<Data> dataList = new ArrayList<>();
             for (FldInfo fldInfo : fldInfos) {
                 Data data = new Data();
                 data.setLabel(fldInfo.getName());
                 data.setLabelCN(fldInfo.getCaption());
+                System.out.print(fldInfo.getName());
+
                 Object sdd = getFieldValue(ghdk, fldInfo.getName());
-                data.setValue(sdd.toString());
+                if(sdd!=null){
+                    data.setValue(sdd.toString());
+                }
+
                 dataList.add(data);
             }
             ghdkInfo.setData(dataList);
 
             // 从WKT字符串读取Geometry对象
-            Geometry geometry =createGeometryByWkt(ghdk.getSmgeometry());
+            Geometry geometry =createGeometryByWkt(ghdk.getGeom());
             //组织超图格式图形
             com.onemap.sanya.domain.JZDJ.Geometry geom = new com.onemap.sanya.domain.JZDJ.Geometry();
-            geom.setWKTstr(ghdk.getSmgeometry());
+            geom.setWKTstr(ghdk.getGeom());
             Center center = new Center();
             center.setX(geometry.getCentroid().getX());
             center.setY(geometry.getCentroid().getY());
@@ -197,13 +202,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C12Sfjb":
                                 List<C12Sfjb> DataList = c12SfjbService.selectByPolygon(WKTString);
                                 for (C12Sfjb data : DataList) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -214,13 +219,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C22Zzjb":
                                 List<C22Zzjb> DataList1 = c22ZzjbService.selectByPolygon(WKTString);
                                 for (C22Zzjb data : DataList1) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -230,13 +235,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C32Gyjb":
                                 List<C32Gyjb> DataList2 = c32GyjbService.selectByPolygon(WKTString);
                                 for (C32Gyjb data : DataList2) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -246,13 +251,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C41Gfjb":
                                 List<C41Gfjb> DataList3 = c41GfjbService.selectByPolygon(WKTString);
                                 for (C41Gfjb data : DataList3) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -304,7 +309,7 @@ public class JZDJAnalyseController extends BaseController {
                     // 从WKT字符串读取Geometry对象
                     Geometry geometryJZDJ =createGeometryByWkt(JZDJ.getGeometry().getWKTstr());
                     polygons.add(geometryJZDJ);
-                    Double area = getIntersectByGeometrys(polygons);
+                    Double area = setPrecision2(getIntersectByGeometrys(polygons));
                     if (area >= 0.01) {
                         ZytdList zytdList = new ZytdList();
                         zytdList.setData(JZDJ.getData());
@@ -345,9 +350,9 @@ public class JZDJAnalyseController extends BaseController {
         ztBenchmarkLandPriceResults.setProjectName(BenchmarkLandPrice.getProjectName());
         ztBenchmarkLandPriceResults.setAnalysisDate(BenchmarkLandPrice.getAnalysisDate());
         ztBenchmarkLandPriceResults.setBuildUnit(BenchmarkLandPrice.getConstructionUnit());
-        ztBenchmarkLandPriceResults.setAnalysisArea(Double.toString(getGeometryArea(polygon)/666.66));
-        ztBenchmarkLandPriceResults.setParticipationArea(Double.toString(jszmj));
-        ztBenchmarkLandPriceResults.setTotalLandPrice(Double.toString(zdj));
+        ztBenchmarkLandPriceResults.setAnalysisArea(Double.toString(setPrecision2(getGeometryArea(polygon)/666.66)));
+        ztBenchmarkLandPriceResults.setParticipationArea(Double.toString(setPrecision2(jszmj)));
+        ztBenchmarkLandPriceResults.setTotalLandPrice(Double.toString(setPrecision2(zdj)));
         ztBenchmarkLandPriceResults.setGhdkDetailedDjList(objectMapper.writeValueAsString(ghdkDetailedDjList));
         return ztBenchmarkLandPriceResults;
     }
@@ -377,7 +382,7 @@ public class JZDJAnalyseController extends BaseController {
      * @throws Exception
      */
     public List<Data> combinationData(Object dataInfo) throws Exception {
-        List<FldInfo> fldInfos = getFieldAnnotation(dataInfo);
+        List<FldInfo> fldInfos = getFieldAnnotationJZDJ(dataInfo);
         List<Data> dataList = new ArrayList<>();
         for (FldInfo fldInfo : fldInfos) {
             Data data = new Data();
@@ -449,6 +454,12 @@ public class JZDJAnalyseController extends BaseController {
                 children.stream().flatMap(this::flattenNode) // 递归扁平化子节点
         );
     }
-
+    //保留2位小数
+    private   Double  setPrecision2(Double data)
+    {
+        java.text.DecimalFormat   df   =new   java.text.DecimalFormat("#.00");
+        String result =   df.format(data);
+        return Double.parseDouble(result);
+    }
 
 }

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

@@ -3,7 +3,6 @@ package com.onemap.sanya.controller.spatial;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.sanya.domain.business.*;
 import com.onemap.sanya.domain.spatial.*;
@@ -14,13 +13,14 @@ import com.onemap.sanya.utils.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 import static com.onemap.sanya.utils.SpatialOperate.getFieldAnnotation;
 
 /**
@@ -76,7 +76,7 @@ public class ZDAnalyseController extends BaseController {
     Polygon polygon = null;
 
     @PostMapping("/getAnalyseResult")
-    public ZtZdProjectList getAnalyseResult(ZDPost zdPost) throws JsonProcessingException {
+    public ZtZdProjectList getAnalyseResult(@RequestBody ZDPost zdPost) throws JsonProcessingException {
         try {
 
             List<Coordinate> pointArray = objectMapper.readValue(zdPost.getRegions(), new TypeReference<List<Coordinate>>() {
@@ -197,7 +197,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < gysyqs.size(); i++) {
             Gysyq feature1 = gysyqs.get(i);
             String qsdwmc = feature1.getRightOwne();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea =  setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
          SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
             Integer index = -1;
@@ -223,7 +223,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < jtowners.size(); i++) {
             Jtowner feature1 = jtowners.get(i);
             String qsdwmc = feature1.getQlr();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
             Integer index = -1;
             SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
@@ -250,7 +250,7 @@ public class ZDAnalyseController extends BaseController {
             Jtuse feature1 = jtuses.get(i);
 
             String qsdwmc = feature1.getSyqr();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
             Integer index = -1;
             SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
@@ -289,12 +289,11 @@ public class ZDAnalyseController extends BaseController {
         qsResultList.setCollectiveUsedFeatures(objectMapper.writeValueAsString(gyFeatures));
         qsResultList.setCollectiveOwnerFeatures(objectMapper.writeValueAsString(jtOFeatures));
         qsResultList.setCollectiveUsedFeatures(objectMapper.writeValueAsString(jtUFeatures));
-
-
+        qsResultList.setStateUsedFeatures(objectMapper.writeValueAsString(gyFeatures));
 
         Gysyq gysyq = new Gysyq();
-        Jtuse jtuse = new Jtuse();
-        Jtowner jtowner = new Jtowner();
+        Jtowner jtuse = new Jtowner();
+        Jtuse jtowner = new Jtuse();
 
         List<FldInfo> gyFldInfos = getFieldAnnotation(gysyq);
         List<FldInfo> jtOFldInfos = getFieldAnnotation(jtuse);
@@ -353,18 +352,20 @@ public class ZDAnalyseController extends BaseController {
         Double jjzwMj = 0.00;
         Double nzwMj = 0.00;
         List<SuperMapFreature> qmFreatures = new ArrayList<>();
-
+        String dlmc="";
+        String qsdw="";
         for (int i = 0; i < dltbs.size(); i++) {
             Dltb feature = dltbs.get(i);
-            String dlmc = feature.getDlmc();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getSmgeometry());
-            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom)) ;
+             dlmc = feature.getDlmc();//地类名称
+             qsdw=feature.getQsdwmc(); //权属单位
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getGeom());
+            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom)) ;//亩
             if (instertArea == 0)
                 continue;
             Integer index = -1;
             SuperMapFreature superMapFreature=  SpatialOperate.  Feature2Supermap(feature,geom);
             //集体或者国有地类判断 权属字段包含 村/村民 为集体 否则为国有
-            if (isValueInList(jtLikes, dlmc)) {
+            if (isValueInList(jtLikes, qsdw)) {
                 jtmj = getaDouble(instertArea, jtdlData, jtmj, dlmc, index);
                 jtFeatures.add(superMapFreature);
                 //青苗判断
@@ -386,24 +387,26 @@ public class ZDAnalyseController extends BaseController {
 
         }
         //青苗补偿
-        ZtQmBcbzList qmBcbz= zdProjectList.getQmBcbz();
-        if(qmBcbz!=null)
-        {
-            smPay=setPrecision2((smMj*qmBcbz.getSm()));
-            jjzwPay=setPrecision2(jjzwMj*qmBcbz.getJjzw());
-            nzwPay=setPrecision2(nzwMj*qmBcbz.getNzw());
-        }
+//        ZtQmBcbzList qmBcbz= zdProjectList.getQmBcbz();
+//        if(qmBcbz!=null)
+//        {
+//            smPay=setPrecision2((smMj*qmBcbz.getSm())/10000); //树木
+//            jjzwPay=setPrecision2(jjzwMj*qmBcbz.getJjzw()/10000);//经济作物
+//            nzwPay=setPrecision2(nzwMj*qmBcbz.getNzw()/10000);//农作物
+//        }
         ZtZdBcbzList zdbcbz= zdProjectList.getZdBcbz();
         if(zdbcbz!=null) {
-            zdPay =setPrecision2(zdbcbz.getTdcz() * (jtmj));
-            azPay = setPrecision2(zdbcbz.getAzbcf() * (jtmj));
-            bchjPay=setPrecision2(zdbcbz.getBchj()* (jtmj));
+//           土地补偿费 Tdbcf 安置补偿费Azbcf 补偿合计 Bchj
+            zdPay =setPrecision2(zdbcbz.getTdbcf() * (jtmj)/10000);//转为万元
+            azPay = setPrecision2(zdbcbz.getAzbcf() * (jtmj)/10000);
+            bchjPay=setPrecision2(zdbcbz.getBchj()* (jtmj)/10000);
 
         }
         //征地补偿
-        ztZdDlResultList.setTotalAZPay(azPay);
-        ztZdDlResultList.setTotalZDPay(zdPay);
-        ztZdDlResultList.setTotalPay(bchjPay);
+        ztZdDlResultList.setTotalZDMJ(zdProjectList.getTotalZDMJ());
+        ztZdDlResultList.setTotalAZPay(azPay);//安置补偿费
+        ztZdDlResultList.setTotalZDPay(zdPay);// 土地补偿费
+        ztZdDlResultList.setTotalPay(bchjPay);//补偿合计
         //地类统计
         //国有用地统计
         ztZdDlResultList.setGyMJ(setPrecision2(gymj));
@@ -423,9 +426,9 @@ public class ZDAnalyseController extends BaseController {
         //青苗补偿计算
         ZtQmBcbzList qmbcbz = zdProjectList.getQmBcbz();
         if (qmbcbz != null) {
-            Float jjzwbz = qmbcbz.getJjzw();
-            Float nzwbz = qmbcbz.getNzw();
-            Float smbz = qmbcbz.getSm();
+            Float jjzwbz = qmbcbz.getJjzw()/10000;//转为万元
+            Float nzwbz = qmbcbz.getNzw()/10000; //转为万元
+            Float smbz = qmbcbz.getSm()/10000;//转为万元
 
             jjzwPay = setPrecision2(jjzwbz * jjzwMj);
             ztZdQmResultList.setJjzwMJ(setPrecision2(jjzwMj));
@@ -448,6 +451,8 @@ public class ZDAnalyseController extends BaseController {
         ztZdQmResultList.setJjzwPay(jjzwPay);
 
         ztZdQmResultList.setFeatures(objectMapper.writeValueAsString(qmFreatures));
+        ztZdQmResultList.setTotalPay(nzwPay + jjzwPay + smPay);
+        ztZdQmResultList.setTotalMJ(nzwMj + jjzwMj + smMj);
 
         Dltb dltb = new Dltb();
         List<FldInfo> dltbFldInfos = getFieldAnnotation(dltb);
@@ -475,10 +480,10 @@ public class ZDAnalyseController extends BaseController {
         }
         if (index > -1) {
             Double area = jtdlData.get(index).getMj() + instertArea;
-            jtdlData.get(index).setMj(area + instertArea);
+            jtdlData.get(index).setMj(setPrecision2(area + instertArea));
         } else {
             DLItem dlItem = new DLItem();
-            dlItem.setMj(instertArea);
+            dlItem.setMj(setPrecision2(instertArea));
             dlItem.setDlmc(dlmc);
             jtdlData.add(dlItem);
         }
@@ -501,7 +506,7 @@ public class ZDAnalyseController extends BaseController {
         List<FWItem> jtList = new ArrayList<>();
         for (int i = 0; i < bdcs.size(); i++) {
             Bdc feature = bdcs.get(i);
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getGeom());
             //占地面积
             Double zdmj =  setPrecision2(SpatialOperate.getGeometryArea(geom));
             //高度
@@ -514,7 +519,7 @@ public class ZDAnalyseController extends BaseController {
             String jtUqsdwmc = "";
             for (int i1 = 0; i1 < gysyqs.size(); i1++) {
                 Gysyq temfeature = gysyqs.get(i1);
-                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getGeom());
                 if (polygon1.intersects(geom)) {
                     gyqsdwmc = temfeature.getRightOwne();
                     isgy = true;
@@ -523,7 +528,7 @@ public class ZDAnalyseController extends BaseController {
             }
             for (int j = 0; j < jtowners.size(); j++) {
                 Jtowner temfeature = jtowners.get(j);
-                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getGeom());
                 if (polygon1.intersects(geom)) {
                     isgy=false;
                     jtOqsdwmc = temfeature.getQlr();
@@ -532,7 +537,7 @@ public class ZDAnalyseController extends BaseController {
             }
             for (int i1 = 0; i1 < jtuses.size(); i1++) {
                 Jtuse temfeature = jtuses.get(i1);
-                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getGeom());
                 if (polygon1.intersects(geom)) {
                     jtUqsdwmc = temfeature.getSyqr();
                     isgy=false;
@@ -552,6 +557,7 @@ public class ZDAnalyseController extends BaseController {
                 jzmj = floor * zdmj;
             } else
                 jzmj = feature.getJzmj();
+            jzmj=setPrecision2(jzmj);
             Integer grade = feature.getGrade() == null ? 1 : feature.getGrade();
             if (grade == 0)
                 grade = 1;
@@ -574,7 +580,7 @@ public class ZDAnalyseController extends BaseController {
             item.setAddress(address);
             item.setFloor(floor);
             item.setGrade(grade);
-            item.setId(feature.getSmid().toString());
+            item.setId(feature.getGid().toString());
             item.setJg(jg);
             item.setJzmj(jzmj);
             item.setPay(signalPay);
@@ -589,7 +595,7 @@ public class ZDAnalyseController extends BaseController {
                 gymj+=jzmj;
                 gyPay += signalPay;
                 gyFeatures.add(superMapFreature);
-                jtList.add(item);
+                gyList.add(item);
             }
         }
         cqReultList.setJtFWData(jtList);
@@ -605,7 +611,8 @@ public class ZDAnalyseController extends BaseController {
         cqReultList.setJtfeatures(objectMapper.writeValueAsString(jtFeatyres));
         cqReultList.setGyCount(gyList.size());
         cqReultList.setJtCount(jtList.size());
-
+        cqReultList.setGyPay(gyPay);
+        cqReultList.setJtPay(jtPay);
         cqReultList.setTotalPay(setPrecision2(jtPay + gyPay));
         cqReultList.setTotalJZMJ(setPrecision2(jtmj + gymj));
         average = setPrecision2 ((jtPay + gyPay)*10000 / (jtmj + gymj));

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

@@ -0,0 +1,279 @@
+package com.onemap.sanya.domain.business;
+
+import com.deepoove.poi.expression.Name;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.onemap.common.core.annotation.Excel;
+import com.onemap.common.core.web.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 征地补偿拆迁分析结果对象 zt_zd_cq_reult_list
+ *
+ * @author ruoyi
+ * @date 2024-08-21
+ */
+public class ZtZdCqReultList extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 房屋数量 */
+    @Excel(name = "房屋数量")
+    private Integer count;
+
+    /** 总建筑面积(平方米) */
+    @Excel(name = "总建筑面积(平方米)")
+    private Double totalJZMJ;
+
+    /** 总赔偿(万元) */
+    @Excel(name = "总赔偿(万元)")
+    private Double totalPay;
+
+    /** 平均补偿价(元/平方米) */
+    @Excel(name = "平均补偿价(元/平方米)")
+    private Double average;
+
+    /** 国有列表 */
+    @Excel(name = "国有列表")
+    private String gyList;
+
+    private List<FWItem> gyFWData;
+
+
+    /** 相关图元信息 */
+    @Excel(name = "相关图元信息")
+    private String gyfeatures;
+
+    /** 所属项目 */
+    @Excel(name = "所属项目")
+    private String projectId;
+
+    /** 国有建筑面积 */
+    @Excel(name = "国有建筑面积")
+    private Double gyJZMJ;
+
+    /** 集体建筑面积 */
+    @Excel(name = "集体建筑面积")
+    private Double jtJZMJ;
+    /**国有补偿8 */
+    private Double gyPay;
+    /** 集体补偿 */
+
+    private Double jtPay;
+    /** 国有建筑数量 */
+    @Excel(name = "国有建筑数量")
+    private Integer gyCount;
+
+    /** 集体建筑数量 */
+    @Excel(name = "集体建筑数量")
+    private Integer jtCount;
+
+    /** 集体列表 */
+    @Excel(name = "集体列表")
+    private String jtList;
+      private List<FWItem> jtFWData;
+          /** 相关图元信息 */
+    @Excel(name = "相关图元信息")
+    private String jtfeatures;
+
+    /** 字段信息 */
+    @Excel(name = "字段信息")
+    private String fieldInfos;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setCount(Integer count)
+    {
+        this.count = count;
+    }
+
+    public Integer getCount()
+    {
+        return count;
+    }
+    public void setTotalJZMJ(Double totalJZMJ)
+    {
+        this.totalJZMJ = totalJZMJ;
+    }
+
+    public Double getTotalJZMJ()
+    {
+        return totalJZMJ;
+    }
+    public void setTotalPay(Double totalPay)
+    {
+        this.totalPay = totalPay;
+    }
+
+    public Double getTotalPay()
+    {
+        return totalPay;
+    }
+    public void setAverage(Double average)
+    {
+        this.average = average;
+    }
+
+    public Double getAverage()
+    {
+        return average;
+    }
+    public void setGyList(String gyList)
+    {
+        this.gyList = gyList;
+    }
+
+    public String getGyList()
+    {
+        return gyList;
+    }
+    public void setGyfeatures(String gyfeatures)
+    {
+        this.gyfeatures = gyfeatures;
+    }
+
+    public String getGyfeatures()
+    {
+        return gyfeatures;
+    }
+    public void setProjectId(String projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId()
+    {
+        return projectId;
+    }
+    public void setGyJZMJ(Double gyJZMJ)
+    {
+        this.gyJZMJ = gyJZMJ;
+    }
+
+    public Double getGyJZMJ()
+    {
+        return gyJZMJ;
+    }
+    public void setJtJZMJ(Double jtJZMJ)
+    {
+        this.jtJZMJ = jtJZMJ;
+    }
+
+    public Double getJtJZMJ()
+    {
+        return jtJZMJ;
+    }
+    public void setGyCount(Integer gyCount)
+    {
+        this.gyCount = gyCount;
+    }
+
+
+    public Double getGyPay()
+    {
+        return gyPay;
+    }
+    public void setGyPay(Double gyPay)
+    {
+        this.gyPay = gyPay;
+    }
+
+    public Double getJtPay()
+    {
+        return jtPay;
+    }
+    public void setJtPay(Double jtPay)
+    {
+        this.jtPay = jtPay;
+    }
+
+    public Integer getGyCount()
+    {
+        return gyCount;
+    }
+    public void setJtCount(Integer jtCount)
+    {
+        this.jtCount = jtCount;
+    }
+
+    public Integer getJtCount()
+    {
+        return jtCount;
+    }
+    public void setJtList(String jtList)
+    {
+        this.jtList = jtList;
+    }
+
+    public String getJtList()
+    {
+        return jtList;
+    }
+    public void setJtfeatures(String jtfeatures)
+    {
+        this.jtfeatures = jtfeatures;
+    }
+
+    public String getJtfeatures()
+    {
+        return jtfeatures;
+    }
+    public void setFieldInfos(String fieldInfos)
+    {
+        this.fieldInfos = fieldInfos;
+    }
+
+    public String getFieldInfos()
+    {
+        return fieldInfos;
+    }
+
+    public List<FWItem> getGyFWData() {
+        return gyFWData;
+    }
+
+    public List<FWItem> getJtFWData() {
+        return jtFWData;
+    }
+
+    public void setGyFWData(List<FWItem> gyFWData) {
+        this.gyFWData = gyFWData;
+    }
+
+    public void setJtFWData(List<FWItem> jtFWData) {
+        this.jtFWData = jtFWData;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("count", getCount())
+                .append("totalJZMJ", getTotalJZMJ())
+                .append("totalPay", getTotalPay())
+                .append("average", getAverage())
+                .append("gyList", getGyList())
+                .append("gyfeatures", getGyfeatures())
+                .append("projectId", getProjectId())
+                .append("gyJZMJ", getGyJZMJ())
+                .append("jtJZMJ", getJtJZMJ())
+                .append("gyCount", getGyCount())
+                .append("jtCount", getJtCount())
+                .append("jtList", getJtList())
+                .append("jtfeatures", getJtfeatures())
+                .append("fieldInfos", getFieldInfos())
+                .toString();
+    }
+}
+

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

@@ -14,6 +14,8 @@
         <result property="projectId"    column="projectId"    />
         <result property="gyJZMJ"    column="gyJZMJ"    />
         <result property="jtJZMJ"    column="jtJZMJ"    />
+        <result property="jtPay"    column="jtPay"    />
+        <result property="gyPay"    column="gyPay"    />
         <result property="gyCount"    column="gyCount"    />
         <result property="jtCount"    column="jtCount"    />
         <result property="jtList"    column="jtList"    />
@@ -36,6 +38,8 @@
             <if test="projectId != null  and projectId != ''"> and "projectId" = #{projectId}</if>
             <if test="gyJZMJ != null "> and "gyJZMJ" = #{gyJZMJ}</if>
             <if test="jtJZMJ != null "> and "jtJZMJ" = #{jtJZMJ}</if>
+            <if test="jtPay != null "> and "jtPay" = #{jtPay}</if>
+            <if test="gyPay != null "> and "gyPay" = #{gyPay}</if>
             <if test="gyCount != null "> and "gyCount" = #{gyCount}</if>
             <if test="jtCount != null "> and "jtCount" = #{jtCount}</if>
             <if test="jtList != null  and jtList != ''"> and "jtList" = #{jtList}</if>
@@ -62,6 +66,8 @@
             <if test="projectId != null">"projectId",</if>
             <if test="gyJZMJ != null">"gyJZMJ",</if>
             <if test="jtJZMJ != null">"jtJZMJ",</if>
+            <if test="jtPay != null">"jtPay",</if>
+            <if test="gyPay != null">"gyPay",</if>
             <if test="gyCount != null">"gyCount",</if>
             <if test="jtCount != null">"jtCount",</if>
             <if test="jtList != null">"jtList",</if>
@@ -79,6 +85,8 @@
             <if test="projectId != null">#{projectId},</if>
             <if test="gyJZMJ != null">#{gyJZMJ},</if>
             <if test="jtJZMJ != null">#{jtJZMJ},</if>
+            <if test="jtPay != null">#{jtPay},</if>
+            <if test="gyPay != null">#{gyPay},</if>
             <if test="gyCount != null">#{gyCount},</if>
             <if test="jtCount != null">#{jtCount},</if>
             <if test="jtList != null">#{jtList},</if>
@@ -99,6 +107,8 @@
             <if test="projectId != null">"projectId" = #{projectId},</if>
             <if test="gyJZMJ != null">"gyJZMJ" = #{gyJZMJ},</if>
             <if test="jtJZMJ != null">"jtJZMJ" = #{jtJZMJ},</if>
+            <if test="jtPay != null">"jtPay" = #{jtPay},</if>
+            <if test="gyPay != null">"gyPay" = #{gyPay},</if>
             <if test="gyCount != null">"gyCount" = #{gyCount},</if>
             <if test="jtCount != null">"jtCount" = #{jtCount},</if>
             <if test="jtList != null">"jtList" = #{jtList},</if>