新增存量数据供地相关

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/SupplyController.java

@@ -271,14 +271,6 @@ public class SupplyController extends BaseController {
     }
 
 
-
-
-
-
-
-
-
-
     /**
      * 根据年份和供地类型查询土地供应统计报表数据
      * @param year
@@ -309,6 +301,21 @@ public class SupplyController extends BaseController {
     }
 
 
+    @GetMapping("/getActualProject")
+    public R<Map<String,Object>> getActualProject(@RequestParam String propertyId) {
+        try {
+            Map<String,Object> res =  supplyService.getActualProject(propertyId);
+            return R.ok(res);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+
+
+
 
     /**
      *

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

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

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdgyMapper.java

@@ -62,7 +62,7 @@ public interface TdgyMapper {
     List<TdgyStatisticsRes> getListByYear(@Param("year") String year,@Param("landTypeCode") String landTypeCode, @Param("startTime") String startTime, @Param("endTime") String endTime);
     List<TdgyStatisticsRes> getSjgdListByYear(@Param("year") String year,@Param("landTypeCode") String landTypeCode, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-
+    Map<String,Object> getActualProject( @Param("gid") String gid);
 
 
 }

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

@@ -10,6 +10,7 @@ import com.siwei.apply.domain.vo.LandSupplyProjectVO;
 import com.siwei.apply.domain.vo.LandSupplyReportVO;
 
 import java.util.List;
+import java.util.Map;
 
 
 public interface ISupplyService {
@@ -28,6 +29,9 @@ public interface ISupplyService {
 
     GongdiJihua getPlanProject(String id);
 
+    Map<String,Object> getActualProject(String id);
+
+
     List<LandType> getLandTypeList();
 
 }

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

@@ -556,6 +556,7 @@ public class SupplyServiceImpl implements ISupplyService {
                 vo.setCompanyName("暂无");
                 vo.setSupplyMethod(item.getGyfs());
                 vo.setSupplyType(supplyType.toString());
+                vo.setDateType(supplyType.toString());
                 vo.setGeom(item.getGeom());
                 return vo;
             }).collect(Collectors.toList());
@@ -578,6 +579,10 @@ public class SupplyServiceImpl implements ISupplyService {
                  vo.setCompanyName(item.getCompany());
                  vo.setSupplyMethod(item.getGyfs());
                  vo.setSupplyType(supplyType.toString());
+                 vo.setDateType(supplyType.toString());
+                 if(StringUtils.isBlank(item.getProjectId())){
+                     vo.setDateType("3");
+                 }
                  vo.setNodeId(item.getNodeId());
                  vo.setGeom(item.getGeom());
                  return vo;
@@ -639,6 +644,14 @@ public class SupplyServiceImpl implements ISupplyService {
         return res;
     }
 
+    @Override
+    public Map<String,Object> getActualProject(String id) {
+        Map<String,Object> res = null;
+        if(StringUtils.isNumeric(id)){
+            res = dgyMapper.getActualProject(id);
+        }
+        return res;
+    }
 
 
     @Override

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

@@ -204,4 +204,33 @@
         </if>
     </select>
 
+    <select id="getActualProject" resultType="Map" parameterType="String">
+        SELECT
+        "gid",
+        "objectid",
+        "xzq_dm",
+        "gyfs",
+        "nf",
+        "dzjgh",
+        "hthbbh",
+        "qdrq",
+        "xmmc",
+        "srr",
+        "srrlxdh",
+        "zdbh",
+        "tdzl",
+        "tdly",
+        "xmzmj",
+        "gymj",
+        "shape_area",
+        ST_AsEWKT ( geom ) AS geom
+        FROM
+        vector.gj_gd_data
+        WHERE 1=1
+        <if test="gid != null and gid != ''">
+            AND gj_gd_data.gid::varchar = #{gid}
+        </if>
+        LIMIT 1
+    </select>
+
 </mapper>