大屏界面 -- 房产土地 接口调整

 后台界面 -- 上报问题   接口调整

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

@@ -51,6 +51,9 @@ public class LargeHousingLand extends CustomBaseEntity {
 
     private Long type;
 
+    @TableField(exist = false)
+    private String typeName;
+
     /**
      * 施工时间
      */

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

@@ -28,15 +28,27 @@ public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapp
 
 
     public Map<String, Object> getStockOfEstateResources(){
+        String[] strArr = {"办公用房", "周转用房", "生产管理", "教育培训用房", "交流干部住房", "单身公寓/单身宿舍"};
+        List<LargeHousingLand> arr = new ArrayList<>();
+        for (int i = 0; i < 6; i++){
+            LargeHousingLand land = new LargeHousingLand();
+            land.setNum(0L);
+            land.setAcreage(BigDecimal.valueOf(0));
+            land.setType((long) i);
+            land.setTypeName(strArr[i]);
+            arr.add(land);
+        }
         List<LargeHousingLand> list = platHousingLandMapper.getStockOfEstateResources();
         Map<String, Object> map = new HashMap<>();
-        map.put("pieChart", list);
         BigDecimal housingAcreage = new BigDecimal(0);
         Long housingNum = 0L;
         for (LargeHousingLand it : list){
             housingAcreage = housingAcreage.add(it.getAcreage());
             housingNum += it.getNum();
+            arr.get(it.getType().intValue()).setAcreage(it.getAcreage());
+            arr.get(it.getType().intValue()).setNum(it.getNum());
         }
+        map.put("pieChart", arr);
         map.put("housingNum", housingNum);
         map.put("housingAcreage", housingAcreage);
         return map;

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

@@ -14,7 +14,8 @@
     <select id="getStockOfEstateResources" resultMap="LargeHousingLandResult">
         SELECT
             count( 1 ) AS num,
-            sum( acreage ) AS acreage
+            sum( acreage ) AS acreage,
+            type
         FROM
             large_plat_housing_land
         GROUP BY

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join large_plat_project b
         on a.project_id = b.id
         <where>
+               a.del_flag = '0' AND b.del_flag = '0'
             <if test="description != null  and description != ''"> and description = #{description}</if>
             <if test="projectId != null "> and a.project_id = #{projectId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>