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

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

@@ -2575,6 +2575,7 @@
         ei.use_unit_code useUnitCode,
         ei.use_unit useUnit,
         ei.unit_type unitType,
+        ei.supervise_code superviseCode,
         ei.supervise_org_code superviseOrgCode,
         ei.supervise_org_name superviseOrgName,
         ul.sequence_nbr problemSourceId,
@@ -2639,6 +2640,7 @@
             ei.use_unit_code useUnitCode,
             ei.use_unit useUnit,
             ei.unit_type unitType,
+            ei.supervise_code superviseCode,
             ei.supervise_org_code superviseOrgCode,
             ei.supervise_org_name superviseOrgName,
             tup.sequence_nbr problemSourceId,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/SafetyProblemTopicMessage.java

@@ -176,7 +176,7 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
                 safetyProblemTracing.setPrincipalUnitType(json.getOrDefault("unitType", "").toString());
                 safetyProblemTracing.setGoverningBody(json.getOrDefault("superviseOrgName", "").toString());
-                safetyProblemTracing.setGoverningBodyCode(json.getOrDefault("useUnitCode", "").toString());
+                safetyProblemTracing.setGoverningBodyCode(json.getOrDefault("superviseCode", "").toString());
                 safetyProblemTracing.setGoverningBodyOrgCode(json.getOrDefault("superviseOrgCode", "").toString());
                 safetyProblemTracing.setCreateDate(new Date());
                 safetyProblemTracing.setProblemStatus(SafetyProblemStatusEnum.UNHANDLED.getName());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/PressurePipeBasicInformationSummary.ftl

@@ -175,7 +175,7 @@
                                 <w:sz w:val="15"/>
                                 <w:szCs w:val="15"/>
                             </w:rPr>
-                            <w:t>${fullAddress}</w:t>
+                            <w:t>${(fullAddress)!''}</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="2B3A3AF9" w14:textId="36E874EF" w:rsidR="00505A7C" w:rsidRDefault="00EA7A71"

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

@@ -80,9 +80,7 @@ import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
@@ -3447,7 +3445,12 @@ public class JGDPStatisticsServiceImpl {
         if (com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(orgCode)){
             return new Page<>();
         }
+        // 默认登录监管单位orgcode过滤
         problemModel.setGoverningBodyOrgCode(orgCode);
+        if (!ObjectUtils.isEmpty(problemModel.getGoverningBodyOrgCode())){
+            // 筛选条件起效
+            problemModel.setGoverningBodyOrgCode(problemModel.getGoverningBodyOrgCode());
+        }
         // 使用orgCode过滤
         // 将单位类型从code转化为value
         if (!ValidationUtil.isEmpty(problemModel.getPrincipalUnitType())){