fix(大屏):处理管道长度计算错误问题，综合查询导出添加注册代码字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -724,9 +724,9 @@
             <if test="dto.fullAddress != null and dto.fullAddress != ''">
                 AND fullAddress LIKE CONCAT('%', #{dto.fullAddress}, '%')
             </if>
-            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
-                AND receive_company_code = #{dto.receiveCompanyCode}
-            </if>
+<!--            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">-->
+<!--                AND receive_company_code = #{dto.receiveCompanyCode}-->
+<!--            </if>-->
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and useUnitName like concat('%',#{dto.useUnitName},'%')
             </if>
@@ -742,6 +742,16 @@
             <if test="dto.auditPassDateStart != null and dto.auditPassDateEnd != null">
                 AND auditPassDate BETWEEN #{dto.auditPassDateStart} AND #{dto.auditPassDateEnd}
             </if>
+            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
+                <choose>
+                    <when test="client == 'jgLook'">
+                        and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
+                    </when>
+                    <otherwise>
+                        and supervisionOrgCode = #{dto.orgBranchCode}
+                    </otherwise>
+                </choose>
+            </if>
             <if test="dto.dataType == 'supervision' ">
                 <choose>
                     <when test="client == 'jgAudit'">

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/vo/EquipInfoVo.java

@@ -41,6 +41,9 @@ public class EquipInfoVo {
     @ExcelProperty("使用登记证编号")
     private String USE_ORG_CODE;
 
+    @ExcelProperty("注册代码")
+    private String RECORD;
+
     @ExcelProperty("96333电梯码")
     private String CODE96333;
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -525,6 +525,7 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * 获取es和数据库中设备数据差异V2
      * @return Object
      */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/getDataDifferenceV2")
     @ApiOperation(httpMethod = "GET", value = "获取es和数据库数据差异V2", notes = "获取es和数据库数据差异V2")
     public ResponseModel<Object> getDataDifferenceV2() {

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/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -2639,6 +2639,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                 JSONObject maintenances = equip.getJSONArray("maintenances").getJSONObject(0);
                 BeanUtil.copyProperties(maintenances, equipInfoVo, CopyOptions.create().setIgnoreNullValue(true));
             }
+            Optional.of(equip)
+                    .filter(e -> "3000".equals(String.valueOf(e.get("EQU_LIST_CODE"))))
+                    .filter(e -> String.valueOf(e.get("DATA_SOURCE")).contains("jg_his_xa"))
+                    .map(e -> String.valueOf(e.get("SEQUENCE_NBR")))
+                    .ifPresent(equipInfoVo::setRECORD);
+
             // 技术参数
             if (!equip.getJSONArray("techParams").isEmpty()) {
                 JSONObject paramsJson = new JSONObject();

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/JGDPStatisticsServiceImpl.java

@@ -3899,8 +3899,9 @@ public class JGDPStatisticsServiceImpl {
                 countItemDto.setGl(String.valueOf(data.get(DPMapStatisticsItemEnum.BOILERS.getCode())));
                 countItemDto.setYlrq(String.valueOf(data.get(DPMapStatisticsItemEnum.PRESSURE_VESSELS.getCode())));
                 // 2. 压力管道长度统计
-                this.staticsCenterMapCountPipLine(data, orgCode, true,isOrgBranchCodeExactMatch);
-//                countItemDto.setYlgd(stCommonService.staticsCenterMapCountDataForPipeline(data, orgCode, true, isOrgBranchCodeExactMatch));
+                this.staticsCenterMapCountPipLine(data, orgCode, true, isOrgBranchCodeExactMatch);
+                countItemDto.setYlgd(String.valueOf(data.get(DPMapStatisticsItemEnum.PRESSURE_PIPELINES.getCode())));
+                //countItemDto.setYlgd(stCommonService.staticsCenterMapCountDataForPipeline(data, orgCode, true, isOrgBranchCodeExactMatch));
                 // 如果是地市数据则计算上线率，上线率=系统已有数据/最新期底数x100%
                 if ("610000".equals(r.getParentRegionCode())) {
                     Map<String, Object> baselineMap = baselineData.stream().filter(d -> d.get("city_code").equals(regionCode)).findFirst().orElse(null);