Merge branch 'develop_tzs_bugfix' of http://39.100.92.250:5000/moa/amos-boot-biz…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -6,7 +6,6 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
 import java.util.Date;
 
 /**
@@ -258,17 +257,15 @@ public class JgTransferNotice extends BaseEntity {
     private String isXixian;
 
     /**
-     *  	 * 设备使用地点-街道（镇）
-     *      */
-
-    @TableField(value ="\"factory_use_site_street\"")
+     * 设备使用地点-街道（镇）
+     */
+    @TableField(value = "factory_use_site_street")
     private String factoryUseSiteStreet;
 
     /**
-     *  	 * 设备使用地点-街道（镇）-名称
-     *      */
-
-    @TableField(value ="\"street_name\"")
+     * 设备使用地点-街道（镇）-名称
+     */
+    @TableField(value = "street_name")
     private String streetName;
 
     @TableField("county_name")
@@ -295,18 +292,16 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "handle_date")
     private Date handleDate;
 
-    @TableField(value = "\"create_user_company_name\"")
+    @TableField(value = "create_user_company_name")
     private String createUserCompanyName;
 
     //下一步任务ID
-    @TableField(value = "\"next_task_id\"")
+    @TableField(value = "next_task_id")
     private String nextTaskId;
 
-
     @TableField(exist = false)
     private String supervisoryCode;
 
-
     @TableField(value = "equ_category")
     private String equCategory;
 
@@ -318,7 +313,7 @@ public class JgTransferNotice extends BaseEntity {
     /**
      * 下一节点可执行人
      */
-    @TableField("\"next_execute_user_ids\"")
+    @TableField("next_execute_user_ids")
     private String nextExecuteUserIds;
 
     @TableField(exist = false)
@@ -334,14 +329,12 @@ public class JgTransferNotice extends BaseEntity {
 //    @TableField(value = "inform_number")
 //    private String informNumber;
 
-
     /**
      * 其他附件
      */
     @TableField(value = "other_accessories")
     private String otherAccessories;
 
-
     /**
      * 接收机构公司的org_code
      */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -305,6 +305,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
         for (Map<String, Object> objectMap : informationList) {
             List<Map<String, Object>> temp = new ArrayList<>();
+            objectMap.put("equipProvinceName", objectMap.get("provinceName"));
+            objectMap.put("equipCityName", objectMap.get("cityName"));
+            objectMap.put("equipCountyName", objectMap.get("countyName"));
+            objectMap.put("equipStreetName", objectMap.get("streetName"));
+            objectMap.put("equipAddress", objectMap.get("address"));
             temp.add(objectMap);
             Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(temp, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
             maps.add(placeholders);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -276,6 +276,9 @@ public class YJDPStatisticsServiceImpl {
         lambda.eq(AlertUseUnitStatistics::getStatisticsDate, date);
         lambda.isNotNull(AlertUseUnitStatistics::getUseUnitCode);
         List<AlertUseUnitStatistics> alertUseUnitStatistics = alertUseUnitStatisticsMapper.selectList(lambda);
+        alertUseUnitStatistics.sort(Comparator.comparing(
+                (AlertUseUnitStatistics a) -> a.getFaultNum() + a.getTrappedNum()
+        ).reversed());
         return Bean.toModels(alertUseUnitStatistics, AlertUseUnitStatisticsDto.class);
     }