学生、课程

yn147

2023-11-24 26780c533f2c2af6b9216306f649c1bcede94e4a

学生、课程

 src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java

@@ -27,12 +27,12 @@
        StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);

        try{
            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
            String hqlTwo = "from Subject where name = ?";
            List<Object> argsTwo = CollectionUtils.newList(subjectName);
            Subject subject = findUnique(hqlTwo,argsTwo,Subject.class);
            //上课时间
            String classTime = subject.getEndTime();
            //结束时间
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String classTime = sdf.format(subject.getEndTime());
            //当前时间
            String currentTime = sdf.format(new Date());
            //添加subjectId
@@ -41,7 +41,7 @@
            }else {
                stuStudent.setSubjectId(subject.getSubjectId());
            }
            //如果上课时间(9点)>当前时间
            //结束时间 >当前时间
            int compareTo = classTime.compareTo(currentTime);
            if(compareTo>0)
            {
@@ -51,7 +51,7 @@
            else
            {
                //打卡时间
                String clockTime = subject.getEndTime();
                String clockTime = sdf.format(subject.getStartTime());
                compareTo = currentTime.compareTo(clockTime);
                if(compareTo<0)
                {

 src/main/java/com/qxueyou/scc/controller/SubjectController.java

@@ -1,10 +1,15 @@
package com.qxueyou.scc.controller;

import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;

import com.qxueyou.scc.base.util.DateUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +44,8 @@
@RestController
@RequestMapping(value = "/teach/subject")
public class SubjectController {

    private final Logger log = LogManager.getLogger(SubjectController.class);

    @Autowired
    ISubjectService subjectService;
@@ -103,7 +110,7 @@

        return new Result(true, "success", CollectionUtils.newObjectMap("subjectLst",
                QBeanUtils.listBean2ListMap(lst,
                        CollectionUtils.newStringMap("name", "subjectName", "subjectId", "subjectId","type","type", "status",
                        CollectionUtils.newStringMap("name", "subjectName", "subjectId", "subjectId","type","type","startTime","startTime","endTime","endTime", "status",
                                "status", "updateTime", "updateTime", "lectureCount", "lectureCount")),

                "subjectCount", count));
@@ -206,8 +213,12 @@
        if (StringUtils.isNotBlank(imgPath)) {
            coverPageFileId = fileService.readIdByPath(imgPath);
        }
		
        return subjectService.add(subjectName, coverPageFileId,contentFileId,type,startTime,endTime);
        try {
            return subjectService.add(subjectName, coverPageFileId,contentFileId,type, DateUtils.convertStringToDate(startTime),DateUtils.convertStringToDate(endTime));
        }catch (ParseException e) {
            log.error(e, e);
            return new Result(false, "日期参数错误");
        }
    }

    /**

 src/main/java/com/qxueyou/scc/teach/subject/model/Subject.java

@@ -103,10 +103,16 @@
    private String contentFileId;

    @Column(name = "START_TIME")
    private String startTime;
    @Temporal(TemporalType.TIMESTAMP)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonIgnore
    private Date startTime;

    @Column(name = "END_TIME")
    private String endTime;
    @Temporal(TemporalType.TIMESTAMP)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonIgnore
    private Date endTime;
    
    public final static String STATUS_DRAFT = "0";
    
@@ -368,19 +374,19 @@
        this.orgId = orgId;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    public Date getStartTime() {
        return startTime;
    }

    public Date getEndTime() {
        return endTime;
    }
}

 src/main/java/com/qxueyou/scc/teach/subject/service/ISubjectService.java

@@ -1,6 +1,7 @@
package com.qxueyou.scc.teach.subject.service;

import java.lang.reflect.InvocationTargetException;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -24,7 +25,7 @@
     *            内容文件id
     * @return
     */
    Result add(String subjectName, String coverPageFileId, String contentFileId,int type,String startTime,String endTime);
    Result add(String subjectName, String coverPageFileId, String contentFileId, int type, Date startTime, Date endTime);

    /**
     * 修改课程

 src/main/java/com/qxueyou/scc/teach/subject/service/impl/SubjectService.java

@@ -2,10 +2,7 @@

import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

import com.qxueyou.scc.base.model.UserInfoWrapper;
@@ -107,7 +104,7 @@


    @Override
    public Result add(String subjectName, String coverPageFileId, String contentFileId, int type,String startTime,String endTime) {
    public Result add(String subjectName, String coverPageFileId, String contentFileId, int type, Date startTime, Date endTime) {

        Subject subject = new Subject();
        if (StringUtils.isNotEmpty(coverPageFileId)) {