Skip to content

涂亚平 / subsidy

Go to a project
Commit d60823da by 涂亚平
Options

导入模板统一

1 parent eede23cb
Inline Side-by-side
Showing with 106 additions and 83 deletions
src/main/java/com/subsidy/controller/AdministerController.java
...@@ -94,7 +94,7 @@ public class AdministerController { ...@@ -94,7 +94,7 @@ public class AdministerController {
@PostMapping("classDetail") @PostMapping("classDetail")
@ApiOperation("班级管理--班级成员 id 班级id userName") @ApiOperation("班级管理--班级成员 id 班级id userName")
//@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
public ResponseVO classDetail(@RequestBody ClassDetailDTO classDetailDTO){ public ResponseVO classDetail(@RequestBody ClassDetailDTO classDetailDTO){
return ResponseData.generateCreatedResponse(0,administerService.classDetail(classDetailDTO)); return ResponseData.generateCreatedResponse(0,administerService.classDetail(classDetailDTO));
} }
...@@ -109,14 +109,14 @@ public class AdministerController { ...@@ -109,14 +109,14 @@ public class AdministerController {
@PostMapping("signDetail") @PostMapping("signDetail")
@ApiOperation("班级管理--注册签到 id 班级id userName") @ApiOperation("班级管理--注册签到 id 班级id userName")
//@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
public ResponseVO signDetail(@RequestBody ClassDetailDTO classDetailDTO){ public ResponseVO signDetail(@RequestBody ClassDetailDTO classDetailDTO){
return ResponseData.generateCreatedResponse(0,administerService.signDetail(classDetailDTO)); return ResponseData.generateCreatedResponse(0,administerService.signDetail(classDetailDTO));
} }
@PostMapping("exportSignDetail") @PostMapping("exportSignDetail")
@ApiOperation("班级管理--注册签到 id 班级id userName") @ApiOperation("班级管理--注册签到 id 班级id userName")
//@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
public void exportSignDetail(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{ public void exportSignDetail(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{
classDetailDTO.setFlag(true); classDetailDTO.setFlag(true);
administerService.exportSignDetail(classDetailDTO); administerService.exportSignDetail(classDetailDTO);
...@@ -131,7 +131,7 @@ public class AdministerController { ...@@ -131,7 +131,7 @@ public class AdministerController {
@PostMapping("exportExerciseTest") @PostMapping("exportExerciseTest")
@ApiOperation("班级管理--测评成绩 id 班级id userName paperId") @ApiOperation("班级管理--测评成绩 id 班级id userName paperId")
//@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
public void exportExerciseTest(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{ public void exportExerciseTest(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{
classDetailDTO.setFlag(true); classDetailDTO.setFlag(true);
administerService.exportExerciseTest(classDetailDTO); administerService.exportExerciseTest(classDetailDTO);
......
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
...@@ -328,7 +328,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -328,7 +328,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
return companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getId(), operatorsDTO.getUserName(), 0); return companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getId(), operatorsDTO.getUserName(), 0);
} }
@Async
public String addAdminister(AdministerDO administerDO) { public String addAdminister(AdministerDO administerDO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AdministerDO>() int count = this.baseMapper.selectCount(new QueryWrapper<AdministerDO>()
...@@ -352,7 +351,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -352,7 +351,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
return ConstantUtils.ADD_SUCCESS; return ConstantUtils.ADD_SUCCESS;
} }
@Async
public String deleteAdminister(AdministerDO administerDO) { public String deleteAdminister(AdministerDO administerDO) {
this.baseMapper.deleteById(administerDO.getId()); this.baseMapper.deleteById(administerDO.getId());
...@@ -362,7 +360,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -362,7 +360,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
return ConstantUtils.DELETE_SUCCESS; return ConstantUtils.DELETE_SUCCESS;
} }
@Async
public String updateAdminister(AdministerDO administerDO) { public String updateAdminister(AdministerDO administerDO) {
int count = this.baseMapper.selectCount(new QueryWrapper<AdministerDO>() int count = this.baseMapper.selectCount(new QueryWrapper<AdministerDO>()
...@@ -574,7 +571,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -574,7 +571,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
classDetailVO.setAskCounts(count); classDetailVO.setAskCounts(count);
//签到次数 //签到次数
long set = redisUtil.scan(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + classDetailVO.getId() + ":classId:" + classDetailDTO.getId() + "*").stream().count(); long set = redisUtil.scan(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + classDetailVO.getId() + ":classId:" + classDetailDTO.getId() + "*").stream().count();
classDetailVO.setSignCounts(set); classDetailVO.setSignCounts(set);
} }
...@@ -639,7 +636,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -639,7 +636,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
for (String signInRecordDO : sortSet) { for (String signInRecordDO : sortSet) {
String[] array = signInRecordDO.split(":"); String[] array = signInRecordDO.split(":");
//时间戳转时间 //时间戳转时间
stringBuilder.append(sdf.format(new Date(Long.valueOf(array[array.length-1])))).append(";"); stringBuilder.append(sdf.format(new Date(Long.valueOf(array[array.length - 1])))).append(";");
} }
if (StringUtils.isNotBlank(stringBuilder.toString())) { if (StringUtils.isNotBlank(stringBuilder.toString())) {
String signInDate = stringBuilder.toString().substring(0, stringBuilder.length() - 1); String signInDate = stringBuilder.toString().substring(0, stringBuilder.length() - 1);
...@@ -701,7 +698,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -701,7 +698,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
for (String signInRecordDO : sortSet) { for (String signInRecordDO : sortSet) {
String[] array = signInRecordDO.split(":"); String[] array = signInRecordDO.split(":");
//时间戳转时间 //时间戳转时间
stringBuilder.append(sdf.format(new Date(Long.valueOf(array[array.length-1])))).append(";"); stringBuilder.append(sdf.format(new Date(Long.valueOf(array[array.length - 1])))).append(";");
} }
if (StringUtils.isNotBlank(stringBuilder.toString())) { if (StringUtils.isNotBlank(stringBuilder.toString())) {
String signInDate = stringBuilder.toString().substring(0, stringBuilder.length() - 1); String signInDate = stringBuilder.toString().substring(0, stringBuilder.length() - 1);
...@@ -795,7 +792,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -795,7 +792,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
return this.baseMapper.answerRecord(pager, classDetailDTO.getId(), classDetailDTO.getUserName()); return this.baseMapper.answerRecord(pager, classDetailDTO.getId(), classDetailDTO.getUserName());
} }
@Async
public List<AnswerRecordVO> exportAnswerRecord(ClassDetailDTO classDetailDTO) throws Exception { public List<AnswerRecordVO> exportAnswerRecord(ClassDetailDTO classDetailDTO) throws Exception {
Page pager = new Page(1, -1L); Page pager = new Page(1, -1L);
IPage iPage = this.baseMapper.answerRecord(pager, classDetailDTO.getId(), classDetailDTO.getUserName()); IPage iPage = this.baseMapper.answerRecord(pager, classDetailDTO.getId(), classDetailDTO.getUserName());
...@@ -870,9 +866,10 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -870,9 +866,10 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
// 表头 // 表头
List<String> title = new ArrayList<>(); List<String> title = new ArrayList<>();
title.add("序号");
title.add("姓名"); title.add("姓名");
title.addAll(findDaysStr(classDailyInfoDTO.getStartDate(), classDailyInfoDTO.getEndDate())); title.addAll(findDaysStr(classDailyInfoDTO.getStartDate(), classDailyInfoDTO.getEndDate()));
title.add("合计总时长"); title.add("合计时长");
//获取班级成员 //获取班级成员
IPage<ClassDailyInfoVO> classDailyInfoVOIPage = classMemberMappingMapper.getClassMembersWithName(pager, classDailyInfoDTO.getClassId(), classDailyInfoDTO.getUserName()); IPage<ClassDailyInfoVO> classDailyInfoVOIPage = classMemberMappingMapper.getClassMembersWithName(pager, classDailyInfoDTO.getClassId(), classDailyInfoDTO.getUserName());
...@@ -932,6 +929,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -932,6 +929,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
for (ClassDailyInfoVO classDailyInfoVO : classDailyInfoVOS) { for (ClassDailyInfoVO classDailyInfoVO : classDailyInfoVOS) {
//查看这个人某个视频的长度 //查看这个人某个视频的长度
int total = 0; int total = 0;
int playLengthTmp = 0;
List<ClassVodDailyInfoItemVO> classVodDailyInfoItemVOS = new ArrayList<>(); List<ClassVodDailyInfoItemVO> classVodDailyInfoItemVOS = new ArrayList<>();
for (VodDictDO vodDictDO : vodDictDOS) { for (VodDictDO vodDictDO : vodDictDOS) {
Integer playLength = hashMap.get(classDailyInfoVO.getId() + "-" + vodDictDO.getId()); Integer playLength = hashMap.get(classDailyInfoVO.getId() + "-" + vodDictDO.getId());
...@@ -944,11 +942,13 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -944,11 +942,13 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
if (playLength >= vodDictDO.getVodLength()) { if (playLength >= vodDictDO.getVodLength()) {
total++; total++;
} }
playLengthTmp += playLength;
} else { } else {
classVodDailyInfoItemVO.setPlayLength(0); classVodDailyInfoItemVO.setPlayLength(0);
classVodDailyInfoItemVOS.add(classVodDailyInfoItemVO); classVodDailyInfoItemVOS.add(classVodDailyInfoItemVO);
} }
} }
classDailyInfoVO.setStudyLength(playLengthTmp);
classDailyInfoVO.setTotal(MathUtil.intDivFloorPercent(total, vodDictDOS.size())); classDailyInfoVO.setTotal(MathUtil.intDivFloorPercent(total, vodDictDOS.size()));
classDailyInfoVO.setClassVodDailyInfoItemVOS(classVodDailyInfoItemVOS); classDailyInfoVO.setClassVodDailyInfoItemVOS(classVodDailyInfoItemVOS);
} }
...@@ -956,7 +956,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -956,7 +956,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
} }
public void exportClassVodDailyInfo(ClassVodDailyInfoDTO classVodDailyInfoDTO){ public void exportClassVodDailyInfo(ClassVodDailyInfoDTO classVodDailyInfoDTO) {
//查看班级里有多少人 //查看班级里有多少人
Page pager = new Page(1, -1L); Page pager = new Page(1, -1L);
...@@ -972,8 +972,10 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -972,8 +972,10 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
// 表头 // 表头
List<String> title = new ArrayList<>(); List<String> title = new ArrayList<>();
title.add("序号");
title.add("姓名"); title.add("姓名");
title.add("合计完成率"); title.add("完成率");
title.add("学习时长");
for (VodDictDO vodDictDO : vodDictDOS) { for (VodDictDO vodDictDO : vodDictDOS) {
title.add(vodDictDO.getVodName()); title.add(vodDictDO.getVodName());
} }
...@@ -1020,39 +1022,48 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1020,39 +1022,48 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
cell.setCellValue(field); cell.setCellValue(field);
}); });
int i = 1;
if (hashMap != null) { if (hashMap != null) {
classDailyInfoVOS.forEach(data -> { for (ClassDailyInfoVO classDailyInfoVO : classDailyInfoVOS){
Row r = sheet.createRow(ai.getAndIncrement()); Row r = sheet.createRow(ai.getAndIncrement());
AtomicInteger a = new AtomicInteger(); AtomicInteger a = new AtomicInteger();
Cell cell = r.createCell(at.getAndIncrement()); Cell cell = r.createCell(at.getAndIncrement());
CellStyle cellStyle = wb.createCellStyle(); CellStyle cellStyle = wb.createCellStyle();
cellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex()); cellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
cell.setCellStyle(cellStyle); cell.setCellStyle(cellStyle);
Cell seqcell = r.createCell(a.getAndIncrement());
seqcell.setCellValue(i++);
Cell namecell = r.createCell(a.getAndIncrement()); Cell namecell = r.createCell(a.getAndIncrement());
namecell.setCellValue(data.getUserName()); namecell.setCellValue(classDailyInfoVO.getUserName());
Cell totalCell = r.createCell(a.getAndIncrement()); Cell totalCell = r.createCell(a.getAndIncrement());
Cell studyLengthCell = r.createCell(a.getAndIncrement());
Integer total = 0; Integer total = 0;
int studyLength = 0;
for (String tt : title) { for (String tt : title) {
if (!"姓名".equals(tt) && !"合计完成率".equals(tt)) {
if (!"姓名".equals(tt) && !"完成率".equals(tt) && !"学习时长".equals(tt)&& !"序号".equals(tt)) {
Cell cell1 = r.createCell(a.getAndIncrement()); Cell cell1 = r.createCell(a.getAndIncrement());
if (null != hashMap) { if (null != hashMap) {
Integer playLength = hashMap.get(data.getId() + "-" + tt); Integer playLength = hashMap.get(classDailyInfoVO.getId() + "-" + tt);
if (null != playLength) { if (null != playLength) {
cell1.setCellValue(MathUtil.secToTime(playLength)); cell1.setCellValue(MathUtil.secToTime(playLength));
if (vodHashmap.get(tt) <= playLength) { if (vodHashmap.get(tt) <= playLength) {
total++; total++;
} }
studyLength += playLength;
} else { } else {
cell1.setCellValue("00:00:00"); cell1.setCellValue("00:00:00");
} }
} }
} }
} }
studyLengthCell.setCellValue(MathUtil.secToTime(studyLength));
totalCell.setCellValue(MathUtil.intDivFloorPercent(total, vodHashmap.keySet().size()) + "%"); totalCell.setCellValue(MathUtil.intDivFloorPercent(total, vodHashmap.keySet().size()) + "%");
}); }
} }
String fileName = String.valueOf(new Date().getTime()); String fileName = String.valueOf(new Date().getTime());
try { try {
...@@ -1092,32 +1103,35 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1092,32 +1103,35 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
}); });
if (hashMap != null) { if (hashMap != null) {
memberIds.forEach(data -> { int i= 1;
Row r = sheet.createRow(ai.getAndIncrement()); for (Long lg : memberIds){
AtomicInteger a = new AtomicInteger(); Row r = sheet.createRow(ai.getAndIncrement());
Cell cell = r.createCell(at.getAndIncrement()); AtomicInteger a = new AtomicInteger();
CellStyle cellStyle = wb.createCellStyle(); Cell cell = r.createCell(at.getAndIncrement());
cellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex()); CellStyle cellStyle = wb.createCellStyle();
cell.setCellStyle(cellStyle); cellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
HashMap<String, Integer> hashMap1 = hashMap.get(data); cell.setCellStyle(cellStyle);
Cell namecell = r.createCell(a.getAndIncrement()); HashMap<String, Integer> hashMap1 = hashMap.get(lg);
namecell.setCellValue(memberMapper.selectById(data).getUserName()); Cell seqcell = r.createCell(a.getAndIncrement());
int total = 0; seqcell.setCellValue(i++);
for (String date : dates) { Cell namecell = r.createCell(a.getAndIncrement());
if (!date.equals("姓名") && !"合计总时长".equals(date)) { namecell.setCellValue(memberMapper.selectById(lg).getUserName());
Cell cell1 = r.createCell(a.getAndIncrement()); int total = 0;
if (null != hashMap1) { for (String date : dates) {
total += null == hashMap1.get(date) ? 0 : hashMap1.get(date); if (!date.equals("姓名") && !"合计时长".equals(date)&& !"序号".equals(date)) {
cell1.setCellValue(null == hashMap1.get(date) ? "00:00:00" : MathUtil.secToTime(hashMap1.get(date))); Cell cell1 = r.createCell(a.getAndIncrement());
} else { if (null != hashMap1) {
cell1.setCellValue("00:00:00"); total += null == hashMap1.get(date) ? 0 : hashMap1.get(date);
} cell1.setCellValue(null == hashMap1.get(date) ? "00:00:00" : MathUtil.secToTime(hashMap1.get(date)));
} else {
cell1.setCellValue("00:00:00");
} }
} }
}
Cell totalCell = r.createCell(a.getAndIncrement());
totalCell.setCellValue(MathUtil.secToTime(total));
}
Cell totalCell = r.createCell(a.getAndIncrement());
totalCell.setCellValue(MathUtil.secToTime(total));
});
} }
String fileName = String.valueOf(new Date().getTime()); String fileName = String.valueOf(new Date().getTime());
try { try {
...@@ -1223,10 +1237,10 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1223,10 +1237,10 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
} }
public IPage memberStudy(MemberStudyLogDTO memberStudyLogDTO){ public IPage memberStudy(MemberStudyLogDTO memberStudyLogDTO) {
Page pager = new Page(memberStudyLogDTO.getPageNum(), memberStudyLogDTO.getPageSize()); Page pager = new Page(memberStudyLogDTO.getPageNum(), memberStudyLogDTO.getPageSize());
IPage iPage = vodPlayHistoryMapper.memberStudy(pager,memberStudyLogDTO.getClassId(),memberStudyLogDTO.getMemberId()); IPage iPage = vodPlayHistoryMapper.memberStudy(pager, memberStudyLogDTO.getClassId(), memberStudyLogDTO.getMemberId());
List<MemberStudyLogVO> memberStudyLogVOS = iPage.getRecords(); List<MemberStudyLogVO> memberStudyLogVOS = iPage.getRecords();
for (MemberStudyLogVO memberStudyLogVO : memberStudyLogVOS) { for (MemberStudyLogVO memberStudyLogVO : memberStudyLogVOS) {
memberStudyLogVO.setPlayLength(MathUtil.secToTime(Integer.valueOf(memberStudyLogVO.getPlayLength()))); memberStudyLogVO.setPlayLength(MathUtil.secToTime(Integer.valueOf(memberStudyLogVO.getPlayLength())));
...@@ -1244,7 +1258,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1244,7 +1258,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
memberStudyLogVO.setPlayLength(MathUtil.secToTime(Integer.valueOf(memberStudyLogVO.getPlayLength()))); memberStudyLogVO.setPlayLength(MathUtil.secToTime(Integer.valueOf(memberStudyLogVO.getPlayLength())));
memberStudyLogVO.setTotalLength(MathUtil.secToTime(Integer.valueOf(memberStudyLogVO.getTotalLength()))); memberStudyLogVO.setTotalLength(MathUtil.secToTime(Integer.valueOf(memberStudyLogVO.getTotalLength())));
} }
ExcelUtil.writeMemberStudyLog(memberDO, "学习日志", memberStudyLog, ExcelFormatUtils.studyLogList); ExcelUtil.writeMemberStudyLog(memberDO, "学习记录", memberStudyLog, ExcelFormatUtils.studyLogList);
} }
...@@ -1496,37 +1510,40 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1496,37 +1510,40 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getIdCard()); newCell.setCellValue(classDetailVO.getIdCard());
newCell = dataRow.createCell(3); newCell = dataRow.createCell(3);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getAccountName()); newCell.setCellValue(classDetailVO.getGender());
newCell = dataRow.createCell(4); newCell = dataRow.createCell(4);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getTelephone()); newCell.setCellValue(classDetailVO.getAccountName());
newCell = dataRow.createCell(5); newCell = dataRow.createCell(5);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getSignCounts()); newCell.setCellValue(classDetailVO.getTelephone());
newCell = dataRow.createCell(6); newCell = dataRow.createCell(6);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getClassProcess()); newCell.setCellValue(classDetailVO.getSignCounts());
newCell = dataRow.createCell(7); newCell = dataRow.createCell(7);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getTrainingLengthStr()); newCell.setCellValue(classDetailVO.getClassProcess());
newCell = dataRow.createCell(8); newCell = dataRow.createCell(8);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getAskCounts()); newCell.setCellValue(classDetailVO.getTrainingLengthStr());
newCell = dataRow.createCell(9); newCell = dataRow.createCell(9);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getScore()); newCell.setCellValue(classDetailVO.getAskCounts());
newCell = dataRow.createCell(10); newCell = dataRow.createCell(10);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getScore());
newCell = dataRow.createCell(11);
newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getResult()); newCell.setCellValue(classDetailVO.getResult());
rowIndex++; rowIndex++;
......
src/main/java/com/subsidy/service/impl/CourseDictServiceImpl.java
...@@ -77,7 +77,6 @@ public class CourseDictServiceImpl extends ServiceImpl<CourseDictMapper, CourseD ...@@ -77,7 +77,6 @@ public class CourseDictServiceImpl extends ServiceImpl<CourseDictMapper, CourseD
return this.baseMapper.queryCourses(pager, queryCoursesDTO.getCourseName(), queryCoursesDTO.getCategoryId(), queryCoursesDTO.getCourseType(), queryCoursesDTO.getCourseSource(), queryCoursesDTO.getCompanyId()); return this.baseMapper.queryCourses(pager, queryCoursesDTO.getCourseName(), queryCoursesDTO.getCategoryId(), queryCoursesDTO.getCourseType(), queryCoursesDTO.getCourseSource(), queryCoursesDTO.getCompanyId());
} }
@Async
public String updateCourses(CourseDictDO courseDictDO) { public String updateCourses(CourseDictDO courseDictDO) {
int count; int count;
......
src/main/java/com/subsidy/service/impl/DepartmentDictServiceImpl.java
...@@ -98,7 +98,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper, ...@@ -98,7 +98,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper,
return getDepartmentsVOS; return getDepartmentsVOS;
} }
@Async
public String addDepartment(DepartmentDictDO departmentDictDO) { public String addDepartment(DepartmentDictDO departmentDictDO) {
Integer counter = this.baseMapper.selectCount(new QueryWrapper<DepartmentDictDO>() Integer counter = this.baseMapper.selectCount(new QueryWrapper<DepartmentDictDO>()
...@@ -115,7 +114,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper, ...@@ -115,7 +114,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper,
return ConstantUtils.ADD_SUCCESS; return ConstantUtils.ADD_SUCCESS;
} }
@Async
public String deleteDepartment(DepartmentDictDO departmentDictDO) { public String deleteDepartment(DepartmentDictDO departmentDictDO) {
this.baseMapper.deleteById(departmentDictDO.getId()); this.baseMapper.deleteById(departmentDictDO.getId());
...@@ -143,7 +141,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper, ...@@ -143,7 +141,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper,
this.baseMapper.deleteById(departmentDictDO.getId()); this.baseMapper.deleteById(departmentDictDO.getId());
} }
@Async
public String updateDepartment(DepartmentDictDO departmentDictDO) { public String updateDepartment(DepartmentDictDO departmentDictDO) {
Integer counter = this.baseMapper.selectCount(new QueryWrapper<DepartmentDictDO>() Integer counter = this.baseMapper.selectCount(new QueryWrapper<DepartmentDictDO>()
......
src/main/java/com/subsidy/service/impl/MemberServiceImpl.java
...@@ -376,7 +376,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -376,7 +376,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
return null; return null;
} }
@Async
public String updatePassword(MemberDO memberDO) { public String updatePassword(MemberDO memberDO) {
this.baseMapper.updateById(memberDO); this.baseMapper.updateById(memberDO);
MemberDO memberDO1 = this.baseMapper.selectById(memberDO.getId()); MemberDO memberDO1 = this.baseMapper.selectById(memberDO.getId());
......
src/main/java/com/subsidy/service/impl/PaperDictServiceImpl.java
...@@ -28,19 +28,16 @@ public class PaperDictServiceImpl extends ServiceImpl<PaperDictMapper, PaperDict ...@@ -28,19 +28,16 @@ public class PaperDictServiceImpl extends ServiceImpl<PaperDictMapper, PaperDict
return this.baseMapper.queryPapers(paperDictDO.getCourseId(),paperDictDO.getPaperName(),null); return this.baseMapper.queryPapers(paperDictDO.getCourseId(),paperDictDO.getPaperName(),null);
} }
@Async
public String deletePaper(PaperDictDO paperDictDO){ public String deletePaper(PaperDictDO paperDictDO){
this.baseMapper.deleteById(paperDictDO.getId()); this.baseMapper.deleteById(paperDictDO.getId());
return ConstantUtils.DELETE_SUCCESS; return ConstantUtils.DELETE_SUCCESS;
} }
@Async
public String updateStatus(PaperDictDO paperDictDO){ public String updateStatus(PaperDictDO paperDictDO){
this.baseMapper.updateById(paperDictDO); this.baseMapper.updateById(paperDictDO);
return ConstantUtils.SET_SUCCESS; return ConstantUtils.SET_SUCCESS;
} }
@Async
public String addPaper(PaperDictDO paperDictDO){ public String addPaper(PaperDictDO paperDictDO){
Integer count = this.baseMapper.selectCount(new QueryWrapper<PaperDictDO>() Integer count = this.baseMapper.selectCount(new QueryWrapper<PaperDictDO>()
......
src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java
...@@ -37,7 +37,6 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl<SmsVerifyCodeMapper, S ...@@ -37,7 +37,6 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl<SmsVerifyCodeMapper, S
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
@Async
public void sendVerifyCode(SendVerifyCodeDTO sendVerifyCodeDTO) { public void sendVerifyCode(SendVerifyCodeDTO sendVerifyCodeDTO) {
MemberDO memberDO = memberMapper.selectOne(new QueryWrapper<MemberDO>() MemberDO memberDO = memberMapper.selectOne(new QueryWrapper<MemberDO>()
.lambda() .lambda()
......
src/main/java/com/subsidy/util/ExcelFormatUtils.java
...@@ -6,11 +6,11 @@ import java.util.List; ...@@ -6,11 +6,11 @@ import java.util.List;
public class ExcelFormatUtils { public class ExcelFormatUtils {
public static final List<String> memberList = Arrays.asList("序号", "成员名称", "身份证号码", "账号", "联系方式", "签到次数", "课程进度", "培训时长", "答疑数", "测试成绩", "总评价"); public static final List<String> memberList = Arrays.asList("序号", "成员名称","身份证号码", "性别", "账号", "联系方式", "签到次数", "课程进度", "学习时长", "答疑数", "测试成绩", "总评价");
public static final List<String> signList = Arrays.asList("序号", "成员名称", "身份证号码", "手机号码", "培训时长", "课程进度", "完成率", "签到次数", "签到日期"); public static final List<String> signList = Arrays.asList("序号", "成员名称", "身份证号码", "联系方式", "学习时长", "课程进度", "完成率", "签到次数", "签到日期");
public static final List<String> scoreList = Arrays.asList("序号", "成员名称", "身份证号码", "手机号码", "测试最高成绩", "测试次数", "总评价"); public static final List<String> scoreList = Arrays.asList("序号", "成员名称", "身份证号码", "联系方式", "测试成绩", "测试次数", "总评价");
public static final List<String> answersList = Arrays.asList("序号", "提问", "答疑", "提问时间", "提问成员", "答疑时间"); public static final List<String> answersList = Arrays.asList("序号", "提问", "答疑", "提问时间", "提问成员", "答疑时间");
......
src/main/java/com/subsidy/util/excel/ExcelUtil.java
...@@ -404,38 +404,40 @@ public class ExcelUtil { ...@@ -404,38 +404,40 @@ public class ExcelUtil {
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getIdCard()); newCell.setCellValue(classDetailVO.getIdCard());
newCell = dataRow.createCell(3); newCell = dataRow.createCell(3);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getAccountName()); newCell.setCellValue(classDetailVO.getGender());
newCell = dataRow.createCell(4); newCell = dataRow.createCell(4);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getTelephone()); newCell.setCellValue(classDetailVO.getAccountName());
newCell = dataRow.createCell(5); newCell = dataRow.createCell(5);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getSignCounts()); newCell.setCellValue(classDetailVO.getTelephone());
newCell = dataRow.createCell(6); newCell = dataRow.createCell(6);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getClassProcess()); newCell.setCellValue(classDetailVO.getSignCounts());
newCell = dataRow.createCell(7); newCell = dataRow.createCell(7);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getTrainingLengthStr()); newCell.setCellValue(classDetailVO.getClassProcess());
newCell = dataRow.createCell(8); newCell = dataRow.createCell(8);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getAskCounts()); newCell.setCellValue(classDetailVO.getTrainingLengthStr());
newCell = dataRow.createCell(9); newCell = dataRow.createCell(9);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getScore()); newCell.setCellValue(classDetailVO.getAskCounts());
newCell = dataRow.createCell(10); newCell = dataRow.createCell(10);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getScore());
newCell = dataRow.createCell(11);
newCell.setCellStyle(cellStyle);
newCell.setCellValue(classDetailVO.getResult()); newCell.setCellValue(classDetailVO.getResult());
rowIndex++; rowIndex++;
seq++; seq++;
...@@ -1162,7 +1164,7 @@ public class ExcelUtil { ...@@ -1162,7 +1164,7 @@ public class ExcelUtil {
int[] secondWidth = new int[6]; int[] secondWidth = new int[6];
// 产生表格标题行,以及设置列宽 // 产生表格标题行,以及设置列宽
String[] secondHead = new String[6]; String[] secondHead = new String[6];
List<String> secondList = Arrays.asList("学员姓名", memberDO.getUserName(), "性别:" + memberDO.getGender(), "身份证号", memberDO.getIdCard(), "手机号", memberDO.getTelephone()); List<String> secondList = Arrays.asList("成员名称：" + memberDO.getUserName(), "性别:" + memberDO.getGender(), "身份证号码", memberDO.getIdCard(), "联系方式", memberDO.getTelephone());
ii = 0; ii = 0;
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
...@@ -1257,6 +1259,7 @@ public class ExcelUtil { ...@@ -1257,6 +1259,7 @@ public class ExcelUtil {
e.printStackTrace(); e.printStackTrace();
} }
} }
private static void setStyle(CellStyle cellStyle) { private static void setStyle(CellStyle cellStyle) {
// 水平居中 // 水平居中
cellStyle.setAlignment(CellStyle.ALIGN_CENTER); cellStyle.setAlignment(CellStyle.ALIGN_CENTER);
......
src/main/java/com/subsidy/vo/administer/ClassDailyInfoVO.java
...@@ -16,5 +16,7 @@ public class ClassDailyInfoVO { ...@@ -16,5 +16,7 @@ public class ClassDailyInfoVO {
private Integer total; private Integer total;
private Integer studyLength;
private List<ClassVodDailyInfoItemVO> classVodDailyInfoItemVOS; private List<ClassVodDailyInfoItemVO> classVodDailyInfoItemVOS;
} }
src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
...@@ -18,16 +18,22 @@ public class ClassDetailVO{ ...@@ -18,16 +18,22 @@ public class ClassDetailVO{
@ExcelColumn(col = 2,value = "账号") @ExcelColumn(col = 2,value = "账号")
private String accountName; private String accountName;
@ExcelColumn(col = 3,value = "身份证号") /**
* 性别
*/
@ExcelColumn(col = 3,value = "性别")
private String gender;
@ExcelColumn(col = 4,value = "身份证号")
private String idCard; private String idCard;
@ExcelColumn(col = 4,value = "联系方式") @ExcelColumn(col = 5,value = "联系方式")
private String telephone; private String telephone;
/** /**
* 签到次数 * 签到次数
*/ */
@ExcelColumn(col = 5,value = "签到次数") @ExcelColumn(col = 6,value = "签到次数")
private Long signCounts; private Long signCounts;
/** /**
...@@ -40,12 +46,12 @@ public class ClassDetailVO{ ...@@ -40,12 +46,12 @@ public class ClassDetailVO{
*/ */
//private Integer allVodCounts; //private Integer allVodCounts;
@ExcelColumn(col = 6,value = "课程进度") @ExcelColumn(col = 7,value = "课程进度")
private String classProcess; private String classProcess;
private Integer trainingLength; private Integer trainingLength;
@ExcelColumn(col = 7,value = "培训时长") @ExcelColumn(col = 8,value = "培训时长")
private String trainingLengthStr; private String trainingLengthStr;
...@@ -62,13 +68,13 @@ public class ClassDetailVO{ ...@@ -62,13 +68,13 @@ public class ClassDetailVO{
/** /**
* 评价测试 * 评价测试
*/ */
@ExcelColumn(col = 8,value = "评价测试") @ExcelColumn(col = 9,value = "评价测试")
private String score; private String score;
/** /**
* 答疑个数 * 答疑个数
*/ */
@ExcelColumn(col = 9,value = "答题数") @ExcelColumn(col = 10,value = "答题数")
private Integer askCounts; private Integer askCounts;
......
src/main/resources/mapper/AdministerMapper.xml
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
SELECT SELECT
t2.id, t2.id,
t2.user_name, t2.user_name,
t2.gender,
t2.id_card, t2.id_card,
t2.account_name, t2.account_name,
t2.telephone t2.telephone
......
src/main/resources/mapper/VodPlayHistoryMapper.xml
...@@ -35,8 +35,11 @@ ...@@ -35,8 +35,11 @@
t2.vod_name, t2.vod_name,
t3.play_record, t3.play_record,
t3.create_date, t3.create_date,
IF IF
( t.play_length >= t2.vod_length, 'true', 'false' ) AS STATUS (
round( t.play_length * 100 / t2.vod_length )>= 100,
100,
round( t.play_length * 100 / t2.vod_length )) AS percent
FROM FROM
( (
SELECT SELECT
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!