Skip to content

D
dd_school
Commit 29b98245 by peijy
Options

Merge remote-tracking branch 'origin/master'

parents 220e2cf5 042e1a10
Showing with 4142 additions and 164 deletions
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";
......
ruoyi-ui/src/api/smartSchool/indexMould/myTask/audApplicationapproval/index.js 0 → 100644
import request from "@/utils/request";
// 礼堂申请审批待办列表
export function audiDetail(data) {
return request({
url: "/auditorium/taskList",
method: "get",
data: data,
});
}
/** 礼堂预约申请审批*/
export function completelt({ taskId, instanceId, comment, pass }) {
return request({
url: `/auditorium/complete/${taskId}/${instanceId}`,
method: "post",
data: {
comment,
pass,
},
});
}
// 查询礼堂申请已办列表
export function taskDoneList() {
return request({
url: "/auditorium/taskDoneList",
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/indexMould/myTask/depBudgetapproval/index.js 0 → 100644
import request from "@/utils/request";
// 查看科室预算待办列表
export function departiDetail(data) {
return request({
url: "/departmentBudget/taskList",
method: "get",
data: data,
});
}
/** 科室预算填报审批*/
export function complete({ taskId, instanceId, comment, pass }) {
return request({
url: `departmentBudget/complete/${taskId}/${instanceId}`,
method: "post",
data: {
comment,
pass,
},
});
}
// 查看科室预算已办列表
export function taskDoneList() {
return request({
url: "/departmentBudget/taskDoneList",
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/logisticsManage/detailsofFundusage.js
import request from "@/utils/request";
//查询列表
export function getListlb(query) {
const { budgetName, purchaseName } = query;
return request({
url: "/purchaseApproval/selectPurchaseList",
url: `/purchaseApproval/selectPurchaseList?budgetName=${budgetName}&purchaseName=${purchaseName}`,
method: "get",
params: query,
});
}
// 查看详情
......
ruoyi-ui/src/api/smartSchool/officialWork/budgetFilling.js
......@@ -40,3 +40,10 @@ export function deleteDepart(id) {
method: "delete",
});
}
// 提交申请
export function submitApply(id) {
return request({
url: "/departmentBudget/submitApply/" + id,
method: "post",
});
}
ruoyi-ui/src/api/smartSchool/personWork/auditoriumReservation/index.js
......@@ -3,13 +3,12 @@ import request from "@/utils/request";
// 查询礼堂预约列表
export function listAuditor(query) {
return request({
url: "/auditorium/list",
url: "/auditorium/listGr",
method: "get",
params: query,
});
}
// 新增礼堂预约
export function addAuditor(data) {
return request({
......@@ -49,18 +48,13 @@ export function submitAuditor(id) {
url: "/auditorium/submitApply/" + id,
method: "post",
});
}
}
//获取校领导下拉框
export function getGradeOfficeDirectorList() {
export function getLeaderList(data) {
return request({
url: "/school/teacherLeave/getSchoolLeader" ,
params: form,
url: "/school/teacherLeave/getSchoolLeader",
method: "get",
params: data,
});
}
ruoyi-ui/src/api/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.js
......@@ -18,9 +18,9 @@ export function getAppointmentList(data) {
});
}
// 查询录播室使用情况
export function getstudioUse() {
export function getstudioUse(startTime, studioId) {
return request({
url: "/studioUse/list",
url: "/studioUse/list?startTime=" + startTime + "&studioId=" + studioId,
method: "get",
});
}
ruoyi-ui/src/enums/home/index.js
......@@ -46,13 +46,13 @@ export const approves = [
},
{
label: "礼堂申请审批",
name: "audApplicationapproval",
name: "auditoriumNum",
icon: "food",
path: "/indexMould/myTask/audApplicationapproval",
},
{
label: "科室预算审批",
name: "depBudgetapproval",
name: "departmentBudgetNum",
icon: "teacher",
path: "/indexMould/myTask/depBudgetapproval",
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhandleResolv.vue
<template>
<!-- 办理 -->
<div style="height: 100%;">
<el-dialog :visible.sync="open" :modal="false" :fullscreen="true" :modal-append-to-body="false" :show-close="false">
<template slot="title">
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhishandleResolve.vue
<template>
<!-- 历史 -->
<div style="height: 100%;">
<el-dialog :visible.sync="open" :modal="false" :fullscreen="true" :modal-append-to-body="false" :show-close="false">
<template slot="title">
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auinfo.vue
......@@ -8,32 +8,40 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动名称">
<el-input :value="infoForm.purchaseName"></el-input>
<el-input :value="infoForm.activityName"></el-input>
</el-form-item>
<el-form-item label="活动地点">
<el-input :value="infoForm.budgetName"></el-input>
<el-form-item label="活动场地">
<el-input :value="infoForm.activityArea"></el-input>
</el-form-item>
<el-form-item label="负责人">
<el-input :value="infoForm.purchaseMoney"></el-input>
<el-input :value="infoForm.specificUserName"></el-input>
</el-form-item>
<el-form-item label="活动人数">
<el-input :value="infoForm.activityNumber"></el-input>
</el-form-item>
<el-form-item label="活动人数">
<el-input :value="infoForm.deptName"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否彩排">
<el-input :value="infoForm.deptName"></el-input>
<el-input :value="infoForm.isRehearsal"></el-input>
</el-form-item>
<el-form-item label="书否录像">
<el-input :value="infoForm.applyUser"></el-input>
</el-col>
<el-col :span="12">
<el-form-item label="是否录像">
<el-input :value="infoForm.isRehearsal"></el-input>
</el-form-item>
<el-form-item label="是否直播">
<el-input :value="infoForm.expectedDate"></el-input>
<el-input :value="infoForm.isLive"></el-input>
</el-form-item>
<el-form-item label="申请部门">
<el-input :value="infoForm.applyDept"></el-input>
</el-form-item>
<el-form-item label="申请人">
<el-input :value="infoForm.applyName"></el-input>
</el-form-item>
<el-form-item label="申请部门">
<el-input :value="infoForm.expectedDate"></el-input>
</el-form-item>
<el-form-item label="申请时间">
<el-input :value="infoForm.applyTime"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -45,8 +53,12 @@
</template>
<script>
import { purchaseApprovalDetail } from "@/api/smartSchool/indexMould/myTask/teacherLeaveInfo";
import TaskResolve from "@/views/smartSchool/indexMould/myTask/purchaseApproval/components/TaskResolve.vue"
import {
getAuditor,// 查看详情
} from "@/api/smartSchool/personWork/auditoriumReservation";
import TaskResolve from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/autaskResolve.vue"
export default {
name: "auinfo",
......@@ -104,8 +116,9 @@ export default {
methods: {
/** 获取详情 */
getDetailInfo() {
purchaseApprovalDetail(this.id).then(res => {
getAuditor(this.id).then(res => {
this.infoForm = res.data
console.log(111,this.infoForm);
})
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/autaskResolve.vue
......@@ -35,8 +35,11 @@
</template>
<script>
import { complete } from "@/api/smartSchool/index/purchaseApproval.js";
import {
completelt,/** 礼堂预约申请审批*/
} from "@/api/smartSchool/indexMould/myTask/audApplicationapproval";
export default {
name: "TaskResolve",
dicts: ['template_comments', 'apply_results'],
......@@ -54,7 +57,7 @@ export default {
return {
postForm: {
comment: '',
pass: "1",
pass: "true",
},
// 意见模板
templateComment: '',
......@@ -86,7 +89,7 @@ export default {
if (valid) {
this.$modal.loading('正在提交数据，请稍等...');
complete({
completelt({
taskId: this.$attrs.taskId,
instanceId: this.instanceId,
comment: this.postForm.comment,
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/index.vue
......@@ -11,22 +11,22 @@
</el-tab-pane>
</el-tabs>
</div>
<div class="task-right-content">
<el-form :model="queryParams" :inline="true" style="padding:0 0 0 0" size="small">
</el-form>
<el-table :data="tableData" v-loading="loading">
<el-table :data="tableData">
<el-table-column prop="lesson" label="序号" width="60" type="index" align="center"
style="height: 20px;" />
<el-table-column prop="hdmc" label="活动名称" align="center" />
<el-table-column label="活动地点" align="center" prop="budgetName" />
<el-table-column label="负责人" align="center" prop="purchaseMoney" />
<el-table-column label="活动人数" align="center" prop="expectedDate" />
<el-table-column prop="deptName" label="是否彩排" align="center" />
<el-table-column label="是否录像" align="center" prop="applyUser" />
<el-table-column label="是否直播" align="center" prop="sfzb" />
<el-table-column label="申请部门" align="center" prop="applydepart" />
<el-table-column label="申请人" align="center" prop="applypeople" />
<el-table-column prop="activityName" label="活动名称" align="center" />
<el-table-column label="活动地点" align="center" prop="activityArea" />
<el-table-column label="负责人" align="center" prop="specificUserName" />
<el-table-column label="活动人数" align="center" prop="activityNumber" />
<el-table-column prop="isRehearsal" label="是否彩排" align="center" />
<el-table-column label="是否录像" align="center" prop="isVideo" />
<el-table-column label="是否直播" align="center" prop="isVideo" />
<el-table-column label="申请部门" align="center" prop="applyDept" />
<el-table-column label="申请人" align="center" prop="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" />
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
......@@ -61,11 +61,9 @@
<script>
import {
queryMyClaim,
getTaskDoneList,
complete,
getTaskListe,
} from "@/api/smartSchool/index/purchaseApproval.js";
taskDoneList, //查询礼堂申请已办列表
audiDetail,// 礼堂申请审批待办列表
} from "@/api/smartSchool/indexMould/myTask/audApplicationapproval";
import auhandleResolv from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhandleResolv.vue";
import hisHandleResolve from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhishandleResolve.vue";
......@@ -84,9 +82,7 @@ export default {
// pageSize: 10,
},
tableData: [
{
hdmc:'活动',
}
],
// 存储行数据
rowData: {},
......@@ -115,7 +111,7 @@ export default {
console.log("历史人物")
this.isTaskListe = false
this.loading = true;
getTaskDoneList().then((response) => {
taskDoneList().then((response) => {
this.tableData = response.rows
this.total = response.total
this.loading = false
......@@ -124,7 +120,7 @@ export default {
console.log("金额人物")
this.loading = true;
this.isTaskListe = true
getTaskListe().then((response) => {
audiDetail().then((response) => {
this.tableData = response.rows
this.total = response.total
this.loading = false
......@@ -140,12 +136,12 @@ export default {
pageSize: 10,
}
this.isTaskListe = true
// getTaskListe().then((response) => {
// this.tableData = response.rows
// // console.log(response.rows);
// this.loading = false
audiDetail().then((response) => {
this.tableData = response.rows
// console.log(response.rows);
this.loading = false
// });
});
},
// 搜索查询
......@@ -154,7 +150,7 @@ export default {
this.isTaskListe = true
// console.log(445566);
getTaskListe(this.queryParams.purchaseName).then((response) => {
audiDetail(this.queryParams.purchaseName).then((response) => {
// this.tableData = response.rows
console.log(response.rows);
// this.loading = false
......@@ -178,12 +174,18 @@ export default {
this.process.id = row.id;
this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName
this.rowData.applyUser = row.applyUser
this.rowData.deptName = row.deptName
this.rowData.expectedDate = row.expectedDate
this.rowData.purchaseMoney = row.purchaseMoney
this.rowData.budgetName = row.budgetName
this.rowData.applyUserName = row.applyUserName;
this.rowData.activityName = row.activityName;
this.rowData.activityArea = row.activityArea;
this.rowData.activityTime = row.activityTime;
this.rowData.htNumber = row.htNumber;
this.rowData.specificUserName = row.specificUserName;
this.rowData.activityNumber = row.activityNumber;
this.rowData.isRehearsal = row.isRehearsal;
this.rowData.isVideo = row.isVideo;
this.rowData.isBigScreen = row.isBigScreen;
this.rowData.applyName = row.applyName;
this.rowData.applyDept = row.applyDept;
},
/**历史 */
......@@ -194,12 +196,18 @@ export default {
this.process.id = row.id;
this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName
this.rowData.applyUser = row.applyUser
this.rowData.deptName = row.deptName
this.rowData.expectedDate = row.expectedDate
this.rowData.purchaseMoney = row.purchaseMoney
this.rowData.budgetName = row.budgetName
this.rowData.applyUserName = row.applyUserName;
this.rowData.activityName = row.activityName;
this.rowData.activityArea = row.activityArea;
this.rowData.activityTime = row.activityTime;
this.rowData.htNumber = row.htNumber;
this.rowData.specificUserName = row.specificUserName;
this.rowData.activityNumber = row.activityNumber;
this.rowData.isRehearsal = row.isRehearsal;
this.rowData.isVideo = row.isVideo;
this.rowData.isBigScreen = row.isBigScreen;
this.rowData.applyName = row.applyName;
this.rowData.applyDept = row.applyDept;
},
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/components/deinfo.vue
......@@ -8,18 +8,18 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="科室">
<el-input :value="infoForm.purchaseName"></el-input>
<el-input :value="infoForm.deptName"></el-input>
</el-form-item>
<el-form-item label="填报人">
<el-input :value="infoForm.budgetName"></el-input>
<el-input :value="infoForm.informant"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分管领导">
<el-input :value="infoForm.deptName"></el-input>
<el-input :value="infoForm.leadershipName"></el-input>
</el-form-item>
<el-form-item label="填报时间">
<el-input :value="infoForm.applyUser"></el-input>
<el-input :value="infoForm.tbTime"></el-input>
</el-form-item>
</el-col>
......@@ -33,13 +33,15 @@
</template>
<script>
import { purchaseApprovalDetail } from "@/api/smartSchool/indexMould/myTask/teacherLeaveInfo";
import detaskResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/detaskResolve.vue"
import {
queryDepart,//查看本单位预算填报列表;
} from '@/api/smartSchool/officialWork/budgetFilling'
import TaskResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/detaskResolve.vue"
export default {
name: "auinfo",
name: "deinfo",
dicts: ['biz_leave_type', 'course_num'],
components: { detaskResolve },
components: { TaskResolve },
props: {
id: {
type: [String, Number],
......@@ -92,7 +94,7 @@ export default {
methods: {
/** 获取详情 */
getDetailInfo() {
purchaseApprovalDetail(this.id).then(res => {
queryDepart(this.id).then(res => {
this.infoForm = res.data
})
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/components/detaskResolve.vue
......@@ -35,7 +35,7 @@
</template>
<script>
import { complete } from "@/api/smartSchool/index/purchaseApproval.js";
import { complete } from "@/api/smartSchool/indexMould/myTask/depBudgetapproval";
export default {
name: "TaskResolve",
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/index.vue
......@@ -15,12 +15,11 @@
<el-form :model="queryParams" :inline="true" style="padding:0 0 0 0" size="small">
</el-form>
<el-table :data="tableData" v-loading="loading">
<el-table-column prop="nd" label="年度" width="60" type="index" align="center"
style="height: 20px;" />
<el-table-column prop="ks" label="科室" align="center" />
<el-table-column label="填报人" align="center" prop="budgetName" />
<el-table-column label="分管领导" align="center" prop="purchaseMoney" />
<el-table-column label="填报时间" align="center" prop="applyTime" />
<el-table-column prop="year" label="年度" width="60" type="index" align="center" style="height: 20px;" />
<el-table-column prop="deptName" label="科室" align="center" />
<el-table-column label="填报人" align="center" prop="informant" />
<el-table-column label="分管领导" align="center" prop="leadershipName" />
<el-table-column label="填报时间" align="center" prop="tbTime" />
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button v-if="isTaskListe" type="text" size="mini" icon="el-icon-edit"
......@@ -54,11 +53,11 @@
<script>
import {
queryMyClaim,
getTaskDoneList,
taskDoneList,// 查看科室预算已办列表
complete,
getTaskListe,
} from "@/api/smartSchool/index/purchaseApproval.js";
departiDetail,// 查看科室预算待办列表
} from "@/api/smartSchool/indexMould/myTask/depBudgetapproval";
import HandleResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/dehandleResolv.vue";
import hisHandleResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/dehishandleResolve.vue";
......@@ -108,7 +107,7 @@ export default {
console.log("历史人物")
this.isTaskListe = false
this.loading = true;
getTaskDoneList().then((response) => {
taskDoneList().then((response) => {
this.tableData = response.rows
this.total = response.total
this.loading = false
......@@ -117,7 +116,7 @@ export default {
console.log("金额人物")
this.loading = true;
this.isTaskListe = true
getTaskListe().then((response) => {
departiDetail().then((response) => {
this.tableData = response.rows
this.total = response.total
this.loading = false
......@@ -133,12 +132,12 @@ export default {
pageSize: 10,
}
this.isTaskListe = true
// getTaskListe().then((response) => {
// this.tableData = response.rows
// // console.log(response.rows);
// this.loading = false
departiDetail().then((response) => {
this.tableData = response.rows
// console.log(response.rows);
this.loading = false
// });
});
},
// 搜索查询
......@@ -146,8 +145,8 @@ export default {
// this.loading = true;
this.isTaskListe = true
// console.log(445566);
getTaskListe(this.queryParams.purchaseName).then((response) => {
// this.tableData = response.rows
departiDetail().then((response) => {
this.tableData = response.rows
console.log(response.rows);
// this.loading = false
......@@ -170,12 +169,12 @@ export default {
this.process.id = row.id;
this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName
this.rowData.applyUser = row.applyUser
this.rowData.year = row.year
this.rowData.deptName = row.deptName
this.rowData.informant = row.informant
this.rowData.expectedDate = row.expectedDate
this.rowData.purchaseMoney = row.purchaseMoney
this.rowData.budgetName = row.budgetName
this.rowData.leadershipName = row.leadershipName
this.rowData.tbTime = row.tbTime
},
/**历史 */
......@@ -186,12 +185,12 @@ export default {
this.process.id = row.id;
this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName
this.rowData.applyUser = row.applyUser
this.rowData.year = row.year
this.rowData.deptName = row.deptName
this.rowData.informant = row.informant
this.rowData.expectedDate = row.expectedDate
this.rowData.purchaseMoney = row.purchaseMoney
this.rowData.budgetName = row.budgetName
this.rowData.leadershipName = row.leadershipName
this.rowData.tbTime = row.tbTime
},
},
......
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetApproval/index.vue
......@@ -314,23 +314,26 @@ export default {
// 使用页面跳转方法，例如 Vue Router
this.$router.push(detailUrl);
console.log(1222, row.projectName);
},
// 已使用金额操作
handleAmountClick(row) {
console.log('row', row);
this.$router.push({
path: "/logisticsManage/detailsofFundusage",
query: { projectName: row.projectName }
query: {
budgetName: row.budgetName,
purchaseName: row.purchaseName
}
});
},
// 获取列表
getList() {
this.loading = true;
getBudgetList(this.queryForm).then(response => {
this.loading = false;
this.budgetList = response.rows;
console.log(111, this.budgetList);
this.total = response.total;
}).catch(err => {
this.loading = false;
......
ruoyi-ui/src/views/smartSchool/logisticsManage/detailsofFundusage/index.vue
......@@ -12,7 +12,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="clockRecordList" stripe>
<el-table :data="clockRecordList" stripe>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="标题" align="center" prop="purchaseName" />
<el-table-column label="采购费用-元" align="center" prop="purchaseMoney" />
......@@ -93,12 +93,17 @@ export default {
name: 'detailsofFundusage',
data() {
return {
// 预算项目
budgetName: '',
dialogEditNote: false,
form: {},
// 日期范围
dateRange: [],
// 模糊搜索
queryParams: {},
queryParams: {
purchaseName: "",
budgetName: "",
},
// 加载遮罩
loading: true,
// 记录条数
......@@ -120,14 +125,32 @@ export default {
},
// 目标页面的组件
created() {
const projectName = this.$route.query.projectName;
console.log(111,projectName); // 在控制台中输出 projectName 的值
// const budgetName = this.$route.query.budgetName;
// console.log(this.$route);
// console.log(111, budgetName); // 在控制台中输出 budgetName 的值
},
mounted() {
// const budgetName = this.$route.query.budgetName;
// console.log(this.$route);
// console.log('budgetName', budgetName);
},
methods: {
// 获取列表
getList() {
this.loading = true;
getListlb(this.queryParams).then(response => {
this.budgetName = this.$route.query.budgetName;
this.purchaseName = this.$route.query.purchaseName == undefined ? '' : this.$route.query.purchaseName;
console.log('this.budgetName', this.budgetName);
const query = {
budgetName: this.budgetName,
purchaseName: this.purchaseName
};
getListlb(query).then(response => {
console.log(111, this.budgetName);
this.clockRecordList = response.rows;
console.log(this.clockRecordList);
this.total = response.total;
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/components/SelectUser.vue 0 → 100644
<template>
<el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
<!-- 模糊查询-->
<el-form :model="form" ref="form" size="small" inline>
<el-form-item prop="teacherName" label="姓名">
<el-input v-model.trim="form.teacherName" placeholder="请输入姓名" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item prop="teacherTel" label="联系电话">
<el-input v-model.trim="form.teacherTel" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
<el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
</el-form-item>
</el-form>
<!-- 列表数据-->
<el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
@row-click="rowClick">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column v-if="execute === 'leaderList'" key="avatar" prop="avatar" label="头像" align="center">
<template slot-scope="scope">
<el-image :src="baseURL + scope.row.avatar" :preview-src-list="[baseURL + scope.row.avatar]"
class="custom-image radius-image">
<template slot="error">
{{ }}
</template>
</el-image>
</template>
</el-table-column>
<el-table-column v-if="execute != 'leaderList'" key="teacherCode" prop="teacherCode" label="教师编号"
align="center"></el-table-column>
<el-table-column key="teacherName" prop="teacherName" label="姓名" align="center"></el-table-column>
<el-table-column key="teacherTel" prop="teacherTel" label="联系电话" align="center"></el-table-column>
<el-table-column key="sex" prop="sex" label="性别" align="center">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"></dict-tag>
</template>
</el-table-column>
</el-table>
<!-- 分页-->
<pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
@pagination="search"></pagination>
<!-- 底部-->
<div slot="footer">
<el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
<el-button @click="quit" size="small">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import {
getLeaderList,//获取校领导下拉框
} from "@/api/smartSchool/personWork/auditoriumReservation";
export default {
name: "SelectUser",
dicts: ['sys_user_sex'],
props: {
open: {
type: Boolean,
require: true
},
title: {
type: String,
default: ''
},
width: {
type: [Number, String],
default: '50%'
},
execute: {
type: [String]
},
// 选择级部、处室主任
id: {
type: [Number, String]
}
},
data() {
return {
baseURL: process.env.VUE_APP_BASE_API,
form: {
teacherName: '',
teacherTel: '',
pageNum: 1,
pageSize: 10
},
total: 0,
loading: false,
userList: [],
selectUser: null
}
},
computed: {
openDialog: {
get() {
return this.open;
},
set(value) {
this.$emit('update:open', value);
}
}
},
watch: {
open(value) {
if (value) {
this.$nextTick(() => {
this.reset();
})
}
}
},
methods: {
/** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
async search() {
if (isNaN(Number(this.id))) {
console.error('Invalid ID');
return;
}
try {
this.loading = true;
const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
this.userList = response.rows || [];
this.total = response.total;
this.loading = false;
} catch (exception) {
this.loading = false;
throw new Error(exception);
}
},
/** 重置表单 */
reset() {
this.form = {
teacherName: '',
teacherTel: '',
pageNum: 1,
pageSize: 10
};
this.resetForm('form');
this.search();
},
/** 选项选中发生变化 */
selectionChange(selections) {
this.selectUser = selections[0];
},
/** 点击选中、取消 */
rowClick(row, column) {
this.$refs['tableList'].clearSelection();
this.$refs['tableList'].toggleRowSelection(row, true);
},
/** 提交选中 */
submit() {
this.$emit('select', {
id: this.selectUser.id,
name: this.selectUser.teacherName,
tel: this.selectUser.teacherTel
});
this.quit();
},
/** 取消 */
quit() {
this.openDialog = false;
},
/** 分管领导、主要领导 */
leaderList(form) {
return getLeaderList(form);
},
dialogClose() {
this.userList = []
}
}
}
</script>
<style scoped>
.footer {
display: flex;
justify-content: center;
margin-top: 30px;
}
.radius-image {
border-radius: 40px;
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/components/SelectUser.vue
......@@ -3,12 +3,10 @@
<!-- 模糊查询-->
<el-form :model="form" ref="form" size="small" inline>
<el-form-item prop="teacherName" label="姓名">
<el-input v-model.trim="form.teacherName" placeholder="请输入姓名" clearable
@keyup.enter.native="search"></el-input>
<el-input v-model.trim="form.teacherName" placeholder="请输入姓名" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item prop="teacherTel" label="联系电话">
<el-input v-model.trim="form.teacherTel" placeholder="请输入联系电话" clearable
@keyup.enter.native="search"></el-input>
<el-input v-model.trim="form.teacherTel" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
......@@ -16,18 +14,13 @@
</el-form-item>
</el-form>
<!-- 列表数据-->
<el-table
ref="tableList"
v-loading="loading"
:data="userList"
@selection-change="selectionChange"
@row-click="rowClick"
>
<el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
@row-click="rowClick">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column v-if="execute === 'leaderList'" key="avatar" prop="avatar" label="头像" align="center">
<template slot-scope="scope">
<el-image :src="baseURL + scope.row.avatar" :preview-src-list="[baseURL + scope.row.avatar]"
class="custom-image radius-image">
class="custom-image radius-image">
<template slot="error">
{{ }}
</template>
......@@ -35,7 +28,7 @@
</template>
</el-table-column>
<el-table-column v-if="execute != 'leaderList'" key="teacherCode" prop="teacherCode" label="教师编号"
align="center"></el-table-column>
align="center"></el-table-column>
<el-table-column key="teacherName" prop="teacherName" label="姓名" align="center"></el-table-column>
<el-table-column key="teacherTel" prop="teacherTel" label="联系电话" align="center"></el-table-column>
<el-table-column key="sex" prop="sex" label="性别" align="center">
......@@ -45,13 +38,8 @@
</el-table-column>
</el-table>
<!-- 分页-->
<pagination
v-show="total > 0"
:total="total"
:limit.sync="form.pageSize"
:page.sync="form.pageNum"
@pagination="search"
></pagination>
<pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
@pagination="search"></pagination>
<!-- 底部-->
<div slot="footer">
<el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
......@@ -62,8 +50,10 @@
<script>
import {getGradeOfficeDirectorList, getLeaderList} from "@/api/smartSchool/personWork/leaveApply";
import {
getLeaderList,//获取校领导下拉框
} from "@/api/smartSchool/personWork/auditoriumReservation";
export default {
name: "SelectUser",
dicts: ['sys_user_sex'],
......@@ -126,13 +116,14 @@ export default {
methods: {
/** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
async search() {
// if (!this.id || Number(this.id) === NaN) {
if (!this.id || isNaN(this.id)) {
throw TypeError('级部/处室id应为非空数字类型！');
if (isNaN(Number(this.id))) {
console.error('Invalid ID');
return;
}
try {
this.loading = true;
const response = await this[this.execute]({applyOrgid: this.id, ...this.form});
const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
this.userList = response.rows || [];
this.total = response.total;
this.loading = false;
......@@ -141,6 +132,7 @@ export default {
throw new Error(exception);
}
},
/** 重置表单 */
reset() {
this.form = {
......@@ -158,6 +150,7 @@ export default {
},
/** 点击选中、取消 */
rowClick(row, column) {
console.log('row', row);
this.$refs['tableList'].clearSelection();
this.$refs['tableList'].toggleRowSelection(row, true);
},
......@@ -175,10 +168,7 @@ export default {
this.openDialog = false;
},
/** 级部、处室主任选择 */
gradeOfficeDirector(form) {
return getGradeOfficeDirectorList(form);
},
/** 分管领导、主要领导 */
leaderList(form) {
......
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment /IdleSituation/index.vue → ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
......@@ -146,10 +146,11 @@ export default {
changeDate() {
this.endTime = moment(this.queryParams.startTime).add(9, 'days')
},
fetchStudioUseData() {
// 调用接口获取录播室占用情况数据
console.log(123654, this.queryParams);
getstudioUse(this.queryParams).then((res) => {
getstudioUse(this.queryParams.startTime, this.queryParams.studioId).then((res) => {
this.studioUseData = res.rows;
console.log(123, this.studioUseData);
});
......
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/SchoolDepartmentBudgetProjectmxController.java 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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/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 0 → 100644
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/schoolStudio/SchoolStudioAppointmentServiceImpl.java 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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 0 → 100644
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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment