后勤资源 房产 接口修改

project-zcustom/src/main/java/com/project/zcustom/controller/logistics/PlatHousingLandController.java

@@ -27,24 +27,24 @@ public class PlatHousingLandController extends BaseController {
      * 房产资源存量
      */
     @GetMapping("/stockOfEstateResources")
-    public AjaxResult getStockOfEstateResources() {
-        return AjaxResult.success("查询成功", largeHousingLandService.getStockOfEstateResources());
+    public AjaxResult getStockOfEstateResources(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largeHousingLandService.getStockOfEstateResources(appOrg));
     }
 
     /**
      * 土地资源存量
      */
     @GetMapping("/stockOfLandResources")
-    public AjaxResult getStockOfLandResources() {
-        return AjaxResult.success("查询成功", largeHousingLandService.getStockOfLandResources());
+    public AjaxResult getStockOfLandResources(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largeHousingLandService.getStockOfLandResources(appOrg));
     }
 
     /**
      * 2025年度投资房产完成情况
      */
     @GetMapping("/investFinishState")
-    public AjaxResult getInvestFinishState() {
-        return AjaxResult.success("查询成功", largeHousingLandService.getInvestFinishState());
+    public AjaxResult getInvestFinishState(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largeHousingLandService.getInvestFinishState(appOrg));
     }
 
 }

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeHousingLand.java

@@ -51,6 +51,11 @@ public class LargeHousingLand extends CustomBaseEntity {
 
     private Long type;
 
+    /**
+     * 所属单位编码
+     */
+    private String appOrg;
+
     @TableField(exist = false)
     private String typeName;
 

project-zcustom/src/main/java/com/project/zcustom/mapper/logistics/PlatHousingLandMapper.java

@@ -8,11 +8,11 @@ import java.util.List;
 import java.util.Map;
 
 public interface PlatHousingLandMapper extends BaseMapper<LargeHousingLand> {
-    List<LargeHousingLand> getStockOfEstateResources();
+    List<LargeHousingLand> getStockOfEstateResources(String appOrg);
 
-    Map<String, Object> getStockOfLandResources();
+    Map<String, Object> getStockOfLandResources(String appOrg);
 
-    Map<String, Object> getInvestFinishState();
+    Map<String, Object> getInvestFinishState(String appOrg);
 
     int upload(List<LargeHousingLand> data);
 }

project-zcustom/src/main/java/com/project/zcustom/service/logistics/ILargeHousingLandService.java

@@ -8,11 +8,11 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.Map;
 
 public interface ILargeHousingLandService extends IService<LargeHousingLand> {
-    Map<String, Object> getStockOfEstateResources();
+    Map<String, Object> getStockOfEstateResources(String appOrg);
 
-    Map<String, Object> getStockOfLandResources();
+    Map<String, Object> getStockOfLandResources(String appOrg);
 
-    Map<String, Object> getInvestFinishState();
+    Map<String, Object> getInvestFinishState(String appOrg);
 
     /**
      * 分页查询房产土地列表

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargeHousingLandServiceImpl.java

@@ -27,7 +27,7 @@ public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapp
     private PlatHousingLandMapper platHousingLandMapper;
 
 
-    public Map<String, Object> getStockOfEstateResources(){
+    public Map<String, Object> getStockOfEstateResources(String appOrg){
         String[] strArr = {"办公用房", "周转用房", "生产管理", "教育培训用房", "交流干部住房", "单身公寓/单身宿舍"};
         List<LargeHousingLand> arr = new ArrayList<>();
         for (int i = 0; i < 6; i++){
@@ -38,7 +38,7 @@ public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapp
             land.setTypeName(strArr[i]);
             arr.add(land);
         }
-        List<LargeHousingLand> list = platHousingLandMapper.getStockOfEstateResources();
+        List<LargeHousingLand> list = platHousingLandMapper.getStockOfEstateResources(appOrg);
         Map<String, Object> map = new HashMap<>();
         BigDecimal housingAcreage = new BigDecimal(0);
         Long housingNum = 0L;
@@ -54,12 +54,12 @@ public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapp
         return map;
     }
 
-    public Map<String, Object> getStockOfLandResources(){
-        return platHousingLandMapper.getStockOfLandResources();
+    public Map<String, Object> getStockOfLandResources(String appOrg){
+        return platHousingLandMapper.getStockOfLandResources(appOrg);
     }
 
-    public Map<String, Object> getInvestFinishState(){
-        return platHousingLandMapper.getInvestFinishState();
+    public Map<String, Object> getInvestFinishState(String appOrg){
+        return platHousingLandMapper.getInvestFinishState(appOrg);
     }
 
     /**

project-zcustom/src/main/resources/mapper/zcustom/logistics/PlatHousingLandMapper.xml

@@ -11,32 +11,35 @@
         <result property="constructionTime"    column="construction_time"    />
     </resultMap>
 
-    <select id="getStockOfEstateResources" resultMap="LargeHousingLandResult">
+    <select id="getStockOfEstateResources" parameterType="String" resultMap="LargeHousingLandResult">
         SELECT
             count( 1 ) AS num,
             sum( acreage ) AS acreage,
             type
         FROM
             large_plat_housing_land
+        WHERE app_org = #{appOrg}
         GROUP BY
             type
     </select>
 
-    <select id="getStockOfLandResources" resultType="map">
+    <select id="getStockOfLandResources" parameterType="String" resultType="map">
         SELECT
             count( 1 ) AS num,
             COUNT( CASE WHEN YEAR ( construction_time ) >= YEAR ( CURDATE()) THEN 1 END ) AS new,
             COUNT( CASE WHEN ownership_flag = 1 THEN 1 END ) AS own
         FROM
             large_plat_housing_land
+        WHERE app_org = #{appOrg}
     </select>
 
-    <select id="getInvestFinishState" resultType="map">
+    <select id="getInvestFinishState" parameterType="String" resultType="map">
         SELECT
             COUNT( CASE WHEN YEAR ( construction_time ) >= YEAR ( CURDATE()) THEN 1 END ) AS new,
             COUNT( CASE WHEN ( investment_plan_flag = 1 AND YEAR ( construction_time ) >= YEAR ( CURDATE())) THEN 1 END ) AS invest
         FROM
             large_plat_housing_land
+        WHERE app_org = #{appOrg}
     </select>
 
     <insert id="upload" parameterType="com.project.zcustom.domain.addional.LargeHousingLand">