Browse Source

[task-2453] 首页我的考试要区分已考和全部考试数

Li Yuan 1 year ago
parent
commit
6b0fe6ad39

+ 13 - 2
ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmInitiatedProvider.java

@@ -1484,7 +1484,13 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 				List<Map<String,Object>> objects =
 						(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and shi_fou_guo_shen_ NOT IN ('已删除','未发布')",
 								new String[]{currentUserId});
-				infobox2.setDataText(objects.get(0).get("total").toString());
+				int allNum = Integer.parseInt(objects.get(0).get("total").toString());
+				objects =
+						(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and shi_fou_guo_shen_ NOT IN ('已删除','未发布','已结束')",
+								new String[]{currentUserId});
+				int unNum = Integer.parseInt(objects.get(0).get("total").toString());
+				infobox2.setDataText(String.format("%d,%d,%d",allNum,allNum-unNum,unNum));
+				infobox2.setMessage(String.format("总数:%d,已完成:%d,未完成:%d",allNum,allNum-unNum,unNum));
 				list.add(infobox2);
 
 				infobox2 = new Infobox();
@@ -1497,7 +1503,12 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 				infobox2.setAccessToken(ContextUtil.getCurrentAccessToken());
 				List<Map<String,Object>> object2 =
 						(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_examination WHERE examinee=#{p0}", new String[]{currentUserId});
-				infobox2.setDataText(object2.get(0).get("total").toString());
+				allNum = Integer.parseInt(object2.get(0).get("total").toString());
+				object2 =
+						(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_examination WHERE examinee=#{p0} and examState NOT IN ('已完成')", new String[]{currentUserId});
+				unNum = Integer.parseInt(object2.get(0).get("total").toString());
+				infobox2.setDataText(String.format("%d,%d,%d",allNum,allNum-unNum,unNum));
+				infobox2.setMessage(String.format("总数:%d,已完成:%d,未完成:%d",allNum,allNum-unNum,unNum));
 				list.add(infobox2);
 
 				infobox2 = new Infobox();