Skip to content

A
attendance-performance-platform
Commit 3fe9ce41 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	attendance-performance-manager-ui/admin/vue.config.js
parents dbc7755d d45d876d
Show whitespace changes
Inline Side-by-side
Showing with 924 additions and 653 deletions
attendance-performance-manager-ui/admin/.env.development
View file @ 3fe9ce41
#开发环境 #开发环境
NODE_ENV = "development" NODE_ENV = "development"
VUE_APP_API_BASE_URL= http://112.19.80.237:11039 # VUE_APP_API_BASE_URL= http://112.19.80.237:11039
# VUE_APP_API_BASE_URL= http://192.168.0.98:11039 VUE_APP_API_BASE_URL= http://192.168.0.98:11039
\ No newline at end of file VUE_APP_API_ZWFW_URL= http://112.19.80.237:11031
\ No newline at end of file
attendance-performance-manager-ui/admin/.env.production
View file @ 3fe9ce41
...@@ -3,7 +3,7 @@ NODE_ENV = production ...@@ -3,7 +3,7 @@ NODE_ENV = production
# 地址 # 地址
VUE_APP_API_BASE_URL =http://112.19.80.237:11039 VUE_APP_API_BASE_URL =http://112.19.80.237:11039
VUE_APP_API_ZWFW_URL= http://112.19.80.237:11031
# websocket地址 # websocket地址
VUE_APP_WEBSOCKET_API = VUE_APP_WEBSOCKET_API =
......
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ 3fe9ce41
...@@ -191,6 +191,9 @@ export default { ...@@ -191,6 +191,9 @@ export default {
month--; //否则,只减去月份 month--; //否则,只减去月份
return new Date(year, month, day); return new Date(year, month, day);
}, },
formatteSec(row, column, val) {
return val ? (val / 60 / 60 / 24).toFixed(3) + "天" : "--";
},
// 格式化单元格数据 // 格式化单元格数据
formatter(row, column, val) { formatter(row, column, val) {
const content = formatter(this.tableData, column, val); const content = formatter(this.tableData, column, val);
...@@ -334,7 +337,7 @@ export default { ...@@ -334,7 +337,7 @@ export default {
}, },
// 查看天数 // 查看天数
formatterDay(row, column, val) { formatterDay(row, column, val) {
return ( return val ? (
<el-tag <el-tag
onClick={() => { onClick={() => {
this.handleCountDays(row, column, val); this.handleCountDays(row, column, val);
...@@ -342,6 +345,8 @@ export default { ...@@ -342,6 +345,8 @@ export default {
> >
{val} {val}
</el-tag> </el-tag>
) : (
"不限额"
); );
}, },
// 格式化单元格数据 // 格式化单元格数据
...@@ -480,7 +485,7 @@ export default { ...@@ -480,7 +485,7 @@ export default {
// } // }
// style="width: 100px" // style="width: 100px"
// ></el-image> // ></el-image>
<filepReview src={val}/> <filepReview src={val} />
); );
} else { } else {
return <el-link type="primary">{val}</el-link>; return <el-link type="primary">{val}</el-link>;
......
attendance-performance-manager-ui/admin/src/assets/utils/dateFormat.js
View file @ 3fe9ce41
...@@ -127,3 +127,12 @@ export const getMinu = (s1, s2) => { ...@@ -127,3 +127,12 @@ export const getMinu = (s1, s2) => {
if (ms < 0) return 0; if (ms < 0) return 0;
return Math.floor(ms / 1000 / 60); //分钟 return Math.floor(ms / 1000 / 60); //分钟
}; };
// 求两个日期的 秒差
export const getSec = (s1, s2) => {
var reDate = /\d{4}-\d{1,2}-\d{1,2} /;
s1 = new Date((reDate.test(s1) ? s1 : "2023-01-01 " + s1).replace(/-/g, "/"));
s2 = new Date((reDate.test(s2) ? s2 : "2023-01-01 " + s2).replace(/-/g, "/"));
var ms = s2.getTime() - s1.getTime();
if (ms < 0) return 0;
return Math.floor(ms / 1000); //秒
};
attendance-performance-manager-ui/admin/src/assets/utils/globalComponents.js
View file @ 3fe9ce41
// 全局组件注册 // 全局组件注册
import LayoutTable from '@/components/Table.vue'; import LayoutTable from "@/components/Table.vue";
import LayoutForm from '@/components/Form.vue'; import LayoutForm from "@/components/Form.vue";
import TableButtons from '@/components/tools/TableButtons'; import TableButtons from "@/components/tools/TableButtons";
import FormButtons from '@/components/tools/FormButtons'; import FormButtons from "@/components/tools/FormButtons";
import Breadcrumb from '@/components/Breadcrumb'; import Breadcrumb from "@/components/Breadcrumb";
import MySwitch from '@/components/Switch'; import MySwitch from "@/components/Switch";
import DeviceSwitch from '@/components/DeviceSwitch'; import DeviceSwitch from "@/components/DeviceSwitch";
import Confirm from '@/components/Confirm'; import Confirm from "@/components/Confirm";
import FormField from '@/components/FormField'; import FormField from "@/components/FormField";
import Upload from '@/components/Upload'; import Upload from "@/components/Upload";
import ImageUpload from '@/components/ImageUpload'; import ImageUpload from "@/components/ImageUpload";
import ImagePreview from '@/components/ImagePreview'; import ImagePreview from "@/components/ImagePreview";
import FileUpload from '@/components/FileUpload'; import FileUpload from "@/components/FileUpload";
import Editor from '@/components/Editor'; import Editor from "@/components/Editor";
import Map from '@/components/Map'; import Map from "@/components/Map";
import MapDetail from '@/components/MapDetail'; import MapDetail from "@/components/MapDetail";
import filepReview from '@/components/filepReview'; import filepReview from "@/components/filepReview";
import buttonReview from "@/components/buttonReview";
const Prototype = function() {}; const Prototype = function() {};
Prototype.install = (Vue, options) => { Prototype.install = (Vue, options) => {
Vue.component('LayoutTable', LayoutTable) // 表格 Vue.component("LayoutTable", LayoutTable); // 表格
Vue.component('LayoutForm', LayoutForm) // 表单 Vue.component("LayoutForm", LayoutForm); // 表单
Vue.component('TableButtons', TableButtons) // 表格内的编辑和删除 Vue.component("TableButtons", TableButtons); // 表格内的编辑和删除
Vue.component('FormButtons', FormButtons) // 表单内的保存和取消 Vue.component("FormButtons", FormButtons); // 表单内的保存和取消
Vue.component('Breadcrumb', Breadcrumb) // 面包屑导航 Vue.component("Breadcrumb", Breadcrumb); // 面包屑导航
Vue.component('Field', FormField) // 表单字段 Vue.component("Field", FormField); // 表单字段
Vue.component('MySwitch', MySwitch) // 拨动开关 Vue.component("MySwitch", MySwitch); // 拨动开关
Vue.component('DeviceSwitch', DeviceSwitch) // 拨动开关 Vue.component("DeviceSwitch", DeviceSwitch); // 拨动开关
Vue.component('Confirm', Confirm) // 局部确认窗口 Vue.component("Confirm", Confirm); // 局部确认窗口
Vue.component('Upload', Upload) // 文件上传 Vue.component("Upload", Upload); // 文件上传
Vue.component('ImageUpload', ImageUpload) // 图片上传 Vue.component("ImageUpload", ImageUpload); // 图片上传
Vue.component('ImagePreview', ImagePreview) // 图片预览 Vue.component("ImagePreview", ImagePreview); // 图片预览
Vue.component('FileUpload', FileUpload) // 文件上传 Vue.component("FileUpload", FileUpload); // 文件上传
Vue.component('Editor', Editor) // 富文本 Vue.component("Editor", Editor); // 富文本
Vue.component('Map', Map) // 地图 Vue.component("Map", Map); // 地图
Vue.component('MapDetail', MapDetail) // 地图 Vue.component("MapDetail", MapDetail); // 地图
Vue.component('filepReview', filepReview) // 图片文件预览 Vue.component("filepReview", filepReview); // 图片文件预览
} Vue.component("buttonReview", buttonReview); // 点击按钮图片文件预览
};
export default Prototype; export default Prototype;
attendance-performance-manager-ui/admin/src/assets/utils/table.js
View file @ 3fe9ce41
// table-list 所需的一系列操作方法 // table-list 所需的一系列操作方法
/** /**
* formatter * formatter
* *
...@@ -10,8 +9,8 @@ ...@@ -10,8 +9,8 @@
*/ */
const formatter = (tableData, column, val) => { const formatter = (tableData, column, val) => {
const key = column.property; const key = column.property;
if(tableData.dict && tableData.dict[key]){ if (tableData.dict && tableData.dict[key]) {
const dict = tableData.dict[key] const dict = tableData.dict[key];
return dict[val] || val; return dict[val] || val;
} }
return val; return val;
...@@ -27,11 +26,11 @@ const formatter = (tableData, column, val) => { ...@@ -27,11 +26,11 @@ const formatter = (tableData, column, val) => {
const formatterAmount = (row, column) => { const formatterAmount = (row, column) => {
const property = column.property; const property = column.property;
const amount = row[property]; const amount = row[property];
if(!amount){ if (!amount) {
return '0.00'; return "0.00";
} }
if(amount == 0){ if (amount == 0) {
return '0.00'; return "0.00";
} }
return amount; return amount;
}; };
...@@ -46,15 +45,19 @@ const formatterAmount = (row, column) => { ...@@ -46,15 +45,19 @@ const formatterAmount = (row, column) => {
const formatterDate = (row, column) => { const formatterDate = (row, column) => {
const property = column.property; const property = column.property;
const time = row[property]; const time = row[property];
if(!time) return '--'; if (!time) return "--";
let date = time.length<13?new Date(Number(time) * 1000) : new Date(Number(time)); let date =
let Y = date.getFullYear() + '-'; time.length < 13 ? new Date(Number(time) * 1000) : new Date(Number(time));
let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; let Y = date.getFullYear() + "-";
let D = panLeft(date.getDate()) + ' '; let M =
let h = panLeft(date.getHours()) + ':'; (date.getMonth() + 1 < 10
let m = panLeft(date.getMinutes()) + ':'; ? "0" + (date.getMonth() + 1)
: date.getMonth() + 1) + "-";
let D = panLeft(date.getDate()) + " ";
let h = panLeft(date.getHours()) + ":";
let m = panLeft(date.getMinutes()) + ":";
let s = panLeft(date.getSeconds()); let s = panLeft(date.getSeconds());
return Y+M+D+h+m+s; return Y + M + D + h + m + s;
}; };
/** /**
...@@ -67,16 +70,19 @@ const formatterDate = (row, column) => { ...@@ -67,16 +70,19 @@ const formatterDate = (row, column) => {
const formatterDateOnly = (row, column) => { const formatterDateOnly = (row, column) => {
const property = column.property; const property = column.property;
const time = row[property]; const time = row[property];
if(!time) return '-'; if (!time) return "-";
let date = new Date(Number(time)); let date = new Date(Number(time));
let Y = date.getFullYear() + '-'; let Y = date.getFullYear() + "-";
let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; let M =
let D = panLeft(date.getDate()) + ' '; (date.getMonth() + 1 < 10
return Y+M+D; ? "0" + (date.getMonth() + 1)
: date.getMonth() + 1) + "-";
let D = panLeft(date.getDate()) + " ";
return Y + M + D;
}; };
function panLeft(num){ function panLeft(num) {
return num < 10 ? '0'+num : num; return num < 10 ? "0" + num : num;
} }
/** /**
...@@ -90,18 +96,18 @@ function panLeft(num){ ...@@ -90,18 +96,18 @@ function panLeft(num){
const find = (list, key, val) => { const find = (list, key, val) => {
let index = -1; let index = -1;
let data = null; let data = null;
list.forEach((item, i)=>{ list.forEach((item, i) => {
if(item[key] === val){ if (item[key] === val) {
index = i; index = i;
data = JSON.parse(JSON.stringify(item)); data = JSON.parse(JSON.stringify(item));
return; return;
} }
}) });
return { return {
index, index,
data, data,
} };
} };
/** /**
* 构造树型结构数据 * 构造树型结构数据
...@@ -112,24 +118,34 @@ const find = (list, key, val) => { ...@@ -112,24 +118,34 @@ const find = (list, key, val) => {
* @param {*} rootId 根Id 默认 0 * @param {*} rootId 根Id 默认 0
*/ */
function handleTree(data, id, parentId, children, rootId) { function handleTree(data, id, parentId, children, rootId) {
id = id || 'id' id = id || "id";
parentId = parentId || 'parentId' parentId = parentId || "parentId";
children = children || 'children' children = children || "children";
rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0 rootId =
rootId ||
Math.min.apply(
Math,
data.map((item) => {
return item[parentId];
})
) ||
null;
//对源数据深度克隆 //对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data)) const cloneData = JSON.parse(JSON.stringify(data));
//循环所有项 //循环所有项
const treeData = cloneData.filter(father => { const treeData = cloneData.filter((father) => {
let branchArr = cloneData.filter(child => { let branchArr = cloneData.filter((child) => {
//返回每一项的子级数组 //返回每一项的子级数组
return father[id] === child[parentId] console.log(child[parentId]);
return father[id] === child[parentId];
}); });
branchArr.length > 0 ? father.children = branchArr : ''; branchArr.length > 0 ? (father.children = branchArr) : "";
//返回第一层 //返回第一层
return father[parentId] === rootId; return father[parentId] === rootId;
}); });
return treeData != '' ? treeData : data; console.log(treeData);
}; return treeData != "" ? treeData : data;
}
export { export {
formatter, formatter,
...@@ -137,5 +153,5 @@ export { ...@@ -137,5 +153,5 @@ export {
formatterDate, formatterDate,
formatterDateOnly, formatterDateOnly,
find, find,
handleTree handleTree,
}; };
attendance-performance-manager-ui/admin/src/components/Pagination.vue
View file @ 3fe9ce41
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
:page-size="currSize" :page-size="currSize"
:page-sizes="[10, 20, 50, 100, 200]" :page-sizes="[10, 20, 50, 100, 200]"
layout="sizes, total, prev, pager, next, jumper" layout="sizes, total, prev, pager, next, jumper"
:total="total"> :total="total"
>
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
...@@ -27,53 +28,49 @@ export default { ...@@ -27,53 +28,49 @@ export default {
}, },
}, },
watch: { watch: {
'$route'(route) { $route(route) {
console.log(route);
this.initPage(route.query); this.initPage(route.query);
} },
}, },
created() { created() {
this.initPage(this.$route.query); this.initPage(this.$route.query);
}, },
methods: { methods: {
initPage(query) { initPage(query) {
console.log("query",query) this.currPage = parseInt(query["page"]) || 1;
this.currPage = parseInt(query['page']) || 1; this.currSize = parseInt(query["size"]) || this.prePageResult;
this.currSize = parseInt(query['size']) || this.prePageResult;
}, },
changeHash(key, val) { changeHash(key, val) {
let {path, query} = this.$route; let { path, query } = this.$route;
this.$router.push({ this.$router.push({
path: path, path: path,
query: Object.assign({}, query, {[`${key}`]: val}) query: Object.assign({}, query, { [`${key}`]: val }),
}) });
}, },
handleSizeChange(currSize) { handleSizeChange(currSize) {
console.log("currsize"+currSize) console.log("currsize" + currSize);
this.changeHash('size', currSize); this.changeHash("size", currSize);
}, },
handleCurrentChange(currPage) { handleCurrentChange(currPage) {
this.changeHash('page', currPage); this.changeHash("page", currPage);
}, },
}, },
data() { data() {
return { return {
currPage: 1, currPage: 1,
currSize: 10, currSize: 10,
} };
} },
} };
</script> </script>
<style lang="less"> <style lang="less">
.pagination-wapper{ .pagination-wapper {
background: #fff; background: #fff;
margin-top: 10px; margin-top: 10px;
.el-pagination{ .el-pagination {
margin-left: auto; margin-left: auto;
} }
} }
</style> </style>
attendance-performance-manager-ui/admin/src/components/buttonReview.vue 0 → 100644
View file @ 3fe9ce41
<template>
<div class="img-flex">
<el-image
:preview-src-list="fileList"
:src="require('../assets/images/picture.png')"
>
</el-image>
<!-- <el-image
:preview-src-list="[urlVal(item)]"
v-for="item in fileList"
:key="item"
>
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline" @click="handleClick"></i>
</div>
</el-image> -->
</div>
</template>
<script>
const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";
const zwfwUrl = process.env.VUE_APP_API_ZWFW_URL + "/";
export default {
props: ["src", "row", "fileList"],
data() {
return {
// fileList: [],
};
},
created() {},
computed: {},
methods: {
// handleClick() {
// this.fileList = [];
// if (this.row.snapPath && this.row.filePaths) {
// this.src = this.row.snapPath + this.row.filePaths;
// } else {
// if (this.row.snapPath) {
// this.src = this.row.snapPath;
// } else {
// this.src = this.row.filePaths;
// }
// }
// this.fileList = this.src ? this.src.split(",") : [];
// this.fileList &&
// this.fileList.forEach((val) => {
// val.indexOf("zwfw_api_xnjc") == -1
// ? val.indexOf("http") == -1
// ? (val = baseUrl + val)
// : (val = val)
// : (val = zwfwUrl + val);
// });
// },
urlVal(val) {
return val.indexOf("zwfw_api_xnjc") == -1
? val.indexOf("http") == -1
? baseUrl + val
: val
: zwfwUrl + val;
},
},
};
</script>
<style lang="less" scoped>
.img-flex {
overflow: hidden;
display: inline-block;
vertical-align: middle;
.el-image {
width: 50px;
float: left;
border: 1px solid #ddd;
margin: 2px;
}
}
</style>
attendance-performance-manager-ui/admin/src/components/filepReview.vue
View file @ 3fe9ce41
...@@ -2,41 +2,48 @@ ...@@ -2,41 +2,48 @@
<div class="img-flex"> <div class="img-flex">
<el-image <el-image
:src="urlVal(item)" :src="urlVal(item)"
:preview-src-list="[urlVal(item)]" alt="" v-for="item in fileList" :key="item"/> :preview-src-list="[urlVal(item)]"
alt=""
v-for="item in fileList"
:key="item"
/>
</div> </div>
</template> </template>
<script> <script>
const baseUrl = process.env.VUE_APP_API_BASE_URL + "/"; const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";
const zwfwUrl = process.env.VUE_APP_API_ZWFW_URL + "/";
export default { export default {
props:['src'], props: ["src"],
data() { data() {
return {} return {};
},
created() {
console.log(this.src)
}, },
created() {},
computed: { computed: {
fileList:function(v){ fileList: function(v) {
return this.src?this.src.split(","):[] return this.src ? this.src.split(",") : [];
} },
}, },
methods: { methods: {
urlVal(val){ urlVal(val) {
console.log(val,"2222") return val.indexOf("zwfw_api_xnjc") == -1
return val.indexOf("http") == -1 ? baseUrl + val : val ? val.indexOf("http") == -1
} ? (val = baseUrl + val)
: (val = val)
: (val = zwfwUrl + val);
}, },
} },
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.img-flex{ .img-flex {
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
.el-image{ .el-image {
width: 50px; width: 50px;
float: left; float: left;
border:1px solid #ddd; border: 1px solid #ddd;
margin: 2px; margin: 2px;
} }
} }
......
attendance-performance-manager-ui/admin/src/components/tools/TableButtons.vue
View file @ 3fe9ce41
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
@click="$emit('edit', row)" @click="$emit('edit', row)"
title="核查" title="核查"
style="margin-left: 0;margin-right: 5px" style="margin-left: 0;margin-right: 5px"
>核查</el-button >{{ text ? text : "核查" }}</el-button
> >
<el-button <el-button
v-if="chuli" v-if="chuli"
...@@ -100,6 +100,10 @@ export default { ...@@ -100,6 +100,10 @@ export default {
required: true, required: true,
default: () => {}, default: () => {},
}, },
text: {
type: String,
default: "",
},
}, },
components: { components: {
Confirm, Confirm,
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
View file @ 3fe9ce41
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
/> />
<Field <Field
label="时长(单位:分钟)" label="时长(单位:秒)"
disabled disabled
prop="duration" prop="duration"
v-model="form.duration" v-model="form.duration"
placeholder="请输入时长(分钟)" placeholder="请输入时长(秒)"
:maxLength="4" :maxLength="4"
/> />
<Field <Field
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import valid from "@/assets/utils/vaild.js"; import valid from "@/assets/utils/vaild.js";
import { getMinu } from "@/assets/utils/dateFormat.js"; import { getMinu, getSec } from "@/assets/utils/dateFormat.js";
export default { export default {
name: "AttendanceLeaveRecordDetail", name: "AttendanceLeaveRecordDetail",
mixins: [form], mixins: [form],
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
changedate(val) { changedate(val) {
if (this.form.startTime && this.form.endTime) { if (this.form.startTime && this.form.endTime) {
if (this.form.endTime.valueOf() > this.form.startTime.valueOf()) { if (this.form.endTime.valueOf() > this.form.startTime.valueOf()) {
this.form.duration = getMinu(this.form.startTime, this.form.endTime); this.form.duration = getSec(this.form.startTime, this.form.endTime);
} else { } else {
this.$message.closeAll(); this.$message.closeAll();
this.$message.error("结束日期需大于请假日期"); this.$message.error("结束日期需大于请假日期");
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
View file @ 3fe9ce41
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
{ label: "结束时间", prop: "endTime", formatter: this.formatterDate }, { label: "结束时间", prop: "endTime", formatter: this.formatterDate },
{ label: "时长", prop: "duration", formatter: this.formatter }, { label: "时长", prop: "duration", formatter: this.formatteSec },
// {label: "审批负责人Id", prop: "approverId", formatter: this.formatter}, // {label: "审批负责人Id", prop: "approverId", formatter: this.formatter},
......
attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue
View file @ 3fe9ce41
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig" notAdd notDel> <LayoutTable :data="tableData" :config="tableConfig" notAdd notDel>
<el-button type="primary" @click="doExport" :disabled="isExport" <el-button
size="mini" slot="table-head-left2">导出</el-button> type="primary"
@click="doExport"
:disabled="isExport"
size="mini"
slot="table-head-left2"
>导出</el-button
>
</LayoutTable> </LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
...@@ -15,72 +21,104 @@ import table from "@/assets/mixins/table"; ...@@ -15,72 +21,104 @@ import table from "@/assets/mixins/table";
export default { export default {
name: "AttendanceVacationBalanceList", name: "AttendanceVacationBalanceList",
components: { components: {
drawerShow drawerShow,
}, },
mixins: [table], mixins: [table],
created() { created() {},
},
methods: { methods: {
// 导出 // 导出
doExport(){ doExport() {
this.isExport = true; this.isExport = true;
let params = {} let params = {};
for(let value of this.config.search){ for (let value of this.config.search) {
if(this.query[value.name]){ if (this.query[value.name]) {
params[value.name] = this.query[value.name] params[value.name] = this.query[value.name];
} }
} }
if(this.selection.length>0){ if (this.selection.length > 0) {
params['idList'] = this.selection params["idList"] = this.selection;
} }
this.$download("/attendance/vacation/balance/exportExcel", { this.$download(
...params "/attendance/vacation/balance/exportExcel",
}, { type: "excel" }).then(() => this.isExport = false).catch(error => { {
...params,
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}) });
}, },
/** 查看不同类型假期记录 */ /** 查看不同类型假期记录 */
handleCountDays(row,column,val){ handleCountDays(row, column, val) {
this.$refs.drawerform.view({ this.$refs.drawerform.view({
type:this.util_formatter('AllHolidays',column.property), type: this.util_formatter("AllHolidays", column.property),
staffId:row.staffId, staffId: row.staffId,
id:row.id, id: row.id,
val val,
}) });
} },
}, },
data() { data() {
return { return {
config: { config: {
isshowTabPane:true, isshowTabPane: true,
search: [ search: [
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
label: "全部部门", label: "全部部门",
fuzzy: true fuzzy: true,
}, },
{ {
name: "staffName", name: "staffName",
type: "text", type: "text",
label: "员工姓名", label: "员工姓名",
fuzzy: true fuzzy: true,
}, },
], ],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", width: 60 },
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "员工姓名", prop: "staffName"}, { label: "员工姓名", prop: "staffName" },
{label: "部门名称", prop: "deptName"}, { label: "部门名称", prop: "deptName" },
{label: "入职时间", prop: "entryTime", formatter: this.formatterDate}, {
{label: "事假（天）", prop: "personalLeaveDays", formatter: this.formatterDay}, label: "入职时间",
{label: "调休（天）", prop: "compensatedLeaveDays", formatter: this.formatterDay}, prop: "entryTime",
{label: "病假（天）", prop: "sickLeaveDays", formatter: this.formatterDay}, formatter: this.formatterDate,
{label: "年假（天）", prop: "annualLeaveDays", formatter: this.formatterDay}, },
{label: "婚假（天)", prop: "marriageLeaveDays", formatter: this.formatterDay}, {
{label: "哺乳假（天）", prop: "breastfeedingLeaveDays", formatter: this.formatterDay}, label: "事假（天）",
prop: "personalLeaveDays",
formatter: this.formatterDay,
},
{
label: "调休（天）",
prop: "compensatedLeaveDays",
formatter: this.formatterDay,
},
{
label: "病假（天）",
prop: "sickLeaveDays",
formatter: this.formatterDay,
},
{
label: "年假（天）",
prop: "annualLeaveDays",
formatter: this.formatterDay,
},
{
label: "婚假（天)",
prop: "marriageLeaveDays",
formatter: this.formatterDay,
},
{
label: "哺乳假（天）",
prop: "breastfeedingLeaveDays",
formatter: this.formatterDay,
},
// {label: "创建用户", prop: "createUserId", formatter: this.formatter}, // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
// { // {
// label: "操作", // label: "操作",
...@@ -93,9 +131,9 @@ export default { ...@@ -93,9 +131,9 @@ export default {
// } // }
// } // }
], ],
isExport:false isExport: false,
} },
} };
} },
} };
</script> </script>
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @ 3fe9ce41
...@@ -301,6 +301,7 @@ export default { ...@@ -301,6 +301,7 @@ export default {
noDel noDel
noEdit noEdit
reCheck reCheck
text={"考勤核查"}
noView noView
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @ 3fe9ce41
...@@ -251,7 +251,6 @@ export default { ...@@ -251,7 +251,6 @@ export default {
}, },
}, },
{ label: "投诉设备", prop: "complainDevice" }, { label: "投诉设备", prop: "complainDevice" },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
...@@ -308,6 +307,7 @@ export default { ...@@ -308,6 +307,7 @@ export default {
noEdit noEdit
reCheck reCheck
noView noView
text={"投诉核查"}
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @ 3fe9ce41
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import { downloadFile } from "@/assets/utils/index"; import { downloadFile } from "@/assets/utils/index";
const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";
const zwfwUrl = process.env.VUE_APP_API_ZWFW_URL + "/";
export default { export default {
name: "CheckEffectRecordList", name: "CheckEffectRecordList",
components: { components: {
...@@ -240,22 +241,45 @@ export default { ...@@ -240,22 +241,45 @@ export default {
label: "图片凭证", label: "图片凭证",
width: 150, width: 150,
formatter: (row) => { formatter: (row) => {
row.snapPath && row.snapPath !== "" let src = "";
? (row.filePaths = if (row.snapPath && row.filePaths) {
row.filePaths && row.filePaths !== "" src = row.snapPath + row.filePaths;
? row.filePaths + "," + row.snapPath } else {
: row.snapPath) if (row.snapPath) {
: (row.filePaths = row.filePaths); src = row.snapPath;
return ( } else {
// <el-image src = row.filePaths;
// src={val.indexOf("http") == -1 ? baseUrl + val : val} }
// preview-src-list={ }
// val.indexOf("http") == -1 ? [baseUrl + val] : [val] row.fileList = src ? src.split(",") : [];
// } row.fileList &&
// style="width: 100px" row.fileList.forEach((val) => {
// ></el-image> val.indexOf("zwfw_api_xnjc") == -1
<filepReview src={row.filePaths} /> ? val.indexOf("http") == -1
? (val = baseUrl + val)
: (val = val)
: (val = zwfwUrl + val);
});
return row.snapPath || row.filePaths ? (
<buttonReview row={row} fileList={row.fileList} />
) : (
"--"
); );
// row.snapPath && row.snapPath !== ""
// ? row.filePaths && row.filePaths !== ""
// ? (row.filePaths = row.filePaths + "," + row.snapPath)
// : (row.filePaths = row.snapPath)
// : (row.filePaths = row.filePaths);
// return (
// // <el-image
// // src={val.indexOf("http") == -1 ? baseUrl + val : val}
// // preview-src-list={
// // val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// // }
// // style="width: 100px"
// // ></el-image>
// <filepReview src={row.filePaths} />
// );
}, },
}, },
...@@ -314,6 +338,7 @@ export default { ...@@ -314,6 +338,7 @@ export default {
noEdit noEdit
reCheck reCheck
noView noView
text={"效能核查"}
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @ 3fe9ce41
...@@ -296,6 +296,7 @@ export default { ...@@ -296,6 +296,7 @@ export default {
noEdit noEdit
reCheck reCheck
noView noView
text={"办件核查"}
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @ 3fe9ce41
...@@ -304,6 +304,7 @@ export default { ...@@ -304,6 +304,7 @@ export default {
noEdit noEdit
reCheck reCheck
noView noView
text={"其他核查"}
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @ 3fe9ce41
...@@ -305,6 +305,7 @@ export default { ...@@ -305,6 +305,7 @@ export default {
noEdit noEdit
reCheck reCheck
noView noView
text={"差评核查"}
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/feedback/list.vue
View file @ 3fe9ce41
...@@ -74,8 +74,8 @@ export default { ...@@ -74,8 +74,8 @@ export default {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{ {
name: "feedbackTimeStart", name: "feedbackTimeStartStart",
type: "datetime", type: "date",
label: "请选择日期", label: "请选择日期",
fuzzy: false, fuzzy: false,
}, },
......
attendance-performance-manager-ui/admin/src/views/job/list.vue
View file @ 3fe9ce41
<template> <template>
<div class="page"> <div class="page">
<div style="margin:10px 0"> <div style="margin:10px 0">
<tab-pane :thirdList="thirdList" :activeName="activeName" @handleClick="handleClick"></tab-pane> <tab-pane
:thirdList="thirdList"
:activeName="activeName"
@handleClick="handleClick"
></tab-pane>
</div> </div>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6" :xs="12" class="mytree"> <el-col :span="6" :xs="12" class="mytree">
<div class="title"> <div class="title">
<el-button type="primary" size="mini" @click="saveFn('group')">新增分组</el-button> <el-button type="primary" size="mini" @click="saveFn('group')"
<el-button type="success" size="mini" @click="saveFn('job')">新增职位</el-button> >新增分组</el-button
>
<el-button type="success" size="mini" @click="saveFn('job')"
>新增职位</el-button
>
</div> </div>
<el-scrollbar style="height: 100%" class="mt20"> <el-scrollbar style="height: 100%" class="mt20">
<!-- 区分分组和职位 --> <!-- 区分分组和职位 -->
...@@ -19,7 +27,7 @@ ...@@ -19,7 +27,7 @@
node-key="id" node-key="id"
indent="4" indent="4"
:props="{ :props="{
children:'children' children: 'children',
}" }"
highlight-current highlight-current
default-expand-all default-expand-all
...@@ -29,8 +37,12 @@ ...@@ -29,8 +37,12 @@
> >
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<span class="custom-tree-node"> <span class="custom-tree-node">
<span style="font-size:14px" v-if="!data.groupId">{{ data.groupName }}</span> <span style="font-size:14px" v-if="!data.groupId">{{
<span style="font-size:14px" v-if="data.groupId">{{ data.jobName }}</span> data.groupName
}}</span>
<span style="font-size:14px" v-if="data.groupId">{{
data.jobName
}}</span>
<span style="margin-left:50px"> <span style="margin-left:50px">
<el-button <el-button
type="text" type="text"
...@@ -46,42 +58,62 @@ ...@@ -46,42 +58,62 @@
@click.stop="deleteFn(data)" @click.stop="deleteFn(data)"
></el-button> ></el-button>
</span> </span>
</span> </span>
</template> </template>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
</el-col> </el-col>
<el-col :span="18" :xs="12" class="mytree"> <el-col :span="18" :xs="12" class="mytree">
<div class="mt20" style="font-size:14px" v-if="currentName"> <div class="mt20" style="font-size:14px" v-if="currentName">
{{currentName}} ({{this.staffList.length}}) {{ currentName }} ({{ this.staffList.length }})
</div> </div>
<div class="mt10"> <div class="mt10">
<el-button type="success" size="mini" @click="addStaff"> <el-button type="success" size="mini" @click="addStaff">
新增员工</el-button> 新增员工</el-button
<el-button type="primary" @click="doExport" :disabled="isExport" >
size="mini">导出数据</el-button> <el-button
type="primary"
@click="doExport"
:disabled="isExport"
size="mini"
>导出数据</el-button
>
<el-button type="danger" @click="allDelete" :disabled="isExport" <el-button
size="mini">批量删除</el-button> type="danger"
@click="allDelete"
:disabled="isExport"
size="mini"
>批量删除</el-button
>
</div> </div>
<el-table :data="staffList" border class="mt20" @selection-change="handleSelectionChange"> <el-table
:data="staffList"
border
class="mt20"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column <el-table-column
type="selection" label="序号"
width="55"> type="index"
</el-table-column> width="50"
<el-table-column label="序号" type="index" width="50"></el-table-column> ></el-table-column>
<el-table-column label="姓名" prop="name"></el-table-column> <el-table-column label="姓名" prop="name"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="员工类型" prop="staffType" <el-table-column label="员工类型" prop="staffType">
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size='mini' v-show="scope.row.staffType == 1">全职</el-tag> <el-tag size="mini" v-show="scope.row.staffType == 1"
<el-tag size='mini' v-show="scope.row.staffType == 2">兼职</el-tag> >全职</el-tag
<el-tag size='mini' v-show="scope.row.staffType == 3">实习</el-tag> >
<el-tag size="mini" v-show="scope.row.staffType == 2"
>兼职</el-tag
>
<el-tag size="mini" v-show="scope.row.staffType == 3"
>实习</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机号" prop="phoneNumber"></el-table-column> <el-table-column label="手机号" prop="phoneNumber"></el-table-column>
...@@ -96,98 +128,109 @@ ...@@ -96,98 +128,109 @@
</el-table> </el-table>
</el-col> </el-col>
</el-row> </el-row>
<drawer-show ref="drawerform" @ok="getData"/> <drawer-show ref="drawerform" @ok="getData" />
<drawer-staff ref="drawerStaff" :bumentree="bumentree" @ok="refresh"></drawer-staff> <drawer-staff
ref="drawerStaff"
:bumentree="bumentree"
@ok="refresh"
></drawer-staff>
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import {handleTree} from "@/assets/utils/table"; import { handleTree } from "@/assets/utils/table";
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import TabPane from "@/components/tabPane.vue" import TabPane from "@/components/tabPane.vue";
import drawerStaff from './drawershowStaff.vue' import drawerStaff from "./drawershowStaff.vue";
import {timestampToTime} from '@/assets/utils/dateFormat.js' import { timestampToTime } from "@/assets/utils/dateFormat.js";
export default { export default {
name: "JobList", name: "JobList",
components: { components: {
drawerShow, drawerShow,
TabPane, TabPane,
drawerStaff drawerStaff,
}, },
mixins: [table], mixins: [table],
created() { created() {
this.query = { this.query = {
"page":1, page: 1,
"size":-1 size: -1,
} };
this.$post("/dept/treeselect", {}).then(({ data }) => { this.$post("/dept/treeselect", {}).then(({ data }) => {
this.bumentree = data.result this.bumentree = data.result;
}) });
}, },
computed:{ computed: {
thirdList(){ thirdList() {
if(!this.$store.state.CurrentThirdArr) return [] if (!this.$store.state.CurrentThirdArr) return [];
return this.$store.state.CurrentThirdArr return this.$store.state.CurrentThirdArr;
},
activeName() {
return this.$store.state.ThirdPath;
}, },
activeName(){
return this.$store.state.ThirdPath
}
}, },
methods: { methods: {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
getStaff(){ getStaff() {
this.$post('/job/info?id='+this.currentId).then(res => { this.$post("/job/info?id=" + this.currentId).then((res) => {
if(res.code == 1){ if (res.code == 1) {
this.staffList = res.data.staffEntities this.staffList = res.data.staffEntities;
this.staffList.forEach(item => { this.staffList.forEach((item) => {
item.createTime = timestampToTime(item.createTime,6) item.createTime = timestampToTime(item.createTime, 6);
}) });
} }
}) });
}, },
addStaff(){ addStaff() {
this.$refs.drawerStaff.add(this.currentId) this.$refs.drawerStaff.add(this.currentId);
}, },
refresh(){ refresh() {
// 请求 // 请求
// 员工、职位列表 // 员工、职位列表
if(this.currentId){ if (this.currentId) {
this.getStaff() this.getStaff();
} }
this.getData() this.getData();
}, },
handleNodeClick(node){ handleNodeClick(node) {
if(!node.groupId){ if (!node.groupId) {
return return;
} }
this.currentId = node.id this.currentId = node.id;
this.currentName = node.jobName this.currentName = node.jobName;
this.getStaff() this.getStaff();
}, },
// 获取数据后 // 获取数据后
// 处理树结构 // 处理树结构
afterRender(data){ afterRender(data) {
console.log(data);
data.data = handleTree(data.data, "id", "groupId"); data.data = handleTree(data.data, "id", "groupId");
}, },
saveFn(from){ saveFn(from) {
this.$refs.drawerform.add(from) this.$refs.drawerform.add(from);
}, },
doExport(){ doExport() {
this.isExport = true; this.isExport = true;
let params = {} let params = {};
if(this.multipleSelection.length>0){ if (this.multipleSelection.length > 0) {
params['idList'] = this.multipleSelection params["idList"] = this.multipleSelection;
} }
this.$download("/staff/exportExcel", { this.$download(
...params "/staff/exportExcel",
}, { type: "excel" }).then(() => this.isExport = false).catch(error => { {
...params,
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}) });
}, },
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -195,90 +238,90 @@ ...@@ -195,90 +238,90 @@
// this.$refs.drawerform.add(row); // this.$refs.drawerform.add(row);
}, },
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(form,row) { toEdit(form, row) {
this.$refs.drawerform.edit(form,row); this.$refs.drawerform.edit(form, row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
handleClick(key){ handleClick(key) {
this.$store.commit('setThirdPath',key) this.$store.commit("setThirdPath", key);
this.$router.push({ this.$router.push({
path:key path: key,
}) });
}, },
// 职位 // 职位
editJob(row){ editJob(row) {
let from = '' let from = "";
// 编辑职位/分组 // 编辑职位/分组
if(!row.groupId){ if (!row.groupId) {
from = 'group' from = "group";
}else{ } else {
from = 'job' from = "job";
} }
this.toEdit(from,row) this.toEdit(from, row);
}, },
// 删除分组或者职位 // 删除分组或者职位
deleteFn(row){ deleteFn(row) {
this.$confirm('此操作将永久删除该信息, 是否继续?', '提示', { this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(res => { }).then((res) => {
// 删除操作 // 删除操作
this.$post('/job/delete?id='+row.id).then(data => { this.$post("/job/delete?id=" + row.id).then((data) => {
if(data.code == 1){ if (data.code == 1) {
this.$message({ this.$message({
type: 'success', type: "success",
message: '删除成功!' message: "删除成功!",
}) });
this.getData() this.getData();
} }
}) });
}) });
}, },
// 删除员工 // 删除员工
deleteStaff(row){ deleteStaff(row) {
this.$confirm("此操作将永久删除该员工，是否继续",'提示',{ this.$confirm("此操作将永久删除该员工，是否继续", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(res => { }).then((res) => {
this.$post('/staff/delete?id='+row.id).then(res => { this.$post("/staff/delete?id=" + row.id).then((res) => {
if(res.code == 1){ if (res.code == 1) {
this.$message.success('删除成功') this.$message.success("删除成功");
this.getStaff() this.getStaff();
} }
}) });
}) });
}, },
// 批量删除员工 // 批量删除员工
allDelete(){ allDelete() {
if (!this.multipleSelection.length) { if (!this.multipleSelection.length) {
return this.$message.warning('请选中一条记录'); return this.$message.warning("请选中一条记录");
} }
let ids = this.multipleSelection.map(item => item.id).join(',') let ids = this.multipleSelection.map((item) => item.id).join(",");
this.$get('/staff/delete?',{id:ids}).then(res => { this.$get("/staff/delete?", { id: ids }).then((res) => {
if(res.code == 1){ if (res.code == 1) {
this.$message.success('删除成功') this.$message.success("删除成功");
this.getStaff() this.getStaff();
}
})
} }
});
},
}, },
data() { data() {
return { return {
isExport:false, isExport: false,
saveFrom:'', saveFrom: "",
addShow:false, addShow: false,
staffList:[], staffList: [],
bumentree:[], bumentree: [],
currentId:'', currentId: "",
currentName:'', currentName: "",
multipleSelection:[] multipleSelection: [],
} };
} },
} };
</script> </script>
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
View file @ 3fe9ce41
...@@ -451,6 +451,7 @@ export default { ...@@ -451,6 +451,7 @@ export default {
let arr = this.ruleArr.filter((v) => v.id == val); let arr = this.ruleArr.filter((v) => v.id == val);
this.form.score = arr && arr[0].score; this.form.score = arr && arr[0].score;
this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : ""; this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
this.form.subAddType = arr[0].subAddType;
}, },
cateChange() { cateChange() {
this.$post("/perform/rules/list", { this.$post("/perform/rules/list", {
......
attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue
View file @ 3fe9ce41
...@@ -157,7 +157,6 @@ export default { ...@@ -157,7 +157,6 @@ export default {
methods: { methods: {
switchChange() { switchChange() {
console.log(this.switchValue);
this.switchValue == 0 this.switchValue == 0
? (this.typeArr = [ ? (this.typeArr = [
{ {
...@@ -171,11 +170,14 @@ export default { ...@@ -171,11 +170,14 @@ export default {
sortKind: "desc", sortKind: "desc",
}, },
]); ]);
this.getKaoQin(this.cateObj.id); this.getKaoQin(this.cateObj.id);
}, },
handleClick(val, i) { handleClick(val, i) {
this.index = i; this.index = i;
this.cateObj = val; this.cateObj = val;
this.$route.query.page = 1;
this.query.page = 1;
this.getKaoQin(val.id); this.getKaoQin(val.id);
}, },
addRules() { addRules() {
...@@ -225,6 +227,7 @@ export default { ...@@ -225,6 +227,7 @@ export default {
categoryId, categoryId,
type: this.activeName, type: this.activeName,
page: this.query.page, page: this.query.page,
size: this.query.size,
orderColList: this.typeArr, orderColList: this.typeArr,
andConditionList: [ andConditionList: [
{ content: `%${this.searchValue}%`, name: `%${this.searchValue}%` }, { content: `%${this.searchValue}%`, name: `%${this.searchValue}%` },
......
attendance-performance-manager-ui/admin/src/views/perform/rules/attend/list.vue
View file @ 3fe9ce41
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
created() {}, created() {},
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
this.$route.query.page = 1;
// this.$forceUpdate(this.activeName); // this.$forceUpdate(this.activeName);
}, },
}, },
......
attendance-performance-manager-ui/admin/src/views/staff/onboard/list.vue
View file @ 3fe9ce41
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" notAdd :config="tableConfig"> </LayoutTable>
</LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "StaffOnboardList", name: "StaffOnboardList",
components: { components: {
dialogShow dialogShow,
},
mixins: [table],
created() {
}, },
mixins: [table],
created() {},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -33,43 +30,63 @@ ...@@ -33,43 +30,63 @@
toView(row) { toView(row) {
this.$refs.dialogform.view(row); this.$refs.dialogform.view(row);
}, },
}, },
data() { data() {
return { return {
config: { config: {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [],
],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", width: 60 },
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "员工姓名", prop: "staffName"}, { label: "员工姓名", prop: "staffName" },
{label: "性别", prop: "gender",formatter: this.formatter}, { label: "性别", prop: "gender", formatter: this.formatter },
{label: "政治面貌 ", prop: "politicalstatus",formatter: this.formatter}, {
label: "政治面貌 ",
prop: "politicalstatus",
formatter: this.formatter,
},
{label: "员工类型", prop: "staffType",formatter: this.formatter}, { label: "员工类型", prop: "staffType", formatter: this.formatter },
{label: "员工状态", prop: "onBoardStatus",formatter: this.formatter}, {
label: "员工状态",
prop: "onBoardStatus",
formatter: this.formatter,
},
{label: "入职时间", prop: "entryDate", formatter: this.formatterDate}, {
label: "入职时间",
prop: "entryDate",
formatter: this.formatterDate,
},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {
label: "创建用户",
prop: "createUserId",
formatter: this.formatter,
},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
attendance-performance-manager-ui/admin/src/views/workman/list.vue
View file @ 3fe9ce41
...@@ -6,17 +6,16 @@ ...@@ -6,17 +6,16 @@
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "WorkmanList", name: "WorkmanList",
components: { components: {
dialogShow dialogShow,
},
mixins: [table],
created() {
}, },
mixins: [table],
created() {},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -30,47 +29,57 @@ ...@@ -30,47 +29,57 @@
toView(row) { toView(row) {
this.$refs.dialogform.view(row); this.$refs.dialogform.view(row);
}, },
}, },
data() { data() {
return { return {
config: { config: {
isshowTabPane:true, isshowTabPane: true,
search: [ search: [
{ {
name: "name", name: "name",
type: "text", type: "text",
label: "姓名", label: "姓名",
fuzzy: true fuzzy: true,
}, },
], ],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", width: 60 },
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "部门名称", prop: "deptName"}, { label: "部门名称", prop: "deptName" },
{label: "姓名", prop: "name"}, { label: "姓名", prop: "name" },
{label: "工号", prop: "number"}, { label: "工号", prop: "number" },
{label: "电话号码", prop: "phone"}, { label: "电话号码", prop: "phone" },
{label: "照片", prop: "photoPath",formatter:this.formatterPic}, { label: "照片", prop: "photoPath", formatter: this.formatterPic },
{label: "创建时间", prop: "createTime", formatter: this.formatterDate}, {
label: "创建时间",
prop: "createTime",
formatter: this.formatterDate,
},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
attendance-performance-manager-ui/admin/vue.config.js
View file @ 3fe9ce41
...@@ -17,9 +17,15 @@ module.exports = { ...@@ -17,9 +17,15 @@ module.exports = {
hot: true,//自动保存 hot: true,//自动保存
proxy: { proxy: {
'/attendance': { '/attendance': {
//target: 'http://192.168.0.98:11039', target: 'http://192.168.0.98:11039',
//target: 'http://112.19.80.237:11039', // target: 'http://112.19.80.237:11039',
target: 'http://localhost:17500', // target: 'http://localhost:17500',
changeOrigin: true,
secure: false,
cookieDomainRewrite: 'localhost',
},
'/zwfw_api_xnjc': {
target: 'http://112.19.80.237:11031',
changeOrigin: true, changeOrigin: true,
secure: false, secure: false,
cookieDomainRewrite: 'localhost', cookieDomainRewrite: 'localhost',
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java
View file @ 3fe9ce41
...@@ -123,6 +123,7 @@ public class DingMessageController { ...@@ -123,6 +123,7 @@ public class DingMessageController {
log.info("审批详情："+JSONObject.toJSONString(result) ); log.info("审批详情："+JSONObject.toJSONString(result) );
AttendanceLeaveRecordEntity leaveRecordEntity = new AttendanceLeaveRecordEntity(); AttendanceLeaveRecordEntity leaveRecordEntity = new AttendanceLeaveRecordEntity();
AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = new AttendanceVacationBalanceEntity(); AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = new AttendanceVacationBalanceEntity();
attendanceVacationBalanceEntity.initAttrValue();
leaveRecordEntity.initAttrValue(); leaveRecordEntity.initAttrValue();
leaveRecordEntity.setRemark(processInstanceId); //将钉钉的事物id作为备注填入数据库 leaveRecordEntity.setRemark(processInstanceId); //将钉钉的事物id作为备注填入数据库
...@@ -145,6 +146,7 @@ public class DingMessageController { ...@@ -145,6 +146,7 @@ public class DingMessageController {
attendanceVacationBalanceEntity.setEntryTime(staffEntity.getEntryDate()); attendanceVacationBalanceEntity.setEntryTime(staffEntity.getEntryDate());
if(result.getTasks().size() >0 ){ if(result.getTasks().size() >0 ){
if(result.getTasks().get(0).getCreateTime() != null && result.getTasks().get(0).getFinishTime() != null){
Date startTime = dateFormat(result.getTasks().get(0).getCreateTime(),"yyyy-MM-dd'T'HH:mm'Z'"); Date startTime = dateFormat(result.getTasks().get(0).getCreateTime(),"yyyy-MM-dd'T'HH:mm'Z'");
Date endTime = dateFormat(result.getTasks().get(0).getFinishTime(),"yyyy-MM-dd'T'HH:mm'Z'"); Date endTime = dateFormat(result.getTasks().get(0).getFinishTime(),"yyyy-MM-dd'T'HH:mm'Z'");
...@@ -152,6 +154,7 @@ public class DingMessageController { ...@@ -152,6 +154,7 @@ public class DingMessageController {
leaveRecordEntity.setEndTime(endTime); leaveRecordEntity.setEndTime(endTime);
leaveRecordEntity.setDuration((int) ((endTime.getTime() - startTime.getTime())/1000)); leaveRecordEntity.setDuration((int) ((endTime.getTime() - startTime.getTime())/1000));
} }
}
String leave_code = LeaveRulesEnum.事假.getLeave_code(); String leave_code = LeaveRulesEnum.事假.getLeave_code();
String leave_name = "事假"; String leave_name = "事假";
...@@ -239,7 +242,7 @@ public class DingMessageController { ...@@ -239,7 +242,7 @@ public class DingMessageController {
break; break;
case "探亲假": case "探亲假":
leaveRecordEntity.setLeaveType(21); leaveRecordEntity.setLeaveType(21);
leave_code = LeaveRulesEnum.年假.getLeave_code(); leave_code = LeaveRulesEnum.探亲假.getLeave_code();
break; break;
default: default:
leaveRecordEntity.setLeaveType(1); //默认事假 leaveRecordEntity.setLeaveType(1); //默认事假
...@@ -258,7 +261,7 @@ public class DingMessageController { ...@@ -258,7 +261,7 @@ public class DingMessageController {
}else if (result.getFormComponentValues().size() > 2) { //上传的附件 }else if (result.getFormComponentValues().size() > 2) { //上传的附件
GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResultFormComponentValues picEntity = result.getFormComponentValues().get(2); GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResultFormComponentValues picEntity = result.getFormComponentValues().get(2);
if(picEntity.getName().equals("图片") && picEntity.getValue() != null){ if(picEntity.getName().equals("图片") && picEntity.getValue() != null){
leaveRecordEntity.setReason(picEntity.getValue()); leaveRecordEntity.setAttachmentPath(picEntity.getValue());
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
View file @ 3fe9ce41
...@@ -27,6 +27,11 @@ public class FeedbackVo extends BaseEntityLong { ...@@ -27,6 +27,11 @@ public class FeedbackVo extends BaseEntityLong {
/** 反馈状态 */ /** 反馈状态 */
private Integer backStatus; private Integer backStatus;
/** 开始 反馈开始时间 */
private String feedbackTimeStartStart;
/** 结束 反馈开始时间 */
private String feedbackTimeStartEnd;
private List<FeedbackAnswerEntity> feedbackAnswerList=new ArrayList<>();; private List<FeedbackAnswerEntity> feedbackAnswerList=new ArrayList<>();;
} }
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
View file @ 3fe9ce41
...@@ -164,48 +164,48 @@ ...@@ -164,48 +164,48 @@
<select id="getScoreSummary" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllScoreSummaryVo"> <select id="getScoreSummary" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllScoreSummaryVo">
SELECT sum(0-a.initScore) AS initScore,sum(0-a.checkScore) AS checkScore,sum(a.appealScore) AS appealScore,sum(0-a.checkScore-a.appealScore) AS total FROM ( SELECT sum(0-a.initScore) AS initScore,sum(0-a.checkScore) AS checkScore,sum(a.appealScore) AS appealScore,sum(0-a.checkScore-a.appealScore) AS total FROM (
SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore, SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore, sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) appealScore sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
FROM mortals_xhx_check_attend_record WHERE 1=1 FROM mortals_xhx_check_attend_record WHERE 1=1
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
UNION UNION
SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore, SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore, sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) appealScore sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
FROM mortals_xhx_check_effect_record WHERE 1=1 FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
UNION UNION
SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore, SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore, sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) appealScore sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
FROM mortals_xhx_check_complain_record WHERE 1=1 FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
UNION UNION
SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore, SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore, sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) appealScore sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
FROM mortals_xhx_check_gowork_record WHERE 1=1 FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
UNION UNION
SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore, SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore, sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) appealScore sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
FROM mortals_xhx_check_review_record WHERE 1=1 FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
UNION UNION
SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore, SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore, sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) appealScore sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
FROM mortals_xhx_check_other_record WHERE 1=1 FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapperExt.xml
View file @ 3fe9ce41
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
FROM FROM
mortals_xhx_check_attend_record mortals_xhx_check_attend_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
FROM FROM
mortals_xhx_check_attend_record mortals_xhx_check_attend_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
FROM FROM
mortals_xhx_check_attend_record mortals_xhx_check_attend_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapperExt.xml
View file @ 3fe9ce41
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
FROM FROM
mortals_xhx_check_complain_record mortals_xhx_check_complain_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
FROM FROM
mortals_xhx_check_complain_record mortals_xhx_check_complain_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapperExt.xml
View file @ 3fe9ce41
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
FROM FROM
mortals_xhx_check_effect_record mortals_xhx_check_effect_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
FROM FROM
mortals_xhx_check_effect_record mortals_xhx_check_effect_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapperExt.xml
View file @ 3fe9ce41
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
FROM FROM
mortals_xhx_check_gowork_record mortals_xhx_check_gowork_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
FROM FROM
mortals_xhx_check_gowork_record mortals_xhx_check_gowork_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapperExt.xml
View file @ 3fe9ce41
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
FROM FROM
mortals_xhx_check_other_record mortals_xhx_check_other_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
FROM FROM
mortals_xhx_check_other_record mortals_xhx_check_other_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapperExt.xml
View file @ 3fe9ce41
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
FROM FROM
mortals_xhx_check_review_record mortals_xhx_check_review_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
FROM FROM
mortals_xhx_check_review_record mortals_xhx_check_review_record
WHERE checkStatus = 2 WHERE checkStatus = 2 and checkResult = 1
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
......
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