Merge branch 'master' of 49.232.152.146:xhxy/smart_school

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/CirculationController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备借出归还
+ */
+
+@RestController
+@RequestMapping("/circulation")
+public class CirculationController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/EquipmentLedgerController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备基础信息
+ */
+@RestController
+@RequestMapping("/equipmentLedger")
+public class EquipmentLedgerController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/EquipmentRepairController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备报修
+ */
+
+@RestController
+@RequestMapping("/equipmentRepair")
+public class EquipmentRepairController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/InStockController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备入库
+ */
+
+@RestController
+@RequestMapping("/inStock")
+public class InStockController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/OutStockController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备出库
+ */
+
+@RestController
+@RequestMapping("/outStock")
+public class OutStockController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/ProductCategoryController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 产品分类
+ */
+
+@RestController
+@RequestMapping("/productCategory")
+public class ProductCategoryController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/ReceiveController.java

+package yangtz.cs.liu.campus.controller.SchoolEquipment;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备领用
+ */
+
+@RestController
+@RequestMapping("/receive")
+public class ReceiveController {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolCirculation.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 设备借出归还对象 school_circulation
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolCirculation extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 借用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date borrowTime;
+
+    /** 借用人id */
+    private Long borrowById;
+
+    /** 借用人 */
+    private String borrowBy;
+
+    /** 用途 */
+    private String purpose;
+
+    /** 借用期限（天） */
+    private Long deadline;
+
+    /** 归还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date returnTime;
+
+    /** 归还时设备情况 */
+    private String returnEquipmentCondition;
+
+    /** 接收人id */
+    private Long receivedById;
+
+    /** 接收人 */
+    private String receivedBy;
+
+    /** 预计使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjuseTime;
+
+    /** 实际使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sjuseTime;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEncode.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.core.domain.OurBaseEntity;
+import lombok.Data;
+
+/**
+ * 自编码对象 school_encode
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolEncode
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自编码主键id */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /** 业务分类（固定10） */
+    private Integer ywfl;
+
+    /** 分类（4位，截取分类编码） */
+    private Integer fl;
+
+    /** 年（如2023） */
+    private Integer year;
+
+    /** 顺序号（5位，如00001） */
+    private Integer orderNumber;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEquipmentLedger.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 设备台账对象 school_equipment_ledger
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolEquipmentLedger extends OurBaseEntity
+{
+
+    /** 自编码 */
+    private String encode;
+
+    /** 设备名称 */
+    private String equipmentName;
+
+    /** 型号 */
+    private String model;
+
+    /** 规格 */
+    private String specification;
+
+    /** 分类编码 */
+    private String classificationCode;
+
+    /** 单位 */
+    private String unit;
+
+    /** 归属类型（1公共区域，2信息中心，3个人） */
+    private String affiliationType;
+
+    /** 设备状态（1完好，2损坏，3报废） */
+    private String equipmentState;
+
+    /** 是否允许借出（1是，0否） */
+    private String isAllowLend;
+
+    /** 是否已借出（1是，0否） */
+    private String isLend;
+
+    /** 投产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dateOfProduction;
+
+    /** 价格 */
+    private BigDecimal price;
+
+    /** 效用年限（年） */
+    private String lifeOfUtility;
+
+    /** 地点 */
+    private String place;
+
+    /** 使用人id */
+    private Long useId;
+
+    /** 使用人 */
+    private String useName;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEquipmentRepair.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 设备报修对象 school_equipment_repair
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolEquipmentRepair extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 分类编码 */
+    private String classificationCode;
+
+    /** 报修时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportRepairTime;
+
+    /** 报修人id */
+    private Long reportRepairId;
+
+    /** 报修人 */
+    private String reportRepair;
+
+    /** 问题 */
+    private String problem;
+
+    /** 修理人id */
+    private Long repairId;
+
+    /** 修理人 */
+    private String repairName;
+
+    /** 修理人联系方式 */
+    private Long repairPhone;
+
+    /** 修理时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date repairTime;
+
+    /** 修理状态（0已维修，1已损坏） */
+    private String repairState;
+
+    /** 处理状态（1已处理，0待处理） */
+    private String disposeState;
+
+    /** 评价（1一星，2二星，3三星，4四星，5五星） */
+    private Long evaluate;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolInStock.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 设备入库对象 school_in_stock
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolInStock extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 入库类型 */
+    private String inStockType;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inStockTime;
+
+    /** 备注 */
+    private String remark;
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolOutStock.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 设备出库对象 school_out_stock
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolOutStock extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 出库类型 */
+    private String outStockType;
+
+    /** 出库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date outStockTime;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolProductCategory.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import com.core.domain.OurBaseEntity;
+import lombok.Data;
+
+/**
+ * 产品分类对象 school_product_category
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolProductCategory extends OurBaseEntity
+{
+
+    /** 分类编码 */
+    private String classificationCode;
+
+    /** 上级分类id */
+    private Long parentId;
+
+    /** 祖级列表 */
+    private String ancestors;
+
+    /** 设备分类 */
+    private String equipmentType;
+
+    /** 型号 */
+    private String model;
+
+    /** 级别（1一级，2二级，3三级，...） */
+    private Long rank;
+
+    /** 显示顺序 */
+    private Long orderNum;
+
+    /** 管理员id */
+    private Long adminId;
+
+    /** 管理员 */
+    private String admin;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolReceive.java

+package yangtz.cs.liu.campus.domain.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 设备领用对象 school_receive
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolReceive extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 领用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recipientTime;
+
+    /** 领用人id */
+    private String recipientById;
+
+    /** 领用人 */
+    private String recipientBy;
+
+    /** 退还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date returnTime;
+
+    /** 退还时设备情况 */
+    private String returnEquipmentCondition;
+
+    /** 接收人id */
+    private Long receivedById;
+
+    /** 接收人 */
+    private String receivedBy;
+
+    /** 预计使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjuseTime;
+
+    /** 实际使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sjuseTime;
+
+    /** 备注 */
+    private String remark;
+}

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

@@ -34,5 +34,5 @@ public interface CurriculaVariableMapper extends BaseMapper<CurriculaVariable>
      * 获取选课任务下拉框
      * 获取选课任务下拉框
      * @return
      * @return
      */
      */
-    List<Map<String, String>> getGrade();
+    List<Map<String, String>> getGrade(@Param("teacherId") Long teacherId);
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/CirculationMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
+
+public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentLedgerMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+
+public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentRepairMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
+
+public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/InStockMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
+
+public interface InStockMapper extends BaseMapper<SchoolInStock> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/OutStockMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
+
+public interface OutStockMapper extends BaseMapper<SchoolOutStock> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/ProductCategoryMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
+
+public interface ProductCategoryMapper extends BaseMapper<SchoolProductCategory> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/ReceiveMapper.java

+package yangtz.cs.liu.campus.mapper.schoolEquipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+
+public interface ReceiveMapper extends BaseMapper<SchoolReceive> {
+}

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

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.impl.curricula;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -301,6 +302,7 @@ public class CurriculaStudentServiceImpl extends ServiceImpl<CurriculaStudentMap
      */
      */
     @Override
     @Override
     public List<CurriculaStudentVo> selectCurriculaStudentListBzr(CurriculaStudentVo curriculaStudentVo) {
     public List<CurriculaStudentVo> selectCurriculaStudentListBzr(CurriculaStudentVo curriculaStudentVo) {
+        curriculaStudentVo.setTeacherId(SecurityUtils.getLoginUser().getUser().getUserId());
         return curriculaStudentMapper.selectCurriculaStudentListBzr(curriculaStudentVo);
         return curriculaStudentMapper.selectCurriculaStudentListBzr(curriculaStudentVo);
     }
     }
 }
 }

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

@@ -167,6 +167,7 @@ public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableM
      */
      */
     @Override
     @Override
     public List<Map<String, String>> getGrade() {
     public List<Map<String, String>> getGrade() {
-        return curriculaVariableMapper.getGrade();
+        Long teacherId = SecurityUtils.getLoginUser().getUser().getUserId();
+        return curriculaVariableMapper.getGrade(teacherId);
     }
     }
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.CirculationMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
+
+@Service
+public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, SchoolCirculation> implements ICirculationService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentLedgerMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
+
+@Service
+public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMapper, SchoolEquipmentLedger> implements IEquipmentLedgerService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
+
+@Service
+public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMapper, SchoolEquipmentRepair> implements IEquipmentRepairService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/InStockServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.IInStockService;
+
+@Service
+public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock> implements IInStockService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/OutStockServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.OutStockMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.IOutStockService;
+
+@Service
+public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutStock> implements IOutStockService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ProductCategoryServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.ProductCategoryMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.IProductCategoryService;
+
+@Service
+public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMapper, SchoolProductCategory> implements IProductCategoryService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ReceiveServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.ReceiveMapper;
+import yangtz.cs.liu.campus.service.schoolEquipment.IReceiveService;
+
+@Service
+public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive> implements IReceiveService {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/ICirculationService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
+
+public interface ICirculationService extends IService<SchoolCirculation> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentLedgerService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+
+public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentRepairService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
+
+public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IInStockService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
+
+public interface IInStockService extends IService<SchoolInStock> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IOutStockService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
+
+public interface IOutStockService extends IService<SchoolOutStock> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IProductCategoryService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
+
+public interface IProductCategoryService extends IService<SchoolProductCategory> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IReceiveService.java

+package yangtz.cs.liu.campus.service.schoolEquipment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+
+public interface IReceiveService extends IService<SchoolReceive> {
+}

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

@@ -15,7 +15,7 @@ public class CurriculaStudentVo {
     /** 选课主键id */
     /** 选课主键id */
     private Long curriculaId;
     private Long curriculaId;
     /** 班主任id */
     /** 班主任id */
-    private Long bzrId;
+    private Long teacherId;
     /** 班级主键id */
     /** 班级主键id */
     private Long classId;
     private Long classId;
     /** 班级 */
     /** 班级 */
@@ -31,7 +31,6 @@ public class CurriculaStudentVo {
     @Excel(name = "学号")
     @Excel(name = "学号")
     private String studentNumber;
     private String studentNumber;
     /** 成绩 */
     /** 成绩 */
-    @Excel(name = "成绩")
     private double achievement;
     private double achievement;
     /** 课程类型（1-春季选课，2-夏季选课，3-艺体） */
     /** 课程类型（1-春季选课，2-夏季选课，3-艺体） */
     @Excel(name = "课程类型",readConverterExp = "1=春季选课,2=夏季选课,3=艺体")
     @Excel(name = "课程类型",readConverterExp = "1=春季选课,2=夏季选课,3=艺体")
@@ -59,7 +58,6 @@ public class CurriculaStudentVo {
     @Excel(name = "所选科目",readConverterExp = "1=音乐,2=美术,3=田径,4=舞蹈")
     @Excel(name = "所选科目",readConverterExp = "1=音乐,2=美术,3=田径,4=舞蹈")
     private String selectedSubject;
     private String selectedSubject;
     /** 所分班级 */
     /** 所分班级 */
-    @Excel(name = "所分班级")
     private String divisionClassesName;
     private String divisionClassesName;
     /** 是否删除 */
     /** 是否删除 */
     private String delFalg;
     private String delFalg;

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolCirculationVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 设备借出归还对象 school_circulation
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolCirculationVo extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 自编码 */
+    @Excel(name = "自编码")
+    private String encode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 借用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "借用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date borrowTime;
+
+    /** 借用人id */
+    private Long borrowById;
+
+    /** 借用人 */
+    @Excel(name = "借用人")
+    private String borrowBy;
+
+    /** 用途 */
+    @Excel(name = "用途")
+    private String purpose;
+
+    /** 借用期限（天） */
+    @Excel(name = "借用期限(天)")
+    private Long deadline;
+
+    /** 归还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date returnTime;
+
+    /** 归还时设备情况 */
+    @Excel(name = "归还时设备情况")
+    private String returnEquipmentCondition;
+
+    /** 接收人id */
+    private Long receivedById;
+
+    /** 接收人 */
+    @Excel(name = "接收人")
+    private String receivedBy;
+
+    /** 预计使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预计使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date yjuseTime;
+
+    /** 实际使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "实际使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date sjuseTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentLedgerVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 设备台账对象 school_equipment_ledger
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolEquipmentLedgerVo extends OurBaseEntity
+{
+
+    /** 自编码 */
+    @Excel(name = "自编码")
+    private String encode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String specification;
+
+    /** 分类编码 */
+    @Excel(name = "分类编码")
+    private String classificationCode;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 归属类型（1公共区域，2信息中心，3个人） */
+    @Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人")
+    private String affiliationType;
+
+    /** 设备状态（1完好，2损坏，3报废） */
+    @Excel(name = "设备状态", readConverterExp = "1=完好,2=损坏,3=报废")
+    private String equipmentState;
+
+    /** 是否允许借出（1是，0否） */
+    @Excel(name = "是否允许借出", readConverterExp = "1=是,0=否")
+    private String isAllowLend;
+
+    /** 是否已借出（1是，0否） */
+    @Excel(name = "是否已借出", readConverterExp = "1=是,0=否")
+    private String isLend;
+
+    /** 投产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateOfProduction;
+
+    /** 价格 */
+    @Excel(name = "价格(元)")
+    private BigDecimal price;
+
+    /** 效用年限（年） */
+    @Excel(name = "效用年限(年)")
+    private String lifeOfUtility;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String place;
+
+    /** 使用人id */
+    private Long useId;
+
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private String useName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentRepairVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 设备报修对象 school_equipment_repair
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolEquipmentRepairVo extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 自编码 */
+    @Excel(name = "自编码")
+    private String encode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 投产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateOfProduction;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String place;
+
+    /** 分类编码 */
+    private String classificationCode;
+
+    /** 报修时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reportRepairTime;
+
+    /** 报修人id */
+    private Long reportRepairId;
+
+    /** 报修人 */
+    @Excel(name = "报修人")
+    private String reportRepair;
+
+    /** 问题 */
+    @Excel(name = "问题")
+    private String problem;
+
+    /** 修理人id */
+    private Long repairId;
+
+    /** 修理人 */
+    @Excel(name = "修理人")
+    private String repairName;
+
+    /** 修理人联系方式 */
+    @Excel(name = "修理人联系方式")
+    private Long repairPhone;
+
+    /** 修理时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修理时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date repairTime;
+
+    /** 修理状态（0已维修，1已损坏） */
+    @Excel(name = "修理结果", readConverterExp = "0=已维修,1=已损坏")
+    private String repairState;
+
+    /** 处理状态（1已处理，0待处理） */
+    @Excel(name = "处理状态", readConverterExp = "1=已处理,0=待处理")
+    private String disposeState;
+
+    /** 评价（1一星，2二星，3三星，4四星，5五星） */
+    @Excel(name = "评价", readConverterExp = "1=一星，2二星，3三星，4四星，5五星")
+    private Long evaluate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolInStockVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 设备入库对象 school_in_stock
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolInStockVo extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型")
+    private String inStockType;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date inStockTime;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String specification;
+
+    /** 分类编码 */
+    @Excel(name = "分类编码")
+    private String classificationCode;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 归属类型（1公共区域，2信息中心，3个人） */
+    @Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人")
+    private String affiliationType;
+
+    /** 设备状态（1完好，2损坏，3报废） */
+    @Excel(name = "设备状态", readConverterExp = "1=完好,2=损坏,3=报废")
+    private String equipmentState;
+
+    /** 投产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateOfProduction;
+
+    /** 价格 */
+    @Excel(name = "价格(元)")
+    private BigDecimal price;
+
+    /** 效用年限（年） */
+    @Excel(name = "效用年限(年)")
+    private String lifeOfUtility;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String place;
+
+    /** 使用人id */
+    private Long useId;
+
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private String useName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolOutStockVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 设备出库对象 school_out_stock
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolOutStockVo extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 出库类型 */
+    @Excel(name = "出库类型")
+    private String outStockType;
+
+    /** 出库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date outStockTime;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String specification;
+
+    /** 分类编码 */
+    @Excel(name = "分类编码")
+    private String classificationCode;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 归属类型（1公共区域，2信息中心，3个人） */
+    @Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人")
+    private String affiliationType;
+
+    /** 设备状态（1完好，2损坏，3报废） */
+    @Excel(name = "设备状态", readConverterExp = "1=完好,2=损坏,3=报废")
+    private String equipmentState;
+
+    /** 投产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateOfProduction;
+
+    /** 价格 */
+    @Excel(name = "价格(元)")
+    private BigDecimal price;
+
+    /** 效用年限（年） */
+    @Excel(name = "效用年限(年)")
+    private String lifeOfUtility;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String place;
+
+    /** 使用人id */
+    private Long useId;
+
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private String useName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolProductCategoryVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import com.core.domain.OurBaseEntity;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 产品分类对象 school_product_category
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolProductCategoryVo extends OurBaseEntity
+{
+
+    /** 分类编码 */
+    @Excel(name = "分类编码")
+    private String classificationCode;
+
+    /** 上级分类id */
+    private Long parentId;
+
+    /** 祖级列表 */
+    private String ancestors;
+
+    /** 设备分类 */
+    @Excel(name = "设备分类")
+    private String equipmentType;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 级别（1一级，2二级，3三级，...） */
+    private Long rank;
+
+    /** 显示顺序 */
+    private Long orderNum;
+
+    /** 管理员id */
+    private Long adminId;
+
+    /** 管理员 */
+    @Excel(name = "管理员")
+    private String admin;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolReceiveVo.java

+package yangtz.cs.liu.campus.vo.schoolEquipment;
+
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 设备领用对象 school_receive
+ *
+ * @author ruoyi
+ * @date 2023-08-09
+ */
+@Data
+public class SchoolReceiveVo extends OurBaseEntity
+{
+
+    /** 设备id */
+    private Long equipmentId;
+
+    /** 自编码 */
+    @Excel(name = "自编码")
+    private String encode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 领用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "领用日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date recipientTime;
+
+    /** 领用人id */
+    private String recipientById;
+
+    /** 领用人 */
+    @Excel(name = "领用人")
+    private String recipientBy;
+
+    /** 退还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "退还日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date returnTime;
+
+    /** 退还时设备情况 */
+    @Excel(name = "退还时设备情况")
+    private String returnEquipmentCondition;
+
+    /** 接收人id */
+    private Long receivedById;
+
+    /** 接收人 */
+    @Excel(name = "接收人")
+    private String receivedBy;
+
+    /** 预计使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预计使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date yjuseTime;
+
+    /** 实际使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "实际使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date sjuseTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

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

@@ -64,13 +64,13 @@
         SELECT id as classId,class_name as className FROM school_class WHERE grade_id = (SELECT id FROM school_grade where grade_year = #{grade} AND del_flag = '0')
         SELECT id as classId,class_name as className FROM school_class WHERE grade_id = (SELECT id FROM school_grade where grade_year = #{grade} AND del_flag = '0')
     </select>
     </select>
 
 
-    <select id="getGrade" resultType="Map">
+    <select id="getGrade" parameterType="Long" resultType="Map">
         select
         select
             cv.id as curriculaId,
             cv.id as curriculaId,
             cv.task_name as curriculaName,
             cv.task_name as curriculaName,
             cv.grade as grade,
             cv.grade as grade,
-			(SELECT COUNT(id) as yxrs FROM curricula_student WHERE curricula_id = cv.id and curricula_state = '2' AND del_flag = '0') as yxrs,
-			(SELECT COUNT(id) as zrs FROM curricula_student WHERE curricula_id = cv.id AND del_flag = '0') as zrs
+			(SELECT COUNT(cs.id) as yxrs FROM curricula_student cs LEFT JOIN school_student xs ON cs.student_id = xs.id WHERE curricula_id = cv.id and curricula_state = '2' AND cs.del_flag = '0' AND xs.class_id IN (SELECT class_id FROM school_class_headmaster WHERE teacher_id = #{teacherId})) as yxrs,
+			(SELECT COUNT(cs.id) as zrs FROM curricula_student cs LEFT JOIN school_student xs ON cs.student_id = xs.id WHERE curricula_id = cv.id AND cs.del_flag = '0' AND xs.class_id IN (SELECT class_id FROM school_class_headmaster WHERE teacher_id = #{teacherId})) as zrs
         from curricula_variable cv
         from curricula_variable cv
         where cv.del_flag = '0'
         where cv.del_flag = '0'
     </select>
     </select>

smart-campus/src/main/resources/mapper/schoolEquipment/InStockMapper.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.schoolEquipment.InStockMapper">
+
+
+</mapper>