Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationCycleServiceImpl.java

@@ -80,7 +80,6 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @Override
     public boolean delEvaluationCycleByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
     }

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

@@ -58,7 +58,7 @@ public class WorkOrderStatisticsController {
             endDate = subMonth(startDate, 1);
 
             sameStartDate = subYear(startDate, -1);
-            sameEndDate = subYear(sameStartDate, 1);
+            sameEndDate = subMonth(sameStartDate, 1);
 
             chainStartDate = subMonth(startDate, -1);
             chainEndDate = subMonth(chainStartDate, 1);
@@ -74,12 +74,14 @@ public class WorkOrderStatisticsController {
         } else if (statsType == 2) {
             startDate = String.format("%s-01", startDate);
             endDate = String.format("%s-01", endDate);
+            endDate = subMonth(endDate,1);
         }
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
         workOrderManageDto.setStartDate(startDate);
         workOrderManageDto.setEndDate(endDate);
+        workOrderManageDto.setTenantId(loginUser.getTenantId());
         workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
@@ -95,42 +97,54 @@ public class WorkOrderStatisticsController {
         workOrderManageDto.setEndDate(sameEndDate);
         //同比
         Map<String, Object> sameStatistic = workOrderManageService.workOrderStatistics(workOrderManageDto);
+        if(!sameStatistic.containsKey("工单完成数")){
+            sameStatistic.put("工单完成数",0);
+        }
+        if(!sameStatistic.containsKey("工单完成率")){
+            sameStatistic.put("工单完成率",0);
+        }
         //环比
         workOrderManageDto.setStartDate(chainStartDate);
         workOrderManageDto.setEndDate(chainEndDate);
         Map<String, Object> chainStatistic = workOrderManageService.workOrderStatistics(workOrderManageDto);
+        if(!chainStatistic.containsKey("工单完成数")){
+            chainStatistic.put("工单完成数",0);
+        }
+        if(!chainStatistic.containsKey("工单完成率")){
+            chainStatistic.put("工单完成率",0);
+        }
 
         DecimalFormat df = new DecimalFormat("#0.00");
 
         if (sameStatistic.get("工单完成率") == null || sameStatistic.get("工单完成率").toString().equals("0")) {
-            statistics.put("工单完成率同比", 0);
+            statistics.put("工单完成率同比", "-");
         } else {
             Double finishedSameRate = (Double.parseDouble(statistics.get("工单完成率").toString()) - Double.parseDouble(sameStatistic.get("工单完成率").toString())) * 100 / Double.parseDouble(sameStatistic.get("工单完成率").toString());
             statistics.put("工单完成率同比", df.format(finishedSameRate));
         }
 
         if (chainStatistic.get("工单完成率") == null || chainStatistic.get("工单完成率").toString().equals("0")) {
-            statistics.put("工单完成率环比", 0);
+            statistics.put("工单完成率环比", "-");
         } else {
             Double finishedChainRate = (Double.parseDouble(statistics.get("工单完成率").toString()) - Double.parseDouble(chainStatistic.get("工单完成率").toString())) * 100 / Double.parseDouble(chainStatistic.get("工单完成率").toString());
             statistics.put("工单完成率环比", df.format(finishedChainRate));
         }
         
         if (sameStatistic.get("工单总数") == null || sameStatistic.get("工单总数").toString().equals("0")) {
-            statistics.put("工单总数同比", 0);
+            statistics.put("工单总数同比", "-");
         } else {
             Double orderSameTotalNumberRate = (Double.parseDouble(statistics.get("工单总数").toString()) - Double.parseDouble(sameStatistic.get("工单总数").toString())) * 100 / Double.parseDouble(sameStatistic.get("工单总数").toString());
             statistics.put("工单总数同比", df.format(orderSameTotalNumberRate));
         }
         if (chainStatistic.get("工单总数") == null || chainStatistic.get("工单总数").toString().equals("0")) {
-            statistics.put("工单总数环比", 0);
+            statistics.put("工单总数环比", "-");
         } else {
             Double orderChainTotalNumberRate = (Double.parseDouble(statistics.get("工单总数").toString()) - Double.parseDouble(chainStatistic.get("工单总数").toString())) * 100 / Double.parseDouble(chainStatistic.get("工单总数").toString());
             statistics.put("工单总数环比", df.format(orderChainTotalNumberRate));
         }
 
         if (sameStatistic.get("工单完成数") == null || sameStatistic.get("工单完成数").toString().equals("0")) {
-            statistics.put("工单完成数同比", 0);
+            statistics.put("工单完成数同比", "-");
 
         } else {
             Double finishedSameNumber = (Double.parseDouble(statistics.get("工单完成数").toString()) - Double.parseDouble(sameStatistic.get("工单完成数").toString())) * 100 / Double.parseDouble(sameStatistic.get("工单完成数").toString());
@@ -138,7 +152,7 @@ public class WorkOrderStatisticsController {
         }
 
         if (chainStatistic.get("工单完成数") == null || chainStatistic.get("工单完成数").toString().equals("0")) {
-            statistics.put("工单完成数环比", 0);
+            statistics.put("工单完成数环比", "-");
         } else {
             Double finishedChainNumber = (Double.parseDouble(statistics.get("工单完成数").toString()) - Double.parseDouble(chainStatistic.get("工单完成数").toString())) * 100 / Double.parseDouble(chainStatistic.get("工单完成数").toString());
             statistics.put("工单完成数环比", df.format(finishedChainNumber));
@@ -159,6 +173,7 @@ public class WorkOrderStatisticsController {
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
+        workOrderManageDto.setTenantId(loginUser.getTenantId());
         workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
@@ -178,6 +193,7 @@ public class WorkOrderStatisticsController {
                 maintainerCount = userCenterClient.findMaintainerCount(endDate);
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         workOrderManageDto.setStartDate(startDate);
@@ -216,7 +232,7 @@ public class WorkOrderStatisticsController {
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
-
+        workOrderManageDto.setTenantId(loginUser.getTenantId());
         workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
@@ -233,6 +249,7 @@ public class WorkOrderStatisticsController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         workOrderManageDto.setStartDate(startDate);
@@ -266,6 +283,7 @@ public class WorkOrderStatisticsController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         workOrderManageDto.setStartDate(startDate);
@@ -298,6 +316,7 @@ public class WorkOrderStatisticsController {
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
+        workOrderManageDto.setTenantId(loginUser.getTenantId());
         workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
@@ -312,6 +331,7 @@ public class WorkOrderStatisticsController {
         } else if (statsType == 2) {
             startDate = String.format("%s-01", startDate);
             endDate = String.format("%s-01", endDate);
+            endDate = subMonth(endDate,1);
         }
         workOrderManageDto.setStartDate(startDate);
         workOrderManageDto.setEndDate(endDate);

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

@@ -876,8 +876,7 @@
       select count(1) total,sum(case when order_status=2 then 1 when order_status =3 then 1 else 0 end) finished
       from sc_work_order_manage t1
       <where>
-        t1.order_status != 0
-        and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%m-%d')
+        t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%m-%d')
         and t1.date_create &lt; date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%m-%d')
         <if test="order.tenantId != null and order.tenantId != ''">
           and t1.tenant_id = #{order.tenantId}

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -225,6 +225,9 @@ public class SceneController {
             @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
+
+        LocalDate localDate = LocalDate.now();
+
         LoginUser loginUser = UserUtil.getCurrentUser();
         SceneEntity sceneEntity = new SceneEntity();
         sceneEntity.setTenantId(loginUser.getTenantId());
@@ -238,6 +241,10 @@ public class SceneController {
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);
                 days =getDaysOfMonth(startDate);
+                if(localDate.getYear() == Integer.parseInt(startDate.substring(0,4))&&
+                localDate.getMonthValue() == Integer.parseInt(startDate.substring(5,7))){
+                    days = localDate.getDayOfMonth();
+                }
                 break;
             case 1:
                 days =LocalDate.of(Integer.parseInt(startDate),1,1).lengthOfYear();
@@ -247,10 +254,12 @@ public class SceneController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 days = differentDaysByMillisecond(startDate,endDate);
                 break;
         }
         ParmSettingEntity parmSettingEntity = new ParmSettingEntity();
+        parmSettingEntity.setTenantId(loginUser.getTenantId());
         parmSettingEntity.setCompanyOrgId(Long.valueOf(loginUser.getCompanyId().toString()));
         parmSettingEntity.setParmType(3);
         List<ParmSettingEntity> paramSettingList = parmSettingService.findList(parmSettingEntity);
@@ -316,6 +325,7 @@ public class SceneController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         List<Map<String,Object>> list = new ArrayList<>();
@@ -362,6 +372,7 @@ public class SceneController {
             case 2:
                 startDate = String.format("%s-01", startDate);
                 endDate = String.format("%s-01", endDate);
+                endDate = subMonth(endDate,1);
                 break;
         }
         List<Map<String,Object>> list = sceneService.selectAlarmLable(sceneEntity,startDate,endDate,sort);
@@ -369,9 +380,6 @@ public class SceneController {
     }
 
 
-
-
-
     /**
      * 获取一个月有多少天
      */

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

@@ -49,7 +49,6 @@
         SELECT
         <include refid="parmSettingColumns"/>
         FROM sms_parm_setting a
-
         <where>
             <if test="tenantId != null  and tenantId != ''">and a.tenant_id = #{tenantId}</if>
             <if test="companyOrgId != null ">and a.company_org_id = #{companyOrgId}</if>
@@ -59,13 +58,11 @@
             and a.status=1
         </where>
     </select>
-
     <!--  根据获取实体 page   -->
     <select id="findPage" resultType="com.huaxu.entity.ParmSettingEntity">
         SELECT
         <include refid="parmSettingColumns"/>
         FROM sms_parm_setting a
-
         <where>
             <if test="parmSetting.tenantId != null  and parmSetting.tenantId != ''">and a.tenant_id =
                 #{parmSetting.tenantId}