Tenlion/btgxq-partybuilding
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改主题党日

Browse Source
This commit is contained in:
wans 2021-01-06 10:01:08 +08:00
parent 07d0b779d9
commit d96f205eda
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java
View File

@ -206,7 +206,7 @@ public class ThreeMeetLessonServiceImpl extends AbstractService implements IThre
params.put("userIds",userIds); params.put("userIds",userIds);
List<Map<String, Object>> countList = new ArrayList<>(); List<Map<String, Object>> countList = new ArrayList<>();
String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员", String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员",
"组织生活会","谈心谈话","党员教育培训","党课"}; "组织生活会","谈心谈话","主题党日","党课"};
for(int i = 0; i < categoryName.length; i++){ for(int i = 0; i < categoryName.length; i++){
params.put("category",i + 1); params.put("category",i + 1);
Integer counts = threeMeetLessonDao.getOrgThreeMeetLessonCount(params); 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); String userIds = userIdsList.size() == 0 ? "" : Joiner.on(",").join(userIdsList);
params.put("userIds",userIds); params.put("userIds",userIds);
String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员", String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员",
"组织生活会","谈心谈话","党员教育培训","党课"}; "组织生活会","谈心谈话","主题党日","党课"};
String startDate; String startDate;
String endDate; String endDate;
/**查询当前周数据**/ /**查询当前周数据**/
@ -293,7 +293,7 @@ public class ThreeMeetLessonServiceImpl extends AbstractService implements IThre
@Override @Override
public List<StreetThreeMeetLesson> getExamineStreetCounts(Map<String, Object> params) { public List<StreetThreeMeetLesson> getExamineStreetCounts(Map<String, Object> params) {
String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员", String[] categoryName = {"支部委员会会议","全体党员大会","党小组会议","民主评议党员",
"组织生活会","谈心谈话","党员教育培训","党课"}; "组织生活会","谈心谈话","主题党日","党课"};
List<String> orgList = new ArrayList<>(); List<String> orgList = new ArrayList<>();
List<String> userIdsList = new ArrayList<>(); List<String> userIdsList = new ArrayList<>();
//根据街道查询所有党组织 //根据街道查询所有党组织

2
src/main/resources/static/route/threemeetlesson/save-threemeetlesson.html
View File

@ -442,7 +442,7 @@
case '4': return '民主评议党员'; case '4': return '民主评议党员';
case '5': return '组织生活会'; case '5': return '组织生活会';
case '6': return '谈心谈话'; case '6': return '谈心谈话';
case '7': return '党员教育培训'; case '7': return '主题党日';
case '8': return '党课'; case '8': return '党课';
} }
} }