工程现场部分接口修改

后勤资源 房产 接口修改

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

@@ -78,4 +78,10 @@ public class LargeHousingLand extends CustomBaseEntity {
 
     @TableField(exist = false)
     private Long num;
+
+
+    /**
+     * 所属单位编码
+     */
+    private String appOrg;
 }

src/main/java/com/project/zcustom/domain/addional/LargeLogistics.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.domain.addional;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -47,6 +48,18 @@ public class LargeLogistics extends CustomBaseEntity {
     private String appName;
 
     /**
+     * 所属单位编码
+     */
+    private String appOrg;
+
+    /**
+     * 所属单位的父单位编码
+     */
+    @TableField(exist = false)
+    private String appParentOrg;
+
+
+    /**
      * 父地区编码（后勤资产）
      */
 

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

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -22,24 +23,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));
     }
 
 }

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

@@ -7,11 +7,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);
 }

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);
 
     /**
      * 分页查询房产土地列表

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

@@ -25,7 +25,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++){
@@ -36,7 +36,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;
@@ -52,12 +52,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);
     }
 
     /**

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">

src/main/resources/mapper/zcustom/unit/LargeCameraMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLargeCameraVo">
-        select id, camera_name, project_id, type, status, online_flag, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_camera
+        select id, camera_name, project_id, type, status, online_flag, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_plat_camera
     </sql>
 
     <select id="selectLargeCameraList" parameterType="LargeCamera" resultMap="LargeCameraResult">
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertLargeCamera" parameterType="LargeCamera" useGeneratedKeys="true" keyProperty="id">
-        insert into large_camera
+        insert into large_plat_camera
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="cameraName != null">camera_name,</if>
             <if test="projectId != null">project_id,</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateLargeCamera" parameterType="LargeCamera">
-        update large_camera
+        update large_plat_camera
         <trim prefix="SET" suffixOverrides=",">
             <if test="cameraName != null">camera_name = #{cameraName},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
@@ -89,26 +89,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteLargeCameraById" parameterType="Long">
-        delete from large_camera where id = #{id}
+        delete from large_plat_camera where id = #{id}
     </delete>
 
     <delete id="deleteLargeCameraByIds" parameterType="String">
-        delete from large_camera where id in
+        delete from large_plat_camera where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
     <delete id="reallyDeleteByWrapper">
-        DELETE FROM large_camera ${ew.customSqlSegment}
+        DELETE FROM large_plat_camera ${ew.customSqlSegment}
     </delete>
 
     <select id="getCameraList" parameterType="Long" resultMap="LargeCameraResult">
-        select * from large_camera
+        select * from large_plat_camera
         where del_flag = '0' and project_id = #{projectId}
     </select>
 
     <select id="getCameraNum" resultType="int">
-        select count(*) from large_camera
+        select count(*) from large_plat_camera
         where del_flag = '0'
     </select>
 
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getConnectOnlineCameraNum" resultType="int">
-        select count(*) from large_camera
+        select count(*) from large_plat_camera
         where connect_flag = '0' and del_flag = '0' and online_flag = '0'
     </select>
 

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

@@ -29,7 +29,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'
+               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>
@@ -40,8 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectLargeIssueById" parameterType="Long" resultMap="LargeIssueResult">
         select a.*, b.project_name
         from large_plat_issue a
-                 left join large_plat_project b
-                           on a.project_id = b.id
+        left join large_plat_project b
+        on a.project_id = b.id
         where a.id = #{id}
     </select>
 
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-        </trim>
+         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="description != null">#{description},</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-        </trim>
+         </trim>
     </insert>
 
     <update id="updateLargeIssue" parameterType="LargeIssue">
@@ -102,51 +102,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getIssueNum" parameterType="String" resultType="int">
         SELECT
-        COUNT(a.id)
+            COUNT(a.id)
         FROM
-        large_plat_issue a
-        LEFT JOIN large_plat_project b ON a.project_id = b.id
-        LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+            large_plat_issue a
+                LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
         WHERE
-        a.del_flag = 0
-        AND b.del_flag = 0
-        AND c.del_flag = '0'
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND c.del_flag = '0'
         <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
     </select>
 
     <select id="getOverIssueNum" parameterType="String" resultType="int">
         SELECT
-        COUNT(a.id)
+            COUNT(a.id)
         FROM
-        large_plat_issue a
-        LEFT JOIN large_plat_project b ON a.project_id = b.id
-        LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+            large_plat_issue a
+                LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
         WHERE
-        a.del_flag = 0 and a.status = 1
-        AND b.del_flag = 0
-        AND c.del_flag = '0'
+            a.del_flag = 0 and a.status = 1
+          AND b.del_flag = 0
+          AND c.del_flag = '0'
         <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
     </select>
 
     <select id="getIssueListLastWeek" parameterType="String" resultMap="LargeIssueResult">
         SELECT
-        a.id,
-        title,description,person,
-        `status`,
-        a.create_time,
-        DATE(a.create_time) AS create_date
+            a.id,
+            title,description,person,
+            `status`,
+            a.create_time,
+            DATE(a.create_time) AS create_date
         FROM
-        large_plat_issue a
-        LEFT JOIN large_plat_project b ON a.project_id = b.id
-        LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+            large_plat_issue a
+                LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
         WHERE
-        a.del_flag = 0
-        AND b.del_flag = 0
-        AND c.del_flag = '0'
-        AND (
-        DATE( a.create_time ) BETWEEN DATE( CURDATE() - 7 )
-        AND CURDATE()
-        )
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND c.del_flag = '0'
+          AND (
+            DATE( a.create_time ) BETWEEN DATE( CURDATE() - 7 )
+            AND CURDATE()
+            )
         <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
         order by a.create_time desc
     </select>
@@ -156,7 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.id,
         title,description,person,
         `status`,
-        a.create_time
+        a.create_time,
+        DATE(a.create_time) AS create_date
         FROM
         large_plat_issue a
         LEFT JOIN large_plat_project b ON a.project_id = b.id
@@ -166,10 +167,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND b.del_flag = 0
         AND c.del_flag = '0'
         AND (
-        DATE( a.create_time ) BETWEEN DATE( #{date} )
+        DATE( a.create_time ) BETWEEN DATE( #{arg1} )
         AND CURDATE()
         )
-        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="arg0 != '10001'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
         order by a.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/zcustom/unit/LargePlanMapper.xml

@@ -4,12 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargePlanMapper">
 
-    <resultMap type="LargePlan" id="LargePlanResult">
+    <resultMap type="com.project.zcustom.domain.addional.LargePlan" id="LargePlanResult">
         <result property="id"    column="id"    />
         <result property="projectId"    column="project_id"    />
         <result property="type"    column="type"    />
         <result property="head"    column="head"    />
         <result property="content"    column="content"    />
+        <result property="projectName"    column="project_name"    />
         <result property="startTime"    column="start_time"    />
         <result property="endTime"    column="end_time"    />
         <result property="createBy"    column="create_by"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLargePlanVo">
-        select id, project_id, type, head, content, start_time, end_time, create_by, create_time, update_by, update_time from large_plan
+        select id, project_id, type, head, content, start_time, end_time, create_by, create_time, update_by, update_time from large_plat_plan
     </sql>
 
     <select id="selectLargePlanList" parameterType="LargePlan" resultMap="LargePlanResult">
@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertLargePlan" parameterType="LargePlan" useGeneratedKeys="true" keyProperty="id">
-        insert into large_plan
+        insert into large_plat_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectId != null">project_id,</if>
             <if test="type != null">type,</if>
@@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateLargePlan" parameterType="LargePlan">
-        update large_plan
+        update large_plat_plan
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="type != null">type = #{type},</if>
@@ -85,28 +86,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteLargePlanById" parameterType="Long">
-        delete from large_plan where id = #{id}
+        delete from large_plat_plan where id = #{id}
     </delete>
 
     <delete id="deleteLargePlanByIds" parameterType="String">
-        delete from large_plan where id in
+        delete from large_plat_plan where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
     <delete id="reallyDeleteByWrapper">
-        DELETE FROM large_plan ${ew.customSqlSegment}
+        DELETE FROM large_plat_plan ${ew.customSqlSegment}
     </delete>
 
     <select id="getCheckProjectNum" resultType="int">
         SELECT
             COUNT(*)
         FROM
-            large_plan
+            large_plat_plan
         WHERE
             type = 0
-          AND DATE( start_time ) >= #{startDate}
-          OR DATE( end_time ) &lt;= #{endDate}
+          AND DATE( start_time ) >= #{arg0}
+          OR DATE( end_time ) &lt;= #{arg1}
         GROUP BY
             `type`,
             project_id

src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -7,9 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.project.zcustom.domain.addional.LargeProject" id="LargeProjectResult">
         <result property="id"    column="id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="unitCode"    column="unit_code"    />
+        <result property="appOrg"    column="app_org"    />
+        <result property="appParentOrg"    column="app_parent_org"    />
         <result property="connectFlag"    column="connect_flag"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="subdivision"    column="subdivision"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -17,23 +19,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLargeProjectVo">
-        select id, project_name, unit_code, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_project
+        select id, project_name, app_org, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_plat_project
     </sql>
 
     <select id="selectLargeProjectList" parameterType="LargeProject" resultMap="LargeProjectResult">
         <include refid="selectLargeProjectVo"/>
         <where>
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="unitCode != null "> and unit_code = #{unitCode}</if>
+            <if test="appOrg != null "> and app_org = #{appOrg}</if>
             <if test="connectFlag != null  and connectFlag != ''"> and connect_flag = #{connectFlag}</if>
         </where>
     </select>
 
     <insert id="insertLargeProject" parameterType="LargeProject" useGeneratedKeys="true" keyProperty="id">
-        insert into large_project
+        insert into large_plat_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectName != null">project_name,</if>
-            <if test="unitCode != null">unit_code,</if>
+            <if test="appOrg != null">app_org,</if>
             <if test="connectFlag != null">connect_flag,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -43,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectName != null">#{projectName},</if>
-            <if test="unitCode != null">#{unitCode},</if>
+            <if test="appOrg != null">#{appOrg},</if>
             <if test="connectFlag != null">#{connectFlag},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -54,10 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateLargeProject" parameterType="LargeProject">
-        update large_project
+        update large_plat_project
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
-            <if test="unitCode != null">unit_code = #{unitCode},</if>
+            <if test="appOrg != null">app_org = #{appOrg},</if>
             <if test="connectFlag != null">connect_flag = #{connectFlag},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -69,61 +71,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteLargeProjectById" parameterType="Long">
-        delete from large_project where id = #{id}
+        delete from large_plat_project where id = #{id}
     </delete>
 
     <delete id="deleteLargeProjectByIds" parameterType="String">
-        delete from large_project where id in
+        delete from large_plat_project where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
     <delete id="reallyDeleteByWrapper">
-        DELETE FROM large_project ${ew.customSqlSegment}
+        DELETE FROM large_plat_project ${ew.customSqlSegment}
     </delete>
 
     <select id="getProjectNum" parameterType="String" resultType="Long">
         SELECT
-        count(*) AS num
+            count(*) AS num
         FROM
-        large_plat_project a
-        LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
+            large_plat_project a
+                LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
         WHERE
-        a.del_flag = '0'
-        AND b.del_flag = '0'
+            a.del_flag = '0'
+          AND b.del_flag = '0'
         <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
     </select>
 
     <select id="getProjectNumX" parameterType="String" resultMap="LargeProjectResult">
         SELECT
-        count(*) AS num,
-        subdivision
+            count(*) AS num,
+            subdivision
         FROM
-        large_plat_project a
-        LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
+            large_plat_project a
+            LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
         WHERE
-        a.del_flag = '0'
-        AND b.del_flag = '0'
+            a.del_flag = '0'
+          AND b.del_flag = '0'
         <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
-        AND subdivision &lt;= 10
+          AND subdivision &lt;= 10
         GROUP BY
-        subdivision
+            subdivision
     </select>
 
     <select id="getProjectNumY" parameterType="String" resultMap="LargeProjectResult">
         SELECT
-        count(*) AS num,
-        subdivision
+            count(*) AS num,
+            subdivision
         FROM
-        large_plat_project a
-        LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
+            large_plat_project a
+                LEFT JOIN large_plat_app_org b ON a.app_org = b.app_org
         WHERE
-        a.del_flag = '0'
-        AND b.del_flag = '0'
+            a.del_flag = '0'
+          AND b.del_flag = '0'
         <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
-        AND subdivision >= 10
+          AND subdivision >= 10
         GROUP BY
-        subdivision
+            subdivision
     </select>
 
     <select id="getProjectByAppOrg" parameterType="String" resultMap="LargeProjectResult">

src/main/resources/mapper/zcustom/unit/PlatBuildingMapper.xml

@@ -250,6 +250,7 @@
 
     <insert id="addBuildingControl" parameterType="LargeBuildingControl">
         insert into large_plat_building_control (week_electricity,
+                                                 control_elevator,
                                                  room_electricity,
                                                  today_electricity,
                                                  month_electricity_one,
@@ -267,6 +268,7 @@
                                                  water_state_two)
         values (
                    #{weekElectricity},
+                   #{controlElevator},
                    #{roomElectricity},
                    #{todayElectricity},
                    #{monthElectricityOne},
@@ -288,6 +290,7 @@
     <update id="updateBuildingControl" parameterType="LargeBuildingControl">
         UPDATE large_plat_building_control
         SET week_electricity = #{weekElectricity},
+            control_elevator = #{controlElevator},
             room_electricity = #{roomElectricity},
             today_electricity = #{todayElectricity},
             month_electricity_one = #{monthElectricityOne},