培训首页仪表盘回滚，消息发送回滚

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

@@ -1481,13 +1481,13 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 				infobox2.setAlias("myTraining");
 				infobox2.setDataText("-1");
 				infobox2.setAccessToken(ContextUtil.getCurrentAccessToken());
-				List<Map<String,Object>> objects =(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and pei_xun_zhuang_ta NOT IN ('已删除','未发布')",	new String[]{currentUserId});
-						//(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});
+				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});
 				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 pei_xun_zhuang_ta NOT IN ('已删除','未发布','已结束')",new String[]{currentUserId});
-					//	(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});
+				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));

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/controller/AuditController.java

@@ -30,8 +30,8 @@ public class AuditController extends GenericProvider {
 
         APIResult result = new APIResult<>();
         try {
-          //  auditService.personnelTrain(ids);
-            auditService.newPersonnelTrain(ids);
+           auditService.personnelTrain(ids);
+            //auditService.newPersonnelTrain(ids);
         } catch (Exception e) {
             setExceptionResult(result, StateEnum.ILLEGAL_REQUEST.getCode(), I18nUtil.getMessage(StateEnum.ILLEGAL_REQUEST.getCode() + ""), e);
         }