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

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

@@ -109,8 +109,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private static final String PROCESS_INSTALL_NOTICE_KEY = "installNotice";
 
     private static final String TABLE_PAGE_ID = "1734141426742095873";
-    private static final String CONSTRUCTION_TYPE = "SGLX";
-    private static final String CONSTRUCTION_TYPE_NAME = "安装";
+    public static final String CONSTRUCTION_TYPE = "SGLX";
+    public static final String CONSTRUCTION_TYPE_NAME = "安装";
 
     @Autowired
     JgInstallationNoticeEqMapper jgInstallationNoticeEqMapper;

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

@@ -25,11 +25,12 @@
                 when	0 THEN '尚未巡检'
                 when	1 THEN '按时完成'
                 else	'超时漏检' END) as statusName,
-		    pc.is_ok isOk,
-			(case pc.is_ok
+			b.status isOk,
+			(case b.status
+				 when	0 THEN '未开始'
 				 when	1 THEN '合格'
 				 when	2 THEN '不合格'
-				 else	'漏检' END) as isOkName
+				 when	3 THEN '漏检' END) as isOkName
 		FROM p_plan_task_detail b
 		LEFT JOIN p_check pc ON pc.plan_task_detail_id = b.id
 		LEFT JOIN	p_plan_task a ON a.id = b.task_no