Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -528,9 +528,9 @@ public class DPSubServiceImpl {
                 e.printStackTrace();
             }
         }
-        if ("正常".equals(problemStatus)) {
+        if ("正常".equals(problemStatus) || "已处理".equals(problemStatus)) {
             color = "green";
-        } else if ("异常".equals(problemStatus)) {
+        } else if ("异常".equals(problemStatus) || "未处理".equals(problemStatus)) {
             color = "red";
         }
         qrcode.put("value", !ValidationUtil.isEmpty(result.get("SUPERVISORY_CODE")) ? "https://sxtzsb.sxsei.com:9435/tzs/?code=" + result.get("SUPERVISORY_CODE") : result.get("USE_ORG_CODE"));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json

@@ -77,6 +77,10 @@
   "content": {
     "keyinfo": {
       "title": "{principalUnit}",
+      "qrcode": {
+        "title": "监管码",
+        "problem": []
+      },
       "keyParams": [
         { "key": "sourceType", "label": "隐患主体类型" },
         { "key": "problemType", "label": "隐患类型" },