Browse Source

Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/zhjwxt

master
王泽彦 10 months ago
parent
commit
881b03edde
  1. 62
      admin/src/app/api/assignment.ts
  2. 23
      admin/src/app/lang/zh-cn/assignment.assignment.json
  3. 274
      admin/src/app/views/assignment/assignment.vue
  4. 291
      admin/src/app/views/assignment/components/assignment-edit.vue
  5. 8
      niucloud/app/.idea/.gitignore
  6. 8
      niucloud/app/.idea/app.iml
  7. 8
      niucloud/app/.idea/modules.xml
  8. 22
      niucloud/app/.idea/php.xml
  9. 6
      niucloud/app/.idea/vcs.xml
  10. 119
      niucloud/app/adminapi/controller/assignment/Assignment.php
  11. 46
      niucloud/app/adminapi/route/assignment.php
  12. 189
      niucloud/app/api/controller/apiController/Attendance.php
  13. 25
      niucloud/app/api/controller/apiController/CustomerResources.php
  14. 101
      niucloud/app/model/assignment/Assignment.php
  15. 27
      niucloud/app/model/customer_resources/CustomerResources.php
  16. 123
      niucloud/app/service/admin/assignment/AssignmentService.php
  17. 12
      niucloud/app/service/api/apiService/AttendanceService.php
  18. 5
      niucloud/app/service/api/apiService/CustomerResourcesService.php
  19. 43
      niucloud/app/validate/assignment/Assignment.php

62
admin/src/app/api/assignment.ts

@ -0,0 +1,62 @@
import request from '@/utils/request'
// USER_CODE_BEGIN -- assignment
/**
*
* @param params
* @returns
*/
export function getAssignmentList(params: Record<string, any>) {
return request.get(`assignment/assignment`, {params})
}
/**
*
* @param id id
* @returns
*/
export function getAssignmentInfo(id: number) {
return request.get(`assignment/assignment/${id}`);
}
/**
*
* @param params
* @returns
*/
export function addAssignment(params: Record<string, any>) {
return request.post('assignment/assignment', params, { showErrorMessage: true, showSuccessMessage: true })
}
/**
*
* @param id
* @param params
* @returns
*/
export function editAssignment(params: Record<string, any>) {
return request.put(`assignment/assignment/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
}
/**
*
* @param id
* @returns
*/
export function deleteAssignment(id: number) {
return request.delete(`assignment/assignment/${id}`, { showErrorMessage: true, showSuccessMessage: true })
}
export function getWithClassGradeList(params: Record<string,any>){
return request.get('assignment/class_grade_all', {params})
}export function getWithCourseList(params: Record<string,any>){
return request.get('assignment/course_all', {params})
}export function getWithPersonnelList(params: Record<string,any>){
return request.get('assignment/personnel_all', {params})
}export function getWithStudentList(params: Record<string,any>){
return request.get('assignment/student_all', {params})
}
// USER_CODE_END -- assignment

23
admin/src/app/lang/zh-cn/assignment.assignment.json

@ -0,0 +1,23 @@
{
"classId":"班级",
"classIdPlaceholder":"全部",
"courseId":"课程",
"courseIdPlaceholder":"全部",
"personnelId":"老师",
"personnelIdPlaceholder":"全部",
"studentId":"学员",
"studentIdPlaceholder":"全部",
"description":"作业描述",
"descriptionPlaceholder":"请输入作业描述",
"contentType":"作业类型",
"contentTypePlaceholder":"请输入作业类型",
"contentText":"学生提交的作业内容",
"contentTextPlaceholder":"请输入学生提交的作业内容",
"status":"状态",
"statusPlaceholder":"请输入状态",
"addAssignment":"添加作业管理",
"updateAssignment":"编辑作业管理",
"assignmentDeleteTips":"确定要删除该数据吗?",
"startDate":"请选择开始时间",
"endDate":"请选择结束时间"
}

274
admin/src/app/views/assignment/assignment.vue

@ -0,0 +1,274 @@
<template>
<div class="main-container">
<el-card class="box-card !border-none" shadow="never">
<div class="flex justify-between items-center">
<span class="text-lg">{{pageName}}</span>
<el-button type="primary" @click="addEvent">
{{ t('addAssignment') }}
</el-button>
</div>
<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="assignmentTable.searchParam" ref="searchFormRef">
<el-form-item :label="t('classId')" prop="class_id">
<el-select class="w-[280px]" v-model="assignmentTable.searchParam.class_id" clearable :placeholder="t('classIdPlaceholder')">
<el-option
v-for="(item, index) in classIdList"
:key="index"
:label="item['class_name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('courseId')" prop="course_id">
<el-select class="w-[280px]" v-model="assignmentTable.searchParam.course_id" clearable :placeholder="t('courseIdPlaceholder')">
<el-option
v-for="(item, index) in courseIdList"
:key="index"
:label="item['course_name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('personnelId')" prop="personnel_id">
<el-select class="w-[280px]" v-model="assignmentTable.searchParam.personnel_id" clearable :placeholder="t('personnelIdPlaceholder')">
<el-option
v-for="(item, index) in personnelIdList"
:key="index"
:label="item['name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('studentId')" prop="student_id">
<el-select class="w-[280px]" v-model="assignmentTable.searchParam.student_id" clearable :placeholder="t('studentIdPlaceholder')">
<el-option
v-for="(item, index) in studentIdList"
:key="index"
:label="item['name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('status')" prop="status">
<el-select class="w-[280px]" v-model="assignmentTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in statusList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadAssignmentList()">{{ t('search') }}</el-button>
<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
</el-form-item>
</el-form>
</el-card>
<div class="mt-[10px]">
<el-table :data="assignmentTable.data" size="large" v-loading="assignmentTable.loading">
<template #empty>
<span>{{ !assignmentTable.loading ? t('emptyData') : '' }}</span>
</template>
<el-table-column prop="class_id_name" :label="t('classId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="course_id_name" :label="t('courseId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="personnel_id_name" :label="t('personnelId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="student_id_name" :label="t('studentId')" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="description" :label="t('description')" min-width="120" :show-overflow-tooltip="true"/>
<!--
<el-table-column :label="t('contentType')" min-width="180" align="center" :show-overflow-tooltip="true">
<template #default="{ row }">
<div v-for="(item, index) in content_typeList">
<div v-if="item.value == row.content_type">{{ item.name }}</div>
</div>
</template>
</el-table-column> -->
<el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
<template #default="{ row }">
<div v-for="(item, index) in statusList">
<div v-if="item.value == row.status">{{ item.name }}</div>
</div>
</template>
</el-table-column>
<el-table-column :label="t('operation')" fixed="right" min-width="120">
<template #default="{ row }">
<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
<el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-[16px] flex justify-end">
<el-pagination v-model:current-page="assignmentTable.page" v-model:page-size="assignmentTable.limit"
layout="total, sizes, prev, pager, next, jumper" :total="assignmentTable.total"
@size-change="loadAssignmentList()" @current-change="loadAssignmentList" />
</div>
</div>
<edit ref="editAssignmentDialog" @complete="loadAssignmentList" />
</el-card>
</div>
</template>
<script lang="ts" setup>
import { reactive, ref, watch } from 'vue'
import { t } from '@/lang'
import { useDictionary } from '@/app/api/dict'
import { getAssignmentList, deleteAssignment, getWithClassGradeList, getWithCourseList, getWithPersonnelList, getWithStudentList } from '@/app/api/assignment'
import { img } from '@/utils/common'
import { ElMessageBox,FormInstance } from 'element-plus'
import Edit from '@/app/views/assignment/components/assignment-edit.vue'
import { useRoute } from 'vue-router'
const route = useRoute()
const pageName = route.meta.title;
let assignmentTable = reactive({
page: 1,
limit: 10,
total: 0,
loading: true,
data: [],
searchParam:{
"class_id":"",
"course_id":"",
"personnel_id":"",
"student_id":"",
"status":""
}
})
const searchFormRef = ref<FormInstance>()
//
const selectData = ref<any[]>([])
//
const content_typeList = ref([] as any[])
const content_typeDictList = async () => {
content_typeList.value = await (await useDictionary('content_type')).data.dictionary
}
content_typeDictList();
const statusList = ref([] as any[])
const statusDictList = async () => {
statusList.value = await (await useDictionary('assignment_status')).data.dictionary
}
statusDictList();
/**
* 获取作业管理列表
*/
const loadAssignmentList = (page: number = 1) => {
assignmentTable.loading = true
assignmentTable.page = page
getAssignmentList({
page: assignmentTable.page,
limit: assignmentTable.limit,
...assignmentTable.searchParam
}).then(res => {
assignmentTable.loading = false
assignmentTable.data = res.data.data
assignmentTable.total = res.data.total
}).catch(() => {
assignmentTable.loading = false
})
}
loadAssignmentList()
const editAssignmentDialog: Record<string, any> | null = ref(null)
/**
* 添加作业管理
*/
const addEvent = () => {
editAssignmentDialog.value.setFormData()
editAssignmentDialog.value.showDialog = true
}
/**
* 编辑作业管理
* @param data
*/
const editEvent = (data: any) => {
editAssignmentDialog.value.setFormData(data)
editAssignmentDialog.value.showDialog = true
}
/**
* 删除作业管理
*/
const deleteEvent = (id: number) => {
ElMessageBox.confirm(t('assignmentDeleteTips'), t('warning'),
{
confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'),
type: 'warning',
}
).then(() => {
deleteAssignment(id).then(() => {
loadAssignmentList()
}).catch(() => {
})
})
}
const classIdList = ref([])
const setClassIdList = async () => {
classIdList.value = await (await getWithClassGradeList({})).data
}
setClassIdList()
const courseIdList = ref([])
const setCourseIdList = async () => {
courseIdList.value = await (await getWithCourseList({})).data
}
setCourseIdList()
const personnelIdList = ref([])
const setPersonnelIdList = async () => {
personnelIdList.value = await (await getWithPersonnelList({})).data
}
setPersonnelIdList()
const studentIdList = ref([])
const setStudentIdList = async () => {
studentIdList.value = await (await getWithStudentList({})).data
}
setStudentIdList()
const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return
formEl.resetFields()
loadAssignmentList()
}
</script>
<style lang="scss" scoped>
/* 多行超出隐藏 */
.multi-hidden {
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
</style>

291
admin/src/app/views/assignment/components/assignment-edit.vue

@ -0,0 +1,291 @@
<template>
<el-dialog v-model="showDialog" :title="formData.id ? t('updateAssignment') : t('addAssignment')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
<el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
<el-form-item :label="t('classId')" prop="class_id">
<el-select class="input-width" v-model="formData.class_id" clearable :placeholder="t('classIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in classIdList"
:key="index"
:label="item['class_name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('courseId')" prop="course_id">
<el-select class="input-width" v-model="formData.course_id" clearable :placeholder="t('courseIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in courseIdList"
:key="index"
:label="item['course_name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('personnelId')" prop="personnel_id">
<el-select class="input-width" v-model="formData.personnel_id" clearable :placeholder="t('personnelIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in personnelIdList"
:key="index"
:label="item['name']"
:value="item['id']"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('studentId')" prop="student_id">
<el-select class="input-width" v-model="formData.student_id" clearable :placeholder="t('studentIdPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in studentIdList"
:key="index"
:label="item['name']"
:value="Number(item['id'])"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('description')" >
<el-input v-model="formData.description" type="textarea" rows="4" clearable :placeholder="t('descriptionPlaceholder')" class="input-width"/>
</el-form-item>
<!-- <el-form-item :label="t('contentType')" prop="content_type">
<el-select class="input-width" v-model="formData.content_type" clearable :placeholder="t('contentTypePlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in content_typeList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('contentText')" >
<el-input v-model="formData.content_text" clearable :placeholder="t('contentTextPlaceholder')" class="input-width" />
</el-form-item> -->
<!-- <el-form-item :label="t('status')" >
<el-select class="input-width" v-model="formData.status" clearable :placeholder="t('statusPlaceholder')">
<el-option label="请选择" value=""></el-option>
<el-option
v-for="(item, index) in statusList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item> -->
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
<el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
t('confirm')
}}</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { ref, reactive, computed, watch } from 'vue'
import { useDictionary } from '@/app/api/dict'
import { t } from '@/lang'
import type { FormInstance } from 'element-plus'
import { addAssignment, editAssignment, getAssignmentInfo, getWithClassGradeList, getWithCourseList, getWithPersonnelList, getWithStudentList } from '@/app/api/assignment'
let showDialog = ref(false)
const loading = ref(false)
/**
* 表单数据
*/
const initialFormData = {
id: '',
class_id: '',
course_id: '',
personnel_id: '',
student_id: '',
description: '',
content_type: '',
content_text: '',
status: '',
}
const formData: Record<string, any> = reactive({ ...initialFormData })
const formRef = ref<FormInstance>()
//
const formRules = computed(() => {
return {
class_id: [
{ required: true, message: t('classIdPlaceholder'), trigger: 'blur' },
]
,
course_id: [
{ required: true, message: t('courseIdPlaceholder'), trigger: 'blur' },
]
,
personnel_id: [
{ required: true, message: t('personnelIdPlaceholder'), trigger: 'blur' },
]
,
student_id: [
{ required: true, message: t('studentIdPlaceholder'), trigger: 'blur' },
]
,
description: [
{ required: true, message: t('descriptionPlaceholder'), trigger: 'blur' },
]
,
content_type: [
{ required: true, message: t('contentTypePlaceholder'), trigger: 'blur' },
]
,
content_text: [
{ required: true, message: t('contentTextPlaceholder'), trigger: 'blur' },
]
,
status: [
{ required: true, message: t('statusPlaceholder'), trigger: 'blur' },
]
,
}
})
const emit = defineEmits(['complete'])
/**
* 确认
* @param formEl
*/
const confirm = async (formEl: FormInstance | undefined) => {
if (loading.value || !formEl) return
let save = formData.id ? editAssignment : addAssignment
await formEl.validate(async (valid) => {
if (valid) {
loading.value = true
let data = formData
save(data).then(res => {
loading.value = false
showDialog.value = false
emit('complete')
}).catch(err => {
loading.value = false
})
}
})
}
//
let content_typeList = ref([])
const content_typeDictList = async () => {
content_typeList.value = await (await useDictionary('content_type')).data.dictionary
}
content_typeDictList();
watch(() => content_typeList.value, () => { formData.content_type = content_typeList.value[0].value })
let statusList = ref([])
const statusDictList = async () => {
statusList.value = await (await useDictionary('assignment_status')).data.dictionary
}
statusDictList();
watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
const classIdList = ref([] as any[])
const setClassIdList = async () => {
classIdList.value = await (await getWithClassGradeList({})).data
}
setClassIdList()
const courseIdList = ref([] as any[])
const setCourseIdList = async () => {
courseIdList.value = await (await getWithCourseList({})).data
}
setCourseIdList()
const personnelIdList = ref([] as any[])
const setPersonnelIdList = async () => {
personnelIdList.value = await (await getWithPersonnelList({})).data
}
setPersonnelIdList()
const studentIdList = ref([] as any[])
const setStudentIdList = async () => {
studentIdList.value = await (await getWithStudentList({})).data
}
setStudentIdList()
const setFormData = async (row: any = null) => {
Object.assign(formData, initialFormData)
loading.value = true
if(row){
const data = await (await getAssignmentInfo(row.id)).data
if (data) Object.keys(formData).forEach((key: string) => {
if (data[key] != undefined) formData[key] = data[key]
})
}
loading.value = false
}
//
const mobileVerify = (rule: any, value: any, callback: any) => {
if (value && !/^1[3-9]\d{9}$/.test(value)) {
callback(new Error(t('generateMobile')))
} else {
callback()
}
}
//
const idCardVerify = (rule: any, value: any, callback: any) => {
if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
callback(new Error(t('generateIdCard')))
} else {
callback()
}
}
//
const emailVerify = (rule: any, value: any, callback: any) => {
if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
callback(new Error(t('generateEmail')))
} else {
callback()
}
}
//
const numberVerify = (rule: any, value: any, callback: any) => {
if (!Number.isInteger(value)) {
callback(new Error(t('generateNumber')))
} else {
callback()
}
}
defineExpose({
showDialog,
setFormData
})
</script>
<style lang="scss" scoped></style>
<style lang="scss">
.diy-dialog-wrap .el-form-item__label{
height: auto !important;
}
</style>

8
niucloud/app/.idea/.gitignore

@ -0,0 +1,8 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

8
niucloud/app/.idea/app.iml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
niucloud/app/.idea/modules.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
</modules>
</component>
</project>

22
niucloud/app/.idea/php.xml

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MessDetectorOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCSFixerOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCodeSnifferOptionsConfiguration">
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.0">
<option name="suggestChangeDefaultLanguageLevel" value="false" />
</component>
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PsalmOptionsConfiguration">
<option name="transferred" value="true" />
</component>
</project>

6
niucloud/app/.idea/vcs.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

119
niucloud/app/adminapi/controller/assignment/Assignment.php

@ -0,0 +1,119 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\adminapi\controller\assignment;
use core\base\BaseAdminController;
use app\service\admin\assignment\AssignmentService;
/**
* 作业管理控制器
* Class Assignment
* @package app\adminapi\controller\assignment
*/
class Assignment extends BaseAdminController
{
/**
* 获取作业管理列表
* @return \think\Response
*/
public function lists(){
$data = $this->request->params([
["class_id",""],
["course_id",""],
["personnel_id",""],
["student_id",""],
["status",""]
]);
return success((new AssignmentService())->getPage($data));
}
/**
* 作业管理详情
* @param int $id
* @return \think\Response
*/
public function info(int $id){
return success((new AssignmentService())->getInfo($id));
}
/**
* 添加作业管理
* @return \think\Response
*/
public function add(){
$data = $this->request->params([
["class_id",0],
["course_id",0],
["personnel_id",0],
["student_id",""],
["description",""],
["content_type",""],
["content_text",""],
["status",0],
]);
$this->validate($data, 'app\validate\assignment\Assignment.add');
$id = (new AssignmentService())->add($data);
return success('ADD_SUCCESS', ['id' => $id]);
}
/**
* 作业管理编辑
* @param $id 作业管理id
* @return \think\Response
*/
public function edit(int $id){
$data = $this->request->params([
["class_id",0],
["course_id",0],
["personnel_id",0],
["student_id",""],
["description",""],
["content_type",""],
["content_text",""],
["status",0],
]);
$this->validate($data, 'app\validate\assignment\Assignment.edit');
(new AssignmentService())->edit($id, $data);
return success('EDIT_SUCCESS');
}
/**
* 作业管理删除
* @param $id 作业管理id
* @return \think\Response
*/
public function del(int $id){
(new AssignmentService())->del($id);
return success('DELETE_SUCCESS');
}
public function getClassGradeAll(){
return success(( new AssignmentService())->getClassGradeAll());
}
public function getCourseAll(){
return success(( new AssignmentService())->getCourseAll());
}
public function getPersonnelAll(){
return success(( new AssignmentService())->getPersonnelAll());
}
public function getStudentAll(){
return success(( new AssignmentService())->getStudentAll());
}
}

46
niucloud/app/adminapi/route/assignment.php

@ -0,0 +1,46 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
use think\facade\Route;
use app\adminapi\middleware\AdminCheckRole;
use app\adminapi\middleware\AdminCheckToken;
use app\adminapi\middleware\AdminLog;
// USER_CODE_BEGIN -- assignment
Route::group('assignment', function () {
//作业管理列表
Route::get('assignment', 'assignment.Assignment/lists');
//作业管理详情
Route::get('assignment/:id', 'assignment.Assignment/info');
//添加作业管理
Route::post('assignment', 'assignment.Assignment/add');
//编辑作业管理
Route::put('assignment/:id', 'assignment.Assignment/edit');
//删除作业管理
Route::delete('assignment/:id', 'assignment.Assignment/del');
Route::get('class_grade_all','assignment.Assignment/getClassGradeAll');
Route::get('course_all','assignment.Assignment/getCourseAll');
Route::get('personnel_all','assignment.Assignment/getPersonnelAll');
Route::get('student_all','assignment.Assignment/getStudentAll');
})->middleware([
AdminCheckToken::class,
AdminCheckRole::class,
AdminLog::class
]);
// USER_CODE_END -- assignment

189
niucloud/app/api/controller/apiController/Attendance.php

@ -16,6 +16,7 @@ use app\service\admin\campus\CampusService;
use app\service\api\apiService\AttendanceService;
use app\service\api\apiService\CommonService;
use core\base\BaseApiService;
use think\facade\Db;
/**
* 员工考勤控制器相关接口
@ -42,9 +43,12 @@ class Attendance extends BaseApiService
//员工考勤-编辑(员工打卡/请假/签退)
public function edit(Request $request){
$id =$request->param('id','');//考勤表id
$campus_id =$request->param('campus_id','');//校区ID
$staff_id =$this->member_id;//人员ID
$attendance_date =$request->param('attendance_date','');//考勤日期
$leave_start_time =$request->param('leave_start_time','');//请假开始时间
$leave_end_time =$request->param('leave_end_time','');//请假结束时间
$remarks =$request->param('remarks','');//备注
$status =$request->param('status','');//考勤状态: present-出勤, absent-缺勤, late-迟到, leave_early-早退,leave-请假,sign_out-签退
$longitude = $request->param('longitude','');//经度
@ -56,106 +60,169 @@ class Attendance extends BaseApiService
return fail('缺少定位坐标');
}
if(empty($campus_id) || empty($attendance_date) || empty($status)){
if(empty($attendance_date) || empty($status)){
return fail('缺少参数');
}
if(!in_array($status,['present','absent','late','leave_early','leave','sign_out'])){
return fail('状态类型不正确');
}
//获取校区的经纬度坐标
$campus_data = (new CampusService)->getInfo($campus_id);//查校区详情
$campus_lng = $campus_data['campus_coordinates']['lng'];//校区经度坐标
$campus_lat = $campus_data['campus_coordinates']['lat'];//校区纬度坐标
$radius = 1500.0;//打卡半径(米)
//判断签到+签退时是否超出打卡范围
if(in_array($status,['present','sign_out'])){
$isInCheckRange = (new CommonService())->isInCheckRange((float)$campus_lng, (float)$campus_lat, (float)$longitude, (float)$latitude, (float)$radius);
if(in_array($status,['present','sign_out']) && !empty($campus_id)){
//获取校区的经纬度坐标
$campus_data = (new CampusService)->getInfo($campus_id);//查校区详情
$campus_lng = $campus_data['campus_coordinates']['lng'];//校区经度坐标
$campus_lat = $campus_data['campus_coordinates']['lat'];//校区纬度坐标
$radius = 1500.0;//打卡半径(米)
$isInCheckRange = (new CommonService())->isInCheckRange((float)$campus_lng, (float)$campus_lat, (float)$longitude, (float)$latitude, (float)$radius);//判断是否在打卡范围内
if(!$isInCheckRange){
return fail("超出打卡范围,规定打卡范围({$radius}米)");
}
}
//查询数据是否存在,一天一个校区同一个人只能产生一条数据
//查询数据是否存在,一天一个校区同一个人可能有多条打卡记录数据,只要有1条打卡没签退就不能新增新的打卡记录
$date_h = date('H:i:s');
$obj = (new AttendanceService());
$info = $obj->info([
'id'=>$id,
'campus_id'=>$campus_id,
'staff_id'=>$staff_id,
'attendance_date'=>$attendance_date,
])['data'];
//如果是签退的时候就是修改
if($status == 'sign_out'){
if (($info['status'] ?? '') != 'present') {
return fail('未查询到今日签到信息,无法签退');
//判断是打卡
if($status == 'present'){
$model = new \app\model\attendance\Attendance();
$model = $model->where('staff_id',$staff_id)->where('status','present');
if($campus_id === '0' || $campus_id === 0 || !empty($campus_id)){
$model = $model->where('campus_id',$campus_id);
}
if(!empty($attendance_date)){
$model = $model->where('attendance_date',$attendance_date);
}
//签退的情况
$where = [
'id'=>$info['id']
];
$data = [
'check_out_time'=>$date_h,//签退时间
'coordinate'=>$coordinate,//坐标|经度,纬度
];
//执行修改操作
$res = $obj->editData($where,$data);
}else{
//如果是签到/请假
$data = [
'campus_id'=>$campus_id,//校区ID
'staff_id'=>$staff_id,//人员ID
'attendance_date'=>$attendance_date,//考勤日期
'coordinate'=>$coordinate,//坐标|经度,纬度
'status'=>$status,//考勤状态
];
//如果是签到的情况
if($info){
if($status == 'present' && $info['status'] == 'present'){
//更新签到数据
//执行修改操作
$edit_data = [
'check_in_time'=>$date_h,//签到时间
'coordinate'=>$coordinate,//坐标|经度,纬度
'status'=>$status//考勤状态
];
$res = $obj->editData(['id'=>$info['id']],$edit_data);
if(!$res['code']){
return fail($res['msg']);
}
return success($res['data']);
// 获取今天所有考勤记录
$records = $model->order('id', 'desc')->select()->toArray();
// Step 1: 检查是否有未签退的记录
foreach ($records as $record) {
if (empty($record['check_out_time'])) {
return fail('今日有签到记录未签退,请先签退后再试');
}
$status_arr = (new \app\model\attendance\Attendance())::STATUS;
$status_name = $status_arr[$info['status']] ?? '';
if(!$status_name){
$status_name = '考勤';
}
return fail("今日已{$status_name}重复操作");
}else{
$data['check_in_time'] = $date_h;//签到时间
if($remarks){
$data['remarks'] = $remarks;
}
//获取今天请假的数据(leave_end_time>当前时间的 && attendance_date=当前日期的)请假数据,更新leave_end_time=当前时间
//请假的id
$leave_id_arr = new \app\model\attendance\Attendance();
if($campus_id === '0' || $campus_id === 0 || !empty($campus_id)){
$leave_id_arr = $leave_id_arr->where('campus_id',$campus_id);
}
$leave_id_arr = $leave_id_arr->where('staff_id',$staff_id)
->where('status','leave')
->where('attendance_date',$attendance_date)
->where('leave_end_time','>=',$date_h)->column('id');
Db::startTrans();
try {
if($leave_id_arr){
$update = \app\model\attendance\Attendance::whereIn('id',$leave_id_arr)->update([
'leave_end_time'=>$date_h,
'updated_at'=>date('Y-m-d H:i:s'),
]);
if(!$update){
// Db::rollback();
// return fail('更新请假数据失败');
}
}
//执行创建操作
//插入打卡记录
$data = [
'campus_id'=>$campus_id ?? 0,//
'staff_id'=>$staff_id,//
'attendance_date'=>$attendance_date,//
'check_in_time'=>$date_h,//
'status'=>$status,//
'coordinate'=>$coordinate,//坐标|经度,纬度
'remarks'=>$remarks,//
];
$res = $obj->addData($data);
Db::commit();
if(!$res['code']){
Db::rollback();
return fail($res['msg']);
}
return success($res['data']);
}catch (\Exception $e){
Db::rollback();
dd(123123,$e->getMessage());
return fail('操作失败');
}
}
//判断是签退
if($status == 'sign_out'){
if(!empty($id)){
$info = \app\model\attendance\Attendance::where('id',$id)->find();
}else{
$info = \app\model\attendance\Attendance::where('attendance_date',$attendance_date)
->where('check_out_time',null)
->where('status','present')
->where('staff_id',$staff_id);
if($campus_id){
$info = $info->where('campus_id',$campus_id);
}
$info = $info->find();
}
if(!$info){
return fail('为找到签到记录');
}
//签退的情况
$where = [
'id'=>$info['id']
];
$data = [
'check_out_time'=>$date_h,//签退时间
'coordinate'=>$coordinate,//坐标|经度,纬度
'remarks' => $remarks,//
];
//执行修改操作
$res = $obj->editData($where,$data);
if(!$res['code']){
return fail($res['msg']);
}
return success($res['data']);
}
//判断是请假
if($status == 'leave'){
//判断今日是否存在打卡记录,判断今日的打开记录是否已经签退,是则不可以再请假了
if($info && $info['status'] == 'present' && $info['attendance_date'] == $attendance_date && !empty($info['check_out_time'])){
return fail('今日已签退,无法进行请假操作');
}
$data = [
'campus_id' => $campus_id ?? 0,
'staff_id' => $staff_id,
'attendance_date' => $attendance_date,
'leave_start_time' => $leave_start_time,
'leave_end_time' => $leave_end_time,
'status' => $status,
'coordinate' => $coordinate,
'remarks' => $remarks,
];
//创建请假记录
$res = $obj->addData($data);
if(!$res['code']){
return fail($res['msg']);
}
return success($res['data']);
}
}
}

25
niucloud/app/api/controller/apiController/CustomerResources.php

@ -28,12 +28,14 @@ class CustomerResources extends BaseApiService
public function getAll(Request $request){
$name = $request->param('name', '');//客户姓名
if(empty($name)){
return fail("缺少客户姓名");
$phone_number = $request->param('phone_number', '');//客户手机号
if(empty($name) && empty($phone_number)){
return fail("缺少查询参数");
}
$where = [
'name'=>$name
'name'=>$name,
'phone_number'=>$phone_number
];
$res = (new CustomerResourcesService())->getAll($where);
if(!$res['code']){
@ -93,6 +95,11 @@ class CustomerResources extends BaseApiService
return fail("缺少必填项{$k}");
}
}
if (strlen($customer_resources_data['phone_number']) > 12) {
return fail("联系电话不能超过12位");
}
foreach($six_speed_data as $k=>$v){
if(!isset($v) || $v === ''){
return fail("缺少必填项{$k}");
@ -166,7 +173,7 @@ class CustomerResources extends BaseApiService
"preferred_class_time" => $optional_class_time,//可选上课时间
"distance" => $request->param('distance', ''),//距离
"communication" => $request->param('communication', ''),//沟通备注
"staff_id" => $request->param('staff_id', ''),//人员ID
"staff_id" => $request->param('staff_id', ''),//人员ID//如果没有就是当前登录人的员工id
"first_visit_status" => $request->param('first_visit_status', null),//一访情况
"second_visit_status" => $request->param('second_visit_status', null),//二访情况
@ -177,6 +184,16 @@ class CustomerResources extends BaseApiService
return fail("缺少必填项{$k}");
}
}
if (strlen($customer_resources_data['phone_number']) > 12) {
return fail("联系电话不能超过12位");
}
//如果六要素人员id没有就是当前登录人的员工id
if(empty($six_speed_data['staff_id'])){
$six_speed_data['staff_id'] = $this->member_id;
}
foreach($six_speed_data as $k=>$v){
// 排除 first_visit_status 和 second_visit_status 的必填校验
if (in_array($k, ['first_visit_status', 'second_visit_status'])) {

101
niucloud/app/model/assignment/Assignment.php

@ -15,12 +15,19 @@ use core\base\BaseModel;
use think\model\concern\SoftDelete;
use think\model\relation\HasMany;
use think\model\relation\HasOne;
use app\model\class_grade\ClassGrade;
use app\model\course\Course;
use app\model\personnel\Personnel;
use app\model\student\Student;
use app\model\customer_resources\CustomerResources;
/**
* 校区模型
* Class Campus
* @package app\model\campus
* 作业管理模型
* Class Assignment
* @package app\model\assignment
*/
class Assignment extends BaseModel
{
@ -46,16 +53,90 @@ class Assignment extends BaseModel
protected $deleteTime = 'deleted_at';
/**
* 定义软删除字段的默认值.
* @var int
*/
* 定义软删除字段的默认值.
* @var int
*/
protected $defaultSoftDelete = 0;
/**
* 搜索器:作业管理班级
* @param $value
* @param $data
*/
public function searchClassIdAttr($query, $value, $data)
{
if ($value) {
$query->where("class_id", $value);
}
}
/**
* 搜索器:作业管理课程
* @param $value
* @param $data
*/
public function searchCourseIdAttr($query, $value, $data)
{
if ($value) {
$query->where("course_id", $value);
}
}
/**
* 搜索器:作业管理老师
* @param $value
* @param $data
*/
public function searchPersonnelIdAttr($query, $value, $data)
{
if ($value) {
$query->where("personnel_id", $value);
}
}
/**
* 搜索器:作业管理学员
* @param $value
* @param $data
*/
public function searchStudentIdAttr($query, $value, $data)
{
if ($value) {
$query->where("student_id", $value);
}
}
/**
* 搜索器:作业管理状态
* @param $value
* @param $data
*/
public function searchStatusAttr($query, $value, $data)
{
if ($value) {
$query->where("status", $value);
}
}
public function classGrade(){
return $this->hasOne(ClassGrade::class, 'id', 'class_id')->joinType('left')->withField('class_name,id')->bind(['class_id_name'=>'class_name']);
}
public function student()
{
return $this->hasOne(Student::class, 'id', 'student_id');
public function course(){
return $this->hasOne(Course::class, 'id', 'course_id')->joinType('left')->withField('course_name,id')->bind(['course_id_name'=>'course_name']);
}
public function personnel(){
return $this->hasOne(Personnel::class, 'id', 'personnel_id')->joinType('left')->withField('name,id')->bind(['personnel_id_name'=>'name']);
}
public function student(){
return $this->hasOne(Student::class, 'id', 'student_id')->joinType('left')->withField('name,id')->bind(['student_id_name'=>'name']);
}
}

27
niucloud/app/model/customer_resources/CustomerResources.php

@ -341,6 +341,33 @@ class CustomerResources extends BaseModel
}
}
/**
* 获取决策人类型名称
* @param $value
* @param $data
* @return array|mixed|string
*/
public function getDecisionMakerNameAttr($value, $data)
{
$key = 'decision_maker';
$val = (String)$data['decision_maker'] ?? '';
if ((!empty($val) || isset($val)) && $val !== '') {
$dict = Dict::where('key',$key)->find();
$dictionary = $dict['dictionary'] ?? [];
// 查找匹配的 name
$res = $val;
foreach ($dictionary as $item) {
if ($item['value'] == $val) {
$res = $item['name'];
break;
}
}
return $res;
} else {
return $val;
}
}
}

123
niucloud/app/service/admin/assignment/AssignmentService.php

@ -0,0 +1,123 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\service\admin\assignment;
use app\model\assignment\Assignment;
use app\model\class_grade\ClassGrade;
use app\model\course\Course;
use app\model\personnel\Personnel;
use app\model\student\Student;
use core\base\BaseAdminService;
/**
* 作业管理服务层
* Class AssignmentService
* @package app\service\admin\assignment
*/
class AssignmentService extends BaseAdminService
{
public function __construct()
{
parent::__construct();
$this->model = new Assignment();
}
/**
* 获取作业管理列表
* @param array $where
* @return array
*/
public function getPage(array $where = [])
{
$field = 'id,type,class_id,course_id,personnel_id,student_id,description,content_type,content_text,status,create_time,update_time,deleted_at';
$order = 'id desc';
$search_model = $this->model->withSearch(["class_id","course_id","personnel_id","student_id","status"], $where)->with(['classGrade','course','personnel','student'])->field($field)->order($order);
$list = $this->pageQuery($search_model);
return $list;
}
/**
* 获取作业管理信息
* @param int $id
* @return array
*/
public function getInfo(int $id)
{
$field = 'id,type,class_id,course_id,personnel_id,student_id,description,content_type,content_text,status,create_time,update_time,deleted_at';
$info = $this->model->field($field)->where([['id', "=", $id]])->with(['classGrade','course','personnel','student'])->findOrEmpty()->toArray();
return $info;
}
/**
* 添加作业管理
* @param array $data
* @return mixed
*/
public function add(array $data)
{
$res = $this->model->create($data);
return $res->id;
}
/**
* 作业管理编辑
* @param int $id
* @param array $data
* @return bool
*/
public function edit(int $id, array $data)
{
$this->model->where([['id', '=', $id]])->update($data);
return true;
}
/**
* 删除作业管理
* @param int $id
* @return bool
*/
public function del(int $id)
{
$model = $this->model->where([['id', '=', $id]])->find();
$res = $model->delete();
return $res;
}
public function getClassGradeAll(){
$classGradeModel = new ClassGrade();
return $classGradeModel->select()->toArray();
}
public function getCourseAll(){
$courseModel = new Course();
return $courseModel->select()->toArray();
}
public function getPersonnelAll(){
$personnelModel = new Personnel();
return $personnelModel->select()->toArray();
}
public function getStudentAll(){
$studentModel = new Student();
return $studentModel->select()->toArray();
}
}

12
niucloud/app/service/api/apiService/AttendanceService.php

@ -91,6 +91,18 @@ class AttendanceService extends BaseApiService
if (!empty($where['attendance_date'])) {
$model = $model->where('attendance_date', $where['attendance_date']);
}
if(!empty($where['status'])){
$model = $model->where('status', $where['status']);
}
if(!empty($where['check_out_time'])){
if($where['check_out_time'] === 'null'){
$where['check_out_time'] = null;
$model = $model->where('check_out_time', null);
}else{
$model = $model->whereIn('check_out_time', $where['check_out_time']);
}
}
$data = $model->field($field)->find();
if ($data) {
$res = [

5
niucloud/app/service/api/apiService/CustomerResourcesService.php

@ -87,12 +87,15 @@ class CustomerResourcesService extends BaseApiService
if (!empty($where['name'])) {
$model = $model->where('name', 'like', "%{$where['name']}%");
}
if(!empty($where['phone_number'])){
$model = $model->where('phone_number', $where['phone_number']);
}
$data = $model->field($field)
->with([
'resourceSharingHasMany'
])
->append([
'initial_intent_name'
'initial_intent_name',
])
->select()->toArray();
if (!$data) {

43
niucloud/app/validate/assignment/Assignment.php

@ -0,0 +1,43 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\validate\assignment;
use core\base\BaseValidate;
/**
* 作业管理验证器
* Class Assignment
* @package addon\app\validate\assignment
*/
class Assignment extends BaseValidate
{
protected $rule = [
'class_id' => 'require',
'course_id' => 'require',
'personnel_id' => 'require',
'student_id' => 'require',
'content_type' => 'require',
];
protected $message = [
'class_id.require' => ['common_validate.require', ['class_id']],
'course_id.require' => ['common_validate.require', ['course_id']],
'personnel_id.require' => ['common_validate.require', ['personnel_id']],
'student_id.require' => ['common_validate.require', ['student_id']],
'content_type.require' => ['common_validate.require', ['content_type']],
];
protected $scene = [
"add" => ['class_id', 'course_id', 'personnel_id', 'student_id', 'description', 'content_type', 'content_text', 'status'],
"edit" => ['class_id', 'course_id', 'personnel_id', 'student_id', 'description', 'content_type', 'content_text', 'status']
];
}
Loading…
Cancel
Save