工程量统计新增字段关联作业总数

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmWorkCompleStatistics.java

@@ -238,6 +238,10 @@ public class PdmWorkCompleStatistics extends BaseEntity
     @Excel(name = "ETL时间戳 ")
     private String etlTm;
 
+    /** 杆塔基新增工程量 */
+    @Excel(name = "作业总数")
+    private BigDecimal workTotal;
+
     public void setBatchId(String batchId)
     {
         this.batchId = batchId;
@@ -743,6 +747,15 @@ public class PdmWorkCompleStatistics extends BaseEntity
         return excType;
     }
 
+
+    public BigDecimal getWorkTotal() {
+        return workTotal;
+    }
+
+    public void setWorkTotal(BigDecimal workTotal) {
+        this.workTotal = workTotal;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/WorkPlanStatistics.java

@@ -28,6 +28,11 @@ public class WorkPlanStatistics {
     private BigDecimal ringCabinetAccuQtWork;
     private BigDecimal poleTabAccuQtWork;
 
+    /**
+     * 关联作业总数
+     */
+    private BigDecimal workTotal;
+
 
     /**
      * 查询开始时间

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmWorkCompleStatisticsServiceImpl.java

@@ -224,6 +224,7 @@ public class PdmWorkCompleStatisticsServiceImpl implements IPdmWorkCompleStatist
             work.setTowerAccuQtWork(workPlan.getTowerAccuQtWork());
             work.setRingCabinetAccuQtWork(workPlan.getRingCabinetAccuQtWork());
             work.setPoleTabAccuQtWork(workPlan.getPoleTabAccuQtWork());
+            work.setWorkTotal(workPlan.getWorkTotal());
         }else{
             work.setLineCableNewAccuQtWork(BigDecimal.ZERO);
             work.setLineOverhdNewAccuQtWork(BigDecimal.ZERO);
@@ -232,6 +233,7 @@ public class PdmWorkCompleStatisticsServiceImpl implements IPdmWorkCompleStatist
             work.setTowerAccuQtWork(BigDecimal.ZERO);
             work.setRingCabinetAccuQtWork(BigDecimal.ZERO);
             work.setPoleTabAccuQtWork(BigDecimal.ZERO);
+            work.setWorkTotal(BigDecimal.ZERO);
         }
         if(workPlanLastWeek!=null){
             work.setLineCableNewAccuQtWorkWeek(workPlanLastWeek.getLineCableNewAccuQtWork());

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkCompleStatisticsMapper.xml

@@ -61,10 +61,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ringCabinetAccuQtWorkWeek"    column="ring_cabinet_accu_qt_work_week"    />
         <result property="poleTabAccuQtWorkWeek"    column="pole_tab_accu_qt_work_week"    />
         <result property="excType"    column="exc_type"    />
+        <result property="workTotal"  column="work_total"    />
     </resultMap>
 
     <sql id="selectPdmWorkCompleStatisticsVo">
-        select batch_id, batch_name, batch_code, plan_year, id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category, line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm, line_cable_new_accu_qt_week, line_overhd_new_accu_qt_week, dist_trans_new_accu_qt_week, low_volt_line_accu_qt_week, tower_accu_qt_week, ring_cabinet_accu_qt_week, pole_tab_accu_qt_week, line_cable_new_accu_qt_work, line_overhd_new_accu_qt_work, dist_trans_new_accu_qt_work, low_volt_line_accu_qt_work, tower_accu_qt_work, ring_cabinet_accu_qt_work, pole_tab_accu_qt_work, line_cable_new_accu_qt_work_week, line_overhd_new_accu_qt_work_week, dist_trans_new_accu_qt_work_week, low_volt_line_accu_qt_work_week, tower_accu_qt_work_week, ring_cabinet_accu_qt_work_week, pole_tab_accu_qt_work_week, exc_type from pdm_work_comple_statistics
+        select batch_id, batch_name, batch_code, plan_year, id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category, line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm, line_cable_new_accu_qt_week, line_overhd_new_accu_qt_week, dist_trans_new_accu_qt_week, low_volt_line_accu_qt_week, tower_accu_qt_week, ring_cabinet_accu_qt_week, pole_tab_accu_qt_week, line_cable_new_accu_qt_work, line_overhd_new_accu_qt_work, dist_trans_new_accu_qt_work, low_volt_line_accu_qt_work, tower_accu_qt_work, ring_cabinet_accu_qt_work, pole_tab_accu_qt_work, line_cable_new_accu_qt_work_week, line_overhd_new_accu_qt_work_week, dist_trans_new_accu_qt_work_week, low_volt_line_accu_qt_work_week, tower_accu_qt_work_week, ring_cabinet_accu_qt_work_week, pole_tab_accu_qt_work_week, exc_type,work_total from pdm_work_comple_statistics
     </sql>
 
     <select id="selectPdmWorkCompleStatisticsList" parameterType="PdmWorkCompleStatistics" resultMap="PdmWorkCompleStatisticsResult">
@@ -192,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ringCabinetAccuQtWorkWeek != null">ring_cabinet_accu_qt_work_week,</if>
             <if test="poleTabAccuQtWorkWeek != null">pole_tab_accu_qt_work_week,</if>
             <if test="excType != null">exc_type,</if>
+            <if test="workTotal != null">work_total,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="batchId != null">#{batchId},</if>
@@ -250,6 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ringCabinetAccuQtWorkWeek != null">#{ringCabinetAccuQtWorkWeek},</if>
             <if test="poleTabAccuQtWorkWeek != null">#{poleTabAccuQtWorkWeek},</if>
             <if test="excType != null">#{excType},</if>
+            <if test="workTotal != null">#{workTotal},</if>
          </trim>
     </insert>
 
@@ -311,6 +314,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ringCabinetAccuQtWorkWeek != null">ring_cabinet_accu_qt_work_week = #{ringCabinetAccuQtWorkWeek},</if>
             <if test="poleTabAccuQtWorkWeek != null">pole_tab_accu_qt_work_week = #{poleTabAccuQtWorkWeek},</if>
             <if test="excType != null">exc_type = #{excType},</if>
+            <if test="workTotal != null">work_total = #{workTotal},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkPlanMapper.xml

@@ -695,7 +695,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           or(op_content like '%新建%' and op_content like '%刀闸%') or (op_content like '%更换%' and op_content like '%刀闸%') or (op_content like '%拆除%' and op_content like '%刀闸%')
                           or (op_content like '%新建%' and op_content like '%避雷器%') or (op_content like '%更换%' and op_content like '%避雷器%') or (op_content like '%拆除%' and op_content like '%避雷器%')
                           ),1,0)) pole_tab_accu_qt_work,
-                sum(if(op_content like '%立杆%',1,0)) tower_accu_qt_work
+                sum(if((op_content like '%立%' and op_content like '%杆%') or (op_content like '%撤%' and op_content like '%杆%') ,0,1)) tower_accu_qt_work,
+                sum(1) work_total
         FROM ads_cst_hywzqlc_pdmworkplan_df
         <where>
             <if test="startDate != null and startDate!=''">and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}</if>