8.11新增校产台账

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.schoolEquipment.SchoolCirculation;
+import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
 
 /**
 /**
  * 设备借出归还
  * 设备借出归还
@@ -9,5 +15,59 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
 @RequestMapping("/circulation")
 @RequestMapping("/circulation")
-public class CirculationController {
+public class CirculationController extends BaseController {
+
+    @Autowired
+    private ICirculationService circulationService;
+
+    /**
+     * 查看设备借出归还列表
+     * @param schoolCirculationVo
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolCirculationVo schoolCirculationVo){
+        startPage();
+        return getDataTable(circulationService.selectSchoolCirculationVoList(schoolCirculationVo));
+    }
+
+    /**
+     * 查看设备借出归还详细信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(circulationService.selectSchoolCirculationVoById(id));
+    }
+
+    /**
+     * 新增设备借出归还信息
+     * @param schoolCirculation
+     * @return
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolCirculation schoolCirculation){
+        return toAjax(circulationService.insertSchoolCirculation(schoolCirculation));
+    }
+
+    /**
+     * 修改设备借出归还信息
+     * @param schoolCirculation
+     * @return
+     */
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolCirculation schoolCirculation){
+        return toAjax(circulationService.updateSchoolCirculation(schoolCirculation));
+    }
+
+    /**
+     * 删除设备借出归还信息
+     * @param ids
+     * @return
+     */
+    @PostMapping("/delete/{ids}")
+    public AjaxResult delete(@PathVariable Long[] ids){
+        return toAjax(circulationService.deleteSchoolCirculationByIds(ids));
+    }
 }
 }

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
+import yangtz.cs.liu.campus.vo.curricula.CurriculaStudentVo;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
+import yangtz.cs.liu.campus.vo.student.SchoolStudentScoreVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
 /**
  * 设备基础信息
  * 设备基础信息
  */
  */
 @RestController
 @RestController
 @RequestMapping("/equipmentLedger")
 @RequestMapping("/equipmentLedger")
-public class EquipmentLedgerController {
+public class EquipmentLedgerController extends BaseController {
+
+    @Autowired
+    private IEquipmentLedgerService equipmentLedgerService;
+
+    /**
+     * 查看设备台账列表
+     * @param schoolEquipmentLedgerVo
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo){
+        startPage();
+        return getDataTable(equipmentLedgerService.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo));
+    }
+
+    /**
+     * 查看设备台账详细信息
+     * @param
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(equipmentLedgerService.selectSchoolEquipmentLedgerById(id));
+    }
+
+    /**
+     * 导出设备台账列表
+     */
+    @Log(title = "设备台账", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolEquipmentLedgerVo schoolEquipmentLedgerVo)
+    {
+        List<SchoolEquipmentLedger> list = equipmentLedgerService.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
+        ExcelUtil<SchoolEquipmentLedger> util = new ExcelUtil<SchoolEquipmentLedger>(SchoolEquipmentLedger.class);
+        util.exportExcel(response, list, "设备台账数据");
+    }
+
+    /**
+     * 入库设备台账信息
+     * @param schoolEquipmentLedger
+     * @return
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolEquipmentLedger schoolEquipmentLedger){
+        return toAjax(equipmentLedgerService.insertSchoolEquipmentLedger(schoolEquipmentLedger));
+    }
+
+    /**
+     * 修改设备台账信息
+     * @param schoolEquipmentLedger
+     * @return
+     */
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolEquipmentLedger schoolEquipmentLedger){
+        return toAjax(equipmentLedgerService.updateSchoolEquipmentLedger(schoolEquipmentLedger));
+    }
+
+    /**
+     * 批量出库设备台账信息
+     * @param
+     * @return
+     */
+    @PostMapping("/outStock/{ids}")
+    public AjaxResult outStock(@PathVariable Long[] ids){
+        return toAjax(equipmentLedgerService.outSchoolEquipmentLedger(ids));
+    }
+
+    /**
+     * 生成自编码
+     * @return
+     */
+    @GetMapping("/getCode")
+    public AjaxResult getCode(@RequestParam("code") String code){
+        return AjaxResult.success(equipmentLedgerService.getCode(code));
+    }
+
+    /**
+     * 下载模板
+     *
+     * @return
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<SchoolEquipmentLedger> util = new ExcelUtil<>(SchoolEquipmentLedger.class);
+        util.importTemplateExcel(response, "设备台账表");
+    }
+
+    /**
+     * 导入
+     *
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<SchoolEquipmentLedger> util = new ExcelUtil<SchoolEquipmentLedger>(SchoolEquipmentLedger.class);
+        List<SchoolEquipmentLedger> list = util.importExcel(file.getInputStream());
+        //校验
+        equipmentLedgerService.checkImport(list);
+        //导入
+        String message = equipmentLedgerService.importExamDetail(list);
+        return AjaxResult.success(message);
+    }
+
 }
 }

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.schoolEquipment.SchoolEquipmentRepair;
+import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
 
 /**
 /**
  * 设备报修
  * 设备报修
@@ -9,5 +15,77 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
 @RequestMapping("/equipmentRepair")
 @RequestMapping("/equipmentRepair")
-public class EquipmentRepairController {
+public class EquipmentRepairController extends BaseController {
+
+    @Autowired
+    private IEquipmentRepairService equipmentRepairService;
+
+    /**
+     * 查看设备报修列表
+     * @param schoolEquipmentRepairVo
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolEquipmentRepairVo schoolEquipmentRepairVo){
+        startPage();
+        return getDataTable(equipmentRepairService.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo));
+    }
+
+    /**
+     * 查看设备报修详细信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(equipmentRepairService.selectSchoolEquipmentRepairVoById(id));
+    }
+
+    /**
+     * 新增设备报修
+     * @return
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
+        return toAjax(equipmentRepairService.insertSchoolEquipmentRepairVo(schoolEquipmentRepair));
+    }
+
+    /**
+     * 修改设备报修
+     * @param schoolEquipmentRepair
+     * @return
+     */
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
+        return toAjax(equipmentRepairService.updateSchoolEquipmentRepair(schoolEquipmentRepair));
+    }
+
+    /**
+     * 删除设备报修
+     * @param ids
+     * @return
+     */
+    @PostMapping("/delete/{ids}")
+    public AjaxResult delete(@PathVariable Long[] ids){
+        return toAjax(equipmentRepairService.deleteSchoolEquipmentRepairById(ids));
+    }
+
+    /**
+     * 根据自编码获取设备信息
+     * @param encode
+     * @return
+     */
+    @GetMapping("/getEquipment/{encode}")
+    public AjaxResult getEquipment(@PathVariable("encode") String encode){
+        return AjaxResult.success(equipmentRepairService.getEquipment(encode));
+    }
+
+    /**
+     * 获取修理人下拉框
+     * @return
+     */
+    @GetMapping("/getRepair")
+    public AjaxResult getRepair(){
+        return AjaxResult.success(equipmentRepairService.getRepair());
+    }
 }
 }

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
+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.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
+import yangtz.cs.liu.campus.service.schoolEquipment.IInStockService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolInStockVo;
 
 
 /**
 /**
  * 设备入库
  * 设备入库
@@ -9,5 +17,29 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
 @RequestMapping("/inStock")
 @RequestMapping("/inStock")
-public class InStockController {
+public class InStockController extends BaseController {
+
+    @Autowired
+    private IInStockService inStockService;
+
+    /**
+     * 查看设备入库列表
+     * @param schoolInStockVo
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolInStockVo schoolInStockVo){
+        startPage();
+        return getDataTable(inStockService.selectSchoolInStockVoList(schoolInStockVo));
+    }
+
+    /**
+     * 查看设备入库详细信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(inStockService.selectSchoolInStockVoById(id));
+    }
 }
 }

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
+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.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
+import yangtz.cs.liu.campus.service.schoolEquipment.IOutStockService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolOutStockVo;
 
 
 /**
 /**
  * 设备出库
  * 设备出库
@@ -9,5 +17,29 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
 @RequestMapping("/outStock")
 @RequestMapping("/outStock")
-public class OutStockController {
+public class OutStockController extends BaseController {
+
+    @Autowired
+    private IOutStockService outStockService;
+
+    /**
+     * 查看设备出库列表
+     * @param schoolOutStockVo
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolOutStockVo schoolOutStockVo){
+        startPage();
+        return getDataTable(outStockService.selectSchoolOutStockVoList(schoolOutStockVo));
+    }
+
+    /**
+     * 查看设备出库详细信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(outStockService.selectSchoolOutStockVoById(id));
+    }
 }
 }

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
+import yangtz.cs.liu.campus.service.schoolEquipment.IProductCategoryService;
 
 
 /**
 /**
  * 产品分类
  * 产品分类
@@ -9,5 +15,87 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
 @RequestMapping("/productCategory")
 @RequestMapping("/productCategory")
-public class ProductCategoryController {
+public class ProductCategoryController extends BaseController {
+
+    @Autowired
+    private IProductCategoryService productCategoryService;
+
+    /**
+     * 查看产品分类列表
+     * @param schoolProductCategory
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolProductCategory schoolProductCategory){
+        return getDataTable(productCategoryService.selectSchoolProductCateGory(schoolProductCategory));
+    }
+
+    /**
+     * 查看产品分类详细信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(productCategoryService.selectSchoolProductCateGoryById(id));
+    }
+
+    /**
+     * 新增产品分类
+     * @param schoolProductCategory
+     * @return
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolProductCategory schoolProductCategory){
+        return toAjax(productCategoryService.insertSchoolProductCategory(schoolProductCategory));
+    }
+
+    /**
+     * 修改产品分类信息
+     * @param schoolProductCategory
+     * @return
+     */
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolProductCategory schoolProductCategory){
+        return toAjax(productCategoryService.updateSchoolProductCategory(schoolProductCategory));
+    }
+
+    /**
+     * 删除产品分类信息
+     * @param ids
+     * @return
+     */
+    @PostMapping("/delete/{ids}")
+    public AjaxResult delete(@PathVariable Long[] ids){
+        return toAjax(productCategoryService.deleteSchoolProductCategory(ids));
+    }
+
+    /**
+     * 获取设备分类下拉框
+     * @param
+     * @return
+     */
+    @GetMapping("/getEquipmentType")
+    public AjaxResult getEquipmentType(SchoolProductCategory schoolProductCategory){
+        return AjaxResult.success(productCategoryService.getEquipmentType(schoolProductCategory));
+    }
+
+    /**
+     * 获取管理员
+     * @return
+     */
+    @GetMapping("/getAdmin")
+    public AjaxResult getAdmin(SchoolProductCategory schoolProductCategory){
+        return AjaxResult.success(productCategoryService.getAdmin(schoolProductCategory));
+    }
+
+    /**
+     * 根据分类编码查询产品分类信息
+     * @param code
+     * @return
+     */
+    @GetMapping("/getEquipmentByCode/{code}")
+    public AjaxResult getEquipmentByCode(@PathVariable("code") String code){
+        return AjaxResult.success(productCategoryService.getEquipmentByCode(code));
+    }
 }
 }

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

 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 package yangtz.cs.liu.campus.controller.SchoolEquipment;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.service.schoolEquipment.IReceiveService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
 
 
 /**
 /**
  * 设备领用
  * 设备领用
@@ -9,5 +15,59 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
 @RequestMapping("/receive")
 @RequestMapping("/receive")
-public class ReceiveController {
+public class ReceiveController extends BaseController {
+
+    @Autowired
+    private IReceiveService receiveService;
+
+    /**
+     * 查看设备领用列表
+     * @param schoolReceiveVo
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolReceiveVo schoolReceiveVo){
+        startPage();
+        return getDataTable(receiveService.selectSchoolReceiveVoList(schoolReceiveVo));
+    }
+
+    /**
+     * 查看设备领用详细信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id){
+        return AjaxResult.success(receiveService.selectSchoolReceiveVoById(id));
+    }
+
+    /**
+     * 新增设备领用
+     * @param schoolReceive
+     * @return
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolReceive schoolReceive){
+        return toAjax(receiveService.insertSchoolReceive(schoolReceive));
+    }
+
+    /**
+     * 修改设备领用
+     * @param schoolReceive
+     * @return
+     */
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolReceive schoolReceive){
+        return toAjax(receiveService.updateSchoolReceive(schoolReceive));
+    }
+
+    /**
+     * 删除设备领用
+     * @param ids
+     * @return
+     */
+    @PostMapping("/delete/{ids}")
+    public AjaxResult delete(@PathVariable Long[] ids){
+        return toAjax(receiveService.deleteSchoolReceiveByIds(ids));
+    }
 }
 }

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

@@ -107,6 +107,17 @@ public class CurriculaStudentController extends BaseController {
                         }
                         }
                     }
                     }
                     studentVo.setSelectedMajorName(selectedMajorName);
                     studentVo.setSelectedMajorName(selectedMajorName);
+                    studentVo.setSelectedMajorSubject(selectedMajorName);
+                }
+            }
+            if (null != studentVo.getSelectedCourse()){
+                if (null != studentVo.getSelectedSubject()){
+                    String selectedSubject = sysDictDataService.selectDictLabel("art_subject",studentVo.getSelectedSubject());
+                    String selectedCourse = sysDictDataService.selectDictLabel("section_type",studentVo.getSelectedCourse());
+                    studentVo.setSelectedMajorSubject(selectedSubject+ "," + selectedCourse);
+                }else {
+                    String selectedCourse = sysDictDataService.selectDictLabel("section_type",studentVo.getSelectedCourse());
+                    studentVo.setSelectedMajorSubject(selectedCourse);
                 }
                 }
             }
             }
         }
         }
@@ -229,7 +240,20 @@ public class CurriculaStudentController extends BaseController {
                         }
                         }
                     }
                     }
                     studentVo.setSelectedMajorName(selectedMajorName);
                     studentVo.setSelectedMajorName(selectedMajorName);
+                    studentVo.setSelectedMajorSubject(studentVo.getSelectedMajorName());
+                }
+            }
+            if (null != studentVo.getSelectedCourse()){
+                if (null != studentVo.getSelectedSubject()){
+                    String selectedSubject = sysDictDataService.selectDictLabel("art_subject",studentVo.getSelectedSubject());
+                    studentVo.setSelectedSubject(selectedSubject);
+                    String selectedCourse = sysDictDataService.selectDictLabel("section_type",studentVo.getSelectedCourse());
+                    studentVo.setSelectedCourse(selectedCourse);
+                    studentVo.setSelectedMajorSubject(studentVo.getSelectedCourse() + "," + studentVo.getSelectedSubject());
                 }
                 }
+                String selectedCourse = sysDictDataService.selectDictLabel("section_type",studentVo.getSelectedCourse());
+                studentVo.setSelectedCourse(selectedCourse);
+                studentVo.setSelectedMajorSubject(studentVo.getSelectedCourse());
             }
             }
         }
         }
         ExcelUtil<CurriculaStudentVo> util = new ExcelUtil<CurriculaStudentVo>(CurriculaStudentVo.class);
         ExcelUtil<CurriculaStudentVo> util = new ExcelUtil<CurriculaStudentVo>(CurriculaStudentVo.class);

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

@@ -16,7 +16,6 @@ import lombok.Data;
 public class SchoolCirculation extends OurBaseEntity
 public class SchoolCirculation extends OurBaseEntity
 {
 {
 
 
-    private Long id;
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;
 
 

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

@@ -14,21 +14,20 @@ import lombok.Data;
 @Data
 @Data
 public class SchoolEncode
 public class SchoolEncode
 {
 {
-    private static final long serialVersionUID = 1L;
 
 
     /** 自编码主键id */
     /** 自编码主键id */
     @TableId(value = "id", type = IdType.AUTO)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long id;
 
 
     /** 业务分类（固定10） */
     /** 业务分类（固定10） */
-    private Integer ywfl;
+    private String ywfl;
 
 
     /** 分类（4位，截取分类编码） */
     /** 分类（4位，截取分类编码） */
-    private Integer fl;
+    private String fl;
 
 
     /** 年（如2023） */
     /** 年（如2023） */
-    private Integer year;
+    private String year;
 
 
     /** 顺序号（5位，如00001） */
     /** 顺序号（5位，如00001） */
-    private Integer orderNumber;
+    private String orderNumber;
 }
 }

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

@@ -5,6 +5,7 @@ import java.util.Date;
 
 
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -21,43 +22,56 @@ public class SchoolEquipmentLedger extends OurBaseEntity
     private String encode;
     private String encode;
 
 
     /** 设备名称 */
     /** 设备名称 */
+    @Excel(name = "设备名称")
     private String equipmentName;
     private String equipmentName;
 
 
     /** 型号 */
     /** 型号 */
+    @Excel(name = "型号")
     private String model;
     private String model;
 
 
     /** 规格 */
     /** 规格 */
+    @Excel(name = "规格")
     private String specification;
     private String specification;
 
 
     /** 分类编码 */
     /** 分类编码 */
+    @Excel(name = "分类编码")
     private String classificationCode;
     private String classificationCode;
 
 
     /** 单位 */
     /** 单位 */
+    @Excel(name = "单位")
     private String unit;
     private String unit;
 
 
     /** 归属类型（1公共区域，2信息中心，3个人） */
     /** 归属类型（1公共区域，2信息中心，3个人） */
+    @Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人")
     private String affiliationType;
     private String affiliationType;
 
 
     /** 设备状态（1完好，2损坏，3报废） */
     /** 设备状态（1完好，2损坏，3报废） */
+    @Excel(name = "设备状态", readConverterExp = "1=完好,2=损坏,3=报废")
     private String equipmentState;
     private String equipmentState;
 
 
     /** 是否允许借出（1是，0否） */
     /** 是否允许借出（1是，0否） */
+    @Excel(name = "是否允许借出", readConverterExp = "1=是,0=否")
     private String isAllowLend;
     private String isAllowLend;
 
 
     /** 是否已借出（1是，0否） */
     /** 是否已借出（1是，0否） */
+    @Excel(name = "是否已借出", readConverterExp = "1=是,0=否")
     private String isLend;
     private String isLend;
 
 
     /** 投产日期 */
     /** 投产日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dateOfProduction;
     private Date dateOfProduction;
 
 
     /** 价格 */
     /** 价格 */
+    @Excel(name = "价格(元)")
     private BigDecimal price;
     private BigDecimal price;
 
 
     /** 效用年限（年） */
     /** 效用年限（年） */
+    @Excel(name = "效用年限(年)")
     private String lifeOfUtility;
     private String lifeOfUtility;
 
 
     /** 地点 */
     /** 地点 */
+    @Excel(name = "地点")
     private String place;
     private String place;
 
 
     /** 使用人id */
     /** 使用人id */
@@ -67,5 +81,6 @@ public class SchoolEquipmentLedger extends OurBaseEntity
     private String useName;
     private String useName;
 
 
     /** 备注 */
     /** 备注 */
+    @Excel(name = "备注")
     private String remark;
     private String remark;
 }
 }

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

@@ -16,7 +16,6 @@ import lombok.Data;
 public class SchoolEquipmentRepair extends OurBaseEntity
 public class SchoolEquipmentRepair extends OurBaseEntity
 {
 {
 
 
-    private Long id;
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;
 
 
@@ -46,7 +45,7 @@ public class SchoolEquipmentRepair extends OurBaseEntity
     private Long repairPhone;
     private Long repairPhone;
 
 
     /** 修理时间 */
     /** 修理时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date repairTime;
     private Date repairTime;
 
 
     /** 修理状态（0已维修，1已损坏） */
     /** 修理状态（0已维修，1已损坏） */

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

 package yangtz.cs.liu.campus.domain.schoolEquipment;
 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 com.core.domain.OurBaseEntity;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -10,8 +13,13 @@ import lombok.Data;
  * @date 2023-08-09
  * @date 2023-08-09
  */
  */
 @Data
 @Data
-public class SchoolProductCategory extends OurBaseEntity
+public class SchoolProductCategory extends BaseEntity
 {
 {
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
 
 
     /** 分类编码 */
     /** 分类编码 */
     private String classificationCode;
     private String classificationCode;

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

 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
 
-@Mapper
+import java.util.List;
+
 public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
 public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
 
 
-  @Select("SELECT sc.id,el.model,el.encode,sc.borrow_by,sc.borrow_time,return_time,sc.deadline,sc.return_equipment_condition ,sc.remark FROM school_circulation sc LEFT JOIN school_equipment_ledger el  on el.id = sc.equipment_id\n"
-      + "  LEFT JOIN  school_product_category pc on pc.classification_code = el.classification_code WHERE pc.admin_id=#{adminId}")
-  List<SchoolCirculationVo> getReturningEquipmentByadminId(@Param("adminId") Long adminId);
+    @Select("SELECT sc.id,el.model,el.encode,sc.borrow_by,sc.borrow_time,return_time,sc.deadline,sc.return_equipment_condition ,sc.remark FROM school_circulation sc LEFT JOIN school_equipment_ledger el  on el.id = sc.equipment_id\n"
+            + "  LEFT JOIN  school_product_category pc on pc.classification_code = el.classification_code WHERE pc.admin_id=#{adminId}")
+    List<SchoolCirculationVo> getReturningEquipmentByadminId(@Param("adminId") Long adminId);
+
+    /**
+     * 查看设备借出归还列表
+     * @param schoolCirculationVo
+     * @return
+     */
+    List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo);
+
+    /**
+     * 查看设备借出归还详细信息
+     * @param id
+     * @return
+     */
+    SchoolCirculationVo selectSchoolCirculationVoById(Long id);
+
+    /**
+     * 删除设备借出归还详细信息
+     * @param ids
+     * @return
+     */
+    int deleteSchoolCirculationByIds(Long[] ids);
 }
 }

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

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

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

@@ -2,6 +2,22 @@ package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
+
+import java.util.List;
 
 
 public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger> {
 public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger> {
+    /**
+     * 查看设备台账列表
+     * @param schoolEquipmentLedgerVo
+     * @return
+     */
+    List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo);
+
+    /**
+     * 批量出库设备信息
+     * @param ids
+     * @return
+     */
+    int outSchoolEquipmentLedger(Long[] ids);
 }
 }

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

 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
 
-@Mapper
+import java.util.List;
+import java.util.Map;
+
 public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> {
 public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> {
 
 
-  @Select("SELECT el.id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n"
-      + "el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,\n"
-      + "er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark\n"
-      + "FROM school_equipment_repair  er LEFT JOIN school_equipment_ledger  el ON er.equipment_id=el.id WHERE er.id=#{id}")
-  public SchoolEquipmentRepairVo getEquipmentById(@Param("id") Long id);
+    @Select("SELECT el.id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n"
+            + "el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,\n"
+            + "er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark\n"
+            + "FROM school_equipment_repair  er LEFT JOIN school_equipment_ledger  el ON er.equipment_id=el.id WHERE er.id=#{id}")
+    public SchoolEquipmentRepairVo getEquipmentById(@Param("id") Long id);
+
+    @Select("SELECT el.id,el.encode,er.repair_name,er.repair_time,er.repair_state\n"
+            + "FROM school_equipment_repair  er LEFT JOIN school_equipment_ledger  el ON er.equipment_id=el.id WHERE er.id=#{id}} ")
+    public SchoolEquipmentRepairVo getfeedback(@Param("id") Long id);
+    /**
+     * 查看设备报修列表
+     * @param schoolEquipmentRepairVo
+     * @return
+     */
+    List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo);
+
+    /**
+     * 查看设备报修详细信息
+     * @param id
+     * @return
+     */
+    SchoolEquipmentRepairVo selectSchoolEquipmentRepairVoById(Long id);
+
+    /**
+     * 根据自编码获取设备信息
+     * @param
+     * @return
+     */
+    Map<String, String> getEquipment(@Param("encode") String encode,@Param("adminId") Long adminId);
 
 
+    /**
+     * 删除设备报修
+     * @param ids
+     * @return
+     */
+    int deleteSchoolEquipmentRepairById(Long[] ids);
 
 
+    /**
+     * 获取修理人下拉框
+     * @return
+     */
+    List<Map<String, String>> getRepair();
 
 
-  @Select("SELECT el.id,el.encode,er.repair_name,er.repair_time,er.repair_state\n"
-      + "FROM school_equipment_repair  er LEFT JOIN school_equipment_ledger  el ON er.equipment_id=el.id WHERE er.id=#{id}} ")
-  public SchoolEquipmentRepairVo getfeedback(@Param("id") Long id);
 }
 }

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

@@ -2,6 +2,22 @@ package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolInStockVo;
+
+import java.util.List;
 
 
 public interface InStockMapper extends BaseMapper<SchoolInStock> {
 public interface InStockMapper extends BaseMapper<SchoolInStock> {
+    /**
+     * 查看设备入库列表
+     * @param schoolInStockVo
+     * @return
+     */
+    List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo);
+
+    /**
+     * 查看设备入库详细信息
+     * @param id
+     * @return
+     */
+    SchoolInStockVo selectSchoolInStockVoById(Long id);
 }
 }

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

@@ -2,6 +2,23 @@ package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolOutStockVo;
+
+import java.util.List;
 
 
 public interface OutStockMapper extends BaseMapper<SchoolOutStock> {
 public interface OutStockMapper extends BaseMapper<SchoolOutStock> {
+
+    /**
+     * 查看设备出库列表
+     * @param schoolOutStockVo
+     * @return
+     */
+    List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo);
+
+    /**
+     * 查看设备出库详细信息
+     * @param id
+     * @return
+     */
+    SchoolOutStockVo selectSchoolOutStockVoById(Long id);
 }
 }

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

 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolProductCategoryVo;
+
+import java.util.List;
+import java.util.Map;
 
 
 public interface ProductCategoryMapper extends BaseMapper<SchoolProductCategory> {
 public interface ProductCategoryMapper extends BaseMapper<SchoolProductCategory> {
+
+    /**
+     * 查询产品分类列表
+     * @param schoolProductCategory
+     * @return
+     */
+    List<SchoolProductCategory> selectSchoolProductCateGory(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 查询产品分类详细信息
+     * @param id
+     * @return
+     */
+    SchoolProductCategoryVo selectSchoolProductCateGoryById(Long id);
+
+    /**
+     * 删除产品分类信息
+     * @param id
+     * @return
+     */
+    int deleteSchoolProductCategory(@Param("id") Long id);
+
+    /**
+     * 获取设备分类下拉框
+     * @param
+     * @return
+     */
+    List<Map<String, String>> getEquipmentType(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 获取管理员
+     * @return
+     */
+    List<Map<String, String>> getAdmin(SchoolProductCategory schoolProductCategory);
 }
 }

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

@@ -2,6 +2,29 @@ package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
+
+import java.util.List;
 
 
 public interface ReceiveMapper extends BaseMapper<SchoolReceive> {
 public interface ReceiveMapper extends BaseMapper<SchoolReceive> {
+    /**
+     * 查看设备领用列表
+     * @param schoolReceiveVo
+     * @return
+     */
+    List<SchoolReceiveVo> selectSchoolReceiveVoList(SchoolReceiveVo schoolReceiveVo);
+
+    /**
+     * 查看设备领用详细信息
+     * @param id
+     * @return
+     */
+    SchoolReceiveVo selectSchoolReceiveVoById(Long id);
+
+    /**
+     * 删除设备领用
+     * @param ids
+     * @return
+     */
+    int deleteSchoolReceiveByIds(Long[] ids);
 }
 }

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

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.CirculationMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.CirculationMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
 import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
 
+import java.util.List;
+
 @Service
 @Service
 public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, SchoolCirculation> implements ICirculationService {
 public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, SchoolCirculation> implements ICirculationService {
 
 
+    @Autowired
+    private CirculationMapper circulationMapper;
+
+    /**
+     * 查看设备借出归还列表
+     * @param schoolCirculationVo
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
+        return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
+    }
+
+    /**
+     * 查看设备借出归还详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolCirculationVo selectSchoolCirculationVoById(Long id) {
+        return circulationMapper.selectSchoolCirculationVoById(id);
+    }
+
+    /**
+     * 新增设备借出归还信息
+     * @param schoolCirculation
+     * @return
+     */
+    @Override
+    @Transactional
+    public int insertSchoolCirculation(SchoolCirculation schoolCirculation) {
+        schoolCirculation.setBorrowTime(DateUtils.getNowDate());
+        return circulationMapper.insert(schoolCirculation);
+    }
+
+    /**
+     * 修改设备借出归还信息
+     * @param schoolCirculation
+     * @return
+     */
+    @Override
+    public int updateSchoolCirculation(SchoolCirculation schoolCirculation) {
+        return circulationMapper.updateById(schoolCirculation);
+    }
+
+    /**
+     * 删除设备借出归还信息
+     * @param ids
+     * @return
+     */
+    @Override
+    public int deleteSchoolCirculationByIds(Long[] ids) {
+        return circulationMapper.deleteSchoolCirculationByIds(ids);
+    }
 
 
-  @Autowired
-  private CirculationMapper schoolCirculationMapper;
-  @Override
-  public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
-    return schoolCirculationMapper.getReturningEquipmentByadminId(userId);
-  }
+    @Override
+    public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
+        return circulationMapper.getReturningEquipmentByadminId(userId);
+    }
 }
 }

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

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
 import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
 
+import java.util.List;
+import java.util.Map;
+
 @Service
 @Service
 public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMapper, SchoolEquipmentRepair> implements IEquipmentRepairService {
 public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMapper, SchoolEquipmentRepair> implements IEquipmentRepairService {
 
 
-  @Autowired
-  EquipmentRepairMapper equipmentRepairMapper;
 
 
+    @Autowired
+    private EquipmentRepairMapper equipmentRepairMapper;
+
+    /**
+     * 查看设备报修列表
+     * @param schoolEquipmentRepairVo
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo) {
+        return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
+    }
+
+    /**
+     * 查看设备报修详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolEquipmentRepairVo selectSchoolEquipmentRepairVoById(Long id) {
+        return equipmentRepairMapper.selectSchoolEquipmentRepairVoById(id);
+    }
+
+    /**
+     * 新增设备报修
+     * @return
+     */
+    @Override
+    @Transactional
+    public int insertSchoolEquipmentRepairVo(SchoolEquipmentRepair schoolEquipmentRepair) {
+        schoolEquipmentRepair.setReportRepairTime(DateUtils.getNowDate());
+        return equipmentRepairMapper.insert(schoolEquipmentRepair);
+    }
+
+    /**
+     * 修改设备报修
+     * @param schoolEquipmentRepair
+     * @return
+     */
+    @Override
+    @Transactional
+    public int updateSchoolEquipmentRepair(SchoolEquipmentRepair schoolEquipmentRepair) {
+        return equipmentRepairMapper.updateById(schoolEquipmentRepair);
+    }
+
+    /**
+     * 删除设备报修
+     * @param ids
+     * @return
+     */
+    @Override
+    @Transactional
+    public int deleteSchoolEquipmentRepairById(Long[] ids) {
+        return equipmentRepairMapper.deleteSchoolEquipmentRepairById(ids);
+    }
+
+    /**
+     * 根据自编码获取设备信息
+     * @param encode
+     * @return
+     */
+    @Override
+    public Map<String, String> getEquipment(String encode) {
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        return equipmentRepairMapper.getEquipment(encode,userId);
+    }
+
+    /**
+     * 获取修理人下拉框
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> getRepair() {
+        return equipmentRepairMapper.getRepair();
+    }
 
 
-  @Override
-  public SchoolEquipmentRepairVo getEquipmentById(Long id) {
-    return equipmentRepairMapper.getEquipmentById(id);
-  }
+    @Override
+    public SchoolEquipmentRepairVo getEquipmentById(Long id) {
+        return equipmentRepairMapper.getEquipmentById(id);
+    }
 
 
-  @Override
-  public SchoolEquipmentRepairVo getfeedback(Long id) {
-    return equipmentRepairMapper.getfeedback(id);
-  }
+    @Override
+    public SchoolEquipmentRepairVo getfeedback(Long id) {
+        return equipmentRepairMapper.getfeedback(id);
+    }
 }
 }

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

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IInStockService;
 import yangtz.cs.liu.campus.service.schoolEquipment.IInStockService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolInStockVo;
+
+import java.util.List;
 
 
 @Service
 @Service
 public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock> implements IInStockService {
 public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock> implements IInStockService {
+
+    @Autowired
+    private InStockMapper inStockMapper;
+
+    /**
+     * 查看设备入库列表
+     * @param schoolInStockVo
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo) {
+        return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
+    }
+
+    /**
+     * 查看设备入库详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolInStockVo selectSchoolInStockVoById(Long id) {
+        return inStockMapper.selectSchoolInStockVoById(id);
+    }
+
+
 }
 }

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

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.OutStockMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.OutStockMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IOutStockService;
 import yangtz.cs.liu.campus.service.schoolEquipment.IOutStockService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolOutStockVo;
+
+import java.util.List;
 
 
 @Service
 @Service
 public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutStock> implements IOutStockService {
 public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutStock> implements IOutStockService {
+
+    @Autowired
+    private OutStockMapper outStockMapper;
+
+    /**
+     * 查看设备出库列表
+     * @param schoolOutStockVo
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo) {
+        return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
+    }
+
+    /**
+     * 查看设备出库详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolOutStockVo selectSchoolOutStockVoById(Long id) {
+        return outStockMapper.selectSchoolOutStockVoById(id);
+    }
 }
 }

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

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 
+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.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.ProductCategoryMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.ProductCategoryMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IProductCategoryService;
 import yangtz.cs.liu.campus.service.schoolEquipment.IProductCategoryService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolProductCategoryVo;
+
+import java.util.List;
+import java.util.Map;
 
 
 @Service
 @Service
 public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMapper, SchoolProductCategory> implements IProductCategoryService {
 public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMapper, SchoolProductCategory> implements IProductCategoryService {
+
+    @Autowired
+    private ProductCategoryMapper productCategoryMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    /**
+     * 查看产品分类列表
+     * @param schoolProductCategory
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<SchoolProductCategory> selectSchoolProductCateGory(SchoolProductCategory schoolProductCategory) {
+        return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
+    }
+
+    /**
+     * 查看产品分类详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolProductCategoryVo selectSchoolProductCateGoryById(Long id) {
+        return productCategoryMapper.selectSchoolProductCateGoryById(id);
+    }
+
+    /**
+     * 新增产品分类
+     * @param schoolProductCategory
+     * @return
+     */
+    @Override
+    @Transactional
+    public int insertSchoolProductCategory(SchoolProductCategory schoolProductCategory) {
+        //父id
+        Long parentId = schoolProductCategory.getParentId();
+        if (null != parentId){
+            SchoolProductCategory schoolProductCategory1 = productCategoryMapper.selectById(parentId);
+            schoolProductCategory.setAncestors(schoolProductCategory1.getAncestors() + "," + parentId);
+        }else {
+            schoolProductCategory.setParentId((long) 0);
+            schoolProductCategory.setAncestors("0");
+        }
+        String[] split = schoolProductCategory.getAncestors().split(",");
+        schoolProductCategory.setRank((long) split.length);
+        String userName = sysUserMapper.selectUserById(schoolProductCategory.getAdminId()).getUserName();
+        schoolProductCategory.setAdmin(userName);
+        return productCategoryMapper.insert(schoolProductCategory);
+    }
+
+    /**
+     * 修改产品分类信息
+     * @param schoolProductCategory
+     * @return
+     */
+    @Override
+    @Transactional
+    public int updateSchoolProductCategory(SchoolProductCategory schoolProductCategory) {
+        return productCategoryMapper.updateById(schoolProductCategory);
+    }
+
+    /**
+     * 删除产品分类信息
+     * @param ids
+     * @return
+     */
+    @Override
+    @Transactional
+    public int deleteSchoolProductCategory(Long[] ids) {
+        int i = 0;
+        for (Long id : ids) {
+            i += productCategoryMapper.deleteSchoolProductCategory(id);
+        }
+        return i;
+    }
+
+    /**
+     * 获取设备分类下拉框
+     * @param
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<Map<String, String>> getEquipmentType(SchoolProductCategory schoolProductCategory) {
+        return productCategoryMapper.getEquipmentType(schoolProductCategory);
+    }
+
+    /**
+     * 获取管理员
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<Map<String, String>> getAdmin(SchoolProductCategory schoolProductCategory) {
+        return productCategoryMapper.getAdmin(schoolProductCategory);
+    }
+
+    /**
+     * 根据分类编码查询产品分类信息
+     * @param code
+     * @return
+     */
+    @Override
+    public SchoolProductCategory getEquipmentByCode(String code) {
+        LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SchoolProductCategory::getClassificationCode,code);
+        return productCategoryMapper.selectOne(wrapper);
+    }
 }
 }

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

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.ReceiveMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.ReceiveMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IReceiveService;
 import yangtz.cs.liu.campus.service.schoolEquipment.IReceiveService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
+
+import java.util.List;
 
 
 @Service
 @Service
 public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive> implements IReceiveService {
 public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive> implements IReceiveService {
+
+    @Autowired
+    private ReceiveMapper receiveMapper;
+
+    /**
+     * 查看设备领用列表
+     * @param schoolReceiveVo
+     * @return
+     */
+    @Override
+    @DataScope(userAlias = "u")
+    public List<SchoolReceiveVo> selectSchoolReceiveVoList(SchoolReceiveVo schoolReceiveVo) {
+        return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
+    }
+
+    /**
+     * 查看设备领用详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolReceiveVo selectSchoolReceiveVoById(Long id) {
+        return receiveMapper.selectSchoolReceiveVoById(id);
+    }
+
+    /**
+     * 新增设备领用
+     * @param schoolReceive
+     * @return
+     */
+    @Override
+    public int insertSchoolReceive(SchoolReceive schoolReceive) {
+        return receiveMapper.insert(schoolReceive);
+    }
+
+    /**
+     * 修改设备领用
+     * @param schoolReceive
+     * @return
+     */
+    @Override
+    public int updateSchoolReceive(SchoolReceive schoolReceive) {
+        return receiveMapper.updateById(schoolReceive);
+    }
+
+    /**
+     * 删除设备领用
+     * @param ids
+     * @return
+     */
+    @Override
+    public int deleteSchoolReceiveByIds(Long[] ids) {
+        return receiveMapper.deleteSchoolReceiveByIds(ids);
+    }
 }
 }

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

 package yangtz.cs.liu.campus.service.schoolEquipment;
 package yangtz.cs.liu.campus.service.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
 
+import java.util.List;
+
 public interface ICirculationService extends IService<SchoolCirculation> {
 public interface ICirculationService extends IService<SchoolCirculation> {
-  List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId);
+    /**
+     * 查看设备借出归还列表
+     * @param schoolCirculationVo
+     * @return
+     */
+    List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo);
+
+    /**
+     * 查看设备借出归还详细信息
+     * @param id
+     * @return
+     */
+    SchoolCirculationVo selectSchoolCirculationVoById(Long id);
+
+    /**
+     * 新增设备借出归还信息
+     * @param schoolCirculation
+     * @return
+     */
+    int insertSchoolCirculation(SchoolCirculation schoolCirculation);
+
+    /**
+     * 修改设备借出归还信息
+     * @param schoolCirculation
+     * @return
+     */
+    int updateSchoolCirculation(SchoolCirculation schoolCirculation);
+
+    /**
+     * 删除设备借出归还信息
+     * @param ids
+     * @return
+     */
+    int deleteSchoolCirculationByIds(Long[] ids);
+
+    List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId);
 }
 }

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

@@ -2,6 +2,63 @@ package yangtz.cs.liu.campus.service.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
+
+import java.util.List;
 
 
 public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger> {
 public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger> {
+
+    /**
+     * 查看设备台账列表
+     * @param schoolEquipmentLedgerVo
+     * @return
+     */
+    List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo);
+
+    /**
+     * 查看设备台账详细信息
+     * @param id
+     * @return
+     */
+    SchoolEquipmentLedger selectSchoolEquipmentLedgerById(Long id);
+
+    /**
+     * 新增设备台账信息
+     * @param schoolEquipmentLedger
+     * @return
+     */
+    int insertSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger);
+
+    /**
+     * 修改设备台账信息
+     * @param schoolEquipmentLedger
+     * @return
+     */
+    int updateSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger);
+
+    /**
+     * 批量出库设备台账信息
+     * @param ids
+     * @return
+     */
+    int outSchoolEquipmentLedger(Long[] ids);
+
+    /**
+     * 生成自编码
+     * @return
+     */
+    String getCode(String code);
+
+    /**
+     * 导入设备台账
+     * @param list
+     * @return
+     */
+    String importExamDetail(List<SchoolEquipmentLedger> list);
+
+    /**
+     * 校验
+     * @param list
+     */
+    void checkImport(List<SchoolEquipmentLedger> list);
 }
 }

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

@@ -4,8 +4,59 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
 
+import java.util.List;
+import java.util.Map;
+
 public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> {
 public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> {
-  public SchoolEquipmentRepairVo getEquipmentById(Long id);
+    /**
+     * 查看设备报修列表
+     * @param schoolEquipmentRepairVo
+     * @return
+     */
+    List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo);
+
+    /**
+     * 查看设备报修详细信息
+     * @param id
+     * @return
+     */
+    SchoolEquipmentRepairVo selectSchoolEquipmentRepairVoById(Long id);
+
+    /**
+     * 新增设备报修
+     * @return
+     */
+    int insertSchoolEquipmentRepairVo(SchoolEquipmentRepair schoolEquipmentRepair);
+
+    /**
+     * 修改设备报修
+     * @param schoolEquipmentRepair
+     * @return
+     */
+    int updateSchoolEquipmentRepair(SchoolEquipmentRepair schoolEquipmentRepair);
+
+    /**
+     * 删除设备报修
+     * @param ids
+     * @return
+     */
+    int deleteSchoolEquipmentRepairById(Long[] ids);
+
+    /**
+     * 根据自编码获取设备信息
+     * @param encode
+     * @return
+     */
+    Map<String,String> getEquipment(String encode);
+
+    /**
+     * 获取修理人下拉框
+     * @return
+     */
+    List<Map<String,String>> getRepair();
+
+    public SchoolEquipmentRepairVo getEquipmentById(Long id);
+
+    public SchoolEquipmentRepairVo getfeedback(Long id);
 
 
-  public SchoolEquipmentRepairVo getfeedback(Long id);
 }
 }

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

@@ -2,6 +2,22 @@ package yangtz.cs.liu.campus.service.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolInStockVo;
+
+import java.util.List;
 
 
 public interface IInStockService extends IService<SchoolInStock> {
 public interface IInStockService extends IService<SchoolInStock> {
+    /**
+     * 查看设备入库列表
+     * @param schoolInStockVo
+     * @return
+     */
+    List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo);
+
+    /**
+     * 查看设备入库详细信息
+     * @param id
+     * @return
+     */
+    SchoolInStockVo selectSchoolInStockVoById(Long id);
 }
 }

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

@@ -2,6 +2,22 @@ package yangtz.cs.liu.campus.service.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolOutStockVo;
+
+import java.util.List;
 
 
 public interface IOutStockService extends IService<SchoolOutStock> {
 public interface IOutStockService extends IService<SchoolOutStock> {
+    /**
+     * 查看设备出库列表
+     * @param schoolOutStockVo
+     * @return
+     */
+    List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo);
+
+    /**
+     * 查看设备出库详细信息
+     * @param id
+     * @return
+     */
+    SchoolOutStockVo selectSchoolOutStockVoById(Long id);
 }
 }

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

@@ -2,6 +2,65 @@ package yangtz.cs.liu.campus.service.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolProductCategoryVo;
+
+import java.util.List;
+import java.util.Map;
 
 
 public interface IProductCategoryService extends IService<SchoolProductCategory> {
 public interface IProductCategoryService extends IService<SchoolProductCategory> {
+
+    /**
+     * 查询产品分类列表
+     * @param schoolProductCategory
+     * @return
+     */
+    List<SchoolProductCategory> selectSchoolProductCateGory(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 查看产品分类详细信息
+     * @param id
+     * @return
+     */
+    SchoolProductCategoryVo selectSchoolProductCateGoryById(Long id);
+
+    /**
+     * 新增产品分类
+     * @param schoolProductCategory
+     * @return
+     */
+    int insertSchoolProductCategory(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 修改产品分类信息
+     * @param schoolProductCategory
+     * @return
+     */
+    int updateSchoolProductCategory(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 删除产品分类信息
+     * @param ids
+     * @return
+     */
+    int deleteSchoolProductCategory(Long[] ids);
+
+    /**
+     * 获取设备分类下拉框
+     * @param
+     * @return
+     */
+    List<Map<String,String>> getEquipmentType(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 获取管理员
+     * @return
+     */
+    List<Map<String,String>> getAdmin(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 根据分类编码查询产品分类信息
+     * @param code
+     * @return
+     */
+    SchoolProductCategory getEquipmentByCode(String code);
 }
 }

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

@@ -2,6 +2,43 @@ package yangtz.cs.liu.campus.service.schoolEquipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
+
+import java.util.List;
 
 
 public interface IReceiveService extends IService<SchoolReceive> {
 public interface IReceiveService extends IService<SchoolReceive> {
+    /**
+     * 查看设备领用列表
+     * @param schoolReceiveVo
+     * @return
+     */
+    List<SchoolReceiveVo> selectSchoolReceiveVoList(SchoolReceiveVo schoolReceiveVo);
+
+    /**
+     * 查看设备领用详细信息
+     * @param id
+     * @return
+     */
+    SchoolReceiveVo selectSchoolReceiveVoById(Long id);
+
+    /**
+     * 新增设备领用
+     * @param schoolReceive
+     * @return
+     */
+    int insertSchoolReceive(SchoolReceive schoolReceive);
+
+    /**
+     * 修改设备领用
+     * @param schoolReceive
+     * @return
+     */
+    int updateSchoolReceive(SchoolReceive schoolReceive);
+
+    /**
+     * 删除设备领用
+     * @param ids
+     * @return
+     */
+    int deleteSchoolReceiveByIds(Long[] ids);
 }
 }

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

@@ -44,9 +44,6 @@ public class CurriculaStudentCjVo {
     /** 已选课程成绩 */
     /** 已选课程成绩 */
     private double courseScore;
     private double courseScore;
     /** 已选课程 */
     /** 已选课程 */
-//    @Excel(name = "已选课程",readConverterExp = "1=物理+政治+化学,2=物理+政治+生物,3=物理+政治+地理,4=物理+政治+历史,5=物理+历史+化学,6=物理+历史+生物,7=物理+地理+化学,8=物理+地理+生物" +
-//            ",9=物理+化学+生物,10=物理+历史+地理,11=化学+政治+地理,12=化学+政治+历史,13=化学+政治+生物,14=化学+历史+地理,15=化学+历史+生物,16=化学+地理+生物,17=生物+政治+地理" +
-//            ",18=生物+历史+地理,19=生物+政治+历史,20=政治+历史+地理")
     private String selectedCourse;
     private String selectedCourse;
     /** 已选专业 */
     /** 已选专业 */
     private String selectedMajor;
     private String selectedMajor;

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

@@ -45,18 +45,20 @@ public class CurriculaStudentVo {
     /** 已选课程成绩 */
     /** 已选课程成绩 */
     private double courseScore;
     private double courseScore;
     /** 已选课程 */
     /** 已选课程 */
-    @Excel(name = "已选课程",readConverterExp = "1=物理+政治+化学,2=物理+政治+生物,3=物理+政治+地理,4=物理+政治+历史,5=物理+历史+化学,6=物理+历史+生物,7=物理+地理+化学,8=物理+地理+生物" +
-            ",9=物理+化学+生物,10=物理+历史+地理,11=化学+政治+地理,12=化学+政治+历史,13=化学+政治+生物,14=化学+历史+地理,15=化学+历史+生物,16=化学+地理+生物,17=生物+政治+地理" +
-            ",18=生物+历史+地理,19=生物+政治+历史,20=政治+历史+地理")
     private String selectedCourse;
     private String selectedCourse;
     /** 已选专业 */
     /** 已选专业 */
     private String selectedMajor;
     private String selectedMajor;
     /** 已选专业名称 */
     /** 已选专业名称 */
-    @Excel(name = "已选专业")
+//    @Excel(name = "已选专业")
     private String selectedMajorName;
     private String selectedMajorName;
     /** 所选科目 */
     /** 所选科目 */
-    @Excel(name = "所选科目",readConverterExp = "1=音乐,2=美术,3=田径,4=舞蹈")
+//    @Excel(name = "所选科目",readConverterExp = "1=音乐,2=美术,3=田径,4=舞蹈")
     private String selectedSubject;
     private String selectedSubject;
+
+    /** 已选专业/课程 */
+    @Excel(name = "已选专业/课程")
+    private String selectedMajorSubject;
+
     /** 所分班级 */
     /** 所分班级 */
     private String divisionClassesName;
     private String divisionClassesName;
     /** 是否删除 */
     /** 是否删除 */

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

@@ -45,9 +45,9 @@ public class CurriculaStudentXjVo {
     @Excel(name = "成绩")
     @Excel(name = "成绩")
     private double courseScore;
     private double courseScore;
     /** 已选课程 */
     /** 已选课程 */
-    @Excel(name = "已选课程",readConverterExp = "1=物理+政治+化学,2=物理+政治+生物,3=物理+政治+地理,4=物理+政治+历史,5=物理+历史+化学,6=物理+历史+生物,7=物理+地理+化学,8=物理+地理+生物" +
-            ",9=物理+化学+生物,10=物理+历史+地理,11=化学+政治+地理,12=化学+政治+历史,13=化学+政治+生物,14=化学+历史+地理,15=化学+历史+生物,16=化学+地理+生物,17=生物+政治+地理" +
-            ",18=生物+历史+地理,19=生物+政治+历史,20=政治+历史+地理")
+    @Excel(name = "已选课程",readConverterExp = "1=物政化,2=物政生,3=物政地,4=物政历,5=物历化,6=物历生,7=物地化,8=物地生" +
+            ",9=物化生,10=物历地,11=化政地,12=化政历,13=化政生,14=化历地,15=化历生,16=化地生,17=生政地" +
+            ",18=生历地,19=生政历,20=政历地")
     private String selectedCourse;
     private String selectedCourse;
     /** 已选专业 */
     /** 已选专业 */
     private String selectedMajor;
     private String selectedMajor;

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

@@ -53,9 +53,9 @@ public class CurriculaStudentYtVo {
     @Excel(name = "所选科目",readConverterExp = "1=音乐,2=美术,3=田径,4=舞蹈")
     @Excel(name = "所选科目",readConverterExp = "1=音乐,2=美术,3=田径,4=舞蹈")
     private String selectedSubject;
     private String selectedSubject;
     /** 已选课程 */
     /** 已选课程 */
-    @Excel(name = "已选课程",readConverterExp = "1=物理+政治+化学,2=物理+政治+生物,3=物理+政治+地理,4=物理+政治+历史,5=物理+历史+化学,6=物理+历史+生物,7=物理+地理+化学,8=物理+地理+生物" +
-            ",9=物理+化学+生物,10=物理+历史+地理,11=化学+政治+地理,12=化学+政治+历史,13=化学+政治+生物,14=化学+历史+地理,15=化学+历史+生物,16=化学+地理+生物,17=生物+政治+地理" +
-            ",18=生物+历史+地理,19=生物+政治+历史,20=政治+历史+地理")
+    @Excel(name = "已选课程",readConverterExp = "1=物政化,2=物政生,3=物政地,4=物政历,5=物历化,6=物历生,7=物地化,8=物地生" +
+            ",9=物化生,10=物历地,11=化政地,12=化政历,13=化政生,14=化历地,15=化历生,16=化地生,17=生政地" +
+            ",18=生历地,19=生政历,20=政历地")
     private String selectedCourse;
     private String selectedCourse;
     /** 所分班级 */
     /** 所分班级 */
 //    @Excel(name = "所分班级")
 //    @Excel(name = "所分班级")

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

@@ -2,8 +2,11 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 
 
@@ -14,9 +17,12 @@ import com.ruoyi.common.annotation.Excel;
  * @date 2023-08-09
  * @date 2023-08-09
  */
  */
 @Data
 @Data
-public class SchoolCirculationVo extends OurBaseEntity
+public class SchoolCirculationVo extends BaseEntity
 {
 {
 
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;
 
 
@@ -33,8 +39,8 @@ public class SchoolCirculationVo extends OurBaseEntity
     private String model;
     private String model;
 
 
     /** 借用日期 */
     /** 借用日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "借用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "借用日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date borrowTime;
     private Date borrowTime;
 
 
     /** 借用人id */
     /** 借用人id */

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

@@ -3,8 +3,11 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 
 
@@ -15,8 +18,10 @@ import com.ruoyi.common.annotation.Excel;
  * @date 2023-08-09
  * @date 2023-08-09
  */
  */
 @Data
 @Data
-public class SchoolEquipmentLedgerVo extends OurBaseEntity
+public class SchoolEquipmentLedgerVo extends BaseEntity
 {
 {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
 
 
     /** 自编码 */
     /** 自编码 */
     @Excel(name = "自编码")
     @Excel(name = "自编码")

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

@@ -2,8 +2,11 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 
 
@@ -14,9 +17,12 @@ import com.ruoyi.common.annotation.Excel;
  * @date 2023-08-09
  * @date 2023-08-09
  */
  */
 @Data
 @Data
-public class SchoolEquipmentRepairVo extends OurBaseEntity
+public class SchoolEquipmentRepairVo extends BaseEntity
 {
 {
 
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;
 
 
@@ -45,8 +51,8 @@ public class SchoolEquipmentRepairVo extends OurBaseEntity
     private String classificationCode;
     private String classificationCode;
 
 
     /** 报修时间 */
     /** 报修时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date reportRepairTime;
     private Date reportRepairTime;
 
 
     /** 报修人id */
     /** 报修人id */
@@ -72,8 +78,8 @@ public class SchoolEquipmentRepairVo extends OurBaseEntity
     private Long repairPhone;
     private Long repairPhone;
 
 
     /** 修理时间 */
     /** 修理时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "修理时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "修理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date repairTime;
     private Date repairTime;
 
 
     /** 修理状态（0已维修，1已损坏） */
     /** 修理状态（0已维修，1已损坏） */

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

@@ -3,8 +3,11 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 
 
@@ -15,9 +18,12 @@ import com.ruoyi.common.annotation.Excel;
  * @date 2023-08-09
  * @date 2023-08-09
  */
  */
 @Data
 @Data
-public class SchoolInStockVo extends OurBaseEntity
+public class SchoolInStockVo extends BaseEntity
 {
 {
 
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;
 
 
@@ -30,6 +36,10 @@ public class SchoolInStockVo extends OurBaseEntity
     @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date inStockTime;
     private Date inStockTime;
 
 
+    /** 自编码 */
+    @Excel(name = "自编码")
+    private String encode;
+
     /** 设备名称 */
     /** 设备名称 */
     @Excel(name = "设备名称")
     @Excel(name = "设备名称")
     private String equipmentName;
     private String equipmentName;

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

@@ -3,6 +3,8 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
@@ -18,6 +20,9 @@ import com.ruoyi.common.annotation.Excel;
 public class SchoolOutStockVo extends OurBaseEntity
 public class SchoolOutStockVo extends OurBaseEntity
 {
 {
 
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;
 
 
@@ -30,6 +35,10 @@ public class SchoolOutStockVo extends OurBaseEntity
     @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date outStockTime;
     private Date outStockTime;
 
 
+    /** 自编码 */
+    @Excel(name = "自编码")
+    private String encode;
+
     /** 设备名称 */
     /** 设备名称 */
     @Excel(name = "设备名称")
     @Excel(name = "设备名称")
     private String equipmentName;
     private String equipmentName;

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

@@ -21,6 +21,9 @@ public class SchoolProductCategoryVo extends OurBaseEntity
     /** 上级分类id */
     /** 上级分类id */
     private Long parentId;
     private Long parentId;
 
 
+    /** 上级分类名称 */
+    private String parentName;
+
     /** 祖级列表 */
     /** 祖级列表 */
     private String ancestors;
     private String ancestors;
 
 

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

@@ -2,8 +2,11 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 
 
@@ -14,8 +17,10 @@ import com.ruoyi.common.annotation.Excel;
  * @date 2023-08-09
  * @date 2023-08-09
  */
  */
 @Data
 @Data
-public class SchoolReceiveVo extends OurBaseEntity
+public class SchoolReceiveVo extends BaseEntity
 {
 {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
 
 
     /** 设备id */
     /** 设备id */
     private Long equipmentId;
     private Long equipmentId;

smart-campus/src/main/resources/mapper/schoolEquipment/CirculationMapper.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.CirculationMapper">
+    <resultMap type="SchoolCirculationVo" id="schoolCirculationVoResult">
+        <result property="id"    column="id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="encode"    column="encode"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="model"    column="model"    />
+        <result property="borrowTime"    column="borrow_time"    />
+        <result property="borrowById"    column="borrow_by_id"    />
+        <result property="borrowBy"    column="borrow_by"    />
+        <result property="purpose"    column="purpose"    />
+        <result property="deadline"    column="deadline"    />
+        <result property="returnTime"    column="return_time"    />
+        <result property="returnEquipmentCondition"    column="return_equipment_condition"    />
+        <result property="receivedById"    column="received_by_id"    />
+        <result property="receivedBy"    column="received_by"    />
+        <result property="yjuseTime"    column="yjuse_time"    />
+        <result property="sjuseTime"    column="sjuse_time"    />
+        <result property="remark"    column="remark"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+
+    <select id="selectSchoolCirculationVoList" parameterType="SchoolCirculationVo" resultMap="schoolCirculationVoResult">
+        SELECT
+            c.id,
+            c.equipment_id,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            c.borrow_time,
+            c.borrow_by_id,
+            c.borrow_by,
+            c.purpose,
+            c.deadline,
+            c.return_time,
+            c.return_equipment_condition,
+            c.received_by_id,
+            c.received_by,
+            c.yjuse_time,
+            c.sjuse_time,
+            c.remark,
+            c.create_by,
+            c.create_time,
+            c.update_by,
+            c.update_time
+        FROM
+            school_circulation c
+            LEFT JOIN school_equipment_ledger el ON c.equipment_id = el.id
+            LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+            LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+            c.del_flag = '0'
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="borrowTime != null and borrowTime != ''">and c.borrow_time = #{borrowTime}</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolCirculationVoById" parameterType="Long" resultMap="schoolCirculationVoResult">
+        SELECT
+            c.id,
+            c.equipment_id,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            c.borrow_time,
+            c.borrow_by_id,
+            c.borrow_by,
+            c.purpose,
+            c.deadline,
+            c.return_time,
+            c.return_equipment_condition,
+            c.received_by_id,
+            c.received_by,
+            c.yjuse_time,
+            c.sjuse_time,
+            c.remark,
+            c.create_by,
+            c.create_time,
+            c.update_by,
+            c.update_time
+        FROM
+            school_circulation c
+            LEFT JOIN school_equipment_ledger el ON c.equipment_id = el.id
+        WHERE
+            c.id = #{id}
+    </select>
+
+    <update id="deleteSchoolCirculationByIds" parameterType="String">
+        update school_circulation set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+</mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentLedgerMapper.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.EquipmentLedgerMapper">
+
+    <resultMap type="SchoolEquipmentLedger" id="schoolEquipmentLedgerResult">
+        <result property="id"    column="id"    />
+        <result property="encode"    column="encode"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="model"    column="model"    />
+        <result property="specification"    column="specification"    />
+        <result property="classificationCode"    column="classification_code"    />
+        <result property="unit"    column="unit"    />
+        <result property="affiliationType"    column="affiliation_type"    />
+        <result property="equipmentState"    column="equipment_state"    />
+        <result property="isAllowLend"    column="is_allow_lend"    />
+        <result property="isLend"    column="is_lend"    />
+        <result property="dateOfProduction"    column="date_of_production"    />
+        <result property="price"    column="price"    />
+        <result property="lifeOfUtility"    column="life_of_utility"    />
+        <result property="place"    column="place"    />
+        <result property="useId"    column="use_id"    />
+        <result property="useName"    column="use_name"    />
+        <result property="remark"    column="remark"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+
+    <select id="selectSchoolEquipmentLedgerList" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult">
+        select el.id,el.encode,el.equipment_name,el.model,el.specification,el.classification_code,el.unit,el.affiliation_type,el.equipment_state,el.is_allow_lend,el.is_lend,el.date_of_production,
+        el.price,el.life_of_utility,el.place,el.use_id,el.use_name,el.remark,el.create_by,el.create_time,el.update_by,el.update_time
+        from school_equipment_ledger el
+        left join school_product_category pc on el.classification_code = pc.classification_code
+        left join sys_user u on pc.admin_id = u.user_id
+        where
+            el.del_flag = '0'
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if>
+        <if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <update id="outSchoolEquipmentLedger" parameterType="String">
+        update school_equipment_ledger set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentRepairMapper.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.EquipmentRepairMapper">
+
+    <resultMap type="SchoolEquipmentRepairVo" id="schoolEquipmentRepairVoResult">
+        <result property="id"    column="id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="encode"    column="encode"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="model"    column="model"    />
+        <result property="dateOfProduction"    column="date_of_production"    />
+        <result property="place"    column="place"    />
+        <result property="classificationCode"    column="classification_code"    />
+        <result property="reportRepairTime"    column="report_repair_time"    />
+        <result property="reportRepairId"    column="report_repair_id"    />
+        <result property="reportRepair"    column="report_repair"    />
+        <result property="problem"    column="problem"    />
+        <result property="repairId"    column="repair_id"    />
+        <result property="repairName"    column="repair_name"    />
+        <result property="repairPhone"    column="repair_phone"    />
+        <result property="repairTime"    column="repair_time"    />
+        <result property="repairState"    column="repair_state"    />
+        <result property="disposeState"    column="dispose_state"    />
+        <result property="evaluate"    column="evaluate"    />
+        <result property="remark"    column="remark"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+
+    <select id="selectSchoolEquipmentRepairVoList" parameterType="SchoolEquipmentRepairVo" resultMap="schoolEquipmentRepairVoResult">
+        SELECT
+            er.id,
+            er.equipment_id,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            el.date_of_production,
+            el.place,
+            el.classification_code,
+            er.report_repair_time,
+            er.report_repair_id,
+            er.report_repair,
+            er.problem,
+            er.repair_id,
+            er.repair_name,
+            er.repair_phone,
+            er.repair_time,
+            er.repair_state,
+            er.dispose_state,
+            er.evaluate,
+            er.remark
+        FROM
+            school_equipment_repair er
+            LEFT JOIN school_equipment_ledger el ON er.equipment_id = el.id
+            LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+            LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+            er.del_flag = '0'
+            <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+            <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+            <if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if>
+            <if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolEquipmentRepairVoById" parameterType="Long" resultMap="schoolEquipmentRepairVoResult">
+        SELECT
+            er.id,
+            er.equipment_id,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            el.date_of_production,
+            el.place,
+            el.classification_code,
+            er.report_repair_time,
+            er.report_repair_id,
+            er.report_repair,
+            er.problem,
+            er.repair_id,
+            er.repair_name,
+            er.repair_phone,
+            er.repair_time,
+            er.repair_state,
+            er.dispose_state,
+            er.evaluate,
+            er.remark
+        FROM
+            school_equipment_repair er
+        LEFT JOIN school_equipment_ledger el ON er.equipment_id = el.id
+        where er.id = #{id}
+    </select>
+
+    <select id="getEquipment" resultType="Map">
+        SELECT
+            id AS equipmentId,
+            encode AS encode,
+            equipment_name AS equipmentName,
+            model AS model,
+            date_of_production AS dateOfProduction,
+            place AS place ,
+            classification_code
+        FROM
+            school_equipment_ledger
+        WHERE
+            encode = #{encode}
+            AND classification_code IN (
+            SELECT
+                classification_code
+            FROM
+                school_product_category
+        WHERE
+            admin_id = #{adminId})
+    </select>
+
+    <update id="deleteSchoolEquipmentRepairById" parameterType="String">
+        update school_equipment_repair set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="getRepair" resultType="Map">
+        SELECT
+            u.user_id as repairId,
+            u.user_name as repairName,
+            u.phonenumber as repairPhone
+        FROM
+            sys_user u
+            LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
+            LEFT JOIN sys_role r ON ur.role_id = r.role_id
+        WHERE
+            r.role_key = "maintain"
+    </select>
+</mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/InStockMapper.xml

@@ -4,5 +4,102 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper">
 <mapper namespace="yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper">
 
 
+    <resultMap type="SchoolInStockVo" id="schoolInStockVoResult">
+        <result property="id"    column="id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="inStockType"    column="in_stock_type"    />
+        <result property="inStockTime"    column="in_stock_time"    />
+        <result property="encode"    column="encode"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="model"    column="model"    />
+        <result property="specification"    column="specification"    />
+        <result property="classificationCode"    column="classification_code"    />
+        <result property="unit"    column="unit"    />
+        <result property="affiliationType"    column="affiliation_type"    />
+        <result property="equipmentState"    column="equipment_state"    />
+        <result property="dateOfProduction"    column="date_of_production"    />
+        <result property="price"    column="price"    />
+        <result property="lifeOfUtility"    column="life_of_utility"    />
+        <result property="place"    column="place"    />
+        <result property="useId"    column="use_id"    />
+        <result property="useName"    column="use_name"    />
+        <result property="remark"    column="remark"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
 
 
+    <select id="selectSchoolInStockVoList" parameterType="SchoolInStockVo" resultMap="schoolInStockVoResult">
+        SELECT
+            i.id,
+            i.equipment_id,
+            i.in_stock_type,
+            i.in_stock_time,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            el.specification,
+            el.classification_code,
+            el.unit,
+            el.affiliation_type,
+            el.equipment_state,
+            el.date_of_production,
+            el.price,
+            el.life_of_utility,
+            el.place,
+            el.use_id,
+            el.use_name,
+            i.remark,
+            i.create_by,
+            i.create_time,
+            i.update_by,
+            i.update_time
+        FROM
+            school_in_stock i
+            LEFT JOIN school_equipment_ledger el ON i.equipment_id = el.id
+            LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+            LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+            i.del_flag = '0'
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
+        <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolInStockVoById" parameterType="Long" resultMap="schoolInStockVoResult">
+        SELECT
+            i.id,
+            i.equipment_id,
+            i.in_stock_type,
+            i.in_stock_time,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            el.specification,
+            el.classification_code,
+            el.unit,
+            el.affiliation_type,
+            el.equipment_state,
+            el.date_of_production,
+            el.price,
+            el.life_of_utility,
+            el.place,
+            el.use_id,
+            el.use_name,
+            i.remark,
+            i.create_by,
+            i.create_time,
+            i.update_by,
+            i.update_time
+        FROM
+            school_in_stock i
+            LEFT JOIN school_equipment_ledger el ON i.equipment_id = el.id
+        WHERE
+            i.id = #{id}
+    </select>
 </mapper>
 </mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/OutStockMapper.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.OutStockMapper">
+
+    <resultMap type="SchoolOutStockVo" id="schoolOutStockVoResult">
+        <result property="id"    column="id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="outStockType"    column="out_stock_type"    />
+        <result property="outStockTime"    column="out_stock_time"    />
+        <result property="encode"    column="encode"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="model"    column="model"    />
+        <result property="specification"    column="specification"    />
+        <result property="classificationCode"    column="classification_code"    />
+        <result property="unit"    column="unit"    />
+        <result property="affiliationType"    column="affiliation_type"    />
+        <result property="equipmentState"    column="equipment_state"    />
+        <result property="dateOfProduction"    column="date_of_production"    />
+        <result property="price"    column="price"    />
+        <result property="lifeOfUtility"    column="life_of_utility"    />
+        <result property="place"    column="place"    />
+        <result property="useId"    column="use_id"    />
+        <result property="useName"    column="use_name"    />
+        <result property="remark"    column="remark"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+
+    <select id="selectSchoolOutStockVoList" parameterType="SchoolOutStockVo" resultMap="schoolOutStockVoResult">
+        SELECT
+            o.id,
+            o.equipment_id,
+            o.out_stock_type,
+            o.out_stock_time,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            el.specification,
+            el.classification_code,
+            el.unit,
+            el.affiliation_type,
+            el.equipment_state,
+            el.date_of_production,
+            el.price,
+            el.life_of_utility,
+            el.place,
+            el.use_id,
+            el.use_name,
+            o.remark,
+            o.create_by,
+            o.create_time,
+            o.update_by,
+            o.update_time
+        FROM
+            school_out_stock o
+            LEFT JOIN school_equipment_ledger el ON o.equipment_id = el.id
+            LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+            LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+            o.del_flag = '0'
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
+        <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolOutStockVoById" parameterType="Long" resultMap="schoolOutStockVoResult">
+        SELECT
+            o.id,
+            o.equipment_id,
+            o.out_stock_type,
+            o.out_stock_time,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            el.specification,
+            el.classification_code,
+            el.unit,
+            el.affiliation_type,
+            el.equipment_state,
+            el.date_of_production,
+            el.price,
+            el.life_of_utility,
+            el.place,
+            el.use_id,
+            el.use_name,
+            o.remark,
+            o.create_by,
+            o.create_time,
+            o.update_by,
+            o.update_time
+        FROM
+            school_out_stock o
+            LEFT JOIN school_equipment_ledger el ON o.equipment_id = el.id
+        WHERE
+            o.id = #{id}
+    </select>
+</mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/ProductCategoryMapper.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.ProductCategoryMapper">
+    <resultMap type="yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory" id="schoolProductCategoryResult">
+        <result property="id"    column="id"    />
+        <result property="classificationCode"    column="classification_code"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="ancestors"    column="ancestors"    />
+        <result property="equipmentType"    column="equipment_type"    />
+        <result property="model"    column="model"    />
+        <result property="rank"    column="rank"    />
+        <result property="orderNum"    column="order_num"    />
+        <result property="adminId"    column="admin_id"    />
+        <result property="admin"    column="admin"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+    <resultMap type="SchoolProductCategoryVo" id="schoolProductCategoryVoResult">
+        <result property="id"    column="id"    />
+        <result property="classificationCode"    column="classification_code"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="parentName"    column="parent_name"    />
+        <result property="ancestors"    column="ancestors"    />
+        <result property="equipmentType"    column="equipment_type"    />
+        <result property="model"    column="model"    />
+        <result property="rank"    column="rank"    />
+        <result property="orderNum"    column="order_num"    />
+        <result property="adminId"    column="admin_id"    />
+        <result property="admin"    column="admin"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+
+    <select id="selectSchoolProductCateGory" parameterType="yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory" resultMap="schoolProductCategoryResult">
+        SELECT
+            pc.id,
+            pc.classification_code,
+            pc.parent_id,
+            pc.ancestors,
+            pc.equipment_type,
+            pc.model,
+            pc.rank,
+            pc.order_num,
+            pc.admin_id,
+            pc.admin,
+            pc.create_by,
+            pc.create_time,
+            pc.update_by,
+            pc.update_time
+        FROM
+            sys_user u
+        LEFT JOIN school_product_category pc ON u.user_id = pc.admin_id
+        WHERE
+            pc.del_flag = '0'
+        <if test="id != null">and (pc.id = #{id} or FIND_IN_SET(#{id},pc.ancestors))</if>
+        <if test="model != null and model != ''">and pc.model like concat('%', #{model}, '%')</if>
+        <if test="classificationCode != null and classificationCode != ''">and pc.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by order_num ASC
+    </select>
+
+    <select id="selectSchoolProductCateGoryById" parameterType="Long" resultMap="schoolProductCategoryVoResult">
+        select pc.id,pc.classification_code,pc.parent_id,(select equipment_type from school_product_category where id = pc.parent_id) as parent_name,
+        pc.ancestors,pc.equipment_type,pc.model,pc.rank,pc.order_num,pc.admin_id,pc.admin,pc.create_by,pc.create_time,pc.update_by,pc.update_time
+        from school_product_category pc where id = #{id}
+    </select>
+
+    <delete id="deleteSchoolProductCategory" parameterType="Long">
+        update school_product_category set del_flag = '1' where id = #{id} or FIND_IN_SET(#{id},ancestors)
+    </delete>
+
+    <select id="getEquipmentType" parameterType="SchoolProductCategory" resultType="Map">
+        select pc.id as id,pc.equipment_type as equipmentType
+        from  sys_user u
+        left join school_product_category pc on pc.admin_id = u.user_id
+        where pc.parent_id = 0 and pc.del_flag = '0'
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="getAdmin" resultType="Map" parameterType="SchoolProductCategory">
+        SELECT
+            u.user_id as adminId,
+            u.user_name as admin
+        FROM
+            sys_user u
+            LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
+            LEFT JOIN sys_role r ON ur.role_id = r.role_id
+        WHERE
+            r.role_key = "productCategoryAdmin"
+        <if test="admin != null and admin != ''">and u.user_name like concat('%', #{admin}, '%')</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+</mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/ReceiveMapper.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.ReceiveMapper">
+
+    <resultMap type="SchoolReceiveVo" id="schoolReceiveVoResult">
+        <result property="id"    column="id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="encode"    column="encode"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="model"    column="model"    />
+        <result property="recipientTime"    column="recipient_time"    />
+        <result property="recipientById"    column="recipient_by_id"    />
+        <result property="recipientBy"    column="recipient_by"    />
+        <result property="returnTime"    column="return_time"    />
+        <result property="returnEquipmentCondition"    column="return_equipment_condition"    />
+        <result property="receivedById"    column="received_by_id"    />
+        <result property="receivedBy"    column="received_by"    />
+        <result property="yjuseTime"    column="yjuse_time"    />
+        <result property="sjuseTime"    column="sjuse_time"    />
+        <result property="remark"    column="remark"    />
+        <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="delFalg"    column="del_flag"    />
+    </resultMap>
+
+    <select id="selectSchoolReceiveVoList" parameterType="SchoolReceiveVo" resultMap="schoolReceiveVoResult">
+        SELECT
+            r.id,
+            r.equipment_id,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            r.recipient_time,
+            r.recipient_by_id,
+            r.recipient_by,
+            r.return_time,
+            r.return_equipment_condition,
+            r.received_by_id,
+            r.received_by,
+            r.yjuse_time,
+            r.sjuse_time,
+            r.remark,
+            r.create_by,
+            r.create_time,
+            r.update_by,
+            r.update_time
+        FROM
+            school_receive r
+            LEFT JOIN school_equipment_ledger el ON r.equipment_id = el.id
+            LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+            LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+            r.del_flag = '0'
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolReceiveVoById" parameterType="Long" resultMap="schoolReceiveVoResult">
+        SELECT
+            r.id,
+            r.equipment_id,
+            el.encode,
+            el.equipment_name,
+            el.model,
+            r.recipient_time,
+            r.recipient_by_id,
+            r.recipient_by,
+            r.return_time,
+            r.return_equipment_condition,
+            r.received_by_id,
+            r.received_by,
+            r.yjuse_time,
+            r.sjuse_time,
+            r.remark,
+            r.create_by,
+            r.create_time,
+            r.update_by,
+            r.update_time
+        FROM
+            school_receive r
+            LEFT JOIN school_equipment_ledger el ON r.equipment_id = el.id
+        WHERE
+            r.id = #{id}
+    </select>
+
+
+    <update id="deleteSchoolReceiveByIds" parameterType="String">
+        update school_receive set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>