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;
 
 /**
@@ -26,229 +25,229 @@ public class JgTransferNotice extends BaseEntity {
     /**
      * 申请编号
      */
-	@TableField("apply_no")
+    @TableField("apply_no")
     private String applyNo;
 
     /**
      * 告知日期
      */
-	@TableField("notice_date")
+    @TableField("notice_date")
     private Date noticeDate;
 
     /**
      * 告知状态
      */
-	@TableField("notice_status")
+    @TableField("notice_status")
     private String noticeStatus;
 
     /**
      * 施工单位统一信用代码
      */
-	@TableField("install_unit_credit_code")
+    @TableField("install_unit_credit_code")
     private String installUnitCreditCode;
 
     /**
      * 施工单位名称
      */
-	@TableField("install_unit_name")
+    @TableField("install_unit_name")
     private String installUnitName;
 
     /**
      * 设备数量
      */
-	@TableField("equip_num")
+    @TableField("equip_num")
     private Integer equipNum;
 
     /**
      * 流程实例id
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private String instanceId;
 
     /**
      * 下步执行角色/人id
      */
-	@TableField("next_executor_ids")
+    @TableField("next_executor_ids")
     private String nextExecutorIds;
 
     /**
      * 流程执行顺序标识
      */
-	@TableField("execute_sequence")
+    @TableField("execute_sequence")
     private String executeSequence;
 
     /**
      * 创建时间
      */
-	@TableField("create_date")
+    @TableField("create_date")
     private Date createDate;
 
     /**
-     * 创建人id 
+     * 创建人id
      */
-	@TableField("create_user_id")
+    @TableField("create_user_id")
     private String createUserId;
 
     /**
      * 创建人
      */
-	@TableField("create_user_name")
+    @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 备注
      */
-	@TableField("remark")
+    @TableField("remark")
     private String remark;
 
     /**
      * 流程状态
      */
-	@TableField("instance_status")
+    @TableField("instance_status")
     private String instanceStatus;
 
     /**
      * 受理完成日期
      */
-	@TableField("accept_date")
+    @TableField("accept_date")
     private Date acceptDate;
 
     /**
      * 施工区域-省
      */
-	@TableField("province")
+    @TableField("province")
     private String province;
 
     /**
      * 施工区域-市
      */
-	@TableField("city")
+    @TableField("city")
     private String city;
 
     /**
      * 施工区域-区/县
      */
-	@TableField("county")
+    @TableField("county")
     private String county;
 
     /**
      * 施工区域-街道（镇）
      */
-	@TableField("street")
+    @TableField("street")
     private String street;
 
     /**
      * 施工设备详细地址
      */
-	@TableField("address")
+    @TableField("address")
     private String address;
 
     /**
      * 计划施工日期
      */
-	@TableField("plan_date")
+    @TableField("plan_date")
     private Date planDate;
 
     /**
      * 接收机构单位代码
      */
-	@TableField("receive_company_code")
+    @TableField("receive_company_code")
     private String receiveCompanyCode;
 
     /**
      * 接收机构
      */
-	@TableField("receive_org_name")
+    @TableField("receive_org_name")
     private String receiveOrgName;
 
     /**
      * 施工负责人
      */
-	@TableField("construction_manager")
+    @TableField("construction_manager")
     private String constructionManager;
 
     /**
      * 施工负责人id
      */
-	@TableField("construction_manager_id")
+    @TableField("construction_manager_id")
     private String constructionManagerId;
 
     /**
      * 施工负责人手机
      */
-	@TableField("construction_manager_phone")
+    @TableField("construction_manager_phone")
     private String constructionManagerPhone;
 
     /**
      * 检验单位统一信用代码
      */
-	@TableField("inspection_unit_credit_code")
+    @TableField("inspection_unit_credit_code")
     private String inspectionUnitCreditCode;
 
     /**
      * 检验单位名称
      */
-	@TableField("inspection_unit_name")
+    @TableField("inspection_unit_name")
     private String inspectionUnitName;
 
     /**
      * 委托单位统一信用代码
      */
-	@TableField("entrusting_unit_credit_code")
+    @TableField("entrusting_unit_credit_code")
     private String entrustingUnitCreditCode;
 
     /**
      * 委托单位名称
      */
-	@TableField("entrusting_unit_name")
+    @TableField("entrusting_unit_name")
     private String entrustingUnitName;
 
     /**
      * 委托书附件
      */
-	@TableField("power_of_attorney")
+    @TableField("power_of_attorney")
     private String powerOfAttorney;
 
     /**
      * 施工合同附件
      */
-	@TableField("construction_contract")
+    @TableField("construction_contract")
     private String constructionContract;
 
     /**
      * 施工合同是否本单位与甲方直接签署
      */
-	@TableField("is_signed_with_a")
+    @TableField("is_signed_with_a")
     private String isSignedWithA;
 
     /**
      * 使用单位统一信用代码
      */
-	@TableField("use_unit_credit_code")
+    @TableField("use_unit_credit_code")
     private String useUnitCreditCode;
 
     /**
      * 使用单位名称
      */
-	@TableField("use_unit_name")
+    @TableField("use_unit_name")
     private String useUnitName;
 
     /**
      * 是否已报检
      */
-	@TableField("is_inspected")
+    @TableField("is_inspected")
     private String isInspected;
 
     /**
      * 移装类型（1区内移装，2跨区移装）
      */
-	@TableField("transfer_type")
+    @TableField("transfer_type")
     private String transferType;
 
     /**
      * 接收机构机构代码
      */
-	@TableField("receive_org_code")
+    @TableField("receive_org_code")
     private String receiveOrgCode;
 
     /**
@@ -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);
     }