导出格式时分秒

涂亚平
Commit d01760d2 authored Jul 13, 2022 by 涂亚平
Showing with 75 additions and 35 deletions
src/main/java/com/subsidy/controller/AdministerController.java
src/main/java/com/subsidy/model/ExerciseDoneResultDO.java
src/main/java/com/subsidy/model/OprMemDictDO.java
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
src/main/java/com/subsidy/util/ExcelFormatUtils.java
src/main/java/com/subsidy/util/excel/ExcelUtil.java
src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
src/main/java/com/subsidy/vo/member/ClassSignVO.java
src/main/resources/application.properties
--- a/src/main/java/com/subsidy/controller/AdministerController.java
+++ b/src/main/java/com/subsidy/controller/AdministerController.java
@@ -98,7 +98,7 @@ public class AdministerController {
    @PostMapping("classDetail")
    @ApiOperation("班级管理--班级成员  id 班级id  userName")
-//    @LoginRequired
+    @LoginRequired
    public ResponseVO classDetail(@RequestBody ClassDetailDTO classDetailDTO){
        return ResponseData.generateCreatedResponse(0,administerService.classDetail(classDetailDTO));
    }

--- a/src/main/java/com/subsidy/model/ExerciseDoneResultDO.java
+++ b/src/main/java/com/subsidy/model/ExerciseDoneResultDO.java
@@ -66,6 +66,9 @@ public class ExerciseDoneResultDO extends BaseModel {
     */
    private String result;
+    /**
+     * 做题时长
+     */
    private Integer length;
 }
--- a/src/main/java/com/subsidy/model/OprMemDictDO.java
+++ b/src/main/java/com/subsidy/model/OprMemDictDO.java
@@ -37,4 +37,9 @@ public class OprMemDictDO extends BaseModel {
     */
    private Integer result;
+    /**
+     * 登录ip
+     */
+    private String ipAddress;
 }
--- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
@@ -589,9 +589,12 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
            classDetailVO.setScore(stringBuilder.toString());
-            //培训时长
+            //培训时长  小时
            classDetailVO.setTrainingLengthStr(MathUtil.secToTime(playLength));
+            //培训时长  分钟
+            classDetailVO.setTrainingLengthMinute(Math.floorDiv(playLength,60)+"");
            //答疑
            Integer count = answeringQuestionMapper.selectCount(new QueryWrapper<AnsweringQuestionDO>()
                    .lambda()
@@ -706,9 +709,12 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
            String percent = MathUtil.getPercentAvgIndexWithPercent(new BigDecimal(i), new BigDecimal(vodDictDOS.size()));
            classSignVO.setPercent(percent);
-            //培训时长
+            //培训时长  小时
            classSignVO.setTrainingLengthStr(MathUtil.secToTime(playLength));
+            //培训时长  分钟
+            classSignVO.setTrainingLengthMinute(Math.floorDiv(playLength,60)+"");
            //签到
            //Set<String> set = redisUtil.scan(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + classSignVO.getId() + ":classId:" + classDetailDTO.getId() + "*");
            List<SignInRecordDO> signInRecordDOS = signInRecordMapper.selectList(new QueryWrapper<SignInRecordDO>()
@@ -753,7 +759,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        List<ExerciseTestVO> classSignVOS = exerciseTestVOIPage.getRecords();
        for (ExerciseTestVO exerciseTestVO : classSignVOS) {
-            //学生测试完成情况
+            //学生测试完成情况---以最后一次成绩为准
            TestScoreInfoVO testScoreInfoVO = exerciseDoneResultMapper.testScoreInfo(classDetailDTO.getPaperId(), exerciseTestVO.getId(), classDetailDTO.getId());
            exerciseTestVO.setPaperId(exerciseTestVO.getPaperId());
            if (null != testScoreInfoVO) {
@@ -897,7 +903,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        title.add("序号");
        title.add("姓名");
        title.addAll(findDaysStr(classDailyInfoDTO.getStartDate(), classDailyInfoDTO.getEndDate()));
-        title.add("合计时长");
+        title.add("合计时长(小时)");
+        title.add("合计时长(分钟)");
        //获取班级成员
        IPage<ClassDailyInfoVO> classDailyInfoVOIPage = classMemberMappingMapper.getClassMembersWithName(pager, classDailyInfoDTO.getClassId(), classDailyInfoDTO.getUserName());
@@ -1003,7 +1010,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        title.add("序号");
        title.add("姓名");
        title.add("完成率");
-        title.add("学习时长");
+        title.add("学习时长(小时)");
+        title.add("学习时长(分钟)");
        for (VodDictDO vodDictDO : vodDictDOS) {
            title.add(vodDictDO.getVodName());
        }
@@ -1067,12 +1075,13 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
                Cell totalCell = r.createCell(a.getAndIncrement());
                Cell studyLengthCell = r.createCell(a.getAndIncrement());
+                Cell studyLengthCellm = r.createCell(a.getAndIncrement());
                Integer total = 0;
                int studyLength = 0;
                for (String tt : title) {
-                    if (!"姓名".equals(tt) && !"完成率".equals(tt) && !"学习时长".equals(tt) && !"序号".equals(tt)) {
+                    if (!"姓名".equals(tt) && !"完成率".equals(tt) && !"学习时长(小时)".equals(tt) && !"序号".equals(tt)&&!"学习时长".equals(tt)) {
                        Cell cell1 = r.createCell(a.getAndIncrement());
                        if (null != hashMap) {
@@ -1090,6 +1099,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
                    }
                }
                studyLengthCell.setCellValue(MathUtil.secToTime(studyLength));
+                studyLengthCellm.setCellValue(Math.floorDiv(studyLength,60));
                totalCell.setCellValue(MathUtil.intDivFloorPercent(total, vodHashmap.keySet().size()) + "%");
            }
        }
@@ -1146,7 +1156,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
                namecell.setCellValue(memberMapper.selectById(lg).getUserName());
                int total = 0;
                for (String date : dates) {
-                    if (!date.equals("姓名") && !"合计时长".equals(date) && !"序号".equals(date)) {
+                    if (!date.equals("姓名") && !"合计时长(小时)".equals(date) && !"序号".equals(date)&&!"合计时长(分钟)".equals(date)) {
                        Cell cell1 = r.createCell(a.getAndIncrement());
                        if (null != hashMap1) {
                            total += null == hashMap1.get(date) ? 0 : hashMap1.get(date);
@@ -1158,6 +1168,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
                }
                Cell totalCell = r.createCell(a.getAndIncrement());
                totalCell.setCellValue(MathUtil.secToTime(total));
+                Cell totalCell1 = r.createCell(a.getAndIncrement());
+                totalCell1.setCellValue(Math.floorDiv(total,60));
            }
        }
@@ -1510,7 +1522,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        sheet.addMergedRegion(cellRangeAddress21);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress21, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 5, 11);
+        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 5, 12);
        sheet.addMergedRegion(cellRangeAddress22);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress22, sheet, workbook);   //给合并过的单元格加边框
@@ -1526,7 +1538,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        sheet.addMergedRegion(cellRangeAddress31);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress31, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 5, 11);
+        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 5, 12);
        sheet.addMergedRegion(cellRangeAddress32);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress32, sheet, workbook);   //给合并过的单元格加边框
        thirdRow.createCell(0).setCellValue(thirdHead[0]);
@@ -1597,14 +1609,18 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
            newCell = dataRow.createCell(9);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getAskCounts());
+            newCell.setCellValue(classDetailVO.getTrainingLengthMinute());
            newCell = dataRow.createCell(10);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getScore());
+            newCell.setCellValue(classDetailVO.getAskCounts());
            newCell = dataRow.createCell(11);
            newCell.setCellStyle(cellStyle);
+            newCell.setCellValue(classDetailVO.getScore());
+            newCell = dataRow.createCell(12);
+            newCell.setCellStyle(cellStyle);
            newCell.setCellValue(classDetailVO.getResult());
            rowIndex++;
@@ -1730,7 +1746,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        sheet.addMergedRegion(cellRangeAddress21);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress21, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 4, 8);
+        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 4, 9);
        sheet.addMergedRegion(cellRangeAddress22);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress22, sheet, workbook);   //给合并过的单元格加边框
@@ -1746,7 +1762,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
        sheet.addMergedRegion(cellRangeAddress31);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress31, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 4, 8);
+        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 4, 9);
        sheet.addMergedRegion(cellRangeAddress32);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress32, sheet, workbook);   //给合并过的单元格加边框
        thirdRow.createCell(0).setCellValue(thirdHead[0]);
@@ -1802,18 +1818,22 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
            newCell = dataRow.createCell(5);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classSignVO.getClassProcess());
+            newCell.setCellValue(classSignVO.getTrainingLengthMinute());
            newCell = dataRow.createCell(6);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classSignVO.getPercent());
+            newCell.setCellValue(classSignVO.getClassProcess());
            newCell = dataRow.createCell(7);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classSignVO.getSignCounts());
+            newCell.setCellValue(classSignVO.getPercent());
            newCell = dataRow.createCell(8);
            newCell.setCellStyle(cellStyle);
+            newCell.setCellValue(classSignVO.getSignCounts());
+            newCell = dataRow.createCell(9);
+            newCell.setCellStyle(cellStyle);
            newCell.setCellValue(classSignVO.getSignInDateList());
            rowIndex++;

--- a/src/main/java/com/subsidy/util/ExcelFormatUtils.java
+++ b/src/main/java/com/subsidy/util/ExcelFormatUtils.java
@@ -6,9 +6,9 @@ import java.util.List;
 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("序号", "成员名称", "身份证号码", "联系方式", "测试成绩", "测试次数", "总评价");

--- a/src/main/java/com/subsidy/util/excel/ExcelUtil.java
+++ b/src/main/java/com/subsidy/util/excel/ExcelUtil.java
@@ -466,7 +466,7 @@ public class ExcelUtil {
        sheet.addMergedRegion(cellRangeAddress21);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress21, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 5, 11);
+        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 5, 12);
        sheet.addMergedRegion(cellRangeAddress22);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress22, sheet, workbook);   //给合并过的单元格加边框
@@ -482,7 +482,7 @@ public class ExcelUtil {
        sheet.addMergedRegion(cellRangeAddress31);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress31, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 5, 11);
+        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 5, 12);
        sheet.addMergedRegion(cellRangeAddress32);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress32, sheet, workbook);   //给合并过的单元格加边框
        thirdRow.createCell(0).setCellValue(thirdHead[0]);
@@ -553,14 +553,18 @@ public class ExcelUtil {
            newCell = dataRow.createCell(9);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getAskCounts());
+            newCell.setCellValue(classDetailVO.getTrainingLengthMinute());
            newCell = dataRow.createCell(10);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getScore());
+            newCell.setCellValue(classDetailVO.getAskCounts());
            newCell = dataRow.createCell(11);
            newCell.setCellStyle(cellStyle);
+            newCell.setCellValue(classDetailVO.getScore());
+            newCell = dataRow.createCell(12);
+            newCell.setCellStyle(cellStyle);
            newCell.setCellValue(classDetailVO.getResult());
            rowIndex++;
            seq++;
@@ -693,7 +697,7 @@ public class ExcelUtil {
        sheet.addMergedRegion(cellRangeAddress21);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress21, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 4, 8);
+        CellRangeAddress cellRangeAddress22 = new CellRangeAddress(1, 1, 4, 9);
        sheet.addMergedRegion(cellRangeAddress22);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress22, sheet, workbook);   //给合并过的单元格加边框
@@ -709,7 +713,7 @@ public class ExcelUtil {
        sheet.addMergedRegion(cellRangeAddress31);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress31, sheet, workbook);   //给合并过的单元格加边框
-        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 4, 8);
+        CellRangeAddress cellRangeAddress32 = new CellRangeAddress(2, 2, 4, 9);
        sheet.addMergedRegion(cellRangeAddress32);
        setBorderStyle(HSSFCellStyle.BORDER_THIN, cellRangeAddress32, sheet, workbook);   //给合并过的单元格加边框
        thirdRow.createCell(0).setCellValue(thirdHead[0]);
@@ -765,18 +769,22 @@ public class ExcelUtil {
            newCell = dataRow.createCell(5);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classSignVO.getClassProcess());
+            newCell.setCellValue(classSignVO.getTrainingLengthMinute());
            newCell = dataRow.createCell(6);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classSignVO.getPercent());
+            newCell.setCellValue(classSignVO.getClassProcess());
            newCell = dataRow.createCell(7);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classSignVO.getSignCounts());
+            newCell.setCellValue(classSignVO.getPercent());
            newCell = dataRow.createCell(8);
            newCell.setCellStyle(cellStyle);
+            newCell.setCellValue(classSignVO.getSignCounts());
+            newCell = dataRow.createCell(9);
+            newCell.setCellStyle(cellStyle);
            newCell.setCellValue(classSignVO.getSignInDateList());
            rowIndex++;

--- a/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
+++ b/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
@@ -51,9 +51,11 @@ public class ClassDetailVO{
    private Integer trainingLength;
-    @ExcelColumn(col = 8,value = "培训时长")
+    @ExcelColumn(col = 8,value = "培训时长(小时)")
    private String trainingLengthStr;
+    @ExcelColumn(col = 9,value = "培训时长(分钟)")
+    private String trainingLengthMinute;
    /**
     * 作对个数
@@ -68,13 +70,13 @@ public class ClassDetailVO{
    /**
     * 评价测试
     */
-    @ExcelColumn(col = 9,value = "评价测试")
+    @ExcelColumn(col = 10,value = "评价测试")
    private String score;
    /**
     * 答疑个数
     */
-    @ExcelColumn(col = 10,value = "答题数")
+    @ExcelColumn(col = 11,value = "答题数")
    private Integer askCounts;

--- a/src/main/java/com/subsidy/vo/member/ClassSignVO.java
+++ b/src/main/java/com/subsidy/vo/member/ClassSignVO.java
@@ -31,17 +31,19 @@ public class ClassSignVO {
     */
    private Integer trainingLength;
-    @ExcelColumn(col = 4,value = "培训时长")
+    @ExcelColumn(col = 4,value = "培训时长(小时)")
    private String trainingLengthStr;
+    @ExcelColumn(col = 5,value = "培训时长(分钟)")
+    private String trainingLengthMinute;
-    @ExcelColumn(col = 5,value = "课程进度")
+    @ExcelColumn(col = 6,value = "课程进度")
    private String classProcess;
    /**
     * 完成率
     */
-    @ExcelColumn(col = 6,value = "完成率")
+    @ExcelColumn(col = 7,value = "完成率")
    private String percent;

--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
 # 环境配置
-spring.profiles.active=dev
+spring.profiles.active=prod
 #和CPU数
 spring.server.acceptorThreadCount=600
 spring.server.minSpareThreads=100