7.19新增功能

core-common/src/main/java/com/core/constant/ProcessDefinition.java

@@ -50,4 +50,14 @@ public class ProcessDefinition {
      */
     public static final String PURCHASEREQUEST = "schoolPurchase";
 
+    /**
+     * 礼堂预约申请流程
+     */
+    public static final String AUDITORIUMAPPLY = "auditoriumApply";
+
+    /**
+     * 科室预算申请流程
+     */
+    public static final String DEPARTMENTBUDGET = "departmentBudget";
+
 }

core-common/src/main/java/com/core/constant/ProcessVariables.java

@@ -11,6 +11,21 @@ public class ProcessVariables {
     public static final String APPLYUSER = "applyUser";
 
     /**
+     * 礼堂预约申请分管领导
+     */
+    public static final String LEADERSHIPID = "leadershipId";
+
+    /**
+     * 科室预算申请人
+     */
+    public static final String DEPARTMENTAPPLYUSERID = "departmentApplyUserId";
+
+    /**
+     * 科室预算申请分管领导
+     */
+    public static final String DEPARTMENTUSERID = "departmentUserId";
+
+    /**
      * 教师请假级部/处室主任
      * */
     public static final String HANDUSERID1 = "handUserId1";

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/area/SchoolAreaController.java

@@ -30,7 +30,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/area")
 public class SchoolAreaController extends BaseController {
-
     @Autowired
     private ISchoolAreaService schoolAreaService;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/auditorium/SchoolAuditoriumController.java

+package yangtz.cs.liu.campus.controller.auditorium;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+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.enums.BusinessType;
+import yangtz.cs.liu.activiti.domain.HistoricActivity;
+import yangtz.cs.liu.activiti.service.IProcessService;
+import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium;
+import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave;
+import yangtz.cs.liu.campus.domain.temp.AuditoriumTemplate;
+import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
+import yangtz.cs.liu.campus.domain.temp.TeacherLeaveTemplate;
+import yangtz.cs.liu.campus.service.auditorium.ISchoolAuditoriumService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
+import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
+import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
+import yangtz.cs.liu.wechat.service.api.IWxApiService;
+
+import static com.core.constant.ProcessDefinition.*;
+import static yangtz.cs.liu.campus.constant.ProcessState.*;
+import static yangtz.cs.liu.campus.constant.ProcessState.ZHUYAO;
+
+/**
+ * 学校礼堂预约Controller
+ *
+ * @author ruoyi
+ * @date 2023-06-14
+ */
+@RestController
+@RequestMapping("/auditorium")
+public class SchoolAuditoriumController extends BaseController
+{
+    @Autowired
+    private ISchoolAuditoriumService schoolAuditoriumService;
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private IProcessService processService;
+    @Autowired
+    private ISchoolTeacherService teacherService;
+    @Autowired
+    private IWxApiService wxApiService;
+
+    /**
+     * 查询全部学校礼堂预约列表
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolAuditoriumVo schoolAuditorium)
+    {
+        startPage();
+        List<SchoolAuditoriumVo> list = schoolAuditoriumService.selectSchoolAuditoriumList(schoolAuditorium);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询个人学校礼堂预约列表
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:list')")
+    @GetMapping("/listGr")
+    public TableDataInfo listGr(SchoolAuditoriumVo schoolAuditorium)
+    {
+        startPage();
+        List<SchoolAuditoriumVo> list = schoolAuditoriumService.selectSchoolAuditoriumListGr(schoolAuditorium);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学校礼堂预约列表
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:export')")
+    @Log(title = "学校礼堂预约", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolAuditoriumVo schoolAuditorium)
+    {
+        List<SchoolAuditoriumVo> list = schoolAuditoriumService.selectSchoolAuditoriumList(schoolAuditorium);
+        ExcelUtil<SchoolAuditoriumVo> util = new ExcelUtil<SchoolAuditoriumVo>(SchoolAuditoriumVo.class);
+        util.exportExcel(response, list, "学校礼堂预约数据");
+    }
+
+    /**
+     * 获取学校礼堂预约详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolAuditoriumService.selectSchoolAuditoriumById(id));
+    }
+
+    /**
+     * 新增学校礼堂预约
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:add')")
+    @Log(title = "学校礼堂预约", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolAuditorium schoolAuditorium)
+    {
+        return toAjax(schoolAuditoriumService.insertSchoolAuditorium(schoolAuditorium));
+    }
+
+    /**
+     * 修改学校礼堂预约
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:edit')")
+    @Log(title = "学校礼堂预约", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolAuditorium schoolAuditorium)
+    {
+        return toAjax(schoolAuditoriumService.updateSchoolAuditorium(schoolAuditorium));
+    }
+
+    /**
+     * 删除学校礼堂预约
+     */
+//    @PreAuthorize("@ss.hasPermi('auditorium:auditorium:remove')")
+    @Log(title = "学校礼堂预约", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteByIds/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolAuditoriumService.deleteSchoolAuditoriumByIds(ids));
+    }
+
+    /**
+     * 提交申请
+     */
+    @PostMapping("/submitApply/{id}")
+    public AjaxResult submitApply(@PathVariable("id") Long id){
+        SchoolAuditorium schoolAuditorium = schoolAuditoriumService.getById(id);
+        if (StringUtils.isNull(schoolAuditorium)) {
+            throw new ServiceException("提交申请失败,未查询到相关信息");
+        }
+        String userName = getUsername();
+        schoolAuditorium.setApplyId(getUserId());
+        schoolAuditorium.setApplyName(userName);
+        schoolAuditorium.setApplyDeptId(getDeptId());
+        schoolAuditorium.setApplyTime(DateUtils.getNowDate());
+        schoolAuditoriumService.submitApply(schoolAuditorium, userName, AUDITORIUMAPPLY, new HashMap<>());
+
+        /**发送模板消息到分管领导*/
+        AuditoriumTemplate template = new AuditoriumTemplate();
+        String openId = teacherService.getOpenIdByUserId(schoolAuditorium.getLeadershipId());
+        template.setToUserOpenId(openId);
+        template.setFirst("您好，您有礼堂预约申请等待审批。");
+        template.setApplyUser(schoolAuditorium.getApplyName());
+        template.setContent(schoolAuditorium.getActivityName());
+        template.setApplyTime(schoolAuditorium.getApplyTime());
+        template.setRemark("请您尽快处理。");
+        wxApiService.sendAuditoriumTemplate(template);
+
+        return AjaxResult.success("提交成功");
+    }
+
+    /**
+     * 待办事项列表
+     */
+    @GetMapping("/taskList")
+    public TableDataInfo taskList(SchoolAuditorium entity) {
+        String userId = getUserId().toString();
+        List<SchoolAuditoriumVo> list = schoolAuditoriumService.findTodoTasks(AUDITORIUMAPPLY, entity, userId);
+        return getTaskTable(list, list.size());
+    }
+
+    /**
+     * 已办事项列表
+     */
+    @GetMapping("/taskDoneList")
+    public TableDataInfo taskDoneList(SchoolAuditorium entity) {
+        String userId = getUserId().toString();
+        List<SchoolAuditoriumVo> list = schoolAuditoriumService.findDoneTasks(AUDITORIUMAPPLY, entity, userId);
+        return getTaskTable(list,list.size());
+    }
+
+    /**
+     * 完成任务
+     */
+    @PostMapping("/complete/{taskId}/{instanceId}")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult complete(@PathVariable("taskId") String taskId, @PathVariable("instanceId") String instanceId, @RequestBody Map<String, Object> variables) {
+        processService.completeTask(taskId, instanceId, variables);
+        LambdaQueryWrapper<SchoolAuditorium> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SchoolAuditorium::getInstanceId,instanceId);
+        SchoolAuditorium leave = schoolAuditoriumService.getOne(wrapper);
+        Boolean flag = Boolean.parseBoolean(variables.get("pass").toString());
+
+        /**判断流程是否结束,如果结束则更新礼堂预约状态*/
+        ProcessInstance rpi = runtimeService
+                .createProcessInstanceQuery()//创建流程实例查询对象
+                .processInstanceId(instanceId)
+                .singleResult();
+        //说明流程实例结束了
+        if(rpi==null){
+            if(flag){
+                leave.setState("2");
+            }else {
+                leave.setState("3");
+            }
+            /** 修改任务结果 */
+            schoolAuditoriumService.updateById(leave);
+
+            /**发送模板消息到申请人，审批结果*/
+            LeaveResultTemplate template = new LeaveResultTemplate();
+            template.setFirst("您好，您的礼堂预约申请已回复。");
+            //获取申请人openId
+            String openId = teacherService.getOpenIdByUserId(leave.getApplyId());
+            template.setToUserOpenId(openId);
+            template.setResult(flag ? "已通过" : "已驳回");
+            template.setRemark("审批留言： "+ variables.get("comment"));
+            List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
+            if(StringUtils.isNotNull(list) && list.size() > 0){
+                HistoricActivity activity = list.get(0);
+                template.setAuditTime(activity.getEndTime());
+            }
+            wxApiService.sendLeaveResultTemplate(template);
+
+            return AjaxResult.success("审批完成");
+        }
+        return AjaxResult.success("审批完成");
+    }
+}
\ No newline at end of file

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/purchase/SchoolPurchaseController.java

@@ -323,4 +323,16 @@ public class SchoolPurchaseController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 资金使用明细列表
+     * @param schoolPurchase
+     * @return
+     */
+    @GetMapping("/selectPurchaseList")
+    public TableDataInfo selectPurchaseList(SchoolPurchase schoolPurchase){
+        startPage();
+        List<SchoolPurchaseVo> list = schoolPurchaseService.selectPurchaseList(schoolPurchase);
+        return getDataTable(list);
+    }
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDepartmentBudget/SchoolDepartmentBudgetController.java

+package yangtz.cs.liu.campus.controller.schoolDepartmentBudget;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.activiti.domain.HistoricActivity;
+import yangtz.cs.liu.activiti.service.IProcessService;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget;
+import yangtz.cs.liu.campus.domain.temp.DepartmentBudgetTemplate;
+import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
+import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetService;
+import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
+import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo;
+import yangtz.cs.liu.wechat.service.api.IWxApiService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.core.constant.ProcessDefinition.DEPARTMENTBUDGET;
+
+/**
+ * 科室预算填报Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+@RestController
+@RequestMapping("/departmentBudget")
+public class SchoolDepartmentBudgetController extends BaseController
+{
+    @Autowired
+    private ISchoolDepartmentBudgetService schoolDepartmentBudgetService;
+    @Autowired
+    private IProcessService processService;
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private ISchoolTeacherService teacherService;
+    @Autowired
+    private IWxApiService wxApiService;
+
+    /**
+     * 查询全部科室预算填报列表
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolDepartmentBudget schoolDepartmentBudget)
+    {
+        startPage();
+        List<SchoolDepartmentBudgetVo> list = schoolDepartmentBudgetService.selectSchoolDepartmentBudgetList(schoolDepartmentBudget);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询本单位科室预算填报列表
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:list')")
+    @GetMapping("/listDw")
+    public TableDataInfo listDw(SchoolDepartmentBudget schoolDepartmentBudget)
+    {
+        startPage();
+        List<SchoolDepartmentBudgetVo> list = schoolDepartmentBudgetService.selectSchoolDepartmentBudgetListDw(schoolDepartmentBudget);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出科室预算填报列表
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:export')")
+    @Log(title = "科室预算填报", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolDepartmentBudget schoolDepartmentBudget)
+    {
+        List<SchoolDepartmentBudgetVo> list = schoolDepartmentBudgetService.selectSchoolDepartmentBudgetList(schoolDepartmentBudget);
+        ExcelUtil<SchoolDepartmentBudgetVo> util = new ExcelUtil<SchoolDepartmentBudgetVo>(SchoolDepartmentBudgetVo.class);
+        util.exportExcel(response, list, "科室预算填报数据");
+    }
+
+    /**
+     * 获取科室预算填报详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolDepartmentBudgetService.selectSchoolDepartmentBudgetById(id));
+    }
+
+    /**
+     * 新增科室预算填报
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:add')")
+    @Log(title = "科室预算填报", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolDepartmentBudgetVo schoolDepartmentBudget)
+    {
+        return toAjax(schoolDepartmentBudgetService.insertSchoolDepartmentBudget(schoolDepartmentBudget));
+    }
+
+    /**
+     * 修改科室预算填报
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:edit')")
+    @Log(title = "科室预算填报", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolDepartmentBudgetVo schoolDepartmentBudget)
+    {
+        return toAjax(schoolDepartmentBudgetService.updateSchoolDepartmentBudget(schoolDepartmentBudget));
+    }
+
+    /**
+     * 删除科室预算填报
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudget:budget:remove')")
+    @Log(title = "科室预算填报", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolDepartmentBudgetService.deleteSchoolDepartmentBudgetByIds(ids));
+    }
+
+    /**
+     * 提交申请
+     */
+    @PostMapping("/submitApply/{id}")
+    public AjaxResult submitApply(@PathVariable("id") Long id){
+        SchoolDepartmentBudget schoolDepartmentBudget = schoolDepartmentBudgetService.getById(id);
+        if (StringUtils.isNull(schoolDepartmentBudget)) {
+            throw new ServiceException("提交申请失败,未查询到相关信息");
+        }
+        //获取当前登录用户
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //设置申请人id
+        schoolDepartmentBudget.setApplyId(user.getUserId());
+        //设置申请人
+        schoolDepartmentBudget.setApplyName(user.getUserName());
+        //设置申请时间
+        schoolDepartmentBudget.setApplyTime(DateUtils.getNowDate());
+        String userName = user.getUserName();
+        schoolDepartmentBudgetService.submitApply(schoolDepartmentBudget,userName,DEPARTMENTBUDGET,new HashMap<>());
+
+        /**发送模板消息到分管领导*/
+        DepartmentBudgetTemplate template = new DepartmentBudgetTemplate();
+        String openId = teacherService.getOpenIdByUserId(schoolDepartmentBudget.getLeadershipId());
+        template.setToUserOpenId(openId);
+        template.setFirst("您好，您有科室预算申请等待审批。");
+        template.setApplyUser(schoolDepartmentBudget.getApplyName());
+        template.setContent(schoolDepartmentBudget.getYear() + "年度" + schoolDepartmentBudget.getDeptName() + "预算申请");
+        template.setApplyTime(schoolDepartmentBudget.getApplyTime());
+        template.setRemark("请您尽快处理。");
+        wxApiService.sendDepartmentBudgetTemplate(template);
+        return AjaxResult.success("提交成功");
+    }
+
+    /**
+     * 待办事项列表
+     */
+    @GetMapping("/taskList")
+    public TableDataInfo taskList(SchoolDepartmentBudget entity) {
+        String userId = getUserId().toString();
+        List<SchoolDepartmentBudgetVo> list = schoolDepartmentBudgetService.findTodoTasks(DEPARTMENTBUDGET, entity, userId);
+        return getTaskTable(list, list.size());
+    }
+
+    /**
+     * 已办事项列表
+     */
+    @GetMapping("/taskDoneList")
+    public TableDataInfo taskDoneList(SchoolDepartmentBudget entity) {
+        String userId = getUserId().toString();
+        List<SchoolDepartmentBudgetVo> list = schoolDepartmentBudgetService.findDoneTasks(DEPARTMENTBUDGET, entity, userId);
+        return getTaskTable(list,list.size());
+    }
+
+    /**
+     * 完成任务
+     */
+    @PostMapping("/complete/{taskId}/{instanceId}")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult complete(@PathVariable("taskId") String taskId, @PathVariable("instanceId") String instanceId, @RequestBody Map<String, Object> variables) {
+        processService.completeTask(taskId, instanceId, variables);
+        LambdaQueryWrapper<SchoolDepartmentBudget> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SchoolDepartmentBudget::getInstanceId,instanceId);
+        SchoolDepartmentBudget leave = schoolDepartmentBudgetService.getOne(wrapper);
+        Boolean flag = Boolean.parseBoolean(variables.get("pass").toString());
+
+        /**判断流程是否结束,如果结束则更新礼堂预约状态*/
+        ProcessInstance rpi = runtimeService
+                .createProcessInstanceQuery()//创建流程实例查询对象
+                .processInstanceId(instanceId)
+                .singleResult();
+        //说明流程实例结束了
+        if(rpi==null){
+            if(flag){
+                leave.setState("2");
+            }else {
+                leave.setState("3");
+            }
+            /** 修改任务结果 */
+            schoolDepartmentBudgetService.updateById(leave);
+
+            /**发送模板消息到申请人，审批结果*/
+            LeaveResultTemplate template = new LeaveResultTemplate();
+            template.setFirst("您好，您的科室预算申请已回复。");
+            //获取申请人openId
+            String openId = teacherService.getOpenIdByUserId(leave.getApplyId());
+            template.setToUserOpenId(openId);
+            template.setResult(flag ? "已通过" : "已驳回");
+            template.setRemark("审批留言： "+ variables.get("comment"));
+            List<HistoricActivity> list = processService.selectHistoryList(instanceId,new HistoricActivity());
+            if(StringUtils.isNotNull(list) && list.size() > 0){
+                HistoricActivity activity = list.get(0);
+                template.setAuditTime(activity.getEndTime());
+            }
+            wxApiService.sendLeaveResultTemplate(template);
+
+            return AjaxResult.success("审批完成");
+        }
+        return AjaxResult.success("审批完成");
+    }
+
+    /**
+     * 获取当前登录人信息
+     */
+    @GetMapping("/getUserXx")
+    public AjaxResult getUserXx(){
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Map<String,Object> map = new HashMap<>();
+        map.put("userId",user.getUserId());
+        map.put("userName",user.getUserName());
+        map.put("deptId",user.getDeptId());
+        map.put("deptName",user.getDept().getDeptName());
+        return AjaxResult.success(map);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmxController.java

+package yangtz.cs.liu.campus.controller.schoolDepartmentBudget;
+
+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 yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetProjectmxService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 科室预算填报项目明细Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+@RestController
+@RequestMapping("/departmentBudgetProjectmx")
+public class SchoolDepartmentBudgetProjectmxController extends BaseController
+{
+    @Autowired
+    private ISchoolDepartmentBudgetProjectmxService schoolDepartmentBudgetProjectmxService;
+
+    /**
+     * 查询科室预算填报项目明细列表
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudgetProjectmx:projectmx:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+    {
+        startPage();
+        List<SchoolDepartmentBudgetProjectmx> list = schoolDepartmentBudgetProjectmxService.selectList(schoolDepartmentBudgetProjectmx);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出科室预算填报项目明细列表
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudgetProjectmx:projectmx:export')")
+    @Log(title = "科室预算填报项目明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+    {
+        List<SchoolDepartmentBudgetProjectmx> list = schoolDepartmentBudgetProjectmxService.selectList(schoolDepartmentBudgetProjectmx);
+        ExcelUtil<SchoolDepartmentBudgetProjectmx> util = new ExcelUtil<SchoolDepartmentBudgetProjectmx>(SchoolDepartmentBudgetProjectmx.class);
+        util.exportExcel(response, list, "科室预算填报项目明细数据");
+    }
+
+    /**
+     * 获取科室预算填报项目明细详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('departmentBudgetProjectmx:projectmx:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolDepartmentBudgetProjectmxService.selectSchoolDepartmentBudgetProjectmxById(id));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 新增科室预算填报项目明细
+//     */
+////    @PreAuthorize("@ss.hasPermi('departmentBudgetProjectmx:projectmx:add')")
+//    @Log(title = "科室预算填报项目明细", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+//    {
+//        return toAjax(schoolDepartmentBudgetProjectmxService.insertSchoolDepartmentBudgetProjectmx(schoolDepartmentBudgetProjectmx));
+//    }
+//
+//    /**
+//     * 修改科室预算填报项目明细
+//     */
+////    @PreAuthorize("@ss.hasPermi('departmentBudgetProjectmx:projectmx:edit')")
+//    @Log(title = "科室预算填报项目明细", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+//    {
+//        return toAjax(schoolDepartmentBudgetProjectmxService.updateSchoolDepartmentBudgetProjectmx(schoolDepartmentBudgetProjectmx));
+//    }
+//
+//    /**
+//     * 删除科室预算填报项目明细
+//     */
+////    @PreAuthorize("@ss.hasPermi('departmentBudgetProjectmx:projectmx:remove')")
+//    @Log(title = "科室预算填报项目明细", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(schoolDepartmentBudgetProjectmxService.deleteSchoolDepartmentBudgetProjectmxByIds(ids));
+//    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolStudio/SchoolStudioAppointmentController.java

+package yangtz.cs.liu.campus.controller.schoolStudio;
+
+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 yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudio;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioAppointment;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioAppointmentService;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 录播室预约情况Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@RestController
+@RequestMapping("/studioAppointment")
+public class SchoolStudioAppointmentController extends BaseController
+{
+    @Autowired
+    private ISchoolStudioAppointmentService schoolStudioAppointmentService;
+    @Autowired
+    private ISchoolStudioService schoolStudioService;
+
+    /**
+     * 查询全部录播室预约情况列表
+     */
+//    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolStudioAppointment schoolStudioAppointment)
+    {
+        startPage();
+        List<SchoolStudioAppointment> list = schoolStudioAppointmentService.selectSchoolStudioAppointmentList(schoolStudioAppointment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询个人录播室预约情况列表
+     */
+//    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:listGr')")
+    @GetMapping("/listGr")
+    public TableDataInfo listGr(SchoolStudioAppointment schoolStudioAppointment)
+    {
+        startPage();
+        List<SchoolStudioAppointment> list = schoolStudioAppointmentService.selectSchoolStudioAppointmentListGr(schoolStudioAppointment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出录播室预约情况列表
+     */
+//    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:export')")
+    @Log(title = "录播室预约情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolStudioAppointment schoolStudioAppointment)
+    {
+        List<SchoolStudioAppointment> list = schoolStudioAppointmentService.selectSchoolStudioAppointmentList(schoolStudioAppointment);
+        ExcelUtil<SchoolStudioAppointment> util = new ExcelUtil<SchoolStudioAppointment>(SchoolStudioAppointment.class);
+        util.exportExcel(response, list, "录播室预约情况数据");
+    }
+
+    /**
+     * 获取录播室预约情况详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolStudioAppointmentService.selectSchoolStudioAppointmentById(id));
+    }
+
+    /**
+     * 新增录播室预约
+     */
+//    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:add')")
+    @Log(title = "录播室预约情况", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolStudioAppointment schoolStudioAppointment)
+    {
+        return toAjax(schoolStudioAppointmentService.insertSchoolStudioAppointment(schoolStudioAppointment));
+    }
+
+    /**
+     * 取消录播室预约
+     */
+//    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:edit')")
+    @Log(title = "录播室预约情况", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolStudioAppointment schoolStudioAppointment)
+    {
+        return toAjax(schoolStudioAppointmentService.updateSchoolStudioAppointment(schoolStudioAppointment));
+    }
+
+    /**
+     * 录播室下拉框列表
+     * @return
+     */
+    @GetMapping("/studioList")
+    public TableDataInfo studioList(){
+        SchoolStudio schoolStudio = new SchoolStudio();
+        schoolStudio.setStudioStatu("1");
+        List<SchoolStudio> schoolStudios = schoolStudioService.selectSchoolStudioList(schoolStudio);
+        return getDataTable(schoolStudios);
+    }
+
+//    /**
+//     * 删除录播室预约情况
+//     */
+////    @PreAuthorize("@ss.hasPermi('studioAppointment:appointment:remove')")
+//    @Log(title = "录播室预约情况", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(schoolStudioAppointmentService.deleteSchoolStudioAppointmentByIds(ids));
+//    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolStudio/SchoolStudioController.java

+package yangtz.cs.liu.campus.controller.schoolStudio;
+
+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 yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudio;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 录播室管理Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@RestController
+@RequestMapping("/studio")
+public class SchoolStudioController extends BaseController
+{
+    @Autowired
+    private ISchoolStudioService schoolStudioService;
+
+    /**
+     * 查询录播室管理列表
+     */
+//    @PreAuthorize("@ss.hasPermi('studio:studio:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolStudio schoolStudio)
+    {
+        startPage();
+        List<SchoolStudio> list = schoolStudioService.selectSchoolStudioList(schoolStudio);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出录播室管理列表
+     */
+//    @PreAuthorize("@ss.hasPermi('studio:studio:export')")
+    @Log(title = "录播室管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolStudio schoolStudio)
+    {
+        List<SchoolStudio> list = schoolStudioService.selectSchoolStudioList(schoolStudio);
+        ExcelUtil<SchoolStudio> util = new ExcelUtil<SchoolStudio>(SchoolStudio.class);
+        util.exportExcel(response, list, "录播室管理数据");
+    }
+
+    /**
+     * 获取录播室管理详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('studio:studio:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolStudioService.selectSchoolStudioById(id));
+    }
+
+    /**
+     * 新增录播室管理
+     */
+//    @PreAuthorize("@ss.hasPermi('studio:studio:add')")
+    @Log(title = "录播室管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolStudio schoolStudio)
+    {
+        return toAjax(schoolStudioService.insertSchoolStudio(schoolStudio));
+    }
+
+    /**
+     * 修改录播室管理
+     */
+//    @PreAuthorize("@ss.hasPermi('studio:studio:edit')")
+    @Log(title = "录播室管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolStudio schoolStudio)
+    {
+        return toAjax(schoolStudioService.updateSchoolStudio(schoolStudio));
+    }
+
+    /**
+     * 删除录播室管理
+     */
+//    @PreAuthorize("@ss.hasPermi('studio:studio:remove')")
+    @Log(title = "录播室管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolStudioService.deleteSchoolStudioByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolStudio/SchoolStudioUseController.java

+package yangtz.cs.liu.campus.controller.schoolStudio;
+
+import com.ruoyi.common.core.controller.BaseController;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioUse;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioUseService;
+
+/**
+ * 录播室使用情况Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@RestController
+@RequestMapping("/studioUse")
+public class SchoolStudioUseController extends BaseController
+{
+    @Autowired
+    private ISchoolStudioUseService schoolStudioUseService;
+
+    /**
+     * 查询录播室使用情况
+     * @param schoolStudioUse
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolStudioUse schoolStudioUse){
+        return getDataTable(schoolStudioUseService.selectStudioUse(schoolStudioUse));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 查询录播室使用情况列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('studioUse:use:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SchoolStudioUse schoolStudioUse)
+//    {
+//        startPage();
+//        List<SchoolStudioUse> list = schoolStudioUseService.selectSchoolStudioUseList(schoolStudioUse);
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出录播室使用情况列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('studioUse:use:export')")
+//    @Log(title = "录播室使用情况", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, SchoolStudioUse schoolStudioUse)
+//    {
+//        List<SchoolStudioUse> list = schoolStudioUseService.selectSchoolStudioUseList(schoolStudioUse);
+//        ExcelUtil<SchoolStudioUse> util = new ExcelUtil<SchoolStudioUse>(SchoolStudioUse.class);
+//        util.exportExcel(response, list, "录播室使用情况数据");
+//    }
+//
+//    /**
+//     * 获取录播室使用情况详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('studioUse:use:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(schoolStudioUseService.selectSchoolStudioUseById(id));
+//    }
+//
+//    /**
+//     * 新增录播室使用情况
+//     */
+//    @PreAuthorize("@ss.hasPermi('studioUse:use:add')")
+//    @Log(title = "录播室使用情况", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody SchoolStudioUse schoolStudioUse)
+//    {
+//        return toAjax(schoolStudioUseService.insertSchoolStudioUse(schoolStudioUse));
+//    }
+//
+//    /**
+//     * 修改录播室使用情况
+//     */
+//    @PreAuthorize("@ss.hasPermi('studioUse:use:edit')")
+//    @Log(title = "录播室使用情况", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody SchoolStudioUse schoolStudioUse)
+//    {
+//        return toAjax(schoolStudioUseService.updateSchoolStudioUse(schoolStudioUse));
+//    }
+//
+//    /**
+//     * 删除录播室使用情况
+//     */
+//    @PreAuthorize("@ss.hasPermi('studioUse:use:remove')")
+//    @Log(title = "录播室使用情况", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(schoolStudioUseService.deleteSchoolStudioUseByIds(ids));
+//    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/auditorium/SchoolAuditorium.java

+package yangtz.cs.liu.campus.domain.auditorium;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import yangtz.cs.liu.activiti.domain.ProcessBaseEntity;
+
+/**
+ * 学校礼堂预约对象 school_auditorium
+ *
+ * @author ruoyi
+ * @date 2023-06-14
+ */
+@Data
+public class SchoolAuditorium extends OurBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 礼堂预约id */
+    private Long id;
+
+    /** 流程实例id */
+    private String instanceId;
+
+    /** 活动名称 */
+    private String activityName;
+
+    /** 活动场地 */
+    private String activityArea;
+
+    /** 活动时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date activityTime;
+
+    /** 话筒数量 */
+    private Integer htNumber;
+
+    /** 具体负责人id */
+    private Long specificUserId;
+
+    /** 具体负责人 */
+    private String specificUserName;
+
+    /** 活动人数 */
+    private Long activityNumber;
+
+    /** 预计时长 */
+    private BigDecimal duration;
+
+    /** 是否彩排（1-是，0-否） */
+    private String isRehearsal;
+
+    /** 是否录像（1-是，0-否） */
+    private String isVideo;
+
+    /** 是否直播（1-是，0-否） */
+    private String isLive;
+
+    /** 是否需要大屏（1-是，0-否） */
+    private String isBigScreen;
+
+    /** 其他要求 */
+    private String otherRequirements;
+
+    /** 学校分管领导id */
+    private Long leadershipId;
+
+    /** 学校分管领导 */
+    private String leadershipName;
+
+    /** 审核状态（0-未提交，1-审核中，2-审核通过，3-审核不通过） */
+    private String state;
+
+    /** 审批意见 */
+    private String opinion;
+
+    /** 申请人id */
+    private Long applyId;
+
+    /** 申请人 */
+    private String applyName;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 申请部门id */
+    private Long applyDeptId;
+
+    /** 申请部门 */
+    private String applyDept;
+
+    /** 附件路径 */
+    private String fjlj;
+
+    /** 附件名称 */
+    private String fjmc;
+
+    /** 创建人id */
+    private Long createById;
+
+    /** 修改人id */
+    private Long updateById;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+    public void setActivityName(String activityName)
+    {
+        this.activityName = activityName;
+    }
+
+    public String getActivityName()
+    {
+        return activityName;
+    }
+    public void setActivityArea(String activityArea)
+    {
+        this.activityArea = activityArea;
+    }
+
+    public String getActivityArea()
+    {
+        return activityArea;
+    }
+    public void setActivityTime(Date activityTime)
+    {
+        this.activityTime = activityTime;
+    }
+
+    public Date getActivityTime()
+    {
+        return activityTime;
+    }
+    public void setHtNumber(Integer htNumber)
+    {
+        this.htNumber = htNumber;
+    }
+
+    public Integer getHtNumber()
+    {
+        return htNumber;
+    }
+    public void setSpecificUserId(Long specificUserId)
+    {
+        this.specificUserId = specificUserId;
+    }
+
+    public Long getSpecificUserId()
+    {
+        return specificUserId;
+    }
+    public void setSpecificUserName(String specificUserName)
+    {
+        this.specificUserName = specificUserName;
+    }
+
+    public String getSpecificUserName()
+    {
+        return specificUserName;
+    }
+    public void setActivityNumber(Long activityNumber)
+    {
+        this.activityNumber = activityNumber;
+    }
+
+    public Long getActivityNumber()
+    {
+        return activityNumber;
+    }
+    public void setDuration(BigDecimal duration)
+    {
+        this.duration = duration;
+    }
+
+    public BigDecimal getDuration()
+    {
+        return duration;
+    }
+    public void setIsRehearsal(String isRehearsal)
+    {
+        this.isRehearsal = isRehearsal;
+    }
+
+    public String getIsRehearsal()
+    {
+        return isRehearsal;
+    }
+    public void setIsVideo(String isVideo)
+    {
+        this.isVideo = isVideo;
+    }
+
+    public String getIsVideo()
+    {
+        return isVideo;
+    }
+    public void setIsLive(String isLive)
+    {
+        this.isLive = isLive;
+    }
+
+    public String getIsLive()
+    {
+        return isLive;
+    }
+    public void setIsBigScreen(String isBigScreen)
+    {
+        this.isBigScreen = isBigScreen;
+    }
+
+    public String getIsBigScreen()
+    {
+        return isBigScreen;
+    }
+    public void setOtherRequirements(String otherRequirements)
+    {
+        this.otherRequirements = otherRequirements;
+    }
+
+    public String getOtherRequirements()
+    {
+        return otherRequirements;
+    }
+    public void setLeadershipId(Long leadershipId)
+    {
+        this.leadershipId = leadershipId;
+    }
+
+    public Long getLeadershipId()
+    {
+        return leadershipId;
+    }
+    public void setLeadershipName(String leadershipName)
+    {
+        this.leadershipName = leadershipName;
+    }
+
+    public String getLeadershipName()
+    {
+        return leadershipName;
+    }
+    public void setState(String state)
+    {
+        this.state = state;
+    }
+
+    public String getState()
+    {
+        return state;
+    }
+    public void setOpinion(String opinion)
+    {
+        this.opinion = opinion;
+    }
+
+    public String getOpinion()
+    {
+        return opinion;
+    }
+    public void setApplyId(Long applyId)
+    {
+        this.applyId = applyId;
+    }
+
+    public Long getApplyId()
+    {
+        return applyId;
+    }
+    public void setApplyName(String applyName)
+    {
+        this.applyName = applyName;
+    }
+
+    public String getApplyName()
+    {
+        return applyName;
+    }
+    public void setApplyTime(Date applyTime)
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime()
+    {
+        return applyTime;
+    }
+    public void setApplyDept(String applyDept)
+    {
+        this.applyDept = applyDept;
+    }
+
+    public String getApplyDept()
+    {
+        return applyDept;
+    }
+    public void setFjlj(String fjlj)
+    {
+        this.fjlj = fjlj;
+    }
+
+    public String getFjlj()
+    {
+        return fjlj;
+    }
+    public void setFjmc(String fjmc)
+    {
+        this.fjmc = fjmc;
+    }
+
+    public String getFjmc()
+    {
+        return fjmc;
+    }
+    public void setCreateById(Long createById)
+    {
+        this.createById = createById;
+    }
+
+    public Long getCreateById()
+    {
+        return createById;
+    }
+    public void setUpdateById(Long updateById)
+    {
+        this.updateById = updateById;
+    }
+
+    public Long getUpdateById()
+    {
+        return updateById;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("activityName", getActivityName())
+                .append("activityArea", getActivityArea())
+                .append("activityTime", getActivityTime())
+                .append("htNumber", getHtNumber())
+                .append("specificUserId", getSpecificUserId())
+                .append("specificUserName", getSpecificUserName())
+                .append("activityNumber", getActivityNumber())
+                .append("duration", getDuration())
+                .append("isRehearsal", getIsRehearsal())
+                .append("isVideo", getIsVideo())
+                .append("isLive", getIsLive())
+                .append("isBigScreen", getIsBigScreen())
+                .append("otherRequirements", getOtherRequirements())
+                .append("leadershipId", getLeadershipId())
+                .append("leadershipName", getLeadershipName())
+                .append("state", getState())
+                .append("opinion", getOpinion())
+                .append("applyId", getApplyId())
+                .append("applyName", getApplyName())
+                .append("applyTime", getApplyTime())
+                .append("applyDept", getApplyDept())
+                .append("fjlj", getFjlj())
+                .append("fjmc", getFjmc())
+                .append("createById", getCreateById())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateById", getUpdateById())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolDepartmentBudget/SchoolDepartmentBudget.java

+package yangtz.cs.liu.campus.domain.schoolDepartmentBudget;
+
+import java.util.List;
+import java.util.Date;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 科室预算填报对象 school_department_budget
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+@Data
+public class SchoolDepartmentBudget extends OurBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 科室预算填报主键id */
+    private Long id;
+
+    /** 流程实例id */
+    private String instanceId;
+
+    /** 年度 */
+    private String year;
+
+    /** 科室id */
+    private Long deptId;
+
+    /** 科室名称 */
+    private String deptName;
+
+    /** 填报人id */
+    private Long informantId;
+
+    /** 填报人名称 */
+    private String informant;
+
+    /** 分管领导id */
+    private Long leadershipId;
+
+    /** 分管领导名称 */
+    private String leadershipName;
+
+    /** 填报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date tbTime;
+
+    /** 审核状态（0-未提交，1-分管领导审核，2-审核通过，3-审核不通过） */
+    private String state;
+
+    /** 申请人id */
+    private Long applyId;
+
+    /** 申请人 */
+    private String applyName;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 创建人id */
+    private Long createById;
+
+    /** 修改人id */
+    private Long updateById;
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setInstanceId(String instanceId)
+    {
+        this.instanceId = instanceId;
+    }
+
+    public String getInstanceId()
+    {
+        return instanceId;
+    }
+    public void setYear(String year)
+    {
+        this.year = year;
+    }
+
+    public String getYear()
+    {
+        return year;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+    public void setInformantId(Long informantId)
+    {
+        this.informantId = informantId;
+    }
+
+    public Long getInformantId()
+    {
+        return informantId;
+    }
+    public void setInformant(String informant)
+    {
+        this.informant = informant;
+    }
+
+    public String getInformant()
+    {
+        return informant;
+    }
+    public void setLeadershipId(Long leadershipId)
+    {
+        this.leadershipId = leadershipId;
+    }
+
+    public Long getLeadershipId()
+    {
+        return leadershipId;
+    }
+    public void setLeadershipName(String leadershipName)
+    {
+        this.leadershipName = leadershipName;
+    }
+
+    public String getLeadershipName()
+    {
+        return leadershipName;
+    }
+    public void setTbTime(Date tbTime)
+    {
+        this.tbTime = tbTime;
+    }
+
+    public Date getTbTime()
+    {
+        return tbTime;
+    }
+    public void setState(String state)
+    {
+        this.state = state;
+    }
+
+    public String getState()
+    {
+        return state;
+    }
+    public void setCreateById(Long createById)
+    {
+        this.createById = createById;
+    }
+
+    public Long getCreateById()
+    {
+        return createById;
+    }
+    public void setUpdateById(Long updateById)
+    {
+        this.updateById = updateById;
+    }
+
+    public Long getUpdateById()
+    {
+        return updateById;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("instanceId", getInstanceId())
+                .append("year", getYear())
+                .append("deptId", getDeptId())
+                .append("deptName", getDeptName())
+                .append("informantId", getInformantId())
+                .append("informant", getInformant())
+                .append("leadershipId", getLeadershipId())
+                .append("leadershipName", getLeadershipName())
+                .append("tbTime", getTbTime())
+                .append("state", getState())
+                .append("createById", getCreateById())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateById", getUpdateById())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmx.java

+package yangtz.cs.liu.campus.domain.schoolDepartmentBudget;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 科室预算填报项目明细对象 school_department_budget_projectmx
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+public class SchoolDepartmentBudgetProjectmx extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 科室预算填报明细主键id */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String year;
+
+    /** 科室id */
+    private Long deptId;
+
+    /** 科室名称 */
+    @Excel(name = "科室")
+    private String deptName;
+
+    /** 科室预算填报id */
+    private Long departmentBudgetId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 申报政策依据、理由及主要内容 */
+    @Excel(name = "申报政策依据、理由及主要内容")
+    private String content;
+
+    /** 项目支出明细 */
+    @Excel(name = "项目明细")
+    private String projectExpenditures;
+
+    /** 申请总额（万元） */
+    @Excel(name = "申请总额（万元）")
+    private BigDecimal applyMoney;
+
+    /** 是否政府采购（1-是，0-否） */
+    @Excel(name = "是否政府采购", readConverterExp = "1=-是，0-否")
+    private String isGovernmentPurchase;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 填报人id */
+    private Long informantId;
+
+    /** 填报人名称 */
+    private String informant;
+
+    /** 分管领导id */
+    private Long leadershipId;
+
+    /** 分管领导名称 */
+    private String leadershipName;
+
+    public Long getInformantId() {
+        return informantId;
+    }
+
+    public void setInformantId(Long informantId) {
+        this.informantId = informantId;
+    }
+
+    public String getInformant() {
+        return informant;
+    }
+
+    public void setInformant(String informant) {
+        this.informant = informant;
+    }
+
+    public Long getLeadershipId() {
+        return leadershipId;
+    }
+
+    public void setLeadershipId(Long leadershipId) {
+        this.leadershipId = leadershipId;
+    }
+
+    public String getLeadershipName() {
+        return leadershipName;
+    }
+
+    public void setLeadershipName(String leadershipName) {
+        this.leadershipName = leadershipName;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDepartmentBudgetId(Long departmentBudgetId)
+    {
+        this.departmentBudgetId = departmentBudgetId;
+    }
+
+    public Long getDepartmentBudgetId()
+    {
+        return departmentBudgetId;
+    }
+    public void setProjectName(String projectName)
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setProjectExpenditures(String projectExpenditures)
+    {
+        this.projectExpenditures = projectExpenditures;
+    }
+
+    public String getProjectExpenditures()
+    {
+        return projectExpenditures;
+    }
+    public void setIsGovernmentPurchase(String isGovernmentPurchase)
+    {
+        this.isGovernmentPurchase = isGovernmentPurchase;
+    }
+
+    public String getIsGovernmentPurchase()
+    {
+        return isGovernmentPurchase;
+    }
+    public void setApplyMoney(BigDecimal applyMoney)
+    {
+        this.applyMoney = applyMoney;
+    }
+
+    public BigDecimal getApplyMoney()
+    {
+        return applyMoney;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("departmentBudgetId", getDepartmentBudgetId())
+                .append("projectName", getProjectName())
+                .append("content", getContent())
+                .append("projectExpenditures", getProjectExpenditures())
+                .append("isGovernmentPurchase", getIsGovernmentPurchase())
+                .append("applyMoney", getApplyMoney())
+                .append("remark", getRemark())
+                .toString();
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolStudio/SchoolStudio.java

+package yangtz.cs.liu.campus.domain.schoolStudio;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 录播室管理对象 school_studio
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public class SchoolStudio extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 录播室主键id */
+    private Long id;
+
+    /** 录播室简称 */
+    @Excel(name = "录播室简称")
+    private String studioName;
+
+    /** 录播室地点 */
+    @Excel(name = "录播室地点")
+    private String studioArea;
+
+    /** 录播室状态（1-启用，2禁用） */
+    @Excel(name = "录播室状态", readConverterExp = "1-启用，2-禁用")
+    private String studioStatu;
+
+    /** 创建人id */
+    @Excel(name = "创建人id")
+    private Long createById;
+
+    /** 修改人id */
+    @Excel(name = "修改人id")
+    private Long updateById;
+
+    /** 删除状态（1-已删除，0-未删除） */
+    @Excel(name = "删除状态", readConverterExp = "1=-已删除，0-未删除")
+    private String delFlg;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setStudioName(String studioName)
+    {
+        this.studioName = studioName;
+    }
+
+    public String getStudioName()
+    {
+        return studioName;
+    }
+    public void setStudioArea(String studioArea)
+    {
+        this.studioArea = studioArea;
+    }
+
+    public String getStudioArea()
+    {
+        return studioArea;
+    }
+    public void setStudioStatu(String studioStatu)
+    {
+        this.studioStatu = studioStatu;
+    }
+
+    public String getStudioStatu()
+    {
+        return studioStatu;
+    }
+    public void setCreateById(Long createById)
+    {
+        this.createById = createById;
+    }
+
+    public Long getCreateById()
+    {
+        return createById;
+    }
+    public void setUpdateById(Long updateById)
+    {
+        this.updateById = updateById;
+    }
+
+    public Long getUpdateById()
+    {
+        return updateById;
+    }
+    public void setDelFlg(String delFlg)
+    {
+        this.delFlg = delFlg;
+    }
+
+    public String getDelFlg()
+    {
+        return delFlg;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("studioName", getStudioName())
+                .append("studioArea", getStudioArea())
+                .append("studioStatu", getStudioStatu())
+                .append("createById", getCreateById())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateById", getUpdateById())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("delFlg", getDelFlg())
+                .toString();
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolStudio/SchoolStudioAppointment.java

+package yangtz.cs.liu.campus.domain.schoolStudio;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 录播室预约情况对象 school_studio_appointment
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public class SchoolStudioAppointment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 录播室预约主键id */
+    private Long id;
+
+    /** 录播室id */
+    @Excel(name = "录播室id")
+    private Long studioId;
+
+    /** 录播室名称 */
+    @Excel(name = "录播室名称")
+    private String studioName;
+
+    /** 预约日期 */
+    @Excel(name = "预约日期", width = 30)
+    private String appointmentTime;
+
+    /** 预约节次 */
+    @Excel(name = "预约节次")
+    private String appointmentJc;
+
+    /** 录播内容 */
+    @Excel(name = "录播内容")
+    private String studioContent;
+
+    /** 预约人id */
+    @Excel(name = "预约人id")
+    private Long appointmentUserId;
+
+    /** 预约人 */
+    @Excel(name = "预约人")
+    private String appointmentUserName;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 状态（1-预约成功，2-已取消） */
+    @Excel(name = "状态", readConverterExp = "1-预约成功，2-已取消")
+    private String statu;
+
+    private String startTime;
+
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setStudioId(Long studioId)
+    {
+        this.studioId = studioId;
+    }
+
+    public Long getStudioId()
+    {
+        return studioId;
+    }
+    public void setStudioName(String studioName)
+    {
+        this.studioName = studioName;
+    }
+
+    public String getStudioName()
+    {
+        return studioName;
+    }
+    public void setAppointmentTime(String appointmentTime)
+    {
+        this.appointmentTime = appointmentTime;
+    }
+
+    public String getAppointmentTime()
+    {
+        return appointmentTime;
+    }
+    public void setAppointmentJc(String appointmentJc)
+    {
+        this.appointmentJc = appointmentJc;
+    }
+
+    public String getAppointmentJc()
+    {
+        return appointmentJc;
+    }
+    public void setStudioContent(String studioContent)
+    {
+        this.studioContent = studioContent;
+    }
+
+    public String getStudioContent()
+    {
+        return studioContent;
+    }
+    public void setAppointmentUserId(Long appointmentUserId)
+    {
+        this.appointmentUserId = appointmentUserId;
+    }
+
+    public Long getAppointmentUserId()
+    {
+        return appointmentUserId;
+    }
+    public void setAppointmentUserName(String appointmentUserName)
+    {
+        this.appointmentUserName = appointmentUserName;
+    }
+
+    public String getAppointmentUserName()
+    {
+        return appointmentUserName;
+    }
+    public void setApplyTime(Date applyTime)
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime()
+    {
+        return applyTime;
+    }
+    public void setStatu(String statu)
+    {
+        this.statu = statu;
+    }
+
+    public String getStatu()
+    {
+        return statu;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("studioId", getStudioId())
+                .append("studioName", getStudioName())
+                .append("appointmentTime", getAppointmentTime())
+                .append("appointmentJc", getAppointmentJc())
+                .append("studioContent", getStudioContent())
+                .append("appointmentUserId", getAppointmentUserId())
+                .append("appointmentUserName", getAppointmentUserName())
+                .append("applyTime", getApplyTime())
+                .append("statu", getStatu())
+                .toString();
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolStudio/SchoolStudioUse.java

+package yangtz.cs.liu.campus.domain.schoolStudio;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 录播室使用情况对象 school_studio_use
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public class SchoolStudioUse extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 录播室使用情况主键id */
+    private Long id;
+
+    /** 预约id */
+    @Excel(name = "预约id")
+    private Long appointmentId;
+
+    /** 录播室id */
+    @Excel(name = "录播室id")
+    private Long studioId;
+
+    /** 录播室名称 */
+    @Excel(name = "录播室名称")
+    private String studioName;
+
+    /** 使用日期 */
+    @Excel(name = "使用日期", width = 30)
+    private String useDate;
+
+    /** 使用节次 */
+    @Excel(name = "使用节次")
+    private String useJc;
+
+    /** 使用人id */
+    @Excel(name = "使用人id")
+    private Long useUserId;
+
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private String useUserName;
+
+    /** 开始时间 */
+    private String startTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getAppointmentId() {
+        return appointmentId;
+    }
+    public void setAppointmentId(Long appointmentId) {
+        this.appointmentId = appointmentId;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setStudioId(Long studioId)
+    {
+        this.studioId = studioId;
+    }
+
+    public Long getStudioId()
+    {
+        return studioId;
+    }
+    public void setStudioName(String studioName)
+    {
+        this.studioName = studioName;
+    }
+
+    public String getStudioName()
+    {
+        return studioName;
+    }
+    public void setUseDate(String useDate)
+    {
+        this.useDate = useDate;
+    }
+
+    public String getUseDate()
+    {
+        return useDate;
+    }
+    public void setUseJc(String useJc)
+    {
+        this.useJc = useJc;
+    }
+
+    public String getUseJc()
+    {
+        return useJc;
+    }
+    public void setUseUserId(Long useUserId)
+    {
+        this.useUserId = useUserId;
+    }
+
+    public Long getUseUserId()
+    {
+        return useUserId;
+    }
+    public void setUseUserName(String useUserName)
+    {
+        this.useUserName = useUserName;
+    }
+
+    public String getUseUserName()
+    {
+        return useUserName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("studioId", getStudioId())
+                .append("studioName", getStudioName())
+                .append("useDate", getUseDate())
+                .append("useJc", getUseJc())
+                .append("useUserId", getUseUserId())
+                .append("useUserName", getUseUserName())
+                .toString();
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/temp/AuditoriumTemplate.java

+package yangtz.cs.liu.campus.domain.temp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AuditoriumTemplate {
+    private String first;
+    /**
+     * 目标客户
+     */
+    private String toUserOpenId;
+    //申请人
+    private String applyUser;
+    //活动名称
+    private String content;
+    //申请时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date applyTime;
+    //备注
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/temp/DepartmentBudgetTemplate.java

+package yangtz.cs.liu.campus.domain.temp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DepartmentBudgetTemplate {
+    private String first;
+    /**
+     * 目标客户
+     */
+    private String toUserOpenId;
+    //申请人
+    private String applyUser;
+    //科室预算
+    private String content;
+    //申请时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date applyTime;
+    //备注
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/auditorium/SchoolAuditoriumMapper.java

+package yangtz.cs.liu.campus.mapper.auditorium;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium;
+import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
+
+import java.util.List;
+
+/**
+ * 学校礼堂预约Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-06-14
+ */
+public interface SchoolAuditoriumMapper extends BaseMapper<SchoolAuditorium>
+{
+    /**
+     * 查询学校礼堂预约
+     *
+     * @param id 学校礼堂预约主键
+     * @return 学校礼堂预约
+     */
+    public SchoolAuditoriumVo selectSchoolAuditoriumById(Long id);
+
+    /**
+     * 查询学校礼堂预约列表
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 学校礼堂预约集合
+     */
+    public List<SchoolAuditoriumVo> selectSchoolAuditoriumList(SchoolAuditoriumVo schoolAuditorium);
+
+    /**
+     * 查询个人学校礼堂预约列表
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 学校礼堂预约集合
+     */
+    public List<SchoolAuditoriumVo> selectSchoolAuditoriumListGr(SchoolAuditoriumVo schoolAuditorium);
+
+    /**
+     * 新增学校礼堂预约
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 结果
+     */
+    public int insertSchoolAuditorium(SchoolAuditorium schoolAuditorium);
+
+    /**
+     * 修改学校礼堂预约
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 结果
+     */
+    public int updateSchoolAuditorium(SchoolAuditorium schoolAuditorium);
+
+    /**
+     * 删除学校礼堂预约
+     *
+     * @param id 学校礼堂预约主键
+     * @return 结果
+     */
+    public int deleteSchoolAuditoriumById(Long id);
+
+    /**
+     * 批量删除学校礼堂预约
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAuditoriumByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/purchase/SchoolPurchaseMapper.java

@@ -17,4 +17,6 @@ public interface SchoolPurchaseMapper extends BaseMapper<SchoolPurchase> {
  List<SchoolPurchase> findPurchaseName(@Param("handUserId") Long handUserId);
 
  List<SchoolPurchaseVo> queryList(@Param("submitState") String submitState,@Param("entity") SchoolPurchase schoolPurchase);
+
+ List<SchoolPurchaseVo> selectPurchaseList(@Param("entity") SchoolPurchase schoolPurchase);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetMapper.java

+package yangtz.cs.liu.campus.mapper.schoolDepartmentBudget;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo;
+
+import java.util.List;
+
+/**
+ * 科室预算填报Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+public interface SchoolDepartmentBudgetMapper extends BaseMapper<SchoolDepartmentBudget>
+{
+    /**
+     * 查询科室预算填报
+     *
+     * @param id 科室预算填报主键
+     * @return 科室预算填报
+     */
+    public SchoolDepartmentBudgetVo selectSchoolDepartmentBudgetById(Long id);
+
+    /**
+     * 查询科室预算填报列表
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 科室预算填报集合
+     */
+    public List<SchoolDepartmentBudgetVo> selectSchoolDepartmentBudgetList(SchoolDepartmentBudget schoolDepartmentBudget);
+
+    /**
+     * 新增科室预算填报
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 结果
+     */
+    public int insertSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget);
+
+    /**
+     * 修改科室预算填报
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 结果
+     */
+    public int updateSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget);
+
+    /**
+     * 删除科室预算填报
+     *
+     * @param id 科室预算填报主键
+     * @return 结果
+     */
+    public int deleteSchoolDepartmentBudgetById(Long id);
+
+    /**
+     * 批量删除科室预算填报
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolDepartmentBudgetByIds(Long[] ids);
+
+    /**
+     * 批量删除科室预算填报项目明细
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetIds(Long[] ids);
+
+    /**
+     * 批量新增科室预算填报项目明细
+     *
+     * @param schoolDepartmentBudgetProjectmxList 科室预算填报项目明细列表
+     * @return 结果
+     */
+    public int batchSchoolDepartmentBudgetProjectmx(List<SchoolDepartmentBudgetProjectmx> schoolDepartmentBudgetProjectmxList);
+
+
+    /**
+     * 通过科室预算填报主键删除科室预算填报项目明细信息
+     *
+     * @param id 科室预算填报ID
+     * @return 结果
+     */
+    public int deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetId(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmxMapper.java

+package yangtz.cs.liu.campus.mapper.schoolDepartmentBudget;
+
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+
+import java.util.List;
+
+/**
+ * 科室预算填报项目明细Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+@Repository
+public interface SchoolDepartmentBudgetProjectmxMapper
+{
+    /**
+     * 查询科室预算填报项目明细
+     *
+     * @param id 科室预算填报项目明细主键
+     * @return 科室预算填报项目明细
+     */
+    public SchoolDepartmentBudgetProjectmx selectSchoolDepartmentBudgetProjectmxById(Long id);
+
+    /**
+     * 查询科室预算填报项目明细列表
+     *
+     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+     * @return 科室预算填报项目明细集合
+     */
+    public List<SchoolDepartmentBudgetProjectmx> selectList(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 查询科室预算填报项目明细列表
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 科室预算填报项目明细集合
+//     */
+//    public List<SchoolDepartmentBudgetProjectmx> selectSchoolDepartmentBudgetProjectmxList(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+
+//    /**
+//     * 新增科室预算填报项目明细
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 结果
+//     */
+//    public int insertSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+//
+//    /**
+//     * 修改科室预算填报项目明细
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 结果
+//     */
+//    public int updateSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+//
+//    /**
+//     * 删除科室预算填报项目明细
+//     *
+//     * @param id 科室预算填报项目明细主键
+//     * @return 结果
+//     */
+//    public int deleteSchoolDepartmentBudgetProjectmxById(Long id);
+//
+//    /**
+//     * 批量删除科室预算填报项目明细
+//     *
+//     * @param ids 需要删除的数据主键集合
+//     * @return 结果
+//     */
+//    public int deleteSchoolDepartmentBudgetProjectmxByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolStudio/SchoolStudioAppointmentMapper.java

+package yangtz.cs.liu.campus.mapper.schoolStudio;
+
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioAppointment;
+
+import java.util.List;
+
+/**
+ * 录播室预约情况Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@Repository
+public interface SchoolStudioAppointmentMapper
+{
+    /**
+     * 查询录播室预约情况
+     *
+     * @param id 录播室预约情况主键
+     * @return 录播室预约情况
+     */
+    public SchoolStudioAppointment selectSchoolStudioAppointmentById(Long id);
+
+    /**
+     * 查询录播室预约情况列表
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 录播室预约情况集合
+     */
+    public List<SchoolStudioAppointment> selectSchoolStudioAppointmentList(SchoolStudioAppointment schoolStudioAppointment);
+
+    /**
+     * 新增录播室预约情况
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 结果
+     */
+    public int insertSchoolStudioAppointment(SchoolStudioAppointment schoolStudioAppointment);
+
+    /**
+     * 修改录播室预约情况
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 结果
+     */
+    public int updateSchoolStudioAppointment(SchoolStudioAppointment schoolStudioAppointment);
+
+    /**
+     * 删除录播室预约情况
+     *
+     * @param id 录播室预约情况主键
+     * @return 结果
+     */
+    public int deleteSchoolStudioAppointmentById(Long id);
+
+    /**
+     * 批量删除录播室预约情况
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolStudioAppointmentByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolStudio/SchoolStudioMapper.java

+package yangtz.cs.liu.campus.mapper.schoolStudio;
+
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudio;
+
+import java.util.List;
+
+/**
+ * 录播室管理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public interface SchoolStudioMapper
+{
+    /**
+     * 查询录播室管理
+     *
+     * @param id 录播室管理主键
+     * @return 录播室管理
+     */
+    public SchoolStudio selectSchoolStudioById(Long id);
+
+    /**
+     * 查询录播室管理列表
+     *
+     * @param schoolStudio 录播室管理
+     * @return 录播室管理集合
+     */
+    public List<SchoolStudio> selectSchoolStudioList(SchoolStudio schoolStudio);
+
+    /**
+     * 新增录播室管理
+     *
+     * @param schoolStudio 录播室管理
+     * @return 结果
+     */
+    public int insertSchoolStudio(SchoolStudio schoolStudio);
+
+    /**
+     * 修改录播室管理
+     *
+     * @param schoolStudio 录播室管理
+     * @return 结果
+     */
+    public int updateSchoolStudio(SchoolStudio schoolStudio);
+
+    /**
+     * 批量删除录播室管理
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolStudioByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolStudio/SchoolStudioUseMapper.java

+package yangtz.cs.liu.campus.mapper.schoolStudio;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioUse;
+
+import java.util.List;
+
+/**
+ * 录播室使用情况Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@Repository
+public interface SchoolStudioUseMapper
+{
+
+    /**
+     * 根据预约id删除录播室使用情况
+     * @return
+     */
+    public int deleteSchoolStudioUseByAppId(@Param("appId") Long appId);
+
+    /**
+     * 录播室使用情况统计
+     * @param schoolStudioUse
+     * @return
+     */
+    public List<SchoolStudioUse> selectStudioUse(SchoolStudioUse schoolStudioUse);
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 查询录播室使用情况
+     *
+     * @param id 录播室使用情况主键
+     * @return 录播室使用情况
+     */
+    public SchoolStudioUse selectSchoolStudioUseById(Long id);
+
+    /**
+     * 查询录播室使用情况列表
+     *
+     * @param schoolStudioUse 录播室使用情况
+     * @return 录播室使用情况集合
+     */
+    public List<SchoolStudioUse> selectSchoolStudioUseList(SchoolStudioUse schoolStudioUse);
+
+    /**
+     * 新增录播室使用情况
+     *
+     * @param schoolStudioUse 录播室使用情况
+     * @return 结果
+     */
+    public int insertSchoolStudioUse(SchoolStudioUse schoolStudioUse);
+
+    /**
+     * 修改录播室使用情况
+     *
+     * @param schoolStudioUse 录播室使用情况
+     * @return 结果
+     */
+    public int updateSchoolStudioUse(SchoolStudioUse schoolStudioUse);
+
+    /**
+     * 删除录播室使用情况
+     *
+     * @param id 录播室使用情况主键
+     * @return 结果
+     */
+    public int deleteSchoolStudioUseById(Long id);
+
+    /**
+     * 批量删除录播室使用情况
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolStudioUseByIds(Long[] ids);
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/auditorium/ISchoolAuditoriumService.java

+package yangtz.cs.liu.campus.service.auditorium;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium;
+import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 学校礼堂预约Service接口
+ *
+ * @author ruoyi
+ * @date 2023-06-14
+ */
+public interface ISchoolAuditoriumService extends IService<SchoolAuditorium>
+{
+    /**
+     * 查询学校礼堂预约
+     *
+     * @param id 学校礼堂预约主键
+     * @return 学校礼堂预约
+     */
+    public SchoolAuditoriumVo selectSchoolAuditoriumById(Long id);
+
+    /**
+     * 查询全部学校礼堂预约列表
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 学校礼堂预约集合
+     */
+    public List<SchoolAuditoriumVo> selectSchoolAuditoriumList(SchoolAuditoriumVo schoolAuditorium);
+
+    /**
+     * 新增学校礼堂预约
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 结果
+     */
+    public int insertSchoolAuditorium(SchoolAuditorium schoolAuditorium);
+
+    /**
+     * 修改学校礼堂预约
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 结果
+     */
+    public int updateSchoolAuditorium(SchoolAuditorium schoolAuditorium);
+
+    /**
+     * 批量删除学校礼堂预约
+     *
+     * @param ids 需要删除的学校礼堂预约主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAuditoriumByIds(Long[] ids);
+
+    /**
+     * 删除学校礼堂预约信息
+     *
+     * @param id 学校礼堂预约主键
+     * @return 结果
+     */
+    public int deleteSchoolAuditoriumById(Long id);
+
+    /**
+     * 流程定义
+     * @param schoolAuditorium
+     * @param username
+     * @param key
+     * @param variables
+     */
+    public int submitApply(SchoolAuditorium schoolAuditorium , String username, String key, Map<String, Object> variables);
+
+    /**
+     * 查询个人学校礼堂预约列表
+     * @param schoolAuditorium
+     * @return
+     */
+    List<SchoolAuditoriumVo> selectSchoolAuditoriumListGr(SchoolAuditoriumVo schoolAuditorium);
+
+    /**
+     * 待办列表
+     *
+     * @param entity
+     * @param userId
+     * @return
+     */
+    List<SchoolAuditoriumVo> findTodoTasks(String key, SchoolAuditorium entity, String userId);
+
+    /**
+     * 已办列表
+     * @param key
+     * @param entity
+     * @param userId
+     * @return
+     */
+    List<SchoolAuditoriumVo> findDoneTasks(String key, SchoolAuditorium entity, String userId);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/auditorium/SchoolAuditoriumServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.auditorium;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import yangtz.cs.liu.activiti.service.IProcessService;
+import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium;
+import yangtz.cs.liu.campus.mapper.auditorium.SchoolAuditoriumMapper;
+import yangtz.cs.liu.campus.service.auditorium.ISchoolAuditoriumService;
+import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.core.constant.ProcessCommon.PENDING;
+import static com.core.constant.ProcessCommon.SUSPENDSTATE_PENDING;
+import static com.core.constant.ProcessVariables.LEADERSHIPID;
+
+/**
+ * 学校礼堂预约Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-06-14
+ */
+@Service
+public class SchoolAuditoriumServiceImpl extends ServiceImpl<SchoolAuditoriumMapper,SchoolAuditorium> implements ISchoolAuditoriumService
+{
+    @Autowired
+    private SchoolAuditoriumMapper schoolAuditoriumMapper;
+    @Resource
+    private IdentityService identityService;
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private IProcessService processService;
+    @Autowired
+    private HistoryService historyService;
+
+    /**
+     * 查询学校礼堂预约
+     *
+     * @param id 学校礼堂预约主键
+     * @return 学校礼堂预约
+     */
+    @Override
+    public SchoolAuditoriumVo selectSchoolAuditoriumById(Long id)
+    {
+        SchoolAuditoriumVo schoolAuditoriumVo = schoolAuditoriumMapper.selectSchoolAuditoriumById(id);
+        return schoolAuditoriumVo;
+    }
+
+    /**
+     * 查询全部学校礼堂预约列表
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 学校礼堂预约
+     */
+    @Override
+    public List<SchoolAuditoriumVo> selectSchoolAuditoriumList(SchoolAuditoriumVo schoolAuditorium)
+    {
+        List<SchoolAuditoriumVo> list = schoolAuditoriumMapper.selectSchoolAuditoriumList(schoolAuditorium);
+        return list;
+    }
+
+    /**
+     * 查询个人学校礼堂预约列表
+     * @param schoolAuditorium
+     * @return
+     */
+    @Override
+    public List<SchoolAuditoriumVo> selectSchoolAuditoriumListGr(SchoolAuditoriumVo schoolAuditorium) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolAuditorium.setCreateById(user.getUserId());
+        List<SchoolAuditoriumVo> list = schoolAuditoriumMapper.selectSchoolAuditoriumListGr(schoolAuditorium);
+        return list;
+    }
+
+    /**
+     * 新增学校礼堂预约
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertSchoolAuditorium(SchoolAuditorium schoolAuditorium)
+    {
+        //获取当前登录用户
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //设置申请人id
+        schoolAuditorium.setApplyId(user.getUserId());
+        //设置申请部门id
+        schoolAuditorium.setApplyDeptId(user.getDeptId());
+        //设置申请时间
+        schoolAuditorium.setApplyTime(DateUtils.getNowDate());
+        //设置状态为未提交
+        schoolAuditorium.setState("0");
+        //设置创建人id
+        schoolAuditorium.setCreateById(user.getUserId());
+        //设置创建时间
+        schoolAuditorium.setCreateTime(DateUtils.getNowDate());
+        return schoolAuditoriumMapper.insertSchoolAuditorium(schoolAuditorium);
+    }
+
+    /**
+     * 修改学校礼堂预约
+     *
+     * @param schoolAuditorium 学校礼堂预约
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateSchoolAuditorium(SchoolAuditorium schoolAuditorium)
+    {
+        //获取当前登录用户
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolAuditorium.setUpdateById(user.getUserId());
+        schoolAuditorium.setUpdateTime(DateUtils.getNowDate());
+        return schoolAuditoriumMapper.updateSchoolAuditorium(schoolAuditorium);
+    }
+
+    /**
+     * 批量删除学校礼堂预约
+     *
+     * @param ids 需要删除的学校礼堂预约主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteSchoolAuditoriumByIds(Long[] ids)
+    {
+        return schoolAuditoriumMapper.deleteSchoolAuditoriumByIds(ids);
+    }
+
+    /**
+     * 删除学校礼堂预约信息
+     *
+     * @param id 学校礼堂预约主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteSchoolAuditoriumById(Long id)
+    {
+        return schoolAuditoriumMapper.deleteSchoolAuditoriumById(id);
+    }
+
+    /**
+     *
+     * @param schoolAuditorium   业务实体
+     * @param username           提交申请人 记录到底是哪个人提交了申请
+     * @param key                流程标识 用于指定到底启动的是哪个流程(请假流程 办公流程 会议流程等) 这里启动的是 礼堂预约申请流程
+     * @param variables          变量集合 流程中指定一些变量,这里我们主要用于动态指定审批人
+     *
+     *                           启动流程
+     *                           1. 设置流程申请人.
+     *                           2. 设置审批人.审批人因为是动态的,所以放在variables集合里面
+     *                           3. 启动流程
+     */
+    @Override
+    public int submitApply(SchoolAuditorium schoolAuditorium, String username, String key, Map<String, Object> variables) {
+        String businessKey = schoolAuditorium.getId().toString();
+        identityService.setAuthenticatedUserId(username);
+
+
+        //分管领导
+        variables.put(LEADERSHIPID,schoolAuditorium.getLeadershipId());
+
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(key, businessKey, variables);
+        String instanceId = processInstance.getId();
+
+        //与我们的业务表开始建立关系
+        schoolAuditorium.setInstanceId(instanceId);
+        //审批中
+        schoolAuditorium.setState("1");
+        return schoolAuditoriumMapper.updateSchoolAuditorium(schoolAuditorium);
+    }
+
+    /**
+     * 待办列表
+     * @param key
+     * @param entity
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<SchoolAuditoriumVo> findTodoTasks(String key, SchoolAuditorium entity, String userId) {
+        List<SchoolAuditoriumVo> list = new ArrayList<>();
+        //当前登录人待办任务集合
+        List<Task> taskList = processService.findAssigneeTasks(userId, key);
+        for (Task task : taskList) {
+            TaskEntityImpl taskImpl = (TaskEntityImpl) task;
+            //拿到当前任务id
+            String processInstanceId = taskImpl.getProcessInstanceId();
+            //拿到流程定义对象
+            ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+            //业务id(我们当时新增的时候指定了businessKey为id)
+            String businessKey = processInstance.getBusinessKey();
+            //通过id查询出我们业务对象
+            SchoolAuditoriumVo schoolAuditorium = schoolAuditoriumMapper.selectSchoolAuditoriumById(new Long(businessKey));
+            if (StringUtils.isNull(schoolAuditorium)) {
+                continue;
+            }
+            //转vo
+            SchoolAuditoriumVo schoolAuditoriumVo = new SchoolAuditoriumVo();
+            BeanUtils.copyProperties(schoolAuditorium, schoolAuditoriumVo);
+
+            schoolAuditoriumVo.setTaskId(taskImpl.getId());
+
+            if (SUSPENDSTATE_PENDING.equals(taskImpl.getSuspensionState())) {
+                //挂起
+                schoolAuditoriumVo.setTaskName(PENDING);
+            } else {
+                schoolAuditoriumVo.setTaskName(taskImpl.getName());
+            }
+            list.add(schoolAuditoriumVo);
+
+        }
+        List<SchoolAuditoriumVo> resList = list.stream().sorted(Comparator.comparing(SchoolAuditoriumVo::getApplyTime).reversed()).collect(Collectors.toList());
+        return resList;
+    }
+
+    /**
+     * 已办列表
+     * @param key
+     * @param entity
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<SchoolAuditoriumVo> findDoneTasks(String key, SchoolAuditorium entity, String userId) {
+        List<SchoolAuditoriumVo> list = new ArrayList<>();
+        //当前登录人完成的历史集合
+        List<HistoricTaskInstance> hisList = processService.findDoneTasks(userId, key);
+        for (HistoricTaskInstance instance : hisList) {
+            //流程实例key
+            String processInstanceId = instance.getProcessInstanceId();
+            HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery()
+                    .processInstanceId(processInstanceId)
+                    .singleResult();
+            //业务id
+            String businessKey = processInstance.getBusinessKey();
+            //通过id查询出我们业务对象
+            SchoolAuditorium schoolAuditorium = schoolAuditoriumMapper.selectById(new Long(businessKey));
+            if (StringUtils.isNull(schoolAuditorium)) {
+                continue;
+            }
+            //转vo
+            SchoolAuditoriumVo schoolAuditoriumVo = new SchoolAuditoriumVo();
+            BeanUtils.copyProperties(schoolAuditorium, schoolAuditoriumVo);
+            list.add(schoolAuditoriumVo);
+        }
+        List<SchoolAuditoriumVo> resList = list.stream().sorted(Comparator.comparing(SchoolAuditoriumVo::getApplyTime).reversed()).collect(Collectors.toList());
+        return resList;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/common/CountServiceImpl.java

@@ -10,19 +10,25 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.activiti.service.IProcessService;
+import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium;
 import yangtz.cs.liu.campus.domain.purchase.SchoolPurchase;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget;
 import yangtz.cs.liu.campus.domain.schooloffical.SchoolOfficialFlow;
 import yangtz.cs.liu.campus.domain.student.SchoolStudentLeave;
 import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave;
+import yangtz.cs.liu.campus.mapper.auditorium.SchoolAuditoriumMapper;
 import yangtz.cs.liu.campus.mapper.exam.ExamMainMapper;
 import yangtz.cs.liu.campus.mapper.purchase.SchoolPurchaseMapper;
+import yangtz.cs.liu.campus.mapper.schoolDepartmentBudget.SchoolDepartmentBudgetMapper;
 import yangtz.cs.liu.campus.mapper.schooloffical.SchoolOfficialFlowMapper;
 import yangtz.cs.liu.campus.mapper.student.SchoolStudentLeaveMapper;
 import yangtz.cs.liu.campus.mapper.teacher.SchoolTeacherLeaveMapper;
 import yangtz.cs.liu.campus.service.common.ICountService;
 import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService;
+import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
 import yangtz.cs.liu.campus.vo.common.CountVo;
 import yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseVo;
+import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo;
 import yangtz.cs.liu.campus.vo.student.StudentLeaveVO;
 import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
 
@@ -55,6 +61,12 @@ public class CountServiceImpl implements ICountService {
     private SchoolPurchaseMapper schoolPurchaseMapper;
 
     @Autowired
+    private SchoolAuditoriumMapper schoolAuditoriumMapper;
+
+    @Autowired
+    private SchoolDepartmentBudgetMapper schoolDepartmentBudgetMapper;
+
+    @Autowired
     private RuntimeService runtimeService;
 
     @Override
@@ -77,11 +89,19 @@ public class CountServiceImpl implements ICountService {
         /**学生请假审批任务数*/
         int sLeaveNum  = getNum(STUDENTLEAVE, userId.toString());
 
+        /**礼堂预约审批任务数*/
+        int auditoriumNum  = getNum(AUDITORIUMAPPLY, userId.toString());
+
+        /**科室预算审批任务数*/
+        int departmentBudgetNum  = getNum(DEPARTMENTBUDGET, userId.toString());
+
         vo.setTLeaveNum(tLeaveNum);
         vo.setOfficialNum(officialNum);
         vo.setInvestigate(investigate);
         vo.setPurchaseRequisition(purchaseRequisition);
         vo.setSLeaveNum(sLeaveNum);
+        vo.setAuditoriumNum(auditoriumNum);
+        vo.setDepartmentBudgetNum(departmentBudgetNum);
         return vo;
     }
 
@@ -159,6 +179,54 @@ public class CountServiceImpl implements ICountService {
             }
             return list.size();
         }
+
+        if(AUDITORIUMAPPLY.equals(key)){
+            List<SchoolAuditoriumVo> list = new ArrayList<>();
+            //当前登录人待办任务集合
+            List<Task> taskList = processService.findAssigneeTasks(userId, key);
+            for (Task task : taskList) {
+                TaskEntityImpl taskImpl = (TaskEntityImpl) task;
+                //拿到当前任务id
+                String processInstanceId = taskImpl.getProcessInstanceId();
+                //拿到流程定义对象
+                ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+                //业务id(我们当时新增的时候指定了businessKey为id)
+                String businessKey = processInstance.getBusinessKey();
+                //通过id查询出我们业务对象
+                SchoolAuditorium schoolAuditorium = schoolAuditoriumMapper.selectById(new Long(businessKey));
+                if (StringUtils.isNull(schoolAuditorium)) {
+                    continue;
+                }
+                SchoolAuditoriumVo schoolAuditoriumVo = new SchoolAuditoriumVo();
+                BeanUtils.copyProperties(schoolAuditorium, schoolAuditoriumVo);
+                list.add(schoolAuditoriumVo);
+            }
+            return list.size();
+        }
+
+        if(DEPARTMENTBUDGET.equals(key)){
+            List<SchoolDepartmentBudgetVo> list = new ArrayList<>();
+            //当前登录人待办任务集合
+            List<Task> taskList = processService.findAssigneeTasks(userId, key);
+            for (Task task : taskList) {
+                TaskEntityImpl taskImpl = (TaskEntityImpl) task;
+                //拿到当前任务id
+                String processInstanceId = taskImpl.getProcessInstanceId();
+                //拿到流程定义对象
+                ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+                //业务id(我们当时新增的时候指定了businessKey为id)
+                String businessKey = processInstance.getBusinessKey();
+                //通过id查询出我们业务对象
+                SchoolDepartmentBudget departmentBudget = schoolDepartmentBudgetMapper.selectById(new Long(businessKey));
+                if (StringUtils.isNull(departmentBudget)) {
+                    continue;
+                }
+                SchoolDepartmentBudgetVo schoolDepartmentBudgetVo = new SchoolDepartmentBudgetVo();
+                BeanUtils.copyProperties(departmentBudget, schoolDepartmentBudgetVo);
+                list.add(schoolDepartmentBudgetVo);
+            }
+            return list.size();
+        }
         return 0;
     }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/purchase/SchoolPurchaseServiceImpl.java

@@ -401,4 +401,14 @@ public class SchoolPurchaseServiceImpl extends ServiceImpl<SchoolPurchaseMapper,
         /*******************通过用户id查询用户的职务*****************************/
         return workFlowVo;
     }
+
+    /**
+     * 资金使用明细列表
+     * @param schoolPurchase
+     * @return
+     */
+    @Override
+    public List<SchoolPurchaseVo> selectPurchaseList(SchoolPurchase schoolPurchase) {
+        return schoolPurchaseMapper.selectPurchaseList(schoolPurchase);
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmxServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolDepartmentBudget;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+import yangtz.cs.liu.campus.mapper.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmxMapper;
+import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetProjectmxService;
+
+import java.util.List;
+
+/**
+ * 科室预算填报项目明细Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+@Service
+public class SchoolDepartmentBudgetProjectmxServiceImpl implements ISchoolDepartmentBudgetProjectmxService
+{
+    @Autowired
+    private SchoolDepartmentBudgetProjectmxMapper schoolDepartmentBudgetProjectmxMapper;
+
+    /**
+     * 查询科室预算填报项目明细
+     *
+     * @param id 科室预算填报项目明细主键
+     * @return 科室预算填报项目明细
+     */
+    @Override
+    public SchoolDepartmentBudgetProjectmx selectSchoolDepartmentBudgetProjectmxById(Long id)
+    {
+        return schoolDepartmentBudgetProjectmxMapper.selectSchoolDepartmentBudgetProjectmxById(id);
+    }
+
+    /**
+     * 查询科室预算填报项目明细列表
+     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+     * @return
+     */
+    @Override
+    public List<SchoolDepartmentBudgetProjectmx> selectList(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx) {
+        return schoolDepartmentBudgetProjectmxMapper.selectList(schoolDepartmentBudgetProjectmx);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 查询科室预算填报项目明细列表
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 科室预算填报项目明细
+//     */
+//    @Override
+//    public List<SchoolDepartmentBudgetProjectmx> selectSchoolDepartmentBudgetProjectmxList(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+//    {
+//        return schoolDepartmentBudgetProjectmxMapper.selectSchoolDepartmentBudgetProjectmxList(schoolDepartmentBudgetProjectmx);
+//    }
+//
+//    /**
+//     * 新增科室预算填报项目明细
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 结果
+//     */
+//    @Override
+//    public int insertSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+//    {
+//        return schoolDepartmentBudgetProjectmxMapper.insertSchoolDepartmentBudgetProjectmx(schoolDepartmentBudgetProjectmx);
+//    }
+//
+//    /**
+//     * 修改科室预算填报项目明细
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 结果
+//     */
+//    @Override
+//    public int updateSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx)
+//    {
+//        return schoolDepartmentBudgetProjectmxMapper.updateSchoolDepartmentBudgetProjectmx(schoolDepartmentBudgetProjectmx);
+//    }
+//
+//    /**
+//     * 批量删除科室预算填报项目明细
+//     *
+//     * @param ids 需要删除的科室预算填报项目明细主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteSchoolDepartmentBudgetProjectmxByIds(Long[] ids)
+//    {
+//        return schoolDepartmentBudgetProjectmxMapper.deleteSchoolDepartmentBudgetProjectmxByIds(ids);
+//    }
+//
+//    /**
+//     * 删除科室预算填报项目明细信息
+//     *
+//     * @param id 科室预算填报项目明细主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteSchoolDepartmentBudgetProjectmxById(Long id)
+//    {
+//        return schoolDepartmentBudgetProjectmxMapper.deleteSchoolDepartmentBudgetProjectmxById(id);
+//    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolDepartmentBudget/SchoolDepartmentBudgetServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolDepartmentBudget;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import yangtz.cs.liu.activiti.service.IProcessService;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+import yangtz.cs.liu.campus.mapper.schoolDepartmentBudget.SchoolDepartmentBudgetMapper;
+import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetService;
+import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.core.constant.ProcessCommon.PENDING;
+import static com.core.constant.ProcessCommon.SUSPENDSTATE_PENDING;
+import static com.core.constant.ProcessDefinition.DEPARTMENTBUDGET;
+import static com.core.constant.ProcessVariables.DEPARTMENTAPPLYUSERID;
+import static com.core.constant.ProcessVariables.DEPARTMENTUSERID;
+
+/**
+ * 科室预算填报Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+@Service
+public class SchoolDepartmentBudgetServiceImpl extends ServiceImpl<SchoolDepartmentBudgetMapper, SchoolDepartmentBudget> implements ISchoolDepartmentBudgetService
+{
+    @Autowired
+    private SchoolDepartmentBudgetMapper schoolDepartmentBudgetMapper;
+    @Resource
+    private IdentityService identityService;
+    @Autowired
+    private IProcessService processService;
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private HistoryService historyService;
+
+    /**
+     * 查询科室预算填报
+     *
+     * @param id 科室预算填报主键
+     * @return 科室预算填报
+     */
+    @Override
+    public SchoolDepartmentBudgetVo selectSchoolDepartmentBudgetById(Long id)
+    {
+        return schoolDepartmentBudgetMapper.selectSchoolDepartmentBudgetById(id);
+    }
+
+    /**
+     * 查询全部科室预算填报列表
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 科室预算填报
+     */
+    @Override
+    public List<SchoolDepartmentBudgetVo> selectSchoolDepartmentBudgetList(SchoolDepartmentBudget schoolDepartmentBudget)
+    {
+        return schoolDepartmentBudgetMapper.selectSchoolDepartmentBudgetList(schoolDepartmentBudget);
+    }
+
+    /**
+     * 新增科室预算填报
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolDepartmentBudget.setDeptId(user.getDeptId());
+        schoolDepartmentBudget.setInformantId(user.getUserId());
+        schoolDepartmentBudget.setInformant(user.getUserName());
+        schoolDepartmentBudget.setCreateById(user.getUserId());
+        schoolDepartmentBudget.setCreateBy(user.getUserName());
+        schoolDepartmentBudget.setTbTime(DateUtils.getNowDate());
+        schoolDepartmentBudget.setCreateTime(DateUtils.getNowDate());
+        int rows = schoolDepartmentBudgetMapper.insertSchoolDepartmentBudget(schoolDepartmentBudget);
+        insertSchoolDepartmentBudgetProjectmx(schoolDepartmentBudget);
+        return rows;
+    }
+
+    /**
+     * 修改科室预算填报
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolDepartmentBudget.setUpdateById(user.getUserId());
+        schoolDepartmentBudget.setUpdateTime(DateUtils.getNowDate());
+        schoolDepartmentBudgetMapper.deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetId(schoolDepartmentBudget.getId());
+        insertSchoolDepartmentBudgetProjectmx(schoolDepartmentBudget);
+        return schoolDepartmentBudgetMapper.updateSchoolDepartmentBudget(schoolDepartmentBudget);
+    }
+
+    /**
+     * 批量删除科室预算填报
+     *
+     * @param ids 需要删除的科室预算填报主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSchoolDepartmentBudgetByIds(Long[] ids)
+    {
+        schoolDepartmentBudgetMapper.deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetIds(ids);
+        return schoolDepartmentBudgetMapper.deleteSchoolDepartmentBudgetByIds(ids);
+    }
+
+    /**
+     * 删除科室预算填报信息
+     *
+     * @param id 科室预算填报主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSchoolDepartmentBudgetById(Long id)
+    {
+        schoolDepartmentBudgetMapper.deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetId(id);
+        return schoolDepartmentBudgetMapper.deleteSchoolDepartmentBudgetById(id);
+    }
+
+    /**
+     * 查询本单位科室预算填报列表
+     * @param schoolDepartmentBudget
+     * @return
+     */
+    @Override
+    public List<SchoolDepartmentBudgetVo> selectSchoolDepartmentBudgetListDw(SchoolDepartmentBudget schoolDepartmentBudget) {
+        schoolDepartmentBudget.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        return schoolDepartmentBudgetMapper.selectSchoolDepartmentBudgetList(schoolDepartmentBudget);
+    }
+
+    /**
+     * 新增科室预算填报项目明细信息
+     *
+     * @param schoolDepartmentBudget 科室预算填报对象
+     */
+    public void insertSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetVo schoolDepartmentBudget)
+    {
+        List<SchoolDepartmentBudgetProjectmx> schoolDepartmentBudgetProjectmxList = schoolDepartmentBudget.getSchoolDepartmentBudgetProjectmxList();
+        Long id = schoolDepartmentBudget.getId();
+        if (StringUtils.isNotNull(schoolDepartmentBudgetProjectmxList))
+        {
+            List<SchoolDepartmentBudgetProjectmx> list = new ArrayList<SchoolDepartmentBudgetProjectmx>();
+            for (SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx : schoolDepartmentBudgetProjectmxList)
+            {
+                schoolDepartmentBudgetProjectmx.setDepartmentBudgetId(id);
+                list.add(schoolDepartmentBudgetProjectmx);
+            }
+            if (list.size() > 0)
+            {
+                schoolDepartmentBudgetMapper.batchSchoolDepartmentBudgetProjectmx(list);
+            }
+        }
+    }
+
+    /**
+     * 提交申请
+     * @param schoolDepartmentBudget
+     * @param userName
+     * @param key
+     * @param variables
+     * @return
+     */
+    @Override
+    @Transactional
+    public int submitApply(SchoolDepartmentBudget schoolDepartmentBudget, String userName, String key, Map<String, Object> variables) {
+        // 业务type 表示是什么流程类型, businessKey表示礼堂预约申请id
+        String businessKey = schoolDepartmentBudget.getId().toString();
+        identityService.setAuthenticatedUserId(userName);
+
+        //设置申请人
+        variables.put(DEPARTMENTAPPLYUSERID,schoolDepartmentBudget.getApplyId());
+        //设置分管领导
+        variables.put(DEPARTMENTUSERID,schoolDepartmentBudget.getLeadershipId());
+
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(key, businessKey, variables);
+        String instanceId = processInstance.getId();
+        //与我们的业务表开始建立关系
+        schoolDepartmentBudget.setInstanceId(instanceId);
+        schoolDepartmentBudget.setState("1");
+        int i = schoolDepartmentBudgetMapper.updateById(schoolDepartmentBudget);
+        SchoolDepartmentBudgetVo schoolDepartmentBudgetVo = schoolDepartmentBudgetMapper.selectSchoolDepartmentBudgetById(new Long(businessKey));
+        //当前登录人待办任务集合
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId().toString();
+        List<Task> taskList = processService.findAssigneeTasks(userId, DEPARTMENTBUDGET);
+        for (Task task : taskList) {
+            TaskEntityImpl taskImpl = (TaskEntityImpl) task;
+            //拿到当前任务id
+            String processInstanceId = taskImpl.getProcessInstanceId();
+            //拿到流程定义对象
+            ProcessInstance processInstance1 = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+            //业务id(我们当时新增的时候指定了businessKey为id)
+            String businessKey1 = processInstance1.getBusinessKey();
+            if (businessKey1.equals(businessKey)){
+                schoolDepartmentBudgetVo.setTaskId(taskImpl.getId());
+            }
+        }
+        String taskId = schoolDepartmentBudgetVo.getTaskId();
+        Map<String,Object> variables1 = new HashMap<>();
+        variables1.put("comment","同意");
+        variables1.put("pass","true");
+        processService.completeTask(taskId, instanceId, variables1);
+        return i;
+    }
+
+    /**
+     * 待办列表
+     * @param key
+     * @param entity
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<SchoolDepartmentBudgetVo> findTodoTasks(String key, SchoolDepartmentBudget entity, String userId) {
+        List<SchoolDepartmentBudgetVo> list = new ArrayList<>();
+        //当前登录人待办任务集合
+        List<Task> taskList = processService.findAssigneeTasks(userId, key);
+        for (Task task : taskList) {
+            TaskEntityImpl taskImpl = (TaskEntityImpl) task;
+            //拿到当前任务id
+            String processInstanceId = taskImpl.getProcessInstanceId();
+            //拿到流程定义对象
+            ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+            //业务id(我们当时新增的时候指定了businessKey为id)
+            String businessKey = processInstance.getBusinessKey();
+            //通过id查询出我们业务对象
+            SchoolDepartmentBudget schoolDepartmentBudget = schoolDepartmentBudgetMapper.selectById(new Long(businessKey));
+            if (StringUtils.isNull(schoolDepartmentBudget)) {
+                continue;
+            }
+            //转vo
+            SchoolDepartmentBudgetVo schoolDepartmentBudgetVo = new SchoolDepartmentBudgetVo();
+            BeanUtils.copyProperties(schoolDepartmentBudget, schoolDepartmentBudgetVo);
+
+            schoolDepartmentBudgetVo.setTaskId(taskImpl.getId());
+
+            if (SUSPENDSTATE_PENDING.equals(taskImpl.getSuspensionState())) {
+                //挂起
+                schoolDepartmentBudgetVo.setTaskName(PENDING);
+            } else {
+                schoolDepartmentBudgetVo.setTaskName(taskImpl.getName());
+            }
+            list.add(schoolDepartmentBudgetVo);
+        }
+        List<SchoolDepartmentBudgetVo> resList = list.stream().sorted(Comparator.comparing(SchoolDepartmentBudgetVo::getApplyTime).reversed()).collect(Collectors.toList());
+        return resList;
+    }
+
+    @Override
+    public List<SchoolDepartmentBudgetVo> findDoneTasks(String key, SchoolDepartmentBudget entity, String userId) {
+        List<SchoolDepartmentBudgetVo> list = new ArrayList<>();
+        //当前登录人完成的历史集合
+        List<HistoricTaskInstance> hisList = processService.findDoneTasks(userId, key);
+        for (HistoricTaskInstance instance : hisList) {
+            //流程实例key
+            String processInstanceId = instance.getProcessInstanceId();
+            HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery()
+                    .processInstanceId(processInstanceId)
+                    .singleResult();
+            //业务id
+            String businessKey = processInstance.getBusinessKey();
+            //通过id查询出我们业务对象
+            SchoolDepartmentBudget schoolDepartmentBudget = schoolDepartmentBudgetMapper.selectById(new Long(businessKey));
+            if (StringUtils.isNull(schoolDepartmentBudget)) {
+                continue;
+            }
+            //转vo
+            SchoolDepartmentBudgetVo schoolDepartmentBudgetVo = new SchoolDepartmentBudgetVo();
+            BeanUtils.copyProperties(schoolDepartmentBudget, schoolDepartmentBudgetVo);
+            list.add(schoolDepartmentBudgetVo);
+        }
+        List<SchoolDepartmentBudgetVo> resList = list.stream().sorted(Comparator.comparing(SchoolDepartmentBudgetVo::getApplyTime).reversed()).collect(Collectors.toList());
+        return resList;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolStudio/SchoolStudioAppointmentServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolStudio;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioAppointment;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioUse;
+import yangtz.cs.liu.campus.mapper.schoolStudio.SchoolStudioAppointmentMapper;
+import yangtz.cs.liu.campus.mapper.schoolStudio.SchoolStudioUseMapper;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioAppointmentService;
+
+import java.util.List;
+
+/**
+ * 录播室预约情况Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@Service
+public class SchoolStudioAppointmentServiceImpl implements ISchoolStudioAppointmentService
+{
+    @Autowired
+    private SchoolStudioAppointmentMapper schoolStudioAppointmentMapper;
+    @Autowired
+    private SchoolStudioUseMapper schoolStudioUseMapper;
+
+    /**
+     * 查询录播室预约情况
+     *
+     * @param id 录播室预约情况主键
+     * @return 录播室预约情况
+     */
+    @Override
+    public SchoolStudioAppointment selectSchoolStudioAppointmentById(Long id)
+    {
+        SchoolStudioAppointment schoolStudioAppointment = schoolStudioAppointmentMapper.selectSchoolStudioAppointmentById(id);
+        if (StringUtils.isNotNull(schoolStudioAppointment)){
+            schoolStudioAppointment.setAppointmentJc("第" + schoolStudioAppointment.getAppointmentJc() + "节");
+        }
+        return schoolStudioAppointment;
+    }
+
+    /**
+     * 查询全部录播室预约情况列表
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 录播室预约情况
+     */
+    @Override
+    public List<SchoolStudioAppointment> selectSchoolStudioAppointmentList(SchoolStudioAppointment schoolStudioAppointment)
+    {
+        List<SchoolStudioAppointment> list = schoolStudioAppointmentMapper.selectSchoolStudioAppointmentList(schoolStudioAppointment);
+        if (list.size() > 0){
+            for (SchoolStudioAppointment studioAppointment : list) {
+                studioAppointment.setAppointmentJc("第" + studioAppointment.getAppointmentJc() + "节");
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 查询个人录播室预约情况列表
+     * @param schoolStudioAppointment
+     * @return
+     */
+    @Override
+    public List<SchoolStudioAppointment> selectSchoolStudioAppointmentListGr(SchoolStudioAppointment schoolStudioAppointment) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolStudioAppointment.setAppointmentUserId(user.getUserId());
+        List<SchoolStudioAppointment> list = schoolStudioAppointmentMapper.selectSchoolStudioAppointmentList(schoolStudioAppointment);
+        if (list.size() > 0){
+            for (SchoolStudioAppointment studioAppointment : list) {
+                studioAppointment.setAppointmentJc("第" + studioAppointment.getAppointmentJc() + "节");
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 新增录播室预约
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertSchoolStudioAppointment(SchoolStudioAppointment schoolStudioAppointment)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //设置预约人
+        schoolStudioAppointment.setAppointmentUserId(user.getUserId());
+        schoolStudioAppointment.setAppointmentUserName(user.getUserName());
+        //设置申请时间
+        schoolStudioAppointment.setApplyTime(DateUtils.getNowDate());
+        //设置预约状态
+        schoolStudioAppointment.setStatu("1");
+        int rows = schoolStudioAppointmentMapper.insertSchoolStudioAppointment(schoolStudioAppointment);
+        insertSchoolStudioUse(schoolStudioAppointment);
+        return rows;
+    }
+
+    /**
+     * 新增录播室使用情况
+     * @param schoolStudioAppointment
+     */
+    private void insertSchoolStudioUse(SchoolStudioAppointment schoolStudioAppointment)
+    {
+        Long appId = schoolStudioAppointment.getId();
+        String[] split = schoolStudioAppointment.getAppointmentJc().split(",");
+        for (String s : split) {
+            SchoolStudioUse schoolStudioUse = new SchoolStudioUse();
+            schoolStudioUse.setAppointmentId(appId);
+            schoolStudioUse.setStudioId(schoolStudioAppointment.getStudioId());
+            schoolStudioUse.setUseDate(schoolStudioAppointment.getAppointmentTime());
+            schoolStudioUse.setUseJc(s);
+            schoolStudioUse.setUseUserId(schoolStudioAppointment.getAppointmentUserId());
+            schoolStudioUse.setUseUserName(schoolStudioAppointment.getAppointmentUserName());
+            //新增录播室使用
+            schoolStudioUseMapper.insertSchoolStudioUse(schoolStudioUse);
+        }
+    }
+
+    /**
+     * 取消录播室预约
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateSchoolStudioAppointment(SchoolStudioAppointment schoolStudioAppointment)
+    {
+        //取消预约对应录播室使用情况
+        schoolStudioUseMapper.deleteSchoolStudioUseByAppId(schoolStudioAppointment.getId());
+        return schoolStudioAppointmentMapper.updateSchoolStudioAppointment(schoolStudioAppointment);
+    }
+
+//    /**
+//     * 批量删除录播室预约情况
+//     *
+//     * @param ids 需要删除的录播室预约情况主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteSchoolStudioAppointmentByIds(Long[] ids)
+//    {
+//        return schoolStudioAppointmentMapper.deleteSchoolStudioAppointmentByIds(ids);
+//    }
+//
+//    /**
+//     * 删除录播室预约情况信息
+//     *
+//     * @param id 录播室预约情况主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteSchoolStudioAppointmentById(Long id)
+//    {
+//        return schoolStudioAppointmentMapper.deleteSchoolStudioAppointmentById(id);
+//    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolStudio/SchoolStudioServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolStudio;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudio;
+import yangtz.cs.liu.campus.mapper.schoolStudio.SchoolStudioMapper;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioService;
+
+import java.util.List;
+
+/**
+ * 录播室管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@Service
+public class SchoolStudioServiceImpl implements ISchoolStudioService
+{
+    @Autowired
+    private SchoolStudioMapper schoolStudioMapper;
+
+    /**
+     * 查询录播室管理
+     *
+     * @param id 录播室管理主键
+     * @return 录播室管理
+     */
+    @Override
+    public SchoolStudio selectSchoolStudioById(Long id)
+    {
+        return schoolStudioMapper.selectSchoolStudioById(id);
+    }
+
+    /**
+     * 查询录播室管理列表
+     *
+     * @param schoolStudio 录播室管理
+     * @return 录播室管理
+     */
+    @Override
+    public List<SchoolStudio> selectSchoolStudioList(SchoolStudio schoolStudio)
+    {
+        return schoolStudioMapper.selectSchoolStudioList(schoolStudio);
+    }
+
+    /**
+     * 新增录播室管理
+     *
+     * @param schoolStudio 录播室管理
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolStudio(SchoolStudio schoolStudio)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolStudio.setCreateById(user.getUserId());
+        schoolStudio.setCreateTime(DateUtils.getNowDate());
+        return schoolStudioMapper.insertSchoolStudio(schoolStudio);
+    }
+
+    /**
+     * 修改录播室管理
+     *
+     * @param schoolStudio 录播室管理
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolStudio(SchoolStudio schoolStudio)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        schoolStudio.setUpdateById(user.getUserId());
+        schoolStudio.setUpdateTime(DateUtils.getNowDate());
+        return schoolStudioMapper.updateSchoolStudio(schoolStudio);
+    }
+
+    /**
+     * 批量删除录播室管理
+     *
+     * @param ids 需要删除的录播室管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolStudioByIds(Long[] ids)
+    {
+        return schoolStudioMapper.deleteSchoolStudioByIds(ids);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolStudio/SchoolStudioUseServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolStudio;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioUse;
+import yangtz.cs.liu.campus.mapper.schoolStudio.SchoolStudioUseMapper;
+import yangtz.cs.liu.campus.service.schoolStudio.ISchoolStudioUseService;
+
+import java.util.List;
+
+/**
+ * 录播室使用情况Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+@Service
+public class SchoolStudioUseServiceImpl implements ISchoolStudioUseService
+{
+    @Autowired
+    private SchoolStudioUseMapper schoolStudioUseMapper;
+
+    /**
+     * 录播室使用情况统计
+     * @param schoolStudioUse
+     * @return
+     */
+    @Override
+    public List<SchoolStudioUse> selectStudioUse(SchoolStudioUse schoolStudioUse) {
+        return schoolStudioUseMapper.selectStudioUse(schoolStudioUse);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 查询录播室使用情况
+//     *
+//     * @param id 录播室使用情况主键
+//     * @return 录播室使用情况
+//     */
+//    @Override
+//    public SchoolStudioUse selectSchoolStudioUseById(Long id)
+//    {
+//        return schoolStudioUseMapper.selectSchoolStudioUseById(id);
+//    }
+//
+//    /**
+//     * 查询录播室使用情况列表
+//     *
+//     * @param schoolStudioUse 录播室使用情况
+//     * @return 录播室使用情况
+//     */
+//    @Override
+//    public List<SchoolStudioUse> selectSchoolStudioUseList(SchoolStudioUse schoolStudioUse)
+//    {
+//        return schoolStudioUseMapper.selectSchoolStudioUseList(schoolStudioUse);
+//    }
+//
+//    /**
+//     * 新增录播室使用情况
+//     *
+//     * @param schoolStudioUse 录播室使用情况
+//     * @return 结果
+//     */
+//    @Override
+//    public int insertSchoolStudioUse(SchoolStudioUse schoolStudioUse)
+//    {
+//        return schoolStudioUseMapper.insertSchoolStudioUse(schoolStudioUse);
+//    }
+//
+//    /**
+//     * 修改录播室使用情况
+//     *
+//     * @param schoolStudioUse 录播室使用情况
+//     * @return 结果
+//     */
+//    @Override
+//    public int updateSchoolStudioUse(SchoolStudioUse schoolStudioUse)
+//    {
+//        return schoolStudioUseMapper.updateSchoolStudioUse(schoolStudioUse);
+//    }
+//
+//    /**
+//     * 批量删除录播室使用情况
+//     *
+//     * @param ids 需要删除的录播室使用情况主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteSchoolStudioUseByIds(Long[] ids)
+//    {
+//        return schoolStudioUseMapper.deleteSchoolStudioUseByIds(ids);
+//    }
+//
+//    /**
+//     * 删除录播室使用情况信息
+//     *
+//     * @param id 录播室使用情况主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteSchoolStudioUseById(Long id)
+//    {
+//        return schoolStudioUseMapper.deleteSchoolStudioUseById(id);
+//    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolbudget/SchoolBudgetServiceImpl.java

@@ -31,13 +31,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
+import yangtz.cs.liu.campus.domain.purchase.SchoolPurchase;
 import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt;
 import yangtz.cs.liu.campus.domain.schoolbudget.SchoolBudget;
 import yangtz.cs.liu.campus.domain.schoolbudget.SchoolBudgetDetails;
 import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
+import yangtz.cs.liu.campus.mapper.purchase.SchoolPurchaseMapper;
 import yangtz.cs.liu.campus.mapper.schoolbudget.SchoolBudgetDetailsMapper;
 import yangtz.cs.liu.campus.mapper.schoolbudget.SchoolBudgetMapper;
 import yangtz.cs.liu.campus.service.schoolbudget.ISchoolBudgetService;
+import yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseVo;
 import yangtz.cs.liu.campus.vo.schoolAtt.SchoolAttVO;
 import yangtz.cs.liu.campus.vo.schoolbudget.SchoolBudgetVo;
 import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
@@ -67,6 +70,9 @@ public class SchoolBudgetServiceImpl extends ServiceImpl<SchoolBudgetMapper, Sch
     @Autowired
     private SysDeptMapper deptMapper;
 
+    @Autowired
+    private SchoolPurchaseMapper schoolPurchaseMapper;
+
     /**
      * 查询预算项目
      *
@@ -130,6 +136,17 @@ public class SchoolBudgetServiceImpl extends ServiceImpl<SchoolBudgetMapper, Sch
            /* vo.setSchoolBudgetDetailsList(details);
             list.add(vo);*/
            budget.setSchoolBudgetDetailsList(details);
+            SchoolPurchase schoolPurchase1 = new SchoolPurchase();
+            schoolPurchase1.setBudgetId(budget.getId());
+            List<SchoolPurchaseVo> schoolPurchaseVos = schoolPurchaseMapper.selectPurchaseList(schoolPurchase1);
+            BigDecimal bigDecimal = new BigDecimal("0");
+            for (SchoolPurchaseVo schoolPurchase : schoolPurchaseVos) {
+                BigDecimal add = bigDecimal.add(new BigDecimal(schoolPurchase.getPurchaseMoney().toString()));
+                bigDecimal = add;
+            }
+            BigDecimal bigDecimal1 = new BigDecimal("10000");
+            BigDecimal amountSpent = bigDecimal.divide(bigDecimal1);
+            budget.setAmountSpent(amountSpent);
         }
         return budgets;
     }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/purchase/ISchoolPurchaseService.java

@@ -38,4 +38,6 @@ public interface ISchoolPurchaseService extends IService<SchoolPurchase> {
     public List<SchoolPurchase> findPurchaseName(Long handUserId);
 
     WorkFlowVo purchaseFlows(Long id);
+
+    public List<SchoolPurchaseVo> selectPurchaseList(SchoolPurchase schoolPurchase);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolDepartmentBudget/ISchoolDepartmentBudgetProjectmxService.java

+package yangtz.cs.liu.campus.service.schoolDepartmentBudget;
+
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+
+import java.util.List;
+
+/**
+ * 科室预算填报项目明细Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+public interface ISchoolDepartmentBudgetProjectmxService
+{
+    /**
+     * 查询科室预算填报项目明细
+     *
+     * @param id 科室预算填报项目明细主键
+     * @return 科室预算填报项目明细
+     */
+    public SchoolDepartmentBudgetProjectmx selectSchoolDepartmentBudgetProjectmxById(Long id);
+
+    /**
+     * 查询科室预算填报项目明细列表
+     *
+     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+     * @return 科室预算填报项目明细集合
+     */
+    public List<SchoolDepartmentBudgetProjectmx> selectList(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 查询科室预算填报项目明细列表
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 科室预算填报项目明细集合
+//     */
+//    public List<SchoolDepartmentBudgetProjectmx> selectSchoolDepartmentBudgetProjectmxList(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+//
+//    /**
+//     * 新增科室预算填报项目明细
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 结果
+//     */
+//    public int insertSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+//
+//    /**
+//     * 修改科室预算填报项目明细
+//     *
+//     * @param schoolDepartmentBudgetProjectmx 科室预算填报项目明细
+//     * @return 结果
+//     */
+//    public int updateSchoolDepartmentBudgetProjectmx(SchoolDepartmentBudgetProjectmx schoolDepartmentBudgetProjectmx);
+//
+//    /**
+//     * 批量删除科室预算填报项目明细
+//     *
+//     * @param ids 需要删除的科室预算填报项目明细主键集合
+//     * @return 结果
+//     */
+//    public int deleteSchoolDepartmentBudgetProjectmxByIds(Long[] ids);
+//
+//    /**
+//     * 删除科室预算填报项目明细信息
+//     *
+//     * @param id 科室预算填报项目明细主键
+//     * @return 结果
+//     */
+//    public int deleteSchoolDepartmentBudgetProjectmxById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolDepartmentBudget/ISchoolDepartmentBudgetService.java

+package yangtz.cs.liu.campus.service.schoolDepartmentBudget;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget;
+import yangtz.cs.liu.campus.vo.schoolDepartmentBudget.SchoolDepartmentBudgetVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 科室预算填报Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-11
+ */
+public interface ISchoolDepartmentBudgetService extends IService<SchoolDepartmentBudget>
+{
+    /**
+     * 查询科室预算填报
+     *
+     * @param id 科室预算填报主键
+     * @return 科室预算填报
+     */
+    public SchoolDepartmentBudgetVo selectSchoolDepartmentBudgetById(Long id);
+
+    /**
+     * 查询科室预算填报列表
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 科室预算填报集合
+     */
+    public List<SchoolDepartmentBudgetVo> selectSchoolDepartmentBudgetList(SchoolDepartmentBudget schoolDepartmentBudget);
+
+    /**
+     * 新增科室预算填报
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 结果
+     */
+    public int insertSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget);
+
+    /**
+     * 修改科室预算填报
+     *
+     * @param schoolDepartmentBudget 科室预算填报
+     * @return 结果
+     */
+    public int updateSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget);
+
+    /**
+     * 批量删除科室预算填报
+     *
+     * @param ids 需要删除的科室预算填报主键集合
+     * @return 结果
+     */
+    public int deleteSchoolDepartmentBudgetByIds(Long[] ids);
+
+    /**
+     * 删除科室预算填报信息
+     *
+     * @param id 科室预算填报主键
+     * @return 结果
+     */
+    public int deleteSchoolDepartmentBudgetById(Long id);
+
+    /**
+     * 查询本单位科室预算填报列表
+     * @param schoolDepartmentBudget
+     * @return
+     */
+    List<SchoolDepartmentBudgetVo> selectSchoolDepartmentBudgetListDw(SchoolDepartmentBudget schoolDepartmentBudget);
+
+    /**
+     * 流程定义
+     * @param schoolDepartmentBudget
+     * @param userName
+     * @param key
+     * @param variables
+     * @return
+     */
+    int submitApply(SchoolDepartmentBudget schoolDepartmentBudget, String userName, String key, Map<String, Object> variables);
+
+    /**
+     * 待办列表
+     * @param key
+     * @param entity
+     * @param userId
+     * @return
+     */
+    List<SchoolDepartmentBudgetVo> findTodoTasks(String key, SchoolDepartmentBudget entity, String userId);
+
+    /**
+     * 已办列表
+     * @param key
+     * @param entity
+     * @param userId
+     * @return
+     */
+    List<SchoolDepartmentBudgetVo> findDoneTasks(String key, SchoolDepartmentBudget entity, String userId);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolStudio/ISchoolStudioAppointmentService.java

+package yangtz.cs.liu.campus.service.schoolStudio;
+
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioAppointment;
+
+import java.util.List;
+
+/**
+ * 录播室预约情况Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public interface ISchoolStudioAppointmentService
+{
+    /**
+     * 查询全部录播室预约情况
+     *
+     * @param id 录播室预约情况主键
+     * @return 录播室预约情况
+     */
+    public SchoolStudioAppointment selectSchoolStudioAppointmentById(Long id);
+
+    /**
+     * 查询录播室预约情况列表
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 录播室预约情况集合
+     */
+    public List<SchoolStudioAppointment> selectSchoolStudioAppointmentList(SchoolStudioAppointment schoolStudioAppointment);
+
+    /**
+     * 新增录播室预约
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 结果
+     */
+    public int insertSchoolStudioAppointment(SchoolStudioAppointment schoolStudioAppointment);
+
+    /**
+     * 取消录播室预约
+     *
+     * @param schoolStudioAppointment 录播室预约情况
+     * @return 结果
+     */
+    public int updateSchoolStudioAppointment(SchoolStudioAppointment schoolStudioAppointment);
+
+    /**
+     * 查询个人录播室预约情况列表
+     * @param schoolStudioAppointment
+     * @return
+     */
+    List<SchoolStudioAppointment> selectSchoolStudioAppointmentListGr(SchoolStudioAppointment schoolStudioAppointment);
+
+//    /**
+//     * 批量删除录播室预约情况
+//     *
+//     * @param ids 需要删除的录播室预约情况主键集合
+//     * @return 结果
+//     */
+//    public int deleteSchoolStudioAppointmentByIds(Long[] ids);
+//
+//    /**
+//     * 删除录播室预约情况信息
+//     *
+//     * @param id 录播室预约情况主键
+//     * @return 结果
+//     */
+//    public int deleteSchoolStudioAppointmentById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolStudio/ISchoolStudioService.java

+package yangtz.cs.liu.campus.service.schoolStudio;
+
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudio;
+
+import java.util.List;
+
+/**
+ * 录播室管理Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public interface ISchoolStudioService
+{
+    /**
+     * 查询录播室管理
+     *
+     * @param id 录播室管理主键
+     * @return 录播室管理
+     */
+    public SchoolStudio selectSchoolStudioById(Long id);
+
+    /**
+     * 查询录播室管理列表
+     *
+     * @param schoolStudio 录播室管理
+     * @return 录播室管理集合
+     */
+    public List<SchoolStudio> selectSchoolStudioList(SchoolStudio schoolStudio);
+
+    /**
+     * 新增录播室管理
+     *
+     * @param schoolStudio 录播室管理
+     * @return 结果
+     */
+    public int insertSchoolStudio(SchoolStudio schoolStudio);
+
+    /**
+     * 修改录播室管理
+     *
+     * @param schoolStudio 录播室管理
+     * @return 结果
+     */
+    public int updateSchoolStudio(SchoolStudio schoolStudio);
+
+    /**
+     * 批量删除录播室管理
+     *
+     * @param ids 需要删除的录播室管理主键集合
+     * @return 结果
+     */
+    public int deleteSchoolStudioByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolStudio/ISchoolStudioUseService.java

+package yangtz.cs.liu.campus.service.schoolStudio;
+
+import yangtz.cs.liu.campus.domain.schoolStudio.SchoolStudioUse;
+
+import java.util.List;
+
+/**
+ * 录播室使用情况Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-10
+ */
+public interface ISchoolStudioUseService
+{
+    /**
+     * 录播室使用情况统计
+     * @param schoolStudioUse
+     * @return
+     */
+    public List<SchoolStudioUse> selectStudioUse(SchoolStudioUse schoolStudioUse);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    /**
+//     * 查询录播室使用情况
+//     *
+//     * @param id 录播室使用情况主键
+//     * @return 录播室使用情况
+//     */
+//    public SchoolStudioUse selectSchoolStudioUseById(Long id);
+//
+//    /**
+//     * 查询录播室使用情况列表
+//     *
+//     * @param schoolStudioUse 录播室使用情况
+//     * @return 录播室使用情况集合
+//     */
+//    public List<SchoolStudioUse> selectSchoolStudioUseList(SchoolStudioUse schoolStudioUse);
+//
+//    /**
+//     * 新增录播室使用情况
+//     *
+//     * @param schoolStudioUse 录播室使用情况
+//     * @return 结果
+//     */
+//    public int insertSchoolStudioUse(SchoolStudioUse schoolStudioUse);
+//
+//    /**
+//     * 修改录播室使用情况
+//     *
+//     * @param schoolStudioUse 录播室使用情况
+//     * @return 结果
+//     */
+//    public int updateSchoolStudioUse(SchoolStudioUse schoolStudioUse);
+//
+//    /**
+//     * 批量删除录播室使用情况
+//     *
+//     * @param ids 需要删除的录播室使用情况主键集合
+//     * @return 结果
+//     */
+//    public int deleteSchoolStudioUseByIds(Long[] ids);
+//
+//    /**
+//     * 删除录播室使用情况信息
+//     *
+//     * @param id 录播室使用情况主键
+//     * @return 结果
+//     */
+//    public int deleteSchoolStudioUseById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/auditorium/SchoolAuditoriumVo.java

+package yangtz.cs.liu.campus.vo.auditorium;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import yangtz.cs.liu.activiti.domain.ProcessBaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SchoolAuditoriumVo extends ProcessBaseEntity {
+
+    /** 礼堂预约id */
+    private Long id;
+
+    /** 流程实例id */
+    private String instanceId;
+
+    /** 活动名称 */
+    @Excel(name = "活动名称")
+    private String activityName;
+
+    /** 活动场地 */
+    @Excel(name = "活动场地")
+    private String activityArea;
+
+    /** 活动时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "活动时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private Date activityTime;
+
+    /** 话筒数量 */
+    @Excel(name = "话筒数量")
+    private Integer htNumber;
+
+    /** 具体负责人id */
+    @Excel(name = "具体负责人id")
+    private Long specificUserId;
+
+    /** 具体负责人 */
+    @Excel(name = "具体负责人")
+    private String specificUserName;
+
+    /** 活动人数 */
+    @Excel(name = "活动人数")
+    private Long activityNumber;
+
+    /** 预计时长 */
+    @Excel(name = "预计时长")
+    private BigDecimal duration;
+
+    /** 是否彩排（1-是，0-否） */
+    @Excel(name = "是否彩排", readConverterExp = "1=-是，0-否")
+    private String isRehearsal;
+
+    /** 是否录像（1-是，0-否） */
+    @Excel(name = "是否录像", readConverterExp = "1=-是，0-否")
+    private String isVideo;
+
+    /** 是否直播（1-是，0-否） */
+    @Excel(name = "是否直播", readConverterExp = "1=-是，0-否")
+    private String isLive;
+
+    /** 是否需要大屏（1-是，0-否） */
+    @Excel(name = "是否需要大屏", readConverterExp = "1=-是，0-否")
+    private String isBigScreen;
+
+    /** 其他要求 */
+    @Excel(name = "其他要求")
+    private String otherRequirements;
+
+    /** 学校分管领导id */
+    @Excel(name = "学校分管领导id")
+    private Long leadershipId;
+
+    /** 学校分管领导 */
+    @Excel(name = "学校分管领导")
+    private String leadershipName;
+
+    /** 审核状态（0-未提交，1-审核中，2-审核通过，3-审核不通过） */
+    @Excel(name = "审核状态", readConverterExp = "0=-未提交，1-审核中，2-审核通过，3-审核不通过")
+    private String state;
+
+    /** 审批意见 */
+    @Excel(name = "审批意见")
+    private String opinion;
+
+    /** 申请人id */
+    @Excel(name = "申请人id")
+    private Long applyId;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 申请部门id */
+    @Excel(name = "申请部门id")
+    private Long applyDeptId;
+
+    /** 申请部门 */
+    @Excel(name = "申请部门")
+    private String applyDept;
+
+    /** 附件路径 */
+    private String fjlj;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String fjmc;
+
+    /** 附件下载路径 */
+    private String fjxzlj;
+
+    /** 创建人id */
+    private Long createById;
+    /** 创建人 */
+    private String createBy;
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 修改人id */
+    private Long updateById;
+    /** 修改人 */
+    private String updateBy;
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/common/CountVo.java

@@ -18,4 +18,10 @@ public class CountVo {
 
     /**学生请假审批任务数*/
     private int sLeaveNum;
+
+    /**礼堂预约审批任务数*/
+    private int auditoriumNum;
+
+    /**科室预算审批任务数*/
+    private int departmentBudgetNum;
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolDepartmentBudget/SchoolDepartmentBudgetVo.java

+package yangtz.cs.liu.campus.vo.schoolDepartmentBudget;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import yangtz.cs.liu.activiti.domain.ProcessBaseEntity;
+import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmx;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SchoolDepartmentBudgetVo extends ProcessBaseEntity {
+
+    /** 科室预算填报主键id */
+    private Long id;
+
+    /** 流程实例id */
+    @Excel(name = "流程实例id")
+    private String instanceId;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String year;
+
+    /** 科室id */
+    @Excel(name = "科室id")
+    private Long deptId;
+
+    /** 科室名称 */
+    @Excel(name = "科室名称")
+    private String deptName;
+
+    /** 填报人id */
+    @Excel(name = "填报人id")
+    private Long informantId;
+
+    /** 填报人名称 */
+    @Excel(name = "填报人名称")
+    private String informant;
+
+    /** 分管领导id */
+    @Excel(name = "分管领导id")
+    private Long leadershipId;
+
+    /** 分管领导名称 */
+    @Excel(name = "分管领导名称")
+    private String leadershipName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 填报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "填报时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date tbTime;
+
+    /** 审核状态（0-未提交，1-分管领导审核，2-审核通过，3-审核不通过） */
+    @Excel(name = "审核状态", readConverterExp = "0-未提交，1-分管领导审核，2-审核通过，3-审核不通过")
+    private String state;
+
+    /** 申请人id */
+    @Excel(name = "申请人id")
+    private Long applyId;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 创建人id */
+    private Long createById;
+    /** 创建人 */
+    private String createBy;
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 修改人id */
+    private Long updateById;
+    /** 修改人 */
+    private String updateBy;
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 科室预算填报项目明细信息 */
+    private List<SchoolDepartmentBudgetProjectmx> schoolDepartmentBudgetProjectmxList;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolbudget/SchoolBudgetVo.java

@@ -45,6 +45,11 @@ public class SchoolBudgetVo extends OurBaseEntity
 //    @NotBlank(message = "批复总额不能为空")
     private BigDecimal giveMoney;
 
+    /** 已使用金额（万元） */
+    @Excel(name = "已使用金额（万元）", needMerge = true)
+//    @NotBlank(message = "已使用金额不能为空")
+    private BigDecimal amountSpent;
+
     /** 是否政府采购(0是 1否) */
     @Excel(name = "是否政府采购", combo = {"是","否"}, readConverterExp = "0=是,1=否", needMerge = true)
     @NotBlank(message = "是否政府采购不能为空")

smart-campus/src/main/java/yangtz/cs/liu/wechat/service/api/IWxApiService.java

 package yangtz.cs.liu.wechat.service.api;
 
-import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
-import yangtz.cs.liu.campus.domain.temp.OfficalTemplate;
-import yangtz.cs.liu.campus.domain.temp.PurchaseTemplate;
-import yangtz.cs.liu.campus.domain.temp.TeacherLeaveTemplate;
+import yangtz.cs.liu.campus.domain.temp.*;
 import yangtz.cs.liu.wechat.domain.template.LeaveStateTemplate;
 import yangtz.cs.liu.wechat.domain.template.LeaveTemplate;
 import yangtz.cs.liu.wechat.domain.template.StudentLeaveTemplate;
@@ -39,6 +36,12 @@ public interface IWxApiService {
     //采购申请模板
     String sendPurchaseTemplate(PurchaseTemplate template);
 
+    //礼堂预约申请模板
+    String sendAuditoriumTemplate(AuditoriumTemplate template);
+
+    //科室预算申请模板
+    String sendDepartmentBudgetTemplate(DepartmentBudgetTemplate template);
+
     //公文流转模板
     String sendOfficalTemplate(OfficalTemplate template);
 }

smart-campus/src/main/java/yangtz/cs/liu/wechat/service/impl/api/WxApiServiceImpl.java

@@ -7,10 +7,7 @@ import com.ruoyi.common.utils.http.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
-import yangtz.cs.liu.campus.domain.temp.OfficalTemplate;
-import yangtz.cs.liu.campus.domain.temp.PurchaseTemplate;
-import yangtz.cs.liu.campus.domain.temp.TeacherLeaveTemplate;
+import yangtz.cs.liu.campus.domain.temp.*;
 import yangtz.cs.liu.wechat.domain.template.LeaveStateTemplate;
 import yangtz.cs.liu.wechat.domain.template.LeaveTemplate;
 import yangtz.cs.liu.wechat.domain.MsgTemplate;
@@ -342,6 +339,68 @@ public class WxApiServiceImpl implements IWxApiService {
     }
 
     @Override
+    public String sendAuditoriumTemplate(AuditoriumTemplate template) {
+        String toUserOpenId = template.getToUserOpenId();
+        String accessToken = accessTokenUtil.getToken();
+        Map<String, TemplateInfo> data = new HashMap<>();
+        TemplateInfo first = new TemplateInfo(template.getFirst(), "#DC143C");
+        data.put("first", first);
+        TemplateInfo keyword1 = new TemplateInfo(template.getApplyUser(), "#173177");
+        data.put("keyword1", keyword1);
+        TemplateInfo keyword2 = new TemplateInfo(template.getContent(), "#173177");
+        data.put("keyword2", keyword2);
+        //申请时间
+        String applyTime = HolidayDateUtil.format.format(template.getApplyTime());
+        TemplateInfo keyword3 = new TemplateInfo(applyTime, "#173177");
+        data.put("keyword3", keyword3);
+
+        TemplateInfo remark = new TemplateInfo( template.getRemark() , "#DC143C");
+        data.put("remark", remark);
+
+        MsgTemplate msgTemplate = new MsgTemplate();
+        msgTemplate.setData(data);
+        msgTemplate.setTemplate_id(purchaseTemplateId);
+//        msgTemplate.setUrl("www.baidu.com");
+        msgTemplate.setTouser(toUserOpenId);
+        String jsonObject = JSONUtil.parseObj(template).toString();
+
+        String sendUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken;
+        String result = HttpUtils.sendPost(sendUrl, jsonObject);
+        return result;
+    }
+
+    @Override
+    public String sendDepartmentBudgetTemplate(DepartmentBudgetTemplate template) {
+        String toUserOpenId = template.getToUserOpenId();
+        String accessToken = accessTokenUtil.getToken();
+        Map<String, TemplateInfo> data = new HashMap<>();
+        TemplateInfo first = new TemplateInfo(template.getFirst(), "#DC143C");
+        data.put("first", first);
+        TemplateInfo keyword1 = new TemplateInfo(template.getApplyUser(), "#173177");
+        data.put("keyword1", keyword1);
+        TemplateInfo keyword2 = new TemplateInfo(template.getContent(), "#173177");
+        data.put("keyword2", keyword2);
+        //申请时间
+        String applyTime = HolidayDateUtil.format.format(template.getApplyTime());
+        TemplateInfo keyword3 = new TemplateInfo(applyTime, "#173177");
+        data.put("keyword3", keyword3);
+
+        TemplateInfo remark = new TemplateInfo( template.getRemark() , "#DC143C");
+        data.put("remark", remark);
+
+        MsgTemplate msgTemplate = new MsgTemplate();
+        msgTemplate.setData(data);
+        msgTemplate.setTemplate_id(purchaseTemplateId);
+//        msgTemplate.setUrl("www.baidu.com");
+        msgTemplate.setTouser(toUserOpenId);
+        String jsonObject = JSONUtil.parseObj(template).toString();
+
+        String sendUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken;
+        String result = HttpUtils.sendPost(sendUrl, jsonObject);
+        return result;
+    }
+
+    @Override
     public String sendOfficalTemplate(OfficalTemplate template) {
         String toUserOpenId = template.getToUserOpenId();
         String accessToken = accessTokenUtil.getToken();

smart-campus/src/main/resources/mapper/auditorium/SchoolAuditoriumMapper.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.auditorium.SchoolAuditoriumMapper">
+
+    <resultMap type="SchoolAuditoriumVo" id="SchoolAuditoriumResult">
+        <result property="id"    column="id"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="activityName"    column="activity_name"    />
+        <result property="activityArea"    column="activity_area"    />
+        <result property="activityTime"    column="activity_time"    />
+        <result property="htNumber"    column="ht_number"    />
+        <result property="specificUserId"    column="specific_user_id"    />
+        <result property="specificUserName"    column="specific_user_name"    />
+        <result property="activityNumber"    column="activity_number"    />
+        <result property="duration"    column="duration"    />
+        <result property="isRehearsal"    column="is_rehearsal"    />
+        <result property="isVideo"    column="is_video"    />
+        <result property="isLive"    column="is_live"    />
+        <result property="isBigScreen"    column="is_big_screen"    />
+        <result property="otherRequirements"    column="other_requirements"    />
+        <result property="leadershipId"    column="leadership_id"    />
+        <result property="leadershipName"    column="leadership_name"    />
+        <result property="state"    column="state"    />
+        <result property="opinion"    column="opinion"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="applyName"    column="apply_name"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="applyDeptId"    column="apply_dept_id"    />
+        <result property="applyDept"    column="apply_dept"    />
+        <result property="fjlj"    column="fjlj"    />
+        <result property="fjmc"    column="fjmc"    />
+        <result property="createById"    column="create_by_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateById"    column="update_by_id"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectSchoolAuditoriumVo">
+        select id, instance_id, activity_name, activity_area, activity_time, ht_number, specific_user_id, specific_user_name, activity_number, duration, is_rehearsal, is_video, is_live, is_big_screen, other_requirements, leadership_id, leadership_name, state, opinion, apply_id, apply_name, apply_time, apply_dept, apply_dept_id, fjlj, fjmc, create_by_id, create_by, create_time, update_by_id, update_by, update_time from school_auditorium
+    </sql>
+
+    <select id="selectSchoolAuditoriumList" parameterType="SchoolAuditoriumVo" resultMap="SchoolAuditoriumResult">
+        <include refid="selectSchoolAuditoriumVo"/>
+        <where>
+            state != '0'
+            <if test="activityName != null  and activityName != ''"> and activity_name like concat('%', #{activityName}, '%')</if>
+            <if test="activityArea != null  and activityArea != ''"> and activity_area = #{activityArea}</if>
+            <if test="activityTime != null "> and activity_time = #{activityTime}</if>
+            <if test="htNumber != null "> and ht_number = #{htNumber}</if>
+            <if test="specificUserId != null "> and specific_user_id = #{specificUserId}</if>
+            <if test="specificUserName != null  and specificUserName != ''"> and specific_user_name like concat('%', #{specificUserName}, '%')</if>
+            <if test="activityNumber != null "> and activity_number = #{activityNumber}</if>
+            <if test="duration != null "> and duration = #{duration}</if>
+            <if test="isRehearsal != null  and isRehearsal != ''"> and is_rehearsal = #{isRehearsal}</if>
+            <if test="isVideo != null  and isVideo != ''"> and is_video = #{isVideo}</if>
+            <if test="isLive != null  and isLive != ''"> and is_live = #{isLive}</if>
+            <if test="isBigScreen != null  and isBigScreen != ''"> and is_big_screen = #{isBigScreen}</if>
+            <if test="otherRequirements != null  and otherRequirements != ''"> and other_requirements = #{otherRequirements}</if>
+            <if test="leadershipId != null "> and leadership_id = #{leadershipId}</if>
+            <if test="leadershipName != null  and leadershipName != ''"> and leadership_name like concat('%', #{leadershipName}, '%')</if>
+            <if test="state != null  and state != ''"> and state = #{state}</if>
+            <if test="opinion != null  and opinion != ''"> and opinion = #{opinion}</if>
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="applyName != null  and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="applyDeptId != null  and applyDeptId != ''"> and apply_dept_id = #{applyDeptId}</if>
+            <if test="applyDept != null  and applyDept != ''"> and apply_dept = #{applyDept}</if>
+            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(activity_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
+        </where>
+        ORDER BY activity_time DESC
+    </select>
+
+    <select id="selectSchoolAuditoriumListGr" parameterType="SchoolAuditoriumVo" resultMap="SchoolAuditoriumResult">
+        <include refid="selectSchoolAuditoriumVo"/>
+        <where>
+            <if test="activityName != null  and activityName != ''"> and activity_name like concat('%', #{activityName}, '%')</if>
+            <if test="activityArea != null  and activityArea != ''"> and activity_area = #{activityArea}</if>
+            <if test="activityTime != null "> and activity_time = #{activityTime}</if>
+            <if test="htNumber != null "> and ht_number = #{htNumber}</if>
+            <if test="specificUserId != null "> and specific_user_id = #{specificUserId}</if>
+            <if test="specificUserName != null  and specificUserName != ''"> and specific_user_name like concat('%', #{specificUserName}, '%')</if>
+            <if test="activityNumber != null "> and activity_number = #{activityNumber}</if>
+            <if test="duration != null "> and duration = #{duration}</if>
+            <if test="isRehearsal != null  and isRehearsal != ''"> and is_rehearsal = #{isRehearsal}</if>
+            <if test="isVideo != null  and isVideo != ''"> and is_video = #{isVideo}</if>
+            <if test="isLive != null  and isLive != ''"> and is_live = #{isLive}</if>
+            <if test="isBigScreen != null  and isBigScreen != ''"> and is_big_screen = #{isBigScreen}</if>
+            <if test="otherRequirements != null  and otherRequirements != ''"> and other_requirements = #{otherRequirements}</if>
+            <if test="leadershipId != null "> and leadership_id = #{leadershipId}</if>
+            <if test="leadershipName != null  and leadershipName != ''"> and leadership_name like concat('%', #{leadershipName}, '%')</if>
+            <if test="state != null  and state != ''"> and state = #{state}</if>
+            <if test="opinion != null  and opinion != ''"> and opinion = #{opinion}</if>
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="applyName != null  and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="applyDeptId != null  and applyDeptId != ''"> and apply_dept_id = #{applyDeptId}</if>
+            <if test="applyDept != null  and applyDept != ''"> and apply_dept = #{applyDept}</if>
+            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(activity_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
+        </where>
+        ORDER BY activity_time DESC
+    </select>
+
+    <select id="selectSchoolAuditoriumById" parameterType="Long" resultMap="SchoolAuditoriumResult">
+        <include refid="selectSchoolAuditoriumVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolAuditorium" parameterType="SchoolAuditorium" useGeneratedKeys="true" keyProperty="id">
+        insert into school_auditorium
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="instanceId != null and instanceId != ''">instance_id,</if>
+            <if test="activityName != null and activityName != ''">activity_name,</if>
+            <if test="activityArea != null and activityArea != ''">activity_area,</if>
+            <if test="activityTime != null">activity_time,</if>
+            <if test="htNumber != null">ht_number,</if>
+            <if test="specificUserId != null">specific_user_id,</if>
+            <if test="specificUserName != null and specificUserName != ''">specific_user_name,</if>
+            <if test="activityNumber != null">activity_number,</if>
+            <if test="duration != null">duration,</if>
+            <if test="isRehearsal != null and isRehearsal != ''">is_rehearsal,</if>
+            <if test="isVideo != null and isVideo != ''">is_video,</if>
+            <if test="isLive != null and isLive != ''">is_live,</if>
+            <if test="isBigScreen != null and isBigScreen != ''">is_big_screen,</if>
+            <if test="otherRequirements != null">other_requirements,</if>
+            <if test="leadershipId != null">leadership_id,leadership_name,</if>
+            <if test="state != null and state != ''">state,</if>
+            <if test="opinion != null">opinion,</if>
+            <if test="applyId != null">apply_id,apply_name,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="applyDeptId != null">apply_dept_id,apply_dept,</if>
+            <if test="fjlj != null">fjlj,</if>
+            <if test="fjmc != null">fjmc,</if>
+            <if test="createById != null">create_by_id,create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateById != null">update_by_id,update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="instanceId != null and instanceId != ''">#{instanceId},</if>
+            <if test="activityName != null and activityName != ''">#{activityName},</if>
+            <if test="activityArea != null and activityArea != ''">#{activityArea},</if>
+            <if test="activityTime != null">#{activityTime},</if>
+            <if test="htNumber != null">#{htNumber},</if>
+            <if test="specificUserId != null">#{specificUserId},</if>
+            <if test="specificUserName != null and specificUserName != ''">#{specificUserName},</if>
+            <if test="activityNumber != null">#{activityNumber},</if>
+            <if test="duration != null">#{duration},</if>
+            <if test="isRehearsal != null and isRehearsal != ''">#{isRehearsal},</if>
+            <if test="isVideo != null and isVideo != ''">#{isVideo},</if>
+            <if test="isLive != null and isLive != ''">#{isLive},</if>
+            <if test="isBigScreen != null and isBigScreen != ''">#{isBigScreen},</if>
+            <if test="otherRequirements != null">#{otherRequirements},</if>
+            <if test="leadershipId != null">#{leadershipId},(select user_name from sys_user where user_id = #{leadershipId}),</if>
+            <if test="state != null and state != ''">#{state},</if>
+            <if test="opinion != null">#{opinion},</if>
+            <if test="applyId != null">#{applyId},(select user_name from sys_user where user_id = #{applyId}),</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="applyDeptId != null">#{applyDeptId},(select dept_name from sys_dept where dept_id = #{applyDeptId}),</if>
+            <if test="fjlj != null">#{fjlj},</if>
+            <if test="fjmc != null">#{fjmc},</if>
+            <if test="createById != null">#{createById},(select user_name from sys_user where user_id = #{createById}),</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateById != null">#{updateById},(select user_name from sys_user where user_id = #{updateById}),</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolAuditorium" parameterType="SchoolAuditorium">
+        update school_auditorium
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="instanceId != null and instanceId != ''">instance_id = #{instanceId},</if>
+            <if test="activityName != null and activityName != ''">activity_name = #{activityName},</if>
+            <if test="activityArea != null and activityArea != ''">activity_area = #{activityArea},</if>
+            <if test="activityTime != null">activity_time = #{activityTime},</if>
+            <if test="htNumber != null">ht_number = #{htNumber},</if>
+            <if test="specificUserId != null">specific_user_id = #{specificUserId},</if>
+            <if test="specificUserName != null and specificUserName != ''">specific_user_name = #{specificUserName},</if>
+            <if test="activityNumber != null">activity_number = #{activityNumber},</if>
+            <if test="duration != null">duration = #{duration},</if>
+            <if test="isRehearsal != null and isRehearsal != ''">is_rehearsal = #{isRehearsal},</if>
+            <if test="isVideo != null and isVideo != ''">is_video = #{isVideo},</if>
+            <if test="isLive != null and isLive != ''">is_live = #{isLive},</if>
+            <if test="isBigScreen != null and isBigScreen != ''">is_big_screen = #{isBigScreen},</if>
+            <if test="otherRequirements != null">other_requirements = #{otherRequirements},</if>
+            <if test="leadershipId != null">leadership_id = #{leadershipId},leadership_name = (select user_name from sys_user where user_id = #{leadershipId}),</if>
+            <if test="state != null and state != ''">state = #{state},</if>
+            <if test="opinion != null">opinion = #{opinion},</if>
+            <if test="applyId != null">apply_id = #{applyId},apply_name = (select user_name from sys_user where user_id = #{applyId}),</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="applyDeptId != null">apply_dept_id = #{applyDeptId},apply_dept = (select dept_name from sys_dept where dept_id = #{applyDeptId}),</if>
+            <if test="fjlj != null">fjlj = #{fjlj},</if>
+            <if test="fjmc != null">fjmc = #{fjmc},</if>
+            <if test="createById != null">create_by_id = #{createById},create_by = (select user_name from sys_user where user_id = #{createById}),</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateById != null">update_by_id = #{updateById},update_by = (select user_name from sys_user where user_id = #{updateById}),</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSchoolAuditoriumById" parameterType="Long">
+        delete from school_auditorium where id = #{id}
+    </delete>
+
+    <delete id="deleteSchoolAuditoriumByIds" parameterType="String">
+        delete from school_auditorium where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/purchase/SchoolPurchaseMapper.xml

@@ -22,4 +22,15 @@
         </where>
         order by create_time desc
     </select>
+
+    <select id="selectPurchaseList" resultType="yangtz.cs.liu.campus.vo.purchase.SchoolPurchaseVo">
+        select * from school_purchase
+        <where>
+            state = '0' and del_flag = '0'
+            <if test="entity.purchaseName != null  and entity.purchaseName != ''">and purchase_name like concat('%', #{entity.purchaseName}, '%')</if>
+            <if test="entity.budgetName != null  and entity.budgetName != ''">and budget_name like concat('%', #{entity.budgetName}, '%')</if>
+            <if test="entity.budgetId != null">and budget_id = #{entity.budgetId}</if>
+        </where>
+        order by create_time desc
+    </select>
 </mapper>

smart-campus/src/main/resources/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetMapper.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.schoolDepartmentBudget.SchoolDepartmentBudgetMapper">
+
+    <resultMap type="SchoolDepartmentBudgetVo" id="SchoolDepartmentBudgetResult">
+        <result property="id"    column="id"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="year"    column="year"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="informantId"    column="informant_id"    />
+        <result property="informant"    column="informant"    />
+        <result property="leadershipId"    column="leadership_id"    />
+        <result property="leadershipName"    column="leadership_name"    />
+        <result property="remark"    column="remark"    />
+        <result property="tbTime"    column="tb_time"    />
+        <result property="state"    column="state"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="applyName"    column="apply_name"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="createById"    column="create_by_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateById"    column="update_by_id"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <resultMap id="SchoolDepartmentBudgetSchoolDepartmentBudgetProjectmxResult" type="SchoolDepartmentBudgetVo" extends="SchoolDepartmentBudgetResult">
+        <collection property="schoolDepartmentBudgetProjectmxList" notNullColumn="sub_id" javaType="java.util.List" resultMap="SchoolDepartmentBudgetProjectmxResult" />
+    </resultMap>
+
+    <resultMap type="SchoolDepartmentBudgetProjectmx" id="SchoolDepartmentBudgetProjectmxResult">
+        <result property="id"    column="sub_id"    />
+        <result property="departmentBudgetId"    column="sub_department_budget_id"    />
+        <result property="projectName"    column="sub_project_name"    />
+        <result property="content"    column="sub_content"    />
+        <result property="projectExpenditures"    column="sub_project_expenditures"    />
+        <result property="isGovernmentPurchase"    column="sub_is_government_purchase"    />
+        <result property="applyMoney"    column="sub_apply_money"    />
+        <result property="remark"    column="sub_remark"    />
+    </resultMap>
+
+    <sql id="selectSchoolDepartmentBudgetVo">
+        select id, instance_id, year, dept_id, dept_name, informant_id, informant, leadership_id, leadership_name, remark, tb_time, state, apply_id, apply_name, apply_time, create_by_id, create_by, create_time, update_by_id, update_by, update_time from school_department_budget
+    </sql>
+
+    <select id="selectSchoolDepartmentBudgetList" parameterType="SchoolDepartmentBudgetVo" resultMap="SchoolDepartmentBudgetResult">
+        select b.id, b.instance_id, b.year, b.dept_id, b.dept_name, b.informant_id, b.informant, b.leadership_id, b.leadership_name, b.remark,
+        b.tb_time, b.state, b.apply_id, b.apply_name, b.apply_time, b.create_by_id, b.create_by, b.create_time, b.update_by_id, b.update_by, b.update_time from school_department_budget b
+        left join sys_dept d on b.dept_id = d.dept_id
+        <where>
+            <if test="instanceId != null  and instanceId != ''"> and b.instance_id = #{instanceId}</if>
+            <if test="year != null  and year != ''"> and b.year = #{year}</if>
+            <if test="deptId != null "> and (b.dept_id=#{deptId} or FIND_IN_SET(#{deptId},d.ancestors))</if>
+            <if test="deptName != null  and deptName != ''"> and b.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="informantId != null "> and b.informant_id = #{informantId}</if>
+            <if test="informant != null  and informant != ''"> and b.informant = #{informant}</if>
+            <if test="leadershipId != null "> and b.leadership_id = #{leadershipId}</if>
+            <if test="leadershipName != null  and leadershipName != ''"> and b.leadership_name like concat('%', #{leadershipName}, '%')</if>
+            <if test="tbTime != null "> and b.tb_time = #{tbTime}</if>
+            <if test="state != null  and state != ''"> and b.state = #{state}</if>
+            <if test="createById != null "> and b.create_by_id = #{createById}</if>
+            <if test="updateById != null "> and b.update_by_id = #{updateById}</if>
+        </where>
+    </select>
+
+    <select id="selectSchoolDepartmentBudgetById" parameterType="Long" resultMap="SchoolDepartmentBudgetSchoolDepartmentBudgetProjectmxResult">
+        select a.id, a.instance_id, a.year, a.dept_id, a.dept_name, a.informant_id, a.informant, a.leadership_id, a.leadership_name, a.remark, a.tb_time, a.state, a.apply_id, a.apply_name, a.apply_time, a.create_by_id, a.create_by, a.create_time, a.update_by_id, a.update_by, a.update_time,
+ b.id as sub_id, b.department_budget_id as sub_department_budget_id, b.project_name as sub_project_name, b.content as sub_content, b.project_expenditures as sub_project_expenditures, b.is_government_purchase as sub_is_government_purchase, b.apply_money as sub_apply_money, b.remark as sub_remark
+        from school_department_budget a
+        left join school_department_budget_projectmx b on b.department_budget_id = a.id
+        where a.id = #{id}
+    </select>
+
+    <insert id="insertSchoolDepartmentBudget" parameterType="SchoolDepartmentBudgetVo" useGeneratedKeys="true" keyProperty="id">
+        insert into school_department_budget
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="instanceId != null">instance_id,</if>
+            <if test="year != null and year != ''">year,</if>
+            <if test="deptId != null">dept_id,dept_name,</if>
+            <if test="informantId != null">informant_id,informant,</if>
+            <if test="leadershipId != null">leadership_id,leadership_name,</if>
+            <if test="remark != null">remark,</if>
+            <if test="tbTime != null">tb_time,</if>
+            state,
+            <if test="applyId != null">apply_id,apply_name,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="createById != null">create_by_id,create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateById != null">update_by_id,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="instanceId != null">#{instanceId},</if>
+            <if test="year != null and year != ''">#{year},</if>
+            <if test="deptId != null">#{deptId},(select dept_name from sys_dept where dept_id = #{deptId}),</if>
+            <if test="informantId != null">#{informantId},(select user_name from sys_user where user_id = #{informantId}),</if>
+            <if test="leadershipId != null">#{leadershipId},(select user_name from sys_user where user_id = #{leadershipId}),</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="tbTime != null">#{tbTime},</if>
+            '0',
+            <if test="applyId != null">#{applyId},(select user_name from sys_user where user_id = #{applyId}),</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="createById != null">#{createById},(select user_name from sys_user where user_id = #{createById}),</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateById != null">#{updateById},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolDepartmentBudget" parameterType="SchoolDepartmentBudgetVo">
+        update school_department_budget
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="year != null and year != ''">year = #{year},</if>
+            <if test="deptId != null">dept_id = #{deptId},dept_name = (select dept_name from sys_dept where dept_id = #{deptId}),</if>
+            <if test="informantId != null">informant_id = #{informantId},informant = (select user_name from sys_user where user_id = #{informantId}),</if>
+            <if test="leadershipId != null">leadership_id = #{leadershipId},leadership_name = (select user_name from sys_user where user_id = #{leadershipId}),</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="tbTime != null">tb_time = #{tbTime},</if>
+            <if test="state != null and state != ''">state = #{state},</if>
+            <if test="applyId != null">apply_id = #{applyId},</if>
+            <if test="applyName != null and applyName != ''">apply_name = #{applyName},</if>
+            <if test="applyTime != null and applyTime != ''">apply_time = #{applyTime},</if>
+            <if test="createById != null">create_by_id = #{createById},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateById != null">update_by_id = #{updateById},update_by = (select user_name from sys_user where user_id = #{updateById}),</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSchoolDepartmentBudgetById" parameterType="Long">
+        delete from school_department_budget where id = #{id}
+    </delete>
+
+    <delete id="deleteSchoolDepartmentBudgetByIds" parameterType="String">
+        delete from school_department_budget where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetIds" parameterType="String">
+        delete from school_department_budget_projectmx where department_budget_id in
+        <foreach item="departmentBudgetId" collection="array" open="(" separator="," close=")">
+            #{departmentBudgetId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSchoolDepartmentBudgetProjectmxByDepartmentBudgetId" parameterType="Long">
+        delete from school_department_budget_projectmx where department_budget_id = #{departmentBudgetId}
+    </delete>
+
+    <insert id="batchSchoolDepartmentBudgetProjectmx">
+        insert into school_department_budget_projectmx( id, department_budget_id, project_name, content, project_expenditures, is_government_purchase, apply_money, remark) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.departmentBudgetId}, #{item.projectName}, #{item.content}, #{item.projectExpenditures}, #{item.isGovernmentPurchase}, #{item.applyMoney}, #{item.remark})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmxMapper.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.schoolDepartmentBudget.SchoolDepartmentBudgetProjectmxMapper">
+
+    <resultMap type="SchoolDepartmentBudgetProjectmx" id="SchoolDepartmentBudgetProjectmxResult">
+        <result property="id"    column="id"    />
+        <result property="year"    column="year"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="departmentBudgetId"    column="department_budget_id"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="content"    column="content"    />
+        <result property="projectExpenditures"    column="project_expenditures"    />
+        <result property="isGovernmentPurchase"    column="is_government_purchase"    />
+        <result property="applyMoney"    column="apply_money"    />
+        <result property="remark"    column="remark"    />
+        <result property="informantId"    column="informant_id"    />
+        <result property="informant"    column="informant"    />
+        <result property="leadershipId"    column="leadership_id"    />
+        <result property="leadershipName"    column="leadership_name"    />
+    </resultMap>
+
+    <sql id="selectSchoolDepartmentBudgetProjectmxVo">
+        select id, department_budget_id, project_name, content, project_expenditures, is_government_purchase, apply_money, remark from school_department_budget_projectmx
+    </sql>
+
+    <select id="selectList" parameterType="SchoolDepartmentBudgetProjectmx" resultMap="SchoolDepartmentBudgetProjectmxResult">
+        select p.id, d.year, d.dept_id, d.dept_name, p.department_budget_id, p.project_name,
+        p.content, p.project_expenditures, p.is_government_purchase, p.apply_money, p.remark
+        from school_department_budget_projectmx p left join school_department_budget d on p.department_budget_id = d.id
+        <where>
+            d.state = '2'
+            <if test="year != null and year != ''"> and d.year = #{year}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="isGovernmentPurchase != null  and isGovernmentPurchase != ''"> and p.is_government_purchase = #{isGovernmentPurchase}</if>
+        </where>
+    </select>
+
+    <select id="selectSchoolDepartmentBudgetProjectmxById" parameterType="Long" resultMap="SchoolDepartmentBudgetProjectmxResult">
+        select p.id, d.year, d.dept_id, d.dept_name, p.department_budget_id, p.project_name, p.content, p.project_expenditures,
+        p.is_government_purchase, p.apply_money, p.remark, d.informant_id, d.informant, d.leadership_id, d.leadership_name
+        from school_department_budget_projectmx p left join school_department_budget d on p.department_budget_id = d.id
+        where p.id = #{id}
+    </select>
+
+    <select id="selectSchoolDepartmentBudgetProjectmxList" parameterType="SchoolDepartmentBudgetProjectmx" resultMap="SchoolDepartmentBudgetProjectmxResult">
+        <include refid="selectSchoolDepartmentBudgetProjectmxVo"/>
+        <where>
+            <if test="departmentBudgetId != null "> and department_budget_id = #{departmentBudgetId}</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="projectExpenditures != null  and projectExpenditures != ''"> and project_expenditures = #{projectExpenditures}</if>
+            <if test="isGovernmentPurchase != null  and isGovernmentPurchase != ''"> and is_government_purchase = #{isGovernmentPurchase}</if>
+            <if test="applyMoney != null "> and apply_money = #{applyMoney}</if>
+        </where>
+    </select>
+
+    <insert id="insertSchoolDepartmentBudgetProjectmx" parameterType="SchoolDepartmentBudgetProjectmx">
+        insert into school_department_budget_projectmx
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="departmentBudgetId != null">department_budget_id,</if>
+            <if test="projectName != null and projectName != ''">project_name,</if>
+            <if test="content != null and content != ''">content,</if>
+            <if test="projectExpenditures != null and projectExpenditures != ''">project_expenditures,</if>
+            <if test="isGovernmentPurchase != null and isGovernmentPurchase != ''">is_government_purchase,</if>
+            <if test="applyMoney != null">apply_money,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="departmentBudgetId != null">#{departmentBudgetId},</if>
+            <if test="projectName != null and projectName != ''">#{projectName},</if>
+            <if test="content != null and content != ''">#{content},</if>
+            <if test="projectExpenditures != null and projectExpenditures != ''">#{projectExpenditures},</if>
+            <if test="isGovernmentPurchase != null and isGovernmentPurchase != ''">#{isGovernmentPurchase},</if>
+            <if test="applyMoney != null">#{applyMoney},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolDepartmentBudgetProjectmx" parameterType="SchoolDepartmentBudgetProjectmx">
+        update school_department_budget_projectmx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="departmentBudgetId != null">department_budget_id = #{departmentBudgetId},</if>
+            <if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
+            <if test="content != null and content != ''">content = #{content},</if>
+            <if test="projectExpenditures != null and projectExpenditures != ''">project_expenditures = #{projectExpenditures},</if>
+            <if test="isGovernmentPurchase != null and isGovernmentPurchase != ''">is_government_purchase = #{isGovernmentPurchase},</if>
+            <if test="applyMoney != null">apply_money = #{applyMoney},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSchoolDepartmentBudgetProjectmxById" parameterType="Long">
+        delete from school_department_budget_projectmx where id = #{id}
+    </delete>
+
+    <delete id="deleteSchoolDepartmentBudgetProjectmxByIds" parameterType="String">
+        delete from school_department_budget_projectmx where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/schoolStudio/SchoolStudioAppointmentMapper.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.schoolStudio.SchoolStudioAppointmentMapper">
+
+    <resultMap type="SchoolStudioAppointment" id="SchoolStudioAppointmentResult">
+        <result property="id"    column="id"    />
+        <result property="studioId"    column="studio_id"    />
+        <result property="studioName"    column="studio_name"    />
+        <result property="appointmentTime"    column="appointment_time"    />
+        <result property="appointmentJc"    column="appointment_jc"    />
+        <result property="studioContent"    column="studio_content"    />
+        <result property="appointmentUserId"    column="appointment_user_id"    />
+        <result property="appointmentUserName"    column="appointment_user_name"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="statu"    column="statu"    />
+    </resultMap>
+
+    <sql id="selectSchoolStudioAppointmentVo">
+        select id, studio_id, studio_name, appointment_time, appointment_jc, studio_content, appointment_user_id, appointment_user_name, apply_time, statu from school_studio_appointment
+    </sql>
+
+    <select id="selectSchoolStudioAppointmentList" parameterType="SchoolStudioAppointment" resultMap="SchoolStudioAppointmentResult">
+        <include refid="selectSchoolStudioAppointmentVo"/>
+        <where>
+            <if test="studioId != null "> and studio_id = #{studioId}</if>
+            <if test="studioName != null  and studioName != ''"> and studio_name like concat('%', #{studioName}, '%')</if>
+            <if test="appointmentTime != null "> and appointment_time = #{appointmentTime}</if>
+            <if test="appointmentJc != null  and appointmentJc != ''"> and appointment_jc = #{appointmentJc}</if>
+            <if test="studioContent != null  and studioContent != ''"> and studio_content like concat('%', #{studioContent}, '%')</if>
+            <if test="appointmentUserId != null "> and appointment_user_id = #{appointmentUserId}</if>
+            <if test="appointmentUserName != null  and appointmentUserName != ''"> and appointment_user_name like concat('%', #{appointmentUserName}, '%')</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="statu != null  and statu != ''"> and statu = #{statu}</if>
+            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(appointment_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
+        </where>
+    </select>
+
+    <select id="selectSchoolStudioAppointmentById" parameterType="Long" resultMap="SchoolStudioAppointmentResult">
+        <include refid="selectSchoolStudioAppointmentVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolStudioAppointment" parameterType="SchoolStudioAppointment" useGeneratedKeys="true" keyProperty="id">
+        insert into school_studio_appointment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="studioId != null">studio_id,studio_name,</if>
+            <if test="appointmentTime != null">appointment_time,</if>
+            <if test="appointmentJc != null and appointmentJc != ''">appointment_jc,</if>
+            <if test="studioContent != null">studio_content,</if>
+            <if test="appointmentUserId != null">appointment_user_id,</if>
+            <if test="appointmentUserName != null and appointmentUserName != ''">appointment_user_name,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="statu != null and statu != ''">statu,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="studioId != null">#{studioId},(select studio_name from school_studio where id = #{studioId}),</if>
+            <if test="appointmentTime != null">#{appointmentTime},</if>
+            <if test="appointmentJc != null and appointmentJc != ''">#{appointmentJc},</if>
+            <if test="studioContent != null">#{studioContent},</if>
+            <if test="appointmentUserId != null">#{appointmentUserId},</if>
+            <if test="appointmentUserName != null and appointmentUserName != ''">#{appointmentUserName},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="statu != null and statu != ''">#{statu},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolStudioAppointment" parameterType="SchoolStudioAppointment">
+        update school_studio_appointment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="studioId != null">studio_id = #{studioId},studio_name = (select studio_name from school_studio where id = #{studioId}),</if>
+            <if test="appointmentTime != null">appointment_time = #{appointmentTime},</if>
+            <if test="appointmentJc != null and appointmentJc != ''">appointment_jc = #{appointmentJc},</if>
+            <if test="studioContent != null">studio_content = #{studioContent},</if>
+            <if test="appointmentUserId != null">appointment_user_id = #{appointmentUserId},</if>
+            <if test="appointmentUserName != null and appointmentUserName != ''">appointment_user_name = #{appointmentUserName},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="statu != null and statu != ''">statu = #{statu},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSchoolStudioAppointmentById" parameterType="Long">
+        delete from school_studio_appointment where id = #{id}
+    </delete>
+
+    <delete id="deleteSchoolStudioAppointmentByIds" parameterType="String">
+        delete from school_studio_appointment where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/schoolStudio/SchoolStudioMapper.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.schoolStudio.SchoolStudioMapper">
+
+    <resultMap type="SchoolStudio" id="SchoolStudioResult">
+        <result property="id"    column="id"    />
+        <result property="studioName"    column="studio_name"    />
+        <result property="studioArea"    column="studio_area"    />
+        <result property="studioStatu"    column="studio_statu"    />
+        <result property="createById"    column="create_by_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateById"    column="update_by_id"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlg"    column="del_flg"    />
+    </resultMap>
+
+    <sql id="selectSchoolStudioVo">
+        select id, studio_name, studio_area, studio_statu, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flg from school_studio
+    </sql>
+
+    <select id="selectSchoolStudioList" parameterType="SchoolStudio" resultMap="SchoolStudioResult">
+        <include refid="selectSchoolStudioVo"/>
+        <where>
+            del_flg = '0'
+            <if test="studioName != null  and studioName != ''"> and studio_name like concat('%', #{studioName}, '%')</if>
+            <if test="studioArea != null  and studioArea != ''"> and studio_area like concat('%', #{studioArea}, '%')</if>
+            <if test="studioStatu != null  and studioStatu != ''"> and studio_statu = #{studioStatu}</if>
+            <if test="createById != null "> and create_by_id = #{createById}</if>
+            <if test="updateById != null "> and update_by_id = #{updateById}</if>
+        </where>
+    </select>
+
+    <select id="selectSchoolStudioById" parameterType="Long" resultMap="SchoolStudioResult">
+        <include refid="selectSchoolStudioVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolStudio" parameterType="SchoolStudio" useGeneratedKeys="true" keyProperty="id">
+        insert into school_studio
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="studioName != null and studioName != ''">studio_name,</if>
+            <if test="studioArea != null and studioArea != ''">studio_area,</if>
+            <if test="studioStatu != null and studioStatu != ''">studio_statu,</if>
+            <if test="createById != null">create_by_id,create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            del_flg,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="studioName != null and studioName != ''">#{studioName},</if>
+            <if test="studioArea != null and studioArea != ''">#{studioArea},</if>
+            <if test="studioStatu != null and studioStatu != ''">#{studioStatu},</if>
+            <if test="createById != null">#{createById},(select user_name from sys_user where user_id = #{createById}),</if>
+            <if test="createTime != null">#{createTime},</if>
+            '0',
+        </trim>
+    </insert>
+
+    <update id="updateSchoolStudio" parameterType="SchoolStudio">
+        update school_studio
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="studioName != null and studioName != ''">studio_name = #{studioName},</if>
+            <if test="studioArea != null and studioArea != ''">studio_area = #{studioArea},</if>
+            <if test="studioStatu != null and studioStatu != ''">studio_statu = #{studioStatu},</if>
+            <if test="updateById != null">update_by_id = #{updateById},update_by = (select user_name from sys_user where user_id = #{updateById}),</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlg != null and delFlg != ''">del_flg = #{delFlg},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSchoolStudioByIds" parameterType="String">
+        update school_studio set del_flg = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/schoolStudio/SchoolStudioUseMapper.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.schoolStudio.SchoolStudioUseMapper">
+
+    <resultMap type="SchoolStudioUse" id="SchoolStudioUseResult">
+        <result property="id"    column="id"    />
+        <result property="appointmentId"    column="appointment_id"    />
+        <result property="studioId"    column="studio_id"    />
+        <result property="studioName"    column="studio_name"    />
+        <result property="useDate"    column="use_date"    />
+        <result property="useJc"    column="use_jc"    />
+        <result property="useUserId"    column="use_user_id"    />
+        <result property="useUserName"    column="use_user_name"    />
+    </resultMap>
+
+    <sql id="selectSchoolStudioUseVo">
+        select id,appointment_id, studio_id, studio_name, use_date, use_jc, use_user_id, use_user_name from school_studio_use
+    </sql>
+
+    <!--录播室使用情况统计-->
+    <select id="selectStudioUse" parameterType="SchoolStudioUse" resultMap="SchoolStudioUseResult">
+        <include refid="selectSchoolStudioUseVo"/>
+        <where>
+            <if test="studioId != null "> and studio_id = #{studioId}</if>
+            <if test="startTime != null  and startTime != ''"> and use_date BETWEEN #{startTime} AND DATE_ADD(#{startTime}, INTERVAL 9 DAY)</if>
+        </where>
+    </select>
+
+    <select id="selectSchoolStudioUseList" parameterType="SchoolStudioUse" resultMap="SchoolStudioUseResult">
+        <include refid="selectSchoolStudioUseVo"/>
+        <where>
+            <if test="studioId != null "> and studio_id = #{studioId}</if>
+            <if test="studioName != null  and studioName != ''"> and studio_name like concat('%', #{studioName}, '%')</if>
+            <if test="useDate != null "> and use_date = #{useDate}</if>
+            <if test="useJc != null  and useJc != ''"> and use_jc = #{useJc}</if>
+            <if test="useUserId != null "> and use_user_id = #{useUserId}</if>
+            <if test="useUserName != null  and useUserName != ''"> and use_user_name like concat('%', #{useUserName}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectSchoolStudioUseById" parameterType="Long" resultMap="SchoolStudioUseResult">
+        <include refid="selectSchoolStudioUseVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolStudioUse" parameterType="SchoolStudioUse" useGeneratedKeys="true" keyProperty="id">
+        insert into school_studio_use
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="appointmentId != null">appointment_id,</if>
+            <if test="studioId != null">studio_id,studio_name,</if>
+            <if test="useDate != null">use_date,</if>
+            <if test="useJc != null and useJc != ''">use_jc,</if>
+            <if test="useUserId != null">use_user_id,</if>
+            <if test="useUserName != null">use_user_name,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="appointmentId != null">#{appointmentId},</if>
+            <if test="studioId != null">#{studioId},(select studio_name from school_studio where id = #{studioId}),</if>
+            <if test="useDate != null">#{useDate},</if>
+            <if test="useJc != null and useJc != ''">#{useJc},</if>
+            <if test="useUserId != null">#{useUserId},</if>
+            <if test="useUserName != null">#{useUserName},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolStudioUse" parameterType="SchoolStudioUse">
+        update school_studio_use
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="studioId != null">studio_id = #{studioId},studio_name = (select studio_name from school_studio where id = #{studioId}),</if>
+            <if test="useDate != null">use_date = #{useDate},</if>
+            <if test="useJc != null and useJc != ''">use_jc = #{useJc},</if>
+            <if test="useUserId != null">use_user_id = #{useUserId},</if>
+            <if test="useUserName != null">use_user_name = #{useUserName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSchoolStudioUseById" parameterType="Long">
+        delete from school_studio_use where id = #{id}
+    </delete>
+
+    <delete id="deleteSchoolStudioUseByIds" parameterType="String">
+        delete from school_studio_use where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSchoolStudioUseByAppId" parameterType="Long">
+        delete from school_studio_use where appointment_id = #{appId}
+    </delete>
+</mapper>
\ No newline at end of file