调整供地字段等

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/LandSupplyProjectVO.java

@@ -10,5 +10,6 @@ public class LandSupplyProjectVO {
     private String supplyMethod;
     private String supplyType;
     private String dateType;
+    private String area;
     private String geom;
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/SupplyServiceImpl.java

@@ -17,6 +17,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -558,6 +559,8 @@ public class SupplyServiceImpl implements ISupplyService {
                 vo.setSupplyType(supplyType.toString());
                 vo.setDateType(supplyType.toString());
                 vo.setGeom(item.getGeom());
+                String area = String.format("%.2f", item.getMjMu() == null ? BigDecimal.ZERO : item.getMjMu());
+                vo.setArea(area);
                 return vo;
             }).collect(Collectors.toList());
         }else if(supplyType == 2){

siwei-modules/siwei-apply/src/main/resources/mapper/DecisionTaskMapper.xml

@@ -142,7 +142,8 @@
             d.id           AS id,
             d.type         AS type,
             d.details_name AS detailsName,
-            d.shape_area   AS shapeArea
+            ROUND(d.shape_area, 2) AS shapeArea
+
             <if test="extraFields != null and extraFields.size() > 0">
                 <foreach collection="extraFields" item="field" separator="">
                     , COALESCE(b.${field}::varchar, '---') AS ${field}

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdjbxxMapper.xml

@@ -232,11 +232,6 @@
     </select>
 
 
-
-
-
-
-
     <select id="getDjzqWithDjqList" resultType="Map">
         SELECT
             djzq.bsm,
@@ -249,7 +244,7 @@
             djq.djqdm
         FROM vector.djzq
         LEFT JOIN vector.djq ON djq.djqdm = LEFT(djzq.djzqdm, 9)
-        WHERE djq.djqdm IS NOT NULL
+        WHERE 1=1  and (djq.djqdm IS NOT NULL)  and (djzq.valid_flag IS NULL OR djzq.valid_flag = 0) and (djq.valid_flag IS NULL OR djq.valid_flag = 0)
     </select>
 
     <select id="getStatisticsByQllx" resultType="Map">