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

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -134,17 +134,12 @@
 				AND regulatory_labels  LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.regulatoryLabels},'%')
 			</if>
 
-			<if test="orgCodeList != null and ! orgCodeList.isEmpty() and orgCodeList.size() > 0">
-
-				<foreach collection="orgCodeList" item="item" index="index" >
-		          <if test="index==0">
-					  AND
-				  </if>
-					<if test="index!= 0">
-						OR
-					</if>
-					 supervise_org_code LIKE CONCAT('%',#{item},'%')
+			<if test="orgCodeList != null and !orgCodeList.isEmpty()">
+				AND (
+				<foreach collection="orgCodeList" item="item" separator=" OR ">
+					supervise_org_code LIKE CONCAT('%', #{item}, '%')
 				</foreach>
+				)
 			</if>
 			AND is_delete = 0
 		</where>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml

@@ -314,6 +314,7 @@
         WHERE
             C.org_code LIKE concat ( #{orgCode}, '%' )
         and A.certificate_status = '已登记'
+        and A.is_delete = 0
     </select>
 
     <select id="useCountByOrgCode" resultType="java.lang.Long">
@@ -348,21 +349,21 @@
                     tzs_jg_installation_notice T
                 WHERE
                     T.notice_status = 6616
-                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION all
                 SELECT COUNT
                            ( 1 )
                 FROM
                     tzs_jg_maintain_notice T
                 WHERE
                     T.notice_status = 6616
-                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION all
                 SELECT COUNT
                            ( 1 )
                 FROM
                     tzs_jg_reform_notice T
                 WHERE
                     T.notice_status = 6616
-                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION all
                 SELECT COUNT
                            ( 1 )
                 FROM

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"));
@@ -597,8 +597,12 @@ public class DPSubServiceImpl {
                     ((JSONArray)value).stream().forEach(y -> {
                         JSONObject yObj = (JSONObject) y;
                         String[] str = yObj.getString("url").split("\\.");
-                        String icon = MatinfoEnum.getIconUrl(str[1]).getIcon();
-                        yObj.put("thumb", ValidationUtil.isEmpty(icon) ? yObj.getString("url") : icon);
+                        if (ValidationUtil.isEmpty(str)){
+                            yObj.put("thumb", yObj.getString("url"));
+                        } else {
+                            String icon = Objects.requireNonNull(MatinfoEnum.getIconUrl(str[1])).getIcon();
+                            yObj.put("thumb", ValidationUtil.isEmpty(icon) ? yObj.getString("url") : icon);
+                        }
                     });
                     attachmentUploadDatasObj.put("value", value);
                     String accept = visualParams.getString("accept");

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": "隐患类型" },