修改功能

core-common/src/main/java/com/core/utils/UploadToServer.java

@@ -12,7 +12,9 @@ import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class UploadToServer {
@@ -72,6 +74,24 @@ public class UploadToServer {
         return result;
     }
 
+    //故障图片
+    public static Map uploadFailure(String serverAddress, MultipartFile file) {
+        File toFile = transferToFile(file);
+        Map data = new HashMap();
+        data.put("file", toFile);
+        data.put("attachType", file.getContentType());
+        String body = HttpRequest.post(serverAddress+"/common/failure")
+                .form(data)
+                .contentType("multipart/form-data")
+                .execute()
+                .body();
+        Map result = new HashMap();
+        if (StrUtil.isNotBlank(body)) {
+            result = JSON.parseObject(body, Map.class);
+        }
+        return result;
+    }
+
     //获取服务器图片二进制
     public static String getPicFromServer(String serverAddress,String url) throws UnsupportedEncodingException {
         String result = "data:image/jpeg;base64,";
@@ -109,6 +129,4 @@ public class UploadToServer {
         }
         return file;
     }
-
-
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/curricula/CurriCulaVariableController.java

+package yangtz.cs.liu.campus.controller.curricula;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
+import yangtz.cs.liu.campus.service.curricula.ICurriculaVariableService;
+import yangtz.cs.liu.campus.vo.curricula.CurriculaVariableVo;
+
+/**
+ * 选课任务
+ */
+@RestController
+@RequestMapping("/curricula/variable")
+public class CurriCulaVariableController extends BaseController {
+
+    @Autowired
+    private ICurriculaVariableService curriculaVariableService;
+
+    /**
+     * 查询选课任务列表
+     * @param curriculaVariable
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CurriculaVariableVo curriculaVariable){
+        return getDataTable(curriculaVariableService.selectCurriculaVariableList(curriculaVariable));
+    }
+
+    /**
+     * 新增选课任务
+     * @param curriculaVariable
+     * @return
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody CurriculaVariable curriculaVariable){
+        return toAjax(curriculaVariableService.insertCurriculaVariable(curriculaVariable));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/repairs/LogisticsRepairsController.java

@@ -114,7 +114,7 @@ public class LogisticsRepairsController extends BaseController
      */
     @GetMapping("/getNumber")
     public AjaxResult getNumber(){
-        List<LogisticsRepairs> list = logisticsRepairsService.selectLogisticsRepairsList(new LogisticsRepairs());
+        List<LogisticsRepairs> list = logisticsRepairsService.selectListRepairs(new LogisticsRepairs());
         //获取当前日期
         Date nowDate = DateUtils.getNowDate();
         SimpleDateFormat dateFormat= new SimpleDateFormat("yyyyMMdd");
@@ -123,7 +123,7 @@ public class LogisticsRepairsController extends BaseController
         long newNumber = Long.parseLong(number);
         for (LogisticsRepairs repairs : list) {
             if (newNumber == repairs.getId()){
-                newNumber = newNumber + 1;
+                newNumber = repairs.getId() + 1;
             }
         }
         Map<String,Long> map = new HashMap<>();

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/curricula/CurriculaStudent.java

+package yangtz.cs.liu.campus.domain.curricula;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CurriculaStudent {
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    /** 学生主键id */
+    private Long studentId;
+    /** 选课任务主键id */
+    private Long curriculaId;
+    /** 课程类型（1-春季选课，2-夏季选课，3-艺体） */
+    private String courseType;
+    /** 选课时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curriculaTime;
+    /** 选课状态（1-未选课，2-已选课） */
+    private String curriculaState;
+    /** 已选专业/课程 */
+    private String selectedCourse;
+    /** 是否删除 */
+    private String delFalg;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/curricula/CurriculaVariable.java

+package yangtz.cs.liu.campus.domain.curricula;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 选课对象
+ */
+@Data
+public class CurriculaVariable extends OurBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 选课主键id */
+    private Long id;
+    /** 任务名称 */
+    private String taskName;
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+    /** 级部 */
+    private String grade;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/repairs/LogisticsRepairs.java

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.domain.repairs;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-25
  */
+@Data
 public class LogisticsRepairs extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -49,8 +51,9 @@ public class LogisticsRepairs extends BaseEntity
     private String failureEquipmentDescribe;
 
     /** 故障图片 */
-    @Excel(name = "故障图片")
     private String failureEquipmentPicture;
+    /** 故障图片 */
+    private String newFailureEquipmentPicture;
 
     /** 维修状态（1未接单，2维修中，3已完成） */
     @Excel(name = "维修状态", readConverterExp = "1=未接单，2维修中，3已完成")

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/curricula/CurriculaStudentMapper.java

+package yangtz.cs.liu.campus.mapper.curricula;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaStudent;
+
+import java.util.Map;
+
+public interface CurriculaStudentMapper extends BaseMapper<CurriculaStudent> {
+
+    /**
+     * 统计总人数/已选课程人数
+     * @param curriculaId
+     * @return
+     */
+    Map<String,Long> countNum(@Param("curriculaId") Long curriculaId);
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/curricula/CurriculaVariableMapper.java

+package yangtz.cs.liu.campus.mapper.curricula;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
+
+import java.util.List;
+
+public interface CurriculaVariableMapper extends BaseMapper<CurriculaVariable>
+{
+    /**
+     * 新增选课任务
+     * @param curriculaVariable
+     * @return
+     */
+    int insertCurriculaVariable(CurriculaVariable curriculaVariable);
+
+    /**
+     * 通过级部查询学生id集合
+     * @param grade
+     * @return
+     */
+    List<Long> selectByGrade(@Param("grade") String grade);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/repairs/LogisticsRepairsMapper.java

@@ -69,4 +69,6 @@ public interface LogisticsRepairsMapper
      */
     List<LogisticsRepairs> getList(@Param("userId") Long userId, @Param("entity") LogisticsRepairs logisticsRepairs);
 
+    List<LogisticsRepairs> selectListRepairs(LogisticsRepairs logisticsRepairs);
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/curricula/ICurriculaStudentService.java

+package yangtz.cs.liu.campus.service.curricula;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaStudent;
+
+public interface ICurriculaStudentService extends IService<CurriculaStudent> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/curricula/ICurriculaVariableService.java

+package yangtz.cs.liu.campus.service.curricula;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
+import yangtz.cs.liu.campus.vo.curricula.CurriculaVariableVo;
+
+import java.util.List;
+
+public interface ICurriculaVariableService extends IService<CurriculaVariable> {
+    /**
+     * 查询选课任务列表
+     * @param curriculaVariable
+     * @return
+     */
+    List<CurriculaVariableVo> selectCurriculaVariableList(CurriculaVariableVo curriculaVariable);
+
+    /**
+     * 新增选课任务
+     * @param curriculaVariable
+     * @return
+     */
+    int insertCurriculaVariable(CurriculaVariable curriculaVariable);
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/award/AwardServiceImpl.java

@@ -60,6 +60,7 @@ public class AwardServiceImpl implements IAwardService
     @Override
     public List<Award> selectAwardList(Award award)
     {
+        award.setTeacherId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<Award> list = awardMapper.selectAwardList(award);
         list.forEach(award1 -> {
             LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/curricula/CurriculaStudentServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.curricula;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaStudent;
+import yangtz.cs.liu.campus.mapper.curricula.CurriculaStudentMapper;
+import yangtz.cs.liu.campus.service.curricula.ICurriculaStudentService;
+
+@Service
+public class CurriculaStudentServiceImpl extends ServiceImpl<CurriculaStudentMapper, CurriculaStudent> implements ICurriculaStudentService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/curricula/CurriculaVariableServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.curricula;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaStudent;
+import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
+import yangtz.cs.liu.campus.mapper.curricula.CurriculaStudentMapper;
+import yangtz.cs.liu.campus.mapper.curricula.CurriculaVariableMapper;
+import yangtz.cs.liu.campus.service.curricula.ICurriculaVariableService;
+import yangtz.cs.liu.campus.vo.curricula.CurriculaVariableVo;
+import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableMapper, CurriculaVariable> implements ICurriculaVariableService {
+
+    @Autowired
+    private CurriculaVariableMapper curriculaVariableMapper;
+    @Autowired
+    private CurriculaStudentMapper curriculaStudentMapper;
+    /**
+     * 查询选课任务列表
+     * @param curriculaVariable
+     * @return
+     */
+    @Override
+    public List<CurriculaVariableVo> selectCurriculaVariableList(CurriculaVariableVo curriculaVariable) {
+        List<CurriculaVariableVo> list = new ArrayList<>();
+        LambdaQueryWrapper<CurriculaVariable> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(isNotBlank(curriculaVariable.getTaskName()),CurriculaVariable::getTaskName,curriculaVariable.getTaskName())
+                .eq(isNotBlank(curriculaVariable.getGrade()),CurriculaVariable::getGrade,curriculaVariable.getGrade())
+                .eq(CurriculaVariable::getDelFlag,"0")
+                .orderByDesc(CurriculaVariable::getGrade);
+        List<CurriculaVariable> curriculaVariables = curriculaVariableMapper.selectList(wrapper);
+        curriculaVariables.forEach(curriculaVariable1 -> {
+            CurriculaVariableVo curriculaVariableVo = new CurriculaVariableVo();
+            BeanUtils.copyProperties(curriculaVariable1,curriculaVariableVo);
+            Map<String, Long> map = curriculaStudentMapper.countNum(curriculaVariableVo.getId());
+            Long zrs = map.get("zrs");
+            Long yxrs = map.get("yxrs");
+            curriculaVariableVo.setYxrs(zrs.intValue());
+            curriculaVariableVo.setZrs(yxrs.intValue());
+            list.add(curriculaVariableVo);
+        });
+        return list;
+    }
+
+    /**
+     * 新增选课任务
+     * @param curriculaVariable
+     * @return
+     */
+    @Override
+    @Transactional
+    public int insertCurriculaVariable(CurriculaVariable curriculaVariable) {
+        int i = 0;
+        //判断是否已存在当前级部选课任务
+        LambdaQueryWrapper<CurriculaVariable> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CurriculaVariable::getGrade,curriculaVariable.getGrade())
+                .eq(CurriculaVariable::getDelFlag,"0");
+        List<CurriculaVariable> curriculaVariables = curriculaVariableMapper.selectList(wrapper);
+        if (curriculaVariables.size() > 0){
+            throw new ServiceException("已存在当前级部的选课任务");
+        }
+        curriculaVariable.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
+        curriculaVariable.setCreateTime(DateUtils.getNowDate());
+        //新增选课任务
+        i += curriculaVariableMapper.insertCurriculaVariable(curriculaVariable);
+        //通过id查询刚新增的选课任务
+        CurriculaVariable variable = curriculaVariableMapper.selectById(curriculaVariable.getId());
+        //新增学生与选课任务关系
+        List<Long> studentIds = curriculaVariableMapper.selectByGrade(variable.getGrade());
+        if (studentIds.size() > 0){
+            for (Long studentId : studentIds) {
+                CurriculaStudent curriculaStudent = new CurriculaStudent();
+                curriculaStudent.setStudentId(studentId);
+                curriculaStudent.setCurriculaId(curriculaVariable.getId());
+                curriculaStudentMapper.insert(curriculaStudent);
+            }
+        }
+        return i;
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/material/MaterialServiceImpl.java

@@ -60,6 +60,7 @@ public class MaterialServiceImpl implements IMaterialService
     @Override
     public List<Material> selectMaterialList(Material material)
     {
+        material.setTeacherId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<Material> list = materialMapper.selectMaterialList(material);
         list.forEach(material1 -> {
             LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/repairs/LogisticsRepairsServiceImpl.java

@@ -5,7 +5,9 @@ import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.util.UserInfoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.campus.mapper.repairs.LogisticsRepairsMapper;
 import yangtz.cs.liu.campus.domain.repairs.LogisticsRepairs;
@@ -22,6 +24,10 @@ public class LogisticsRepairsServiceImpl implements ILogisticsRepairsService
 {
     @Autowired
     private LogisticsRepairsMapper logisticsRepairsMapper;
+    @Autowired
+    private UserInfoUtil userInfoUtil;
+    @Value("${ruoyi.serverAddress}")
+    private String serverAddress;
 
     /**
      * 查询后勤报修
@@ -32,7 +38,20 @@ public class LogisticsRepairsServiceImpl implements ILogisticsRepairsService
     @Override
     public LogisticsRepairs selectLogisticsRepairsById(Long id)
     {
-        return logisticsRepairsMapper.selectLogisticsRepairsById(id);
+        LogisticsRepairs logisticsRepairs = logisticsRepairsMapper.selectLogisticsRepairsById(id);
+        if (null != logisticsRepairs.getFailureEquipmentPicture() && !"".equals(logisticsRepairs.getFailureEquipmentPicture())){
+            String[] split = logisticsRepairs.getFailureEquipmentPicture().split(",");
+            String pic = "";
+            for (int i = 0; i < split.length; i++) {
+                if (i == split.length - 1){
+                    pic += serverAddress + split[i];
+                }else {
+                    pic += serverAddress + split[i] + ",";
+                }
+            }
+            logisticsRepairs.setNewFailureEquipmentPicture(pic);
+        }
+        return logisticsRepairs;
     }
 
     /**
@@ -71,6 +90,19 @@ public class LogisticsRepairsServiceImpl implements ILogisticsRepairsService
         return logisticsRepairsMapper.insertLogisticsRepairs(logisticsRepairs);
     }
 
+    @Override
+    public int insertRepairs(LogisticsRepairs logisticsRepairs) {
+        //设置报修人id
+        logisticsRepairs.setRepairsId(userInfoUtil.getTeacherId());
+        //设置报修人
+        logisticsRepairs.setRepairsName(userInfoUtil.getTeacherName());
+        //设置报修人联系方式
+        logisticsRepairs.setPhone(Long.parseLong(userInfoUtil.getMpLoginUser().getTeacherPhonenumber()));
+        logisticsRepairs.setCreateBy(userInfoUtil.getTeacherName());
+        logisticsRepairs.setCreateTime(DateUtils.getNowDate());
+        return logisticsRepairsMapper.insertLogisticsRepairs(logisticsRepairs);
+    }
+
     /**
      * 修改后勤报修
      *
@@ -85,6 +117,14 @@ public class LogisticsRepairsServiceImpl implements ILogisticsRepairsService
         return logisticsRepairsMapper.updateLogisticsRepairs(logisticsRepairs);
     }
 
+    @Override
+    public int updateRepairs(LogisticsRepairs logisticsRepairs) {
+        String teacherName = userInfoUtil.getTeacherName();
+        logisticsRepairs.setUpdateBy(teacherName);
+        logisticsRepairs.setUpdateTime(DateUtils.getNowDate());
+        return logisticsRepairsMapper.updateLogisticsRepairs(logisticsRepairs);
+    }
+
     /**
      * 批量删除后勤报修
      *
@@ -119,6 +159,11 @@ public class LogisticsRepairsServiceImpl implements ILogisticsRepairsService
         return logisticsRepairsMapper.selectLogisticsRepairsList(logisticsRepairs);
     }
 
+    @Override
+    public List<LogisticsRepairs> selectListRepairs(LogisticsRepairs logisticsRepairs) {
+        return logisticsRepairsMapper.selectListRepairs(logisticsRepairs);
+    }
+
     /**
      * 查看个人报修列表
      * @param userId

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolgrade/ISchoolGradeImpl.java

@@ -209,8 +209,6 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
             } else {
                 throw new ServiceException("新增" + grade.getSchoolYear() + "学年的高一级部失败，失败原因是" + grade.getSchoolYear() + "学年的高一级部已存在");
             }
-
         }
     }
-
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/thesis/ThesisServiceImpl.java

@@ -60,6 +60,7 @@ public class ThesisServiceImpl implements IThesisService
     @Override
     public List<Thesis> selectThesisList(Thesis thesis)
     {
+        thesis.setTeacherId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<Thesis> list = thesisMapper.selectThesisList(thesis);
         list.forEach(thesis1 -> {
             LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/training/TrainingServiceImpl.java

@@ -60,6 +60,7 @@ public class TrainingServiceImpl implements ITrainingService
     @Override
     public List<Training> selectTrainingList(Training training)
     {
+        training.setTeacherId(SecurityUtils.getLoginUser().getUser().getUserId());
         List<Training> list = trainingMapper.selectTrainingList(training);
         list.forEach(training1 -> {
             LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();

smart-campus/src/main/java/yangtz/cs/liu/campus/service/repairs/ILogisticsRepairsService.java

@@ -36,6 +36,14 @@ public interface ILogisticsRepairsService
     public int insertLogisticsRepairs(LogisticsRepairs logisticsRepairs);
 
     /**
+     * 新增后勤报修
+     *
+     * @param logisticsRepairs 后勤报修
+     * @return 结果
+     */
+    public int insertRepairs(LogisticsRepairs logisticsRepairs);
+
+    /**
      * 修改后勤报修
      *
      * @param logisticsRepairs 后勤报修
@@ -44,6 +52,14 @@ public interface ILogisticsRepairsService
     public int updateLogisticsRepairs(LogisticsRepairs logisticsRepairs);
 
     /**
+     * 修改后勤报修
+     *
+     * @param logisticsRepairs 后勤报修
+     * @return 结果
+     */
+    public int updateRepairs(LogisticsRepairs logisticsRepairs);
+
+    /**
      * 批量删除后勤报修
      *
      * @param ids 需要删除的后勤报修主键集合
@@ -67,6 +83,13 @@ public interface ILogisticsRepairsService
     List<LogisticsRepairs> selectListAll(LogisticsRepairs logisticsRepairs);
 
     /**
+     * 查询所有后勤报修信息
+     * @param logisticsRepairs
+     * @return
+     */
+    List<LogisticsRepairs> selectListRepairs(LogisticsRepairs logisticsRepairs);
+
+    /**
      * 查看个人报修列表
      * @param userId
      * @param logisticsRepairs

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/curricula/CurriculaStudentVo.java

+package yangtz.cs.liu.campus.vo.curricula;
+
+public class CurriculaStudentVo {
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/curricula/CurriculaVariableVo.java

+package yangtz.cs.liu.campus.vo.curricula;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 选课对象
+ */
+@Data
+public class CurriculaVariableVo {
+    /** 选课主键id */
+    private Long id;
+    /** 任务名称 */
+    private String taskName;
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+    /** 级部 */
+    private String grade;
+    /** 创建人 */
+    private String createBy;
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /** 修改人 */
+    private String updateBy;
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** 是否删除 */
+    private String delFlag;
+    /** 已选人数 */
+    private Integer yxrs;
+    /** 总人数 */
+    private Integer zrs;
+}

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/repairs/WxLogisticsRepairsController.java

@@ -54,7 +54,7 @@ public class WxLogisticsRepairsController extends BaseController {
     @PostMapping("/add")
     public AjaxResult add(@RequestBody LogisticsRepairs logisticsRepairs)
     {
-        return toAjax(logisticsRepairsService.insertLogisticsRepairs(logisticsRepairs));
+        return toAjax(logisticsRepairsService.insertRepairs(logisticsRepairs));
     }
 
     /**
@@ -63,7 +63,7 @@ public class WxLogisticsRepairsController extends BaseController {
     @PostMapping("/edit")
     public AjaxResult edit(@RequestBody LogisticsRepairs logisticsRepairs)
     {
-        return toAjax(logisticsRepairsService.updateLogisticsRepairs(logisticsRepairs));
+        return toAjax(logisticsRepairsService.updateRepairs(logisticsRepairs));
     }
 
     /**
@@ -81,7 +81,7 @@ public class WxLogisticsRepairsController extends BaseController {
      */
     @GetMapping("/getNumber")
     public AjaxResult getNumber(){
-        List<LogisticsRepairs> list = logisticsRepairsService.selectLogisticsRepairsList(new LogisticsRepairs());
+        List<LogisticsRepairs> list = logisticsRepairsService.selectListRepairs(new LogisticsRepairs());
         //获取当前日期
         Date nowDate = DateUtils.getNowDate();
         SimpleDateFormat dateFormat= new SimpleDateFormat("yyyyMMdd");
@@ -90,7 +90,7 @@ public class WxLogisticsRepairsController extends BaseController {
         long newNumber = Long.parseLong(number);
         for (LogisticsRepairs repairs : list) {
             if (newNumber == repairs.getId()){
-                newNumber = newNumber + 1;
+                newNumber = repairs.getId() + 1;
             }
         }
         Map<String,Long> map = new HashMap<>();

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/userInfo/WxUserInfoController.java

@@ -28,6 +28,8 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
 import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull;
@@ -168,19 +170,34 @@ public class WxUserInfoController extends BaseController {
     @PutMapping("/editStudentAvatar")
     public AjaxResult editStudentAvatar(@RequestParam("avatarfile") MultipartFile file) throws Exception {
         if (!file.isEmpty()) {
-            SysUser user = sysUserService.selectUserById(userInfoUtil.getMpLoginUser().getUserId());
+//            SysUser user = sysUserService.selectUserById(userInfoUtil.getMpLoginUser().getUserId());
             //String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
             Map map = UploadToServer.uploadAvatar(serverAddress,file);
             String avatar = map.get("url").toString();
-            if (studentService.updateStudentAvatar(user.getStudentId(),avatar)) {
+//            if (studentService.updateStudentAvatar(user.getStudentId(),avatar)) {
                 AjaxResult ajax = AjaxResult.success();
                 ajax.put("imgUrl", avatar);
                 return ajax;
-            }
+//            }
         }
         return AjaxResult.error("图片修改异常");
     }
 
+    /**
+     * 上传故障图片
+     */
+    @PutMapping("/editFailure")
+    public AjaxResult editFailure(@RequestParam("avatarfile") MultipartFile file) throws Exception {
+        if (!file.isEmpty()) {
+            Map map = UploadToServer.uploadFailure(serverAddress,file);
+            String failure = map.get("url").toString();
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("imgUrl", failure);
+            return ajax;
+        }
+        return AjaxResult.error("图片上传异常");
+    }
+
 
     /**
      * 修改个人信息(家长端)

smart-campus/src/main/resources/mapper/curricula/CurriculaStudentMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="yangtz.cs.liu.campus.mapper.curricula.CurriculaStudentMapper">
+    <resultMap type="CurriculaStudent" id="CurriculaStudentResult">
+        <result property="id"    column="id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="curriculaId"    column="curricula_id"    />
+        <result property="courseType"    column="course_type"    />
+        <result property="curriculaTime"    column="curricula_time"    />
+        <result property="curriculaState"    column="curricula_state"    />
+        <result property="selectedCourse"    column="selected_course"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <select id="countNum" parameterType="Long" resultType="Map">
+        SELECT COUNT(id) as zrs,(SELECT COUNT(id) FROM curricula_student WHERE curricula_state = '2' AND del_flag = '0') as yxrs FROM curricula_student WHERE curricula_id = #{curriculaId} AND del_flag = '0'
+    </select>
+
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/curricula/CurriculaVariableMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="yangtz.cs.liu.campus.mapper.curricula.CurriculaVariableMapper">
+    <resultMap type="CurriculaVariable" id="CurriculaVariableResult">
+        <result property="id"    column="id"    />
+        <result property="taskName"    column="task_name"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="grade"    column="grade"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <insert id="insertCurriculaVariable" parameterType="CurriculaVariable" useGeneratedKeys="true" keyProperty="id">
+        insert into curricula_variable
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
+            <if test="taskName != null and taskName != ''">task_name,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="grade != null and grade != ''">grade,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            0,
+            <if test="taskName != null and taskName != ''">#{taskName},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="grade != null and grade != ''">#{grade},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <select id="selectByGrade" parameterType="String" resultType="Long">
+        SELECT
+            id AS student_id
+        FROM
+            school_student
+        WHERE
+            class_id IN (
+            SELECT
+                c.id
+            FROM
+                school_grade g
+                LEFT JOIN school_class c ON g.id = c.grade_id
+                AND c.del_flag = '0'
+            WHERE
+            g.grade_year = #{grade}
+            AND g.del_flag = '0')
+    </select>
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/repairs/LogisticsRepairsMapper.xml

@@ -153,6 +153,11 @@
         <if test="entity.maintainState != null ">
          and maintain_state = #{entity.maintainState}
          </if>
-        order by repairs_time DESC
+        order by create_time DESC
+    </select>
+
+    <select id="selectListRepairs" parameterType="LogisticsRepairs" resultMap="LogisticsRepairsResult">
+        <include refid="selectLogisticsRepairsVo"/>
+        where DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(CURDATE(), '%Y-%m-%d') order by id ASC
     </select>
 </mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetMapper.xml

@@ -65,6 +65,7 @@
             <if test="createById != null "> and b.create_by_id = #{createById}</if>
             <if test="updateById != null "> and b.update_by_id = #{updateById}</if>
         </where>
+        order by b.create_time DESC
     </select>
 
     <select id="selectSchoolDepartmentBudgetById" parameterType="Long" resultMap="SchoolDepartmentBudgetSchoolDepartmentBudgetProjectmxResult">