diff --git a/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java b/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java index 5f9af5f..b88c925 100644 --- a/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java @@ -206,7 +206,7 @@ public class ThreeMeetLessonServiceImpl extends AbstractService implements IThre params.put("userIds",userIds); List> countList = new ArrayList<>(); String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员", - "组织生活会","谈心谈话","党员教育培训","党课"}; + "组织生活会","谈心谈话","主题党日","党课"}; for(int i = 0; i < categoryName.length; i++){ params.put("category",i + 1); Integer counts = threeMeetLessonDao.getOrgThreeMeetLessonCount(params); @@ -225,7 +225,7 @@ public class ThreeMeetLessonServiceImpl extends AbstractService implements IThre String userIds = userIdsList.size() == 0 ? "" : Joiner.on(",").join(userIdsList); params.put("userIds",userIds); String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员", - "组织生活会","谈心谈话","党员教育培训","党课"}; + "组织生活会","谈心谈话","主题党日","党课"}; String startDate; String endDate; /**查询当前周数据**/ @@ -293,7 +293,7 @@ public class ThreeMeetLessonServiceImpl extends AbstractService implements IThre @Override public List getExamineStreetCounts(Map params) { String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员", - "组织生活会","谈心谈话","党员教育培训","党课"}; + "组织生活会","谈心谈话","主题党日","党课"}; List orgList = new ArrayList<>(); List userIdsList = new ArrayList<>(); //根据街道查询所有党组织 diff --git a/src/main/resources/static/route/threemeetlesson/save-threemeetlesson.html b/src/main/resources/static/route/threemeetlesson/save-threemeetlesson.html index 1137964..c35448b 100644 --- a/src/main/resources/static/route/threemeetlesson/save-threemeetlesson.html +++ b/src/main/resources/static/route/threemeetlesson/save-threemeetlesson.html @@ -442,7 +442,7 @@ case '4': return '民主评议党员'; case '5': return '组织生活会'; case '6': return '谈心谈话'; - case '7': return '党员教育培训'; + case '7': return '主题党日'; case '8': return '党课'; } }