导入模板统一

涂亚平 · 涂亚平
Commit d60823da authored Feb 08, 2022 by 涂亚平
Showing with 39 additions and 33 deletions
src/main/java/com/subsidy/controller/AdministerController.java
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
src/main/java/com/subsidy/service/impl/CourseDictServiceImpl.java
src/main/java/com/subsidy/service/impl/DepartmentDictServiceImpl.java
src/main/java/com/subsidy/service/impl/MemberServiceImpl.java
src/main/java/com/subsidy/service/impl/PaperDictServiceImpl.java
src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java
src/main/java/com/subsidy/util/ExcelFormatUtils.java
src/main/java/com/subsidy/util/excel/ExcelUtil.java
src/main/java/com/subsidy/vo/administer/ClassDailyInfoVO.java
src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
src/main/resources/mapper/AdministerMapper.xml
src/main/resources/mapper/VodPlayHistoryMapper.xml
--- a/src/main/java/com/subsidy/controller/AdministerController.java
+++ b/src/main/java/com/subsidy/controller/AdministerController.java
@@ -94,7 +94,7 @@ public class AdministerController {
    @PostMapping("classDetail")
    @ApiOperation("班级管理--班级成员  id 班级id  userName")
-    //@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
+    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
    public ResponseVO classDetail(@RequestBody ClassDetailDTO classDetailDTO){
        return ResponseData.generateCreatedResponse(0,administerService.classDetail(classDetailDTO));
    }
@@ -109,14 +109,14 @@ public class AdministerController {
    @PostMapping("signDetail")
    @ApiOperation("班级管理--注册签到  id 班级id  userName")
-    //@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
+    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
    public ResponseVO signDetail(@RequestBody ClassDetailDTO classDetailDTO){
        return ResponseData.generateCreatedResponse(0,administerService.signDetail(classDetailDTO));
    }
    @PostMapping("exportSignDetail")
    @ApiOperation("班级管理--注册签到  id 班级id  userName")
-    //@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
+    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
    public void exportSignDetail(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{
        classDetailDTO.setFlag(true);
        administerService.exportSignDetail(classDetailDTO);
@@ -131,7 +131,7 @@ public class AdministerController {
    @PostMapping("exportExerciseTest")
    @ApiOperation("班级管理--测评成绩  id 班级id  userName  paperId")
-    //@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
+    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
    public void exportExerciseTest(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{
        classDetailDTO.setFlag(true);
        administerService.exportExerciseTest(classDetailDTO);

--- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
--- a/src/main/java/com/subsidy/service/impl/CourseDictServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/CourseDictServiceImpl.java
@@ -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());
    }
-    @Async
    public String updateCourses(CourseDictDO courseDictDO) {
        int count;

--- a/src/main/java/com/subsidy/service/impl/DepartmentDictServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/DepartmentDictServiceImpl.java
@@ -98,7 +98,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper,
        return getDepartmentsVOS;
    }
-    @Async
    public String addDepartment(DepartmentDictDO departmentDictDO) {
        Integer counter = this.baseMapper.selectCount(new QueryWrapper<DepartmentDictDO>()
@@ -115,7 +114,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper,
        return ConstantUtils.ADD_SUCCESS;
    }
-    @Async
    public String deleteDepartment(DepartmentDictDO departmentDictDO) {
        this.baseMapper.deleteById(departmentDictDO.getId());
@@ -143,7 +141,6 @@ public class DepartmentDictServiceImpl extends ServiceImpl<DepartmentDictMapper,
        this.baseMapper.deleteById(departmentDictDO.getId());
    }
-    @Async
    public String updateDepartment(DepartmentDictDO departmentDictDO) {
        Integer counter = this.baseMapper.selectCount(new QueryWrapper<DepartmentDictDO>()

--- a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java
@@ -376,7 +376,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
        return null;
    }
-    @Async
    public String updatePassword(MemberDO memberDO) {
        this.baseMapper.updateById(memberDO);
        MemberDO memberDO1 = this.baseMapper.selectById(memberDO.getId());

--- a/src/main/java/com/subsidy/service/impl/PaperDictServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/PaperDictServiceImpl.java
@@ -28,19 +28,16 @@ public class PaperDictServiceImpl extends ServiceImpl<PaperDictMapper, PaperDict
        return this.baseMapper.queryPapers(paperDictDO.getCourseId(),paperDictDO.getPaperName(),null);
    }
-    @Async
    public String deletePaper(PaperDictDO paperDictDO){
        this.baseMapper.deleteById(paperDictDO.getId());
        return ConstantUtils.DELETE_SUCCESS;
    }
-    @Async
    public String updateStatus(PaperDictDO paperDictDO){
        this.baseMapper.updateById(paperDictDO);
        return ConstantUtils.SET_SUCCESS;
    }
-    @Async
    public String addPaper(PaperDictDO paperDictDO){
        Integer count = this.baseMapper.selectCount(new QueryWrapper<PaperDictDO>()

--- a/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java
@@ -37,7 +37,6 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl<SmsVerifyCodeMapper, S
    @Autowired
    private RedisUtil redisUtil;
-    @Async
    public void sendVerifyCode(SendVerifyCodeDTO sendVerifyCodeDTO) {
        MemberDO memberDO = memberMapper.selectOne(new QueryWrapper<MemberDO>()
                .lambda()

--- a/src/main/java/com/subsidy/util/ExcelFormatUtils.java
+++ b/src/main/java/com/subsidy/util/ExcelFormatUtils.java
@@ -6,11 +6,11 @@ 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("序号", "成员名称", "身份证号码", "手机号码", "测试最高成绩", "测试次数", "总评价");
+    public static final List<String> scoreList = Arrays.asList("序号", "成员名称", "身份证号码", "联系方式", "测试成绩", "测试次数", "总评价");
    public static final List<String> answersList = Arrays.asList("序号", "提问", "答疑", "提问时间", "提问成员", "答疑时间");

--- a/src/main/java/com/subsidy/util/excel/ExcelUtil.java
+++ b/src/main/java/com/subsidy/util/excel/ExcelUtil.java
@@ -404,38 +404,40 @@ public class ExcelUtil {
            newCell.setCellStyle(cellStyle);
            newCell.setCellValue(classDetailVO.getIdCard());
            newCell = dataRow.createCell(3);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getAccountName());
+            newCell.setCellValue(classDetailVO.getGender());
            newCell = dataRow.createCell(4);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getTelephone());
+            newCell.setCellValue(classDetailVO.getAccountName());
            newCell = dataRow.createCell(5);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getSignCounts());
+            newCell.setCellValue(classDetailVO.getTelephone());
            newCell = dataRow.createCell(6);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getClassProcess());
+            newCell.setCellValue(classDetailVO.getSignCounts());
            newCell = dataRow.createCell(7);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getTrainingLengthStr());
+            newCell.setCellValue(classDetailVO.getClassProcess());
            newCell = dataRow.createCell(8);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getAskCounts());
+            newCell.setCellValue(classDetailVO.getTrainingLengthStr());
            newCell = dataRow.createCell(9);
            newCell.setCellStyle(cellStyle);
-            newCell.setCellValue(classDetailVO.getScore());
+            newCell.setCellValue(classDetailVO.getAskCounts());
            newCell = dataRow.createCell(10);
            newCell.setCellStyle(cellStyle);
+            newCell.setCellValue(classDetailVO.getScore());
+            newCell = dataRow.createCell(11);
+            newCell.setCellStyle(cellStyle);
            newCell.setCellValue(classDetailVO.getResult());
            rowIndex++;
            seq++;
@@ -1162,7 +1164,7 @@ public class ExcelUtil {
        int[] secondWidth = new int[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;
        for (int i = 0; i < 6; i++) {
@@ -1257,6 +1259,7 @@ public class ExcelUtil {
            e.printStackTrace();
        }
    }
    private static void setStyle(CellStyle cellStyle) {
        // 水平居中
        cellStyle.setAlignment(CellStyle.ALIGN_CENTER);

--- a/src/main/java/com/subsidy/vo/administer/ClassDailyInfoVO.java
+++ b/src/main/java/com/subsidy/vo/administer/ClassDailyInfoVO.java
@@ -16,5 +16,7 @@ public class ClassDailyInfoVO {
    private Integer total;
+    private Integer studyLength;
    private List<ClassVodDailyInfoItemVO> classVodDailyInfoItemVOS;
 }
--- a/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
+++ b/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
@@ -18,16 +18,22 @@ public class ClassDetailVO{
    @ExcelColumn(col = 2,value = "账号")
    private String accountName;
-    @ExcelColumn(col = 3,value = "身份证号")
+    /**
+     * 性别
+     */
+    @ExcelColumn(col = 3,value = "性别")
+    private String gender;
+    @ExcelColumn(col = 4,value = "身份证号")
    private String idCard;
-    @ExcelColumn(col = 4,value = "联系方式")
+    @ExcelColumn(col = 5,value = "联系方式")
    private String telephone;
    /**
     * 签到次数
     */
-    @ExcelColumn(col = 5,value = "签到次数")
+    @ExcelColumn(col = 6,value = "签到次数")
    private Long signCounts;
    /**
@@ -40,12 +46,12 @@ public class ClassDetailVO{
     */
    //private Integer allVodCounts;
-    @ExcelColumn(col = 6,value = "课程进度")
+    @ExcelColumn(col = 7,value = "课程进度")
    private String classProcess;
    private Integer trainingLength;
-    @ExcelColumn(col = 7,value = "培训时长")
+    @ExcelColumn(col = 8,value = "培训时长")
    private String trainingLengthStr;
@@ -62,13 +68,13 @@ public class ClassDetailVO{
    /**
     * 评价测试
     */
-    @ExcelColumn(col = 8,value = "评价测试")
+    @ExcelColumn(col = 9,value = "评价测试")
    private String score;
    /**
     * 答疑个数
     */
-    @ExcelColumn(col = 9,value = "答题数")
+    @ExcelColumn(col = 10,value = "答题数")
    private Integer askCounts;

--- a/src/main/resources/mapper/AdministerMapper.xml
+++ b/src/main/resources/mapper/AdministerMapper.xml
@@ -47,6 +47,7 @@
        SELECT
            t2.id,
            t2.user_name,
+            t2.gender,
            t2.id_card,
            t2.account_name,
            t2.telephone

--- a/src/main/resources/mapper/VodPlayHistoryMapper.xml
+++ b/src/main/resources/mapper/VodPlayHistoryMapper.xml
@@ -36,7 +36,10 @@
            t3.play_record,
            t3.create_date,
            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
            (
            SELECT