Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -336,7 +336,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
-            @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
+            @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水、10压力调度)", required = false) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "事件类型(1:运维上报,2:用户上报,3:设备告警)", required = false) @RequestParam(required = false) Integer eventType,
             @ApiParam(value = "单号", required = false) @RequestParam(required = false) String taskNo,
             @ApiParam(value = "计划起始日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String startDate,

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -646,6 +646,9 @@
           order by t1.send_time desc
         </if>
       </if>
+      <if test="order.startDate == null and order.endDate == null">
+         order by t1.date_create desc
+      </if>
     </where>
   </select>
   <!--删除-->
@@ -667,7 +670,7 @@
 
   <!--查询工单派单时的用户状态-->
    <select id="selectOrderUserStatus" parameterType="java.lang.String" resultType="map">
-      SELECT X, Y,
+      SELECT DISTINCT X, Y,
        CASE WHEN S IS NULL THEN '空闲' WHEN S='0' THEN '空闲' ELSE '执行中' END S ,
        CASE WHEN offlinetime IS NULL THEN '离线' WHEN offlinetime>10 THEN '离线' WHEN offlinetime &lt;= 10 THEN '在线' END L
        FROM
@@ -700,7 +703,7 @@
 
   <!--查询维修列表的用户状态-->
   <select id="selectMaintainUserStatus" parameterType="java.lang.String" resultType="map">
-    select X, Y,
+    select distinct X, Y,
     case when offlinetime is null then '离线' when offlinetime>10 then '离线' when offlinetime &lt;= 10 THEN '在线' END L
     from (
         select longtitude X, latitude Y, TIMESTAMPDIFF(second,upload_date, now()) offlinetime from sc_gps_data
@@ -708,7 +711,6 @@
     ) a
   </select>
 
-
   <!--待处理权限-->
   <select id="selectPendingPower" resultType="java.lang.Integer" parameterType="map">
     select count(1) from sc_work_order_manage

sms_water/src/main/java/com/huaxu/service/impl/HomePageReportServiceImpl.java

@@ -191,24 +191,32 @@ public class HomePageReportServiceImpl implements HomePageReportService {
             waterQualityRate.setPipeNetworkQuality(pipeNetworkQuality.getAverageQuality());
             waterQualityRate.setPipeNetworkAbnormal(pipeNetworkQuality.getAbnormal());
             waterQualityRate.setAverageQuality(pipeNetworkQuality.getAverageQuality());
+        }else{
+            waterQualityRate.setAverageQuality(new BigDecimal("100"));
         }
         if(waterSourceQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+waterSourceQuality.getAbnormal());
             waterQualityRate.setWaterSourceQuality(waterSourceQuality.getAverageQuality());
             waterQualityRate.setWaterSourceAbnormal(waterQualityRate.getAbnormal());
             waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(waterSourceQuality.getAverageQuality()));
+        }else{
+            waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(new BigDecimal("100")));
         }
         if(waterFactoryQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+waterFactoryQuality.getAbnormal());
             waterQualityRate.setWaterFactoryQuality(waterFactoryQuality.getAverageQuality());
             waterQualityRate.setWaterFactoryAbnormal(waterFactoryQuality.getAbnormal());
             waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(waterFactoryQuality.getAverageQuality()));
+        }else{
+            waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(new BigDecimal("100")));
         }
         if(pumpingStationQuality != null){
             waterQualityRate.setAbnormal(waterQualityRate.getAbnormal()+pumpingStationQuality.getAbnormal());
             waterQualityRate.setPumpingStationQuality(pumpingStationQuality.getAverageQuality());
             waterQualityRate.setPumpingStationAbnormal(pumpingStationQuality.getAbnormal());
             waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(pumpingStationQuality.getAverageQuality()));
+        }else{
+            waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().add(new BigDecimal("100")));
         }
         waterQualityRate.setAverageQuality(waterQualityRate.getAverageQuality().divide(new BigDecimal("4"),3,BigDecimal.ROUND_HALF_UP));
 

sms_water/src/main/java/com/huaxu/service/impl/RevenueServiceImpl.java

@@ -60,7 +60,8 @@ public class RevenueServiceImpl implements RevenueService {
                 if(i<3){
                     result.add(monthSell.get(i));
                 } else{
-                    othersUsage+=monthSell.get(i).getWaterUsage();
+                    if(monthSell.get(i).getWaterUsage()!=null)
+                        othersUsage+=monthSell.get(i).getWaterUsage();
                 }
             }
             monthSellwaterDto.setPropertyName("其他用水");

sms_water/src/main/resources/mapper/RevenueMapper.xml

@@ -4,9 +4,8 @@
     <!--查询本月售水信息-->
     <select id="selectMonthSell" resultType="com.huaxu.dto.MonthSellwaterDto">
         select t2.property_name ,sum(t1.water_usage) water_usage
-        from sms_month_sellwater t1
-        inner join sms_water_property t2 on t1.property_id=t2.id
-        where t1.collect_date>=date_format(curdate(), '%Y-%m' )
+        from sms_water_property t2
+        left join sms_month_sellwater t1 on t1.property_id=t2.id and t1.collect_date>=date_format(curdate(), '%Y-%m' )
         <if test="tenantId != null and tenantId != ''">
             and t1.tenant_id=#{tenantId}
         </if>
@@ -21,8 +20,19 @@
                 </foreach>
             </if>
         </if>
+        inner join (
+            select distinct property_id
+            from sms_month_sellwater
+            where 1=1
+            <if test="tenantId != null and tenantId != ''">
+                and tenant_id=#{tenantId}
+            </if>
+            <if test="companyOrgId != null and companyOrgId !=''">
+                and company_org_id=#{companyOrgId}
+            </if>
+        )t3 on t2.id=t3.property_id
         group by t2.property_name
-        order by water_usage desc
+        order by water_usage desc,t2.property_name
     </select>
 
     <!--查询近6个月的售水量-->

user_center/src/main/resources/mapper/TenantMapper.xml

@@ -94,9 +94,9 @@
             <if test="code != null and code != ''">
                 CODE = #{code},
             </if>
-            <if test="logo != null and logo != ''">
+<!--            <if test="logo != null and logo != ''">-->
                 LOGO = #{logo},
-            </if>
+<!--            </if>-->
             <if test="webUrl != null and webUrl != ''">
                 WEB_URL = #{webUrl},
             </if>