Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	db/menu.sql
parents 8ed1e363 fb096215
Show whitespace changes
Inline Side-by-side
Showing with 16293 additions and 11083 deletions
attendance-performance-manager-ui/admin/src/assets/less/base.less
View file @ b5b610a3
...@@ -91,6 +91,9 @@ sub { ...@@ -91,6 +91,9 @@ sub {
.mt10{ .mt10{
margin-top: 10px; margin-top: 10px;
} }
.ml10{
margin-left: 10px;
}
.ml20{ .ml20{
margin-left: 20px; margin-left: 20px;
} }
......
attendance-performance-manager-ui/admin/src/assets/utils/common.js
View file @ b5b610a3
...@@ -210,3 +210,11 @@ export const findParentIds = (dataSource, nodeId) => { ...@@ -210,3 +210,11 @@ export const findParentIds = (dataSource, nodeId) => {
return parentIds; // 返回所有父节点ID的数组 return parentIds; // 返回所有父节点ID的数组
} }
// 格式化
export const booleanToNum = (val) => {
if(val){
return 1
}else{
return 0
}
}
\ No newline at end of file
attendance-performance-manager-ui/admin/src/assets/utils/dateFormat.js
View file @ b5b610a3
...@@ -17,3 +17,26 @@ export const timestampToTime = (timestamp) => { ...@@ -17,3 +17,26 @@ export const timestampToTime = (timestamp) => {
var s = date.getSeconds(); var s = date.getSeconds();
return Y + M + D; return Y + M + D;
} }
// 小时：分钟 ==》 转分钟
export const transFormMinut = (String) => {
if(typeof(String) === 'number'){
return
}
if(!String){
return 0
}
let arr = String.split(':')
let hour = arr[0].indexOf('0') === 0? arr[0].substring(1,arr[0].length):arr[0]
let minu = arr[1].indexOf('0') === 0? arr[1].substring(1,arr[1].length):arr[1]
return hour*60 + minu*1
}
// // 分钟 ==》 小时
export const transFormTime = (num) => {
if (typeof(num) != 'string' && num !== 0) {
return (Math.floor(num / 60)).toString() + ":" + (num % 60).toString()
}
else {
return "0:00";
}
}
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/attendance/class/dialogshow.vue
View file @ b5b610a3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="班次名称" prop="className" v-model="form.className" placeholder="请输入班次名称"/> <Field label="班次名称" prop="className" v-model="form.className" placeholder="请输入班次名称"/>
<Field label="班次负责人" prop="classResponsiblePersonId" type="select" <Field label="班次负责人" prop="classResponsiblePersonId" type="select" :enumData="dict.workManId"
v-model="form.classResponsiblePersonId" placeholder="请选择班次负责人"/> v-model="form.classResponsiblePersonId" placeholder="请选择班次负责人"/>
</el-row> </el-row>
<el-form-item label="上下班时间" prop="attendanceClassDetailList"> <el-form-item label="上下班时间" prop="attendanceClassDetailList">
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
style="width:150px" style="width:150px"
class="ml20" class="ml20"
v-model="item.offWorkDateBefore" v-model="item.offWorkDateBefore"
value-format="HH:mm" value-format="H:mm"
format="H小时mm分钟" format="H小时mm分钟"
placeholder="未设置"> placeholder="未设置">
</el-time-picker> </el-time-picker>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
style="width:150px" style="width:150px"
class="ml20" class="ml20"
v-model="item.offWorkDateAfter" v-model="item.offWorkDateAfter"
value-format="HH:mm" value-format="H:mm"
format="H小时mm分钟" format="H小时mm分钟"
placeholder="未设置"> placeholder="未设置">
</el-time-picker> </el-time-picker>
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialog-footer ml20"> <div class="dialog-footer ml20">
<el-button type="primary" size="mini" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <!-- submitForm -->
<el-button type="primary" size="mini" v-if="pageInfo.type !== 'view'" @click="formatData">确 定</el-button>
<el-button @click="cancel" size="mini">取 消</el-button> <el-button @click="cancel" size="mini">取 消</el-button>
</div> </div>
</el-drawer> </el-drawer>
...@@ -100,21 +101,13 @@ ...@@ -100,21 +101,13 @@
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import {transFormMinut,transFormTime} from '@/assets/utils/dateFormat.js'
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow ,
}, },
data() { data() {
var validteList = (rule, value, callback) => {
if (!value) {
return callback(new Error('请添加上班时间'))
}else if(!this.judgeStatus(value) ){
callback(new Error('请完成输入'))
}else{
callback()
}
}
return { return {
// 子表选中数据 // 子表选中数据
checkedAttendanceClassDetail: [], checkedAttendanceClassDetail: [],
...@@ -137,26 +130,47 @@ ...@@ -137,26 +130,47 @@
{required: true,message: "请选择班次负责人" }, {required: true,message: "请选择班次负责人" },
], ],
attendanceClassDetailList:[ attendanceClassDetailList:[
{required: true,message: "请添加" }, {required: true,message: "请添加" }
{ validator:validteList,trigger:'change'}
] ]
}, },
currentIndex:0//当前索引值 currentIndex:0//当前索引值
}; }
}, },
created(){ created(){
// this.transFormMinut('09:03')
}, },
methods: { methods: {
// 时间转分钟 formatData(){
transFormMinut(String){ let value = true
if(!String){
return 0 if(this.attendanceClassDetailList.length < 1){
this.$message.error('请完整打卡时间填写')
value = false
return
}else{
console.log(this.attendanceClassDetailList.length,'执行了')
this.attendanceClassDetailList.forEach((item,index) => {
let valueres = this.judgeStatus(this.attendanceClassDetailList,index)
if(!valueres){
value = false
return
} }
let arr = String.split(':') })
let hour = arr[0].indexOf('0') === 0? arr[0].substring(1,arr[0].length):arr[0] }
let minu = arr[1].indexOf('0') === 0? arr[1].substring(1,arr[1].length):arr[1]
return hour*60 + minu*1 if(value){
console.log('测试')
this.attendanceClassDetailList.forEach(item => {
item.goWorkDateBefore = transFormMinut(item.goWorkDateBefore)
item.goWorkDateAfter = transFormMinut(item.goWorkDateAfter)
item.offWorkDateBefore = transFormMinut(item.offWorkDateBefore)
item.offWorkDateAfter = transFormMinut(item.offWorkDateAfter)
})
this.submitForm()
}else{
this.$message.error('打卡时间填写有误')
}
}, },
/** 考勤班次详细信息序号 */ /** 考勤班次详细信息序号 */
rowAttendanceClassDetailIndex({ row, rowIndex }) { rowAttendanceClassDetailIndex({ row, rowIndex }) {
...@@ -164,13 +178,6 @@ ...@@ -164,13 +178,6 @@
}, },
/** 考勤班次详细信息添加按钮操作 */ /** 考勤班次详细信息添加按钮操作 */
handleAddAttendanceClassDetail() { handleAddAttendanceClassDetail() {
let value = this.judgeStatus(this.attendanceClassDetailList)
if(value){
if(this.attendanceClassDetailList.length == 0){
this.currentIndex = 0
}else{
this.currentIndex ++
}
let obj = {}; let obj = {};
obj.goWorkDate = ""; obj.goWorkDate = "";
obj.goWorkDateBefore = ""; obj.goWorkDateBefore = "";
...@@ -178,68 +185,75 @@ ...@@ -178,68 +185,75 @@
obj.offWorkDate = ""; obj.offWorkDate = "";
obj.offWorkDateBefore = ""; obj.offWorkDateBefore = "";
obj.offWorkDateAfter = ""; obj.offWorkDateAfter = "";
obj.remark = "";
this.attendanceClassDetailList.push(obj); this.attendanceClassDetailList.push(obj);
}else{
this.$message.error("请完成当前设置再添加")
}
}, },
// 判断添加上下班时间 // 判断添加上下班时间
judgeStatus(arr){ judgeStatus(arr,index){
console.log(arr,index,'ces')
let status = true let status = true
if(arr.length == 0){ if(arr.length == 0){
}else{
}else if(arr.length == 1){ if(arr[index].goWorkDate === ''){
console.log(arr[this.currentIndex]) this.$message.error('请选择上班时间')
for(let key in arr[this.currentIndex]){
if(!arr[this.currentIndex][key]){
status = false status = false
return return
} }
if(arr[index].goWorkDateBefore === ''){
this.$message.error('请选择允许上班前打卡时间')
status = false
return
} }
//比较下班和上班 if(arr[index].goWorkDateAfter === ''){
let workTime = this.transFormMinut(arr[this.currentIndex].goWorkDate)+ this.$message.error('请选择允许上班后打卡时间')
this.transFormMinut(arr[this.currentIndex].goWorkDateAfter)
let offworkTime = this.transFormMinut(arr[this.currentIndex].offWorkDate)-
this.transFormMinut(arr[this.currentIndex].offWorkDateBefore)
if(offworkTime <= workTime){
this.$message.error('下班打卡时间不能小于上班打卡时间')
status = false status = false
return return
} }
if(arr[index].offWorkDate === ''){
this.$message.error('请选择下班时间')
status = false
return
} }
else{ if(arr[index].offWorkDateBefore === ''){
for(let key in arr[this.currentIndex]){ this.$message.error('请选择允许下班前打卡时间')
if(!this.arr[this.currentIndex][key]){
status = false status = false
return return
} }
if(arr[index].offWorkDateAfter === ''){
this.$message.error('请选择允许下班后打卡时间')
status = false
return
} }
// 上一次比较 //当前比较下班和上班
let lastworkTime = this.transFormMinut(arr[this.currentIndex-1].goWorkDate) + let workTime = transFormMinut(arr[index].goWorkDate)+
this.transFormMinut(arr[this.currentIndex - 1 ].goWorkDateAfter) transFormMinut(arr[index].goWorkDateAfter)
let currentwokeTime = this.transFormMinut(arr[this.currentIndex].goWorkDate) -
this.transFormMinut(arr[this.currentIndex].goWorkDateBefore)
//当前 let offworkTime = transFormMinut(arr[index].offWorkDate)-
let workTime = this.transFormMinut(arr[this.currentIndex].goWorkDate)+ transFormMinut(arr[index].offWorkDateBefore)
this.transFormMinut(arr[this.currentIndex].goWorkDateAfter)
let offworkTime = this.transFormMinut(arr[this.currentIndex].offWorkDate)- if(offworkTime <= workTime){
this.transFormMinut(arr[this.currentIndex].offWorkDateBefore) this.$message.error('下班打卡时间不能小于上班打卡时间')
if(currentwokeTime<=lastworkTime){
this.$message.error(`第${this.currentIndex}上班时间需大于第${this.currentIndex-1}上班时间`)
status = false status = false
return return
} }
if(offworkTime <= workTime){ if(arr.length > 1 && index>0){
this.$message.error('下班打卡时间不能小于上班打卡时间') console.log(11111)
// 上一次比较
let lastoffTime = transFormMinut(arr[index-1].offWorkDate) +
transFormMinut(arr[index - 1 ].offWorkDateAfter)
let currentwokeTime = transFormMinut(arr[index].goWorkDate) -
transFormMinut(arr[index].goWorkDateBefore)
if(currentwokeTime <= lastoffTime){
this.$message.error(`第${index}上班时间需大于第${index-1}上班时间`)
status = false status = false
return return
} }
} }
}
return status return status
}, },
/** 考勤班次详细信息删除按钮操作 */ /** 考勤班次详细信息删除按钮操作 */
...@@ -276,6 +290,7 @@ ...@@ -276,6 +290,7 @@
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type="edit"
this.title = "修改考勤班次信息"; this.title = "修改考勤班次信息";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
...@@ -300,6 +315,17 @@ ...@@ -300,6 +315,17 @@
}, },
/**获取数据后弹框 */ /**获取数据后弹框 */
afterRender(data) { afterRender(data) {
if(this.attendanceClassDetailList.length>0){
this.attendanceClassDetailList.forEach(item => {
item.goWorkDateBefore = transFormTime(item.goWorkDateBefore)
item.goWorkDateAfter = transFormTime(item.goWorkDateAfter)
item.offWorkDateBefore = transFormTime(item.offWorkDateBefore)
item.offWorkDateAfter = transFormTime(item.offWorkDateAfter)
})
this.currentIndex = this.attendanceClassDetailList.length - 1
this.form.classResponsiblePersonId = this.form.classResponsiblePersonId.toString()
console.log(this.currentIndex,'执行了')
}
this.open = true; this.open = true;
}, },
......
attendance-performance-manager-ui/admin/src/views/attendance/class/list.vue
View file @ b5b610a3
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
return { return {
/** 子表列元素 */ /** 子表列元素 */
columnSet:[ columnSet:[
{prop:"goWorkDate",label:"上班打卡时间",width:100}, {prop:"goWorkDate",label:"上班打卡时间",width:150},
{prop:"goWorkDateBefore",label:"上班打卡前时间段,单位分钟",width:100}, {prop:"goWorkDateBefore",label:"上班前打卡(分钟)",width:150},
{prop:"goWorkDateAfter",label:"上班打卡前时间段,单位分钟",width:100}, {prop:"goWorkDateAfter",label:"上班后打卡(分钟)",width:150},
{prop:"offWorkDate",label:"下班打卡时间",width:100}, {prop:"offWorkDate",label:"下班打卡时间",width:150},
{prop:"offWorkDateBefore",label:"下班打卡前时间段,单位分钟",width:100}, {prop:"offWorkDateBefore",label:"下班前打卡(分钟)",width:150},
{prop:"offWorkDateAfter",label:"下班打卡前时间段,单位分钟",width:100}, {prop:"offWorkDateAfter",label:"下班后打卡(分钟)",width:150},
{prop:"remark",label:"备注",width:100}, // {prop:"remark",label:"备注",width:150},
{prop:"classId",label:"班次ID",width:100}, // {prop:"classId",label:"班次ID",width:150},
{prop:"className",label:"班次名称",width:100} ], ],
config: { config: {
search: [ search: [
{ {
...@@ -75,11 +75,10 @@ ...@@ -75,11 +75,10 @@
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
{label: "班次名称", prop: "className"}, {label: "班次名称", prop: "className"},
// {label: "考勤时间", prop: "className"}, // {label: "考勤时间", prop: "className"},
{label: "考勤班次详细信息", {label: "考勤班次详细信息",
width: 120, width: 200,
prop: "subColumns", prop: "subColumns",
formatter: (row) => { formatter: (row) => {
let widthsize = this.columnSet.reduce((pre, cur) => { let widthsize = this.columnSet.reduce((pre, cur) => {
......
attendance-performance-manager-ui/admin/src/views/attendance/group/banciSelect/index.vue 0 → 100644
View file @ b5b610a3
<template>
<div class="mt20" v-if="isshow">
<el-table :data="classArr" border highlight-current-row ref="table"
@row-click="(row, column, event) => $rowClick(row,column, event, 'table')"
>
<el-table-column label="班次名称" prop="className" width="300px"></el-table-column>
<el-table-column label="考勤时间" prop="" fixed="right">
<template slot-scope="scope">
<div>
<el-tag class="ml10" v-for="(item,index) in scope.row.attendanceClassDetailList" :key="index">
{{item.goWorkDate}} ~ {{item.offWorkDate}}
</el-tag>
</div>
</template>
</el-table-column>
</el-table>
<div class="mt20">
<el-button type="primary" size="mini" @click="saveRowBanci">确定</el-button>
<el-button type="" size="mini" @click="cancelBanci">取消</el-button>
</div>
</div>
</template>
<script>
export default {
props:{
classArr:{
type:Array,
default:[]
},
currentArr:{
type:Object,
default:{}
},
isshow:{
type:Boolean,
default:false
}
},
watch:{
isshow:{
handler(newval){
if(newval){
this.selected = this.currentArr
this.$nextTick(() => {
let index = this.classArr.findIndex(item => item.id == this.selected.id)
this.$refs['table'].setCurrentRow(this.classArr[index],true)
})
}
}
}
},
data(){
return{
selected:{}
}
},
methods:{
saveRowBanci(){
this.$emit('saveRowBanci',this.selected)
},
cancelBanci(){
this.$emit('cancelBanci',null)
},
// 表格切换高亮点击
$rowClick (row, column, ev, ref) {
this.selected = row
const $table = this.$refs[ref]
// 因为不知道表格中包裹了多少层元素,所以需要通过查询点击元素的所有父级元素找到符合条件的类名进行判断
const haveHeightLight = [...ev.path].some(el => {
if (el.classList) return [...el.classList].indexOf('el-table__row') !== -1 && [...el.classList].indexOf('current-row') !== -1
})
try {
$table[0].setCurrentRow(haveHeightLight ? '' : row)
} catch (e) {
$table.setCurrentRow(haveHeightLight ? '' : row)
}
},
}
}
</script>
<style>
</style>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/attendance/group/banciTable/index.vue 0 → 100644
View file @ b5b610a3
<template>
<table class="table mt10">
<th class="heads flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox v-model="selectAll" @change="allhandler"></el-checkbox>
</td>
<td class="t1">工作日</td>
<td class="t2">班次时间段</td>
<td class="t1">操作</td>
</th>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.monday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周一</td>
<td class="t2">
<span>{{setParams.mondayClassId?setParams.mondayClassName:'未设置'}}</span>
<el-tag v-for="(item,index) in setParams.mondayClassTime.attendanceClassDetailList" :key="index" class="ml10">
{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('monday')">更改班次</el-button>
</td>
</tr>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.tuesday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周二</td>
<td class="t2">
{{setParams.tuesdayClassId?setParams.tuesdayClassName:'未设置'}}
<el-tag class="ml10" v-for="(item,index) in setParams.tuesdayClassTime.attendanceClassDetailList" :key="index">{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('tuesday')">更改班次</el-button>
</td>
</tr>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.wednesday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周三</td>
<td class="t2">
{{setParams.wednesdayClassId?setParams.wednesdayClassName:'未设置'}}
<el-tag class="ml10" v-for="(item,index) in setParams.wednesdayClassTime.attendanceClassDetailList" :key="index">{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('wednesday')">更改班次</el-button>
</td>
</tr>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.thursday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周四</td>
<td class="t2">
{{setParams.thursdayClassId?setParams.thursdayClassName:'未设置'}}
<el-tag class="ml10" v-for="(item,index) in setParams.thursdayClassTime.attendanceClassDetailList" :key="index">{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('thursday')">更改班次</el-button>
</td>
</tr>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.friday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周五</td>
<td class="t2">
{{setParams.fridayClassId?setParams.fridayClassName:'未设置'}}
<el-tag class="ml10" v-for="(item,index) in setParams.fridayClassTime.attendanceClassDetailList" :key="index">{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('friday')">更改班次</el-button>
</td>
</tr>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.saturday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周六</td>
<td class="t2">
{{setParams.saturdayClassId?setParams.saturdayClassName:'休息'}}
<el-tag class="ml10" v-for="(item,index) in setParams.saturdayClassTime.attendanceClassDetailList" :key="index">{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('saturday')">更改班次</el-button>
</td>
</tr>
<tr class="flex flex-align-center flex-pack-justify">
<td class="selectTions">
<el-checkbox :true-label="1" :false-label="0" v-model="setParams.sunday" @change="judgeAll"></el-checkbox>
</td>
<td class="t1">周日</td>
<td class="t2">
{{setParams.sundayClassId?setParams.sundayClassName:'休息'}}
<el-tag class="ml10" v-for="(item,index) in setParams.sundayClassTime.attendanceClassDetailList" :key="index">{{item.goWorkDate}}~{{item.offWorkDate}}</el-tag>
</td>
<td class="t1">
<el-button type="text" @click="changebanci('sunday')">更改班次</el-button>
</td>
</tr>
</table>
</template>
<script>
export default {
props:{
setParams:{
type:Object,
default:{}
}
},
data(){
return{
selectAll:false
}
},
mounted(){
// 判断全选
this.judgeAll()
},
methods:{
changebanci(from){
this.$emit('changebanci',from)
},
allhandler(){
if(this.selectAll){
this.setParams.monday = true
this.setParams.tuesday = true
this.setParams.wednesday = true
this.setParams.thursday = true
this.setParams.friday = true
this.setParams.saturday = true
this.setParams.sunday = true
}else{
this.setParams.monday = false
this.setParams.tuesday = false
this.setParams.wednesday = false
this.setParams.thursday = false
this.setParams.friday = false
this.setParams.saturday = false
this.setParams.sunday = false
}
},
judgeAll(){
if(!this.setParams.monday){
this.selectAll = false
return
}
if(!this.setParams.tuesday){
this.selectAll = false
return
}
if(!this.setParams.wednesday){
this.selectAll = false
return
}
if(!this.setParams.thursday){
this.selectAll = false
return
}
if(!this.setParams.friday){
this.selectAll = false
return
}
if(!this.setParams.saturday){
this.selectAll = false
return
}
if(!this.setParams.sunday){
this.selectAll = false
return
}
this.selectAll = true
}
}
}
</script>
<style lang="scss" scoped>
.table{
width: 90%;
.selectTions{
margin-right: 10px;
}
.heads{
background-color: #cae4fd;
height: 50px;
line-height: 50px;
padding: 0 20px;
}
tr{
height: 50px;
line-height: 50px;
padding: 0 20px;
}
.t1{
flex: 1
}
.t2{
flex: 2;
color:gray;
}
}
</style>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/attendance/group/view.vue
View file @ b5b610a3
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
<el-button type="text" class="ml20" @click="drawershow('drawer1')">设置</el-button> <el-button type="text" class="ml20" @click="drawershow('drawer1')">设置</el-button>
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <div class="flex flex-align-center mt10" style="color:#999;font-size:14px" v-if="attendArr.length < 1">
<div>参与考勤人员</div> <div>参与考勤人员</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div>无需考勤人员</div> <div>无需考勤人员</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div> -->
<div style="height:20px"></div> <div style="height:20px"></div>
...@@ -32,29 +32,32 @@ ...@@ -32,29 +32,32 @@
<el-button type="text" class="ml20" @click="drawershow('drawer2')">设置</el-button> <el-button type="text" class="ml20" @click="drawershow('drawer2')">设置</el-button>
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <div class="flex flex-align-center mt10" style="color:#999;font-size:14px" v-if="!setParams.groupResponsibleEntity.responsibleId">
<div>主负责人</div> <div>主负责人</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div>子负责人</div> <div>子负责人</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div> -->
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div>子负责人权限</div> <div>子负责人权限</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div> -->
<div style="height:20px"></div> <div style="height:20px"></div>
<div class="flex flex-align-center mt20"> <div class="flex flex-align-center mt20">
<div>考勤时间</div> <div>考勤时间</div>
<el-button type="text" class="ml20" @click="drawershow('drawer3')">设置</el-button> <el-button type="text" class="ml20" @click="drawershow('drawer3')">设置</el-button>
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div class="flex flex-align-center mt10" v-if="setParams.type === ''" style="color:#999;font-size:14px">
<div>考勤类型</div> <div>考勤类型</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px" v-if="setParams.type === ''">
<div>工作日设置</div> <div>工作日设置</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
...@@ -67,37 +70,44 @@ ...@@ -67,37 +70,44 @@
</div> </div>
<div class="flex flex-align-center mt10" style="color:#999;font-size:14px" <div class="flex flex-align-center mt10" style="color:#999;font-size:14px"
v-if="setParams.attendanceType.length == 0"> v-if="setParams.attendanceType == ''">
<div>考勤方式</div> <div>考勤方式</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div class="mt20"> <div class="mt20">
<el-button type="primary">保存设置</el-button> <el-button type="primary" @click="saveSetform">保存设置</el-button>
<el-button>全部重置</el-button> <el-button @click="allReset">全部重置</el-button>
</div> </div>
</el-card> </el-card>
<!-- 设置考勤人员 --> <!-- 设置考勤人员 -->
<el-drawer <el-drawer
title="考勤人员" title="考勤人员"
size="70%"
:beforeClose="closedrawer" :beforeClose="closedrawer"
:visible.sync="drawer" :visible.sync="drawer"
direction="rtl"> direction="rtl">
<div style="padding:20px"> <div style="padding:20px">
<!-- 考勤人员 --> <!-- 考勤人员 -->
<div v-if="drawer1"> <div v-if="drawer1">
<div>参与考勤人员(0)</div> <div>参与考勤人员({{this.attendArr.length}})</div>
<el-input @focus="selectGroup()" style="width:220px" size="mini" placeholder="请选择"></el-input> <el-input @focus="selectGroup(true)" type="textarea"
</div> v-model="persons" style="width:80%" size="mini" placeholder="请选择">
<div class="mt10" v-if="drawer1"> </el-input>
<div>无需考勤人员(0)</div>
<el-input @focus="selectGroup()" style="width:220px" size="mini" placeholder="请选择"></el-input>
</div> </div>
<!-- 考勤组 --> <!-- 考勤组 -->
<div class="mt10" v-if="drawer2"> <div class="mt10" v-if="drawer2">
<div>考勤组负责人：</div> <div>考勤组负责人：</div>
<el-select></el-select> <el-select v-model="setParams.groupResponsibleEntity.responsibleId">
<el-option
v-for="($label, $value) in responsiableList"
:key="$value"
:label="$label"
:value="$value"
></el-option>
</el-select>
</div> </div>
<div class="mt10" v-if="drawer2"> <!-- <div class="mt10" v-if="drawer2">
<div>主负责人：</div> <div>主负责人：</div>
<el-select></el-select> <el-select></el-select>
</div> </div>
...@@ -110,7 +120,8 @@ ...@@ -110,7 +120,8 @@
<el-select> <el-select>
<el-option></el-option> <el-option></el-option>
</el-select> </el-select>
</div> </div> -->
<!-- 考勤时间 --> <!-- 考勤时间 -->
<div class="mt20" v-if="drawer3"> <div class="mt20" v-if="drawer3">
<el-radio-group v-model="setParams.type" @change="changeRadio"> <el-radio-group v-model="setParams.type" @change="changeRadio">
...@@ -126,21 +137,13 @@ ...@@ -126,21 +137,13 @@
<!-- 固定班次设置 --> <!-- 固定班次设置 -->
<div v-if="setParams.type == 1"> <div v-if="setParams.type == 1">
<div>工作日设置：</div> <div>工作日设置：</div>
<div class="mt10"> <!-- <div class="mt10">
<el-tag type="primary">快捷设置班次</el-tag> <el-tag type="primary">快捷设置班次</el-tag>
<span class="ml20">班次名称：</span> <span class="ml20">班次名称：</span>
<el-button type="text" @click="changeBanci('1')">更改班次</el-button> <el-button type="text" @click="changeBanci('1')">更改班次</el-button>
</div> </div> -->
<!-- 班次表 --> <!-- 固定班次表 -->
<el-table :data="weekList"> <banci-table :setParams="groupFixedworkEntity" @changebanci="changeBanci"></banci-table>
<el-table-column label="工作日"></el-table-column>
<el-table-column label="班次时间段"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="changeBanci(scope.row)">更改班次</el-button>
</template>
</el-table-column>
</el-table>
</div> </div>
...@@ -148,138 +151,466 @@ ...@@ -148,138 +151,466 @@
<div v-if="setParams.type == 3"> <div v-if="setParams.type == 3">
<div class="mt20">工作日</div> <div class="mt20">工作日</div>
<div class="mt10"> <div class="mt10">
<el-checkbox-group v-model="week"> <el-checkbox v-model="attendanceGroupFreeworkEntity.monday" :true-label="1" :false-label="0">周一</el-checkbox>
<el-checkbox label="">周一</el-checkbox> <el-checkbox v-model="attendanceGroupFreeworkEntity.tuesday" :true-label="1" :false-label="0">周二</el-checkbox>
<el-checkbox label="">周二</el-checkbox> <el-checkbox v-model="attendanceGroupFreeworkEntity.wednesday" :true-label="1" :false-label="0">周三</el-checkbox>
<el-checkbox label="">周三</el-checkbox> <el-checkbox v-model="attendanceGroupFreeworkEntity.thursday" :true-label="1" :false-label="0">周四</el-checkbox>
<el-checkbox label="">周四</el-checkbox> <el-checkbox v-model="attendanceGroupFreeworkEntity.friday" :true-label="1" :false-label="0">周五</el-checkbox>
<el-checkbox label="">周五</el-checkbox> <el-checkbox v-model="attendanceGroupFreeworkEntity.saturday" :true-label="1" :false-label="0">周六</el-checkbox>
<el-checkbox label="">周六</el-checkbox> <el-checkbox v-model="attendanceGroupFreeworkEntity.sunday" :true-label="1" :false-label="0">周日</el-checkbox>
<el-checkbox label="">周日</el-checkbox>
</el-checkbox-group>
</div> </div>
<div class="mt20">工作时长</div> <div class="mt20">工作时长</div>
<div class="mt10"> <div class="mt10">
<el-input style="width:100px"></el-input> <el-input style="width:100px" v-model="attendanceGroupFreeworkEntity.workTime" minlength="5"></el-input>
<span class="ml20">小时</span> <span class="ml20">小时</span>
</div> </div>
</div> </div>
<div v-if="setParams.type != 2">
<div class="mt10"> <div class="mt10">
<el-checkbox>法定节假日自动排休</el-checkbox> <el-checkbox v-model="holidays" :true-label="1" :false-label="0">法定节假日自动排休</el-checkbox>
</div> </div>
<div class="mt10"> <div class="mt10">
<div>特殊日期</div> <div>特殊日期</div>
</div> </div>
<div class="mt10"> <div class="mt10">
<el-button @click="mustDaka = true">+新增必须打卡的日期</el-button> <el-button @click="setMustTimes('must',attendanceGroupFixedworkSpecialList[0],0)">
+新增必须打卡的日期
</el-button>
<div class="el-tag ml20" type="primary" size="mini" plain
v-if="attendanceGroupFixedworkSpecialList[0].specialTime">
{{attendanceGroupFixedworkSpecialList[0].specialTime?
attendanceGroupFixedworkSpecialList[0].specialTime:'未设置'}}
</div>
</div> </div>
<div class="mt10"> <div class="mt10">
<el-button @click="noneedDaka = true">+新增无需打卡的日期</el-button> <el-button @click="setMustTimes('noneed',attendanceGroupFixedworkSpecialList[1],1)">
+新增无需打卡的日期
</el-button>
<div class="el-tag ml20" type="primary" size="mini" plain v-if="attendanceGroupFixedworkSpecialList[1].specialTime">
{{attendanceGroupFixedworkSpecialList[1].specialTime}}
</div>
<div class="el-tag ml20" v-else-if="attendanceGroupFixedworkSpecialList[1].specialStartTime">
{{attendanceGroupFixedworkSpecialList[1].specialStartTime}} 至 {{attendanceGroupFixedworkSpecialList[1].specialEndTime}}</div>
</div> </div>
</div> </div>
</div>
<div class="mt20" v-if="drawer4"> <div class="mt20" v-if="drawer4">
<div>考勤方式</div> <div>考勤方式</div>
<el-checkbox-group v-model="setParams.attendanceType"> <el-radio-group v-model="setParams.attendanceType">
<div class="mt10" v-for="(item,index) in attendanceType" :key="index"> <div class="mt10" v-for="(item,index) in attendanceType" :key="index">
<el-checkbox :label="item.value">{{item.label}}</el-checkbox> <el-radio :label="item.value">{{item.label}}</el-radio>
</div> </div>
</el-checkbox-group> </el-radio-group>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<!-- 选择成员 --> <!-- 选择成员 -->
<el-dialog :visible.sync="isshowgroup" title="选择人员"> <el-dialog :visible.sync="isshowgroup" title="选择人员" width="80%" :show-close="false">
<div> <div>
<el-row type="flex">
<!-- 左1 -->
<el-col :span="16">
<el-row type="flex">
<el-col :span="12">
<div class="titles">选择部门</div> <div class="titles">选择部门</div>
<el-scrollbar style="height: 100%"> <el-scrollbar style="height: 50vh">
<el-tree <el-tree
size="mini" size="mini"
ref="siteTree" ref="siteTree"
:data="areaData" :data="areaData"
id="el-tree" id="el-tree"
node-key="id" node-key="id"
indent="4"
:props="treeProps"
:load="loadNode" :load="loadNode"
highlight-current highlight-current
default-expand-all
:expand-on-click-node="false" :expand-on-click-node="false"
:render-content="renderContent" @node-click="handleNodeClickBumen"
@node-click="handleNodeClick"
> >
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
</el-col>
<el-col :span="12">
<div class="titles">人员列表</div>
<el-scrollbar style="height: 50vh">
<div v-if="currentSelect.length>0">
<el-checkbox label="0" v-model="CurrentAllchecked" @change="currentChangeAll">全部</el-checkbox>
</div>
<el-checkbox-group v-model="allSelectId" v-if="currentSelect.length>0">
<el-checkbox :label="item.staffId" @change="changegroupId"
v-for="(item,index) in currentSelect" :key="index">
{{item.staffName}}</el-checkbox>
</el-checkbox-group>
<div v-else class="tips mt10">
该部门没有可选择员工，请选择其他文件
</div>
</el-scrollbar>
</el-col>
</el-row>
</el-col>
<!-- 右1 -->
<el-col :span="8">
<div style="border-left:1px dotted #eee;padding-left:20px">
<div class="titles">已选择</div>
<el-scrollbar style="height: 50vh">
<div class="el-tag ml10 mt10" :key="index"
v-for="(item,index) in allSelect">
<span class="tags">{{item.staffName}}</span>
<i class="el-icon-close" @click="deleteOne(index)"></i>
</div>
</el-scrollbar>
</div>
</el-col>
</el-row>
</div>
<div class="mt20">
<el-button type="primary" size="mini" @click="saveBtnchoice">确定</el-button>
<el-button size="mini" @click="cancelChoice">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 选择班次 --> <!-- 选择班次 -->
<el-dialog :visible.sync="isshowBanci" title="选择班次"> <el-dialog :visible.sync="isshowBanci" title="选择班次" :show-close="false">
<div>
选择班次 选择班次
</div> <banci-select :classArr="classArr" :currentArr="currentselectBanciRow" :isshow="isshowBanci"
@saveRowBanci="saveRowBanci" @cancelBanci="cancelBanci"></banci-select>
</el-dialog> </el-dialog>
<!-- 新增必须打卡时间 --> <!-- 新增必须打卡时间 -->
<el-dialog :visible.sync="mustDaka" title="新增必须打卡日期"> <el-dialog :visible.sync="mustDaka" title="新增必须打卡日期" :show-close="false">
<div> <div>
<span>选择日期</span> <span>选择日期</span>
<el-date-picker type="date" placeholder="年/月/日"></el-date-picker> <el-date-picker type="date" placeholder="年/月/日" class="ml10" value-format="yyyy-MM-dd"
v-model="currentParams.specialTime"></el-date-picker>
</div> </div>
<div> <div>
选择班次 <!-- 选择日期 -->
<banci-select :classArr="classArr" :currentArr="currentselectBanciRow" :isshow="mustDaka"
@saveRowBanci="saveCurrentSpecial" @cancelBanci="cancelSpecial"></banci-select>
</div> </div>
</el-dialog> </el-dialog>
<!-- 新增无需打卡时间 --> <!-- 新增无需打卡时间 -->
<el-dialog :visible.sync="noneedDaka" title="新增无需打卡日期"> <el-dialog :visible.sync="noneedDaka" title="新增无需打卡日期" :show-close="false">
<div> <div>
<span>选择添加方式</span> <span>选择添加方式</span>
<el-radio-group class="ml20"> <el-radio-group class="ml20" v-model="currentParams.addWay" @change="currentParams.specialTime = ''">
<el-radio label="">单个日期</el-radio> <el-radio :label="0">单个日期</el-radio>
<el-radio label="">时间段</el-radio> <el-radio :label="1">时间段</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div> <div>
<div v-if="currentParams.addWay === 0" class="mt20">
<span>选择日期</span> <span>选择日期</span>
<!-- 单个日期 --> <!-- 单个日期 -->
<el-date-picker type="date" class="ml20"></el-date-picker> <el-date-picker type="date" class="ml20" value-format="yyyy-MM-dd"
v-model="currentParams.specialTime"></el-date-picker>
</div>
<div v-else-if="currentParams.addWay === 1" class="mt20">
<!-- 日期段 --> <!-- 日期段 -->
<el-date-picker <el-date-picker
v-model="noneedRange"
@change="changeneedRange"
type="daterange" type="daterange"
class="ml20" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</div> </div>
</div>
<div class="mt20">
<el-button type="primary" size="mini" @click="saveNoneed">确定</el-button>
<el-button size="mini" @click="cancelSpecial">取消</el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import tabPane from '@/components/tabPane.vue' import tabPane from '@/components/tabPane.vue'
import banciTable from './banciTable/index'
import banciSelect from './banciSelect/index.vue'
import {booleanToNum} from '@/assets/utils/common.js'
export default { export default {
components: { components: {
tabPane tabPane,
banciTable,
banciSelect
}, },
created(){ created(){
this.getdata() this.getdata()
this.getresponsiable()
}, },
methods: { methods: {
changeRadio(value){
console.log(value) // ---- 班次选择 -------
// 当前班次选择
saveRowBanci(val){
this.groupFixedworkEntity[this.currentWorkName+'ClassId'] = val.id//存储班次id
this.groupFixedworkEntity[this.currentWorkName+'ClassName'] = val.className//存储班次名称
this.groupFixedworkEntity[this.currentWorkName+'ClassTime'] = val
this.cancelBanci()
}, },
// 固定班制 ---- 触发班次选择
changeBanci(row){ changeBanci(row){
console.log(row) this.currentWorkName = row
this.currentselectBanciRow = this.groupFixedworkEntity[this.currentWorkName+'ClassTime']
this.isshowBanci = true this.isshowBanci = true
}, },
selectGroup(){ // 置空
cancelBanci(){
this.isshowBanci = false
this.currentselectBanciRow = null
},
// ----end ----
// ----- 特殊日期选择 ----
// 新增必须打卡 --- 触发班次
setMustTimes(from,item,index){
this.currentParams = JSON.parse(JSON.stringify(item))
if(from == 'must'){
this.mustDaka = true
this.currentselectBanciRow = this.currentParams.classArr
}else{
this.noneedRange = [this.currentParams.specialStartTime,this.currentParams.specialEndTime]
this.noneedDaka = true
}
},
// 保存必须打卡
saveCurrentSpecial(val){
this.currentParams.classArr = val
this.currentParams.classId = val.id
if(!this.currentParams.specialTime){
this.$message.error('请选择日期')
return
}
if(!this.currentParams.classId){
this.$message.error('请选择班次')
return
}
if(this.attendanceGroupFixedworkSpecialList[1].specialTime === this.currentParams.specialTime){
this.$message.error('该日期已设置为无需打卡日，请重新选择')
return
}
if(this.attendanceGroupFixedworkSpecialList[1]){
let timeStart = Date.parse(this.attendanceGroupFixedworkSpecialList[1].specialStartTime)//无需开始时间戳
let timeEnd = Date.parse(this.attendanceGroupFixedworkSpecialList[1].specialEndTime)//无需结束时间戳
let mustTime = Date.parse(this.currentParams.specialTime)//必须时间戳
if(mustTime >= timeStart && mustTime <= timeEnd){
this.$message.error('必须打卡日期不能设置在无需打卡时间段内,请重新选择')
return false
}
}
this.attendanceGroupFixedworkSpecialList[0] = JSON.parse(JSON.stringify(this.currentParams))
this.cancelSpecial()
},
// 取消当前特殊日期设置
cancelSpecial(){
this.currentParams = {}
this.noneedRange = []
this.mustDaka = false
this.noneedDaka = false
this.currentselectBanciRow = null
},
// 无需时间段
changeneedRange(){
if(this.noneedRange){
this.currentParams.specialStartTime = this.noneedRange[0]
this.currentParams.specialEndTime = this.noneedRange[1]
}else{
this.currentParams.specialStartTime = ''
this.currentParams.specialEndTime = ''
}
},
// 保存 无需打卡
saveNoneed(){
if(this.currentParams.addWay === 0 && this.currentParams.specialTime == ''){
this.$message.error('请选择日期')
return
}
if(this.currentParams.addWay === 1 && this.currentParams.specialStartTime == ''){
this.$message.error('请选择时间段')
return
}
if(this.attendanceGroupFixedworkSpecialList[0].specialTime === this.currentParams.specialTime &&
this.attendanceGroupFixedworkSpecialList[0].specialTime != ''){
this.$message.error('该日期已设置为必须打卡日，请重新选择')
return
}
if(this.attendanceGroupFixedworkSpecialList[0]){
let timeStart = Date.parse(this.currentParams.specialStartTime)//无需开始时间戳
let timeEnd = Date.parse(this.currentParams.specialEndTime)//无需结束时间戳
let mustTime = Date.parse(this.attendanceGroupFixedworkSpecialList[0].specialTime)//必须时间戳
if(mustTime >= timeStart && mustTime <= timeEnd){
this.$message.error('无需打卡时间段内不能含有[必须打卡日期],请重新选择')
return false
}
}
this.attendanceGroupFixedworkSpecialList[1] = JSON.parse(JSON.stringify(this.currentParams))
this.cancelSpecial()
},
// ---- end -------
// ---- 部门-人员选择 ------
// 触发部门选择
selectGroup(from){
this.selectTyep = from
if(this.selectTyep){
this.allSelect = this.attendArr
this.allSelectId = this.attendArrId
}else{
this.allSelect = this.noattendArr
this.allSelectId = this.attendArrId
}
this.isshowgroup = true this.isshowgroup = true
}, },
// 取消选择
cancelChoice(){
this.isshowgroup = false
this.currentSelect = []
this.allSelect = []
this.allSelectId = []
this.CurrentAllchecked = false
},
// 确定当前选择
saveBtnchoice(){
this.CurrentAllchecked = false
if(this.selectTyep){
this.attendArr = this.allSelect
this.attendArrId = this.allSelectId
// 参与考勤
}else{
// 不参与考勤
this.noattendArr = this.allSelect
this.attendArrId = this.allSelectId
}
this.cancelChoice()
},
// 单独选择
changegroupId(val){
let value
if(val){
// id
value = this.allSelectId.filter(item1 => !this.allSelect.some(item2 => item2.staffId === item1))
let obj = this.currentSelect.find(item => item.staffId === value[0])
this.allSelect.push(obj)
}else{
// 对象
value = this.allSelect.filter(item1 => !this.allSelectId.some(item2 => item2 === item1.staffId))
let index = this.allSelect.findIndex(item => item.staffId == value[0].staffId)
this.allSelect.splice(index,1)
}
this.CurrentAllchecked = this.currentSelect.every(val => this.allSelectId.includes(val.staffId))
console.log(value,'当前选择值')
},
// 点击触发
handleNodeClickBumen(val){
if(this.selectTyep){
}else{
}
this.currentSelect = val.personList//人员信息
// 判断当前是不是全选
this.CurrentAllchecked = this.currentSelect.every(val => this.allSelectId.includes(val.staffId))
},
// 全选操作
currentChangeAll(){
if(this.CurrentAllchecked){
// 当前全选
let arr1 = this.currentSelect.filter(item => !this.allSelect.some(item2 => item2 === item))
this.allSelect = [...this.allSelect,...arr1]//渲染列表
let arr2 = this.currentSelect.filter(item1 => !this.allSelectId.some(item2 => item2 === item1.staffId))
this.allSelectId = [...this.allSelectId,...arr2.map(item=>item.staffId)]//id信息
}else{
//取消当前全选
this.allSelect = this.allSelect.filter(item1 => !this.currentSelect.some(item2 => item2 === item1))
this.allSelectId = this.allSelectId.filter(item1 => !this.currentSelect.some(item2 => item2.staffId === item1))
}
},
// 删除某个选择
deleteOne(index){
this.allSelect.splice(index,1)
this.allSelectId.splice(index,1)
this.CurrentAllchecked = this.currentSelect.every(val => this.allSelectId.includes(val.staffId)) //判断全选
},
// ---- end -------
// 考勤方式发生改变 -置空其他类别选项
changeRadio(val){
// 固定班次
if(val == 1){
// 自由工时置空
for(let key in this.attendanceGroupFreeworkEntity){
this.attendanceGroupFreeworkEntity[key] = 0
}
this.attendanceGroupFreeworkEntity['workTime'] = ''
this.attendanceGroupFreeworkEntity['attendanceGroupFreeworkSpecialList'] = []
}else if(val == 2){
// 自由工时置空
for(let key in this.attendanceGroupFreeworkEntity){
this.attendanceGroupFreeworkEntity[key] = 0
}
this.attendanceGroupFreeworkEntity['workTime'] = ''
this.attendanceGroupFreeworkEntity['attendanceGroupFreeworkSpecialList'] = []
// 固定班制置空
for(let key in this.groupFixedworkEntity){
this.groupFixedworkEntity[key] = ''
}
this.groupFixedworkEntity['monday'] = 0
this.groupFixedworkEntity['tuesday'] = 0
this.groupFixedworkEntity['wednesday'] = 0
this.groupFixedworkEntity['thursday'] = 0
this.groupFixedworkEntity['friday'] = 0
this.groupFixedworkEntity['saturday'] = 0
this.groupFixedworkEntity['sunday'] = 0
this.groupFixedworkEntity['mondayClassTime'] = []
this.groupFixedworkEntity['tuesdayClassTime'] = []
this.groupFixedworkEntity['wednesdayClassTime'] = []
this.groupFixedworkEntity['thursdayClassTime'] = []
this.groupFixedworkEntity['fridayClassTime'] = []
this.groupFixedworkEntity['saturdayClassTime'] = []
this.groupFixedworkEntity['sundayClassTime'] = []
}
},
// 触发对应流程设置
drawershow(from){ drawershow(from){
switch(from){ switch(from){
case 'drawer1': case 'drawer1':
...@@ -302,6 +633,7 @@ ...@@ -302,6 +633,7 @@
break; break;
} }
}, },
// 关闭流程设置
closedrawer(){ closedrawer(){
this.drawer = false this.drawer = false
this.drawer1 = false this.drawer1 = false
...@@ -309,12 +641,149 @@ ...@@ -309,12 +641,149 @@
this.drawer3 = false this.drawer3 = false
this.drawer4 = false this.drawer4 = false
}, },
// 全部置空
allReset(){
// 置空无关项
this.changeRadio('1')
this.changeRadio('2')
this.changeRadio('3')
// 先大概处理
for(let key in this.setParams){
this.setParams[key] = ''
}
this.setParams.attendanceGroupStaffList = []
this.attendArr = []
this.attendArrId = []
this.allSelectId = []
this.allSelect = []
this.currentSelect = []
},
// 提交保存
saveSetform(){
// 校验 考勤组名称、参与考勤人员、考勤组负责人、
// 考勤时间 固定班制 -- 校验 排班是否设置 排班id 日期是否参与考勤
// 自由时间 -- 是否参与考勤 工作时长
// 排班制 -- 不确定
// ---- 基础判断 ---
if(this.setParams.groupName === ''){
this.$message.error('请输入考勤组名称')
return
}
if(this.attendArr.length<1){
this.$message.error('请设置参与考勤人员')
return
}
if(this.setParams.groupResponsibleEntity.responsibleId == ''){
this.$message.error('请设置考勤负责人')
return
}
if(this.setParams.type === ''){
this.$message.error('请设置考勤方式')
return
}
if(this.setParams.attendanceType === ''){
this.$message.error('请设置打卡方式')
return false
}
// -----end ---
// ---- 根据类型判断 ---
// 固定班制
if(this.setParams.type == 1){
if(this.groupFixedworkEntity.monday && !this.groupFixedworkEntity.mondayClassId){
this.$message.error('周一考勤班次未设置')
return false
}
if(this.groupFixedworkEntity.tuesday && !this.groupFixedworkEntity.tuesdayClassId){
this.$message.error('周二考勤班次未设置')
return false
}
if(this.groupFixedworkEntity.wednesday && !this.groupFixedworkEntity.wednesdayClassId){
this.$message.error('周三考勤班次未设置')
return false
}
if(this.groupFixedworkEntity.thursday && !this.groupFixedworkEntity.thursdayClassId){
this.$message.error('周四考勤班次未设置')
return false
}
if(this.groupFixedworkEntity.friday && !this.groupFixedworkEntity.fridayClassId){
this.$message.error('周五考勤班次未设置')
return false
}
if(this.groupFixedworkEntity.saturday && !this.groupFixedworkEntity.saturdayClassId){
this.$message.error('周六考勤班次未设置')
return false
}
if(this.groupFixedworkEntity.sunday && !this.groupFixedworkEntity.sundayClassId){
this.$message.error('周日考勤班次未设置')
return false
}
}
if(this.setParams.type == 3){
if(this.attendanceGroupFreeworkEntity.workTime = '' ){
this.$message.error('请设置工作时长')
return false
}
}
// ---- 处理数据 ----
if(this.attendArr.length > 0){
this.setParams.attendanceGroupStaffList = this.attendArr.map(item => {
return{
staffId:item.staffId,
staffName:item.staffName
}
})
}
if(this.setParams.groupResponsibleEntity.responsibleId){
// 给负责人进行赋值
this.setParams.groupResponsibleEntity.responsibleName = this.responsiableList[this.setParams.groupResponsibleEntity.responsibleId]
}
// 删操作值
// delete this.groupFixedworkEntity.mondayClassTime
// delete this.groupFixedworkEntity.tuesdayClassName
// delete this.groupFixedworkEntity.wednesdayClassTime
// delete this.groupFixedworkEntity.thursdayClassTime
// delete this.groupFixedworkEntity.fridayClassTime
// delete this.groupFixedworkEntity.saturdayClassTime
// delete this.groupFixedworkEntity.sundayClassTime
// delete this.attendanceGroupFixedworkSpecialList[0]['classArr']
// delete this.attendanceGroupFixedworkSpecialList[1]['classArr']
// 固定工时
if(this.setParams.type == 1){
this.groupFixedworkEntity.attendanceGroupFixedworkSpecialList = this.attendanceGroupFixedworkSpecialList
this.setParams.groupFixedworkEntity = this.groupFixedworkEntity
}
// 自由工时
if(this.setParams.type == 3){
this.attendanceGroupFreeworkEntity.attendanceGroupFixedworkSpecialList = this.attendanceGroupFixedworkSpecialList
this.setParams.attendanceGroupFreeworkEntity = this.attendanceGroupFreeworkEntity
}
this.$post('/attendance/group/save',this.setParams).then(res => {
if(res.code === 1){
this.$router.back()
}
})
},
// 参数和公共字典
getdata(){ getdata(){
this.$post('/attendance/group/add').then(res => { this.$post('/attendance/group/add').then(res => {
if(res.code == 1){ if(res.code == 1){
// 打卡类型 // 打卡类型
this.attendanceType = [] this.attendanceType = []
let data = res.data.dict//字典函数 let data = res.data.dict//字典函数
this.classArr = data.classId
this.responsiableList = data.workMan
this.areaData = data.deptId
for(let key in data.attendanceType){ for(let key in data.attendanceType){
let obj = { let obj = {
label:data.attendanceType[key], label:data.attendanceType[key],
...@@ -322,6 +791,7 @@ ...@@ -322,6 +791,7 @@
} }
this.attendanceType.push(obj) this.attendanceType.push(obj)
} }
// 类型 // 类型
let type = [] let type = []
for(let key in data.type){ for(let key in data.type){
...@@ -339,24 +809,19 @@ ...@@ -339,24 +809,19 @@
} }
}) })
console.log(this.paibanType)
} }
}) })
},
},
computed:{
persons(){
let arrName = this.attendArr.map(item => item.staffName)
return arrName.join(',')
} }
}, },
data() { data() {
return { return {
size:"small",
column:2,
toString:[
"type",
],
toArrays: [
],
toDate: [
],
activeName:'/attendance/group/view', activeName:'/attendance/group/view',
thirdList:[ thirdList:[
{ {
...@@ -364,30 +829,6 @@ ...@@ -364,30 +829,6 @@
path:'/attendance/group/view' path:'/attendance/group/view'
} }
], ],
drawer1:false,
drawer2:false,
drawer3:false,
drawer4:false,
setParams:{
groupName:'',
personNum:'',
responsiblePerson:'',
type:'',//考勤方式
attendanceTime:'',
remark:'',
attendanceType:[]//打卡类型
},
drawer:false,
weekList:[],
isshowBanci:false,//班次展示
isshowgroup:false,//人员选择
mustDaka:false,//必须打卡设置
noneedDaka:false,//无需打卡
areaData:[],
type:[],
week:[],
reqForm:{},
attendanceType:[],
paibanType:[ paibanType:[
{ {
label:'固定班制（固定时间上下班）', label:'固定班制（固定时间上下班）',
...@@ -404,7 +845,131 @@ ...@@ -404,7 +845,131 @@
value:'3', value:'3',
des:'上下班时间不固定，可随时打卡，适用于销售以及装修、家政等计时工' des:'上下班时间不固定，可随时打卡，适用于销售以及装修、家政等计时工'
} }
] ],
classArr:[],//公共字典 - 班次选择
attendanceType:[],//打卡类型 - 公共字典
areaData:[],//部门信息 - 公共字典
responsiableList:[],//负责人选择 -公共字典
// 当前选择员工
currentSelect:[],
// 员工总表
allSelect:[],//选择的列表
allSelectId:[],//选择的id
CurrentAllchecked:false,
// 存储当前参与考勤人员
attendArr:[],
attendArrId:[],
// 存储当前不参与考勤人员
noattendArr:[],
noattendArrIc:[],
selectTyep:'',//选择人员类型 true参与考勤人员//false不参与考勤人员
drawer1:false,
drawer2:false,
drawer3:false,
drawer4:false,
drawer:false,
isshowBanci:false,//班次展示
isshowgroup:false,//人员选择
mustDaka:false,//必须打卡设置
noneedDaka:false,//无需打卡
setParams:{
groupName:'',//考勤名称
// 负责人信息
groupResponsibleEntity:{
responsibleId:'',//考勤负责人
responsibleName:''//考勤负责人姓名
},
attendanceGroupStaffList:[],//参与考勤人员
type:'',//考勤方式
attendanceType:'',//打卡类型
},
type:[],
currentselectBanciRow:'',//当前班次
// 当前工作日名称
currentWorkName:'',
noneedRange:[],//时间段选择
// 当前特殊日期
currentParams:{},
// 自由工时配置
attendanceGroupFreeworkEntity:{
monday:0,
tuesday:0,
wednesday:0,
thursday:0,
friday:0,
saturday:0,
sunday:0,
holidays:0,
workTime:'',
attendanceGroupFreeworkSpecialList:[]
},
//固定班制
groupFixedworkEntity:{
monday:0,//是否考勤(0.否,1,是)
mondayClassId:'',
mondayClassName:'',
mondayClassTime:[],//便于选择-传参删除
tuesday:0,//是否考勤(0.否,1,是)
tuesdayClassId:'',
tuesdayClassName:'',
tuesdayClassTime:[],//便于选择-传参删除
wednesday:0,//是否考勤(0.否,1,是)
wednesdayClassId:'',
wednesdayClassName:'',
wednesdayClassTime:[],//便于选择-传参删除
thursday:0,//是否考勤(0.否,1,是)
thursdayClassId:'',
thursdayClassName:'',
thursdayClassTime:[],
friday:0,//是否考勤(0.否,1,是)
fridayClassId:'',
fridayClassName:'',
fridayClassTime:'',//便于选择-传参删除
saturday:0,//是否考勤(0.否,1,是)
saturdayClassId:'',
saturdayClassName:'',
saturdayClassTime:[],//便于选择-传参删除
sunday:0,//是否考勤(0.否,1,是)
sundayClassId:'',
sundayClassName:'',
sundayClassTime:[],//便于选择-传参删除
attendanceGroupFixedworkSpecialList:[],
holidays:""
},
holidays:0,// 假期排休 法定节假日自动排休(0.否,1.是)
// 公共 - 特殊日期设置
attendanceGroupFixedworkSpecialList:[
{
must:1,//必需打卡
specialStartTime:'',//时间段
specialEndTime:'',//
specialTime:'',//必须打卡日期
addWay:0,//日期还是时间段
classId:'',
classArr:{}
},
{
must:0,//无需打卡
specialStartTime:'',//时间段
specialEndTime:'',//
specialTime:'',//必须打卡日期
addWay:0,//日期还是时间段
classId:'',
classArr:{}
}
],
} }
} }
} }
...@@ -422,6 +987,7 @@ ...@@ -422,6 +987,7 @@
color: #606266; color: #606266;
background-color: #FFF; background-color: #FFF;
} }
.contentClass{ .contentClass{
width: 600px; width: 600px;
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
View file @ b5b610a3
...@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; ...@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.ImportResource;
@EnableFeignClients @EnableFeignClients
@SpringBootApplication(scanBasePackages = {"com.mortals"}) @SpringBootApplication(scanBasePackages = {"com.mortals"})
@ServletComponentScan("com.mortals") @ServletComponentScan("com.mortals")
...@@ -17,10 +18,12 @@ public class ManagerApplication extends BaseWebApplication { ...@@ -17,10 +18,12 @@ public class ManagerApplication extends BaseWebApplication {
// return new LocalCacheServiceImpl(); // return new LocalCacheServiceImpl();
// } // }
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ManagerApplication.class, args); SpringApplication.run(ManagerApplication.class, args);
System.out.println(123465); System.out.println("考勤管理项目启动！！！！！！！！！！！！！");
}
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @ b5b610a3
...@@ -10,6 +10,10 @@ import com.mortals.xhx.busiz.rsp.DeptHikData; ...@@ -10,6 +10,10 @@ import com.mortals.xhx.busiz.rsp.DeptHikData;
import com.mortals.xhx.busiz.rsp.ListDept; import com.mortals.xhx.busiz.rsp.ListDept;
import com.mortals.xhx.busiz.rsp.ListItem; import com.mortals.xhx.busiz.rsp.ListItem;
import com.mortals.xhx.busiz.rsp.PersonHikData; import com.mortals.xhx.busiz.rsp.PersonHikData;
import com.mortals.xhx.module.attendance.dao.ibatis.AttendanceStatDaoImpl;
import com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationBalanceDaoImpl;
import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
import com.mortals.xhx.module.dept.dao.ibatis.DeptDaoImpl; import com.mortals.xhx.module.dept.dao.ibatis.DeptDaoImpl;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.service.DeptService;
...@@ -43,10 +47,17 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -43,10 +47,17 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
@Autowired @Autowired
private StaffService service; private StaffService service;
@Autowired
private AttendanceStatDaoImpl attendanceStatDao;
@Autowired
private AttendanceVacationBalanceDaoImpl balanceDao;
@Override @Override
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
log.info("同步用户--部门"); log.info("同步用户--部门");
try { try {
//部门同步
String resultDept = ArtemisPostTest.callPostApiGetDeptList(); String resultDept = ArtemisPostTest.callPostApiGetDeptList();
JSONObject jsonObjectDept = JSON.parseObject(resultDept); JSONObject jsonObjectDept = JSON.parseObject(resultDept);
JSONObject jsonObjectDept1 = jsonObjectDept.getJSONObject("data"); JSONObject jsonObjectDept1 = jsonObjectDept.getJSONObject("data");
...@@ -56,15 +67,15 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -56,15 +67,15 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
//查询数据库信息 //查询数据库信息
DeptEntity deptEntity = deptDao.queryDept(listDept.getOrgIndexCode()); DeptEntity deptEntity = deptDao.queryDept(listDept.getOrgIndexCode());
DeptEntity deptEntityParent = deptDao.queryDeptParient(listDept.getParentOrgIndexCode()); DeptEntity deptEntityParent = deptDao.queryDeptParient(listDept.getParentOrgIndexCode());
//新增
if (Objects.isNull(deptEntity)) { if (Objects.isNull(deptEntity)) {
deptEntity.initAttrValue();
if (Objects.nonNull(deptEntityParent)) { if (Objects.nonNull(deptEntityParent)) {
deptEntity.setParentId(deptEntityParent.getId()); deptEntity.setParentId(deptEntityParent.getId());
} }
deptEntity.setDeptName(listDept.getOrgName()); deptEntity.setDeptName(listDept.getOrgName());
deptEntity.setDeptCode(listDept.getOrgIndexCode()); deptEntity.setDeptCode(listDept.getOrgIndexCode());
deptEntity.setAncestors(listDept.getOrgPath()); deptEntity.setAncestors(listDept.getOrgPath());
deptEntity.setDeptStatus(1);
deptEntity.setOrderNum(0); deptEntity.setOrderNum(0);
deptEntity.setRemark(listDept.getParentOrgIndexCode()); deptEntity.setRemark(listDept.getParentOrgIndexCode());
deptEntity.setCreateTime(new Date()); deptEntity.setCreateTime(new Date());
...@@ -73,6 +84,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -73,6 +84,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
deptEntity.setUpdateUserId(Long.valueOf(1)); deptEntity.setUpdateUserId(Long.valueOf(1));
deptService.save(deptEntity); deptService.save(deptEntity);
} else { } else {
//更新
deptEntity.initAttrValue();
if (Objects.nonNull(deptEntityParent)) { if (Objects.nonNull(deptEntityParent)) {
deptEntity.setParentId(deptEntityParent.getId()); deptEntity.setParentId(deptEntityParent.getId());
} }
...@@ -80,6 +93,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -80,6 +93,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
deptEntity.setDeptCode(listDept.getOrgIndexCode()); deptEntity.setDeptCode(listDept.getOrgIndexCode());
deptEntity.setAncestors(listDept.getOrgPath()); deptEntity.setAncestors(listDept.getOrgPath());
deptEntity.setCreateTime(new Date()); deptEntity.setCreateTime(new Date());
deptEntity.setPersonNum(0);
deptEntity.setCreateUserId(Long.valueOf(1)); deptEntity.setCreateUserId(Long.valueOf(1));
deptService.update(deptEntity); deptService.update(deptEntity);
} }
...@@ -97,14 +111,15 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -97,14 +111,15 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
DeptEntity deptEntity = deptDao.queryDept(list.getOrgIndexCode()); DeptEntity deptEntity = deptDao.queryDept(list.getOrgIndexCode());
//判断本地数据是否为空 //判断本地数据是否为空
if (Objects.isNull(staffEntity1)) { if (Objects.isNull(staffEntity1)) {
//如果为空则将数据存入数据库 //新增员工信息
staffEntity1.initAttrValue(); staffEntity1.initAttrValue();
if (Objects.nonNull(staffEntity1)) { if (Objects.nonNull(staffEntity1)) {
staffEntity1.setDeptId(deptEntity.getId()); staffEntity1.setDeptId(deptEntity.getId());
} }
staffEntity1.setName(list.getPersonName()); staffEntity1.setName(list.getPersonName());
staffEntity1.setRemarkId(list.getPersonId()); staffEntity1.setRemarkId(list.getPersonId());
staffEntity1.setPhotoPath(list.getPersonPhoto().getPicUri()); staffEntity1.setPicUri(list.getPersonPhoto().getPicUri());
staffEntity1.setServerIndexCode(list.getPersonPhoto().getServerIndexCode());
staffEntity1.setDeptName(list.getOrgName()); staffEntity1.setDeptName(list.getOrgName());
staffEntity1.setSource(1); staffEntity1.setSource(1);
staffEntity1.setStatus(1); staffEntity1.setStatus(1);
...@@ -119,33 +134,30 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -119,33 +134,30 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
staffEntity1.setPhoneNumber(String.valueOf(list.getPhoneNo())); staffEntity1.setPhoneNumber(String.valueOf(list.getPhoneNo()));
} }
service.save(staffEntity1); service.save(staffEntity1);
//统计各级部门员工数量
DeptEntity deptEntity1 = deptService.get(staffEntity1.getDeptId()); DeptEntity deptEntity1 = deptService.get(staffEntity1.getDeptId());
String ancestor = deptEntity1.getAncestors().split(",", 2)[1]; String ancestor = deptEntity1.getAncestors().split(",", 2)[1];
String[] ancestors = ancestor.split(","); String[] ancestors = ancestor.split(",");
for (String newAncestor : ancestors) { for (String newAncestor : ancestors) {
DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor)); DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
if (Objects.nonNull(deptEntity2)) { if (Objects.nonNull(deptEntity2)) {
int personNumcount = staffDao.queryPersonNum(staffEntity1.getDeptId()); deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
if (Objects.nonNull(personNumcount) && Objects.nonNull(deptEntity2)) {
deptEntity2.setPersonNum(personNumcount);
deptService.update(deptEntity2); deptService.update(deptEntity2);
} }
} }
} }
}
//本地数据不为空 //本地数据不为空
else { else {
//执行修改 //更新员工信息
staffEntity1.initAttrValue(); staffEntity1.initAttrValue();
if (Objects.nonNull(deptEntity)) { if (Objects.nonNull(deptEntity)) {
staffEntity1.setDeptId(deptEntity.getId()); staffEntity1.setDeptId(deptEntity.getId());
} }
staffEntity1.setName(list.getPersonName()); staffEntity1.setName(list.getPersonName());
staffEntity1.setRemarkId(list.getPersonId()); staffEntity1.setRemarkId(list.getPersonId());
staffEntity1.setPhotoPath(list.getPersonPhoto().getPicUri()); staffEntity1.setPicUri(list.getPersonPhoto().getPicUri());
staffEntity1.setServerIndexCode(list.getPersonPhoto().getServerIndexCode());
staffEntity1.setDeptName(list.getOrgName()); staffEntity1.setDeptName(list.getOrgName());
staffEntity1.setGender(list.getGender()); staffEntity1.setGender(list.getGender());
staffEntity1.setWorkNum(list.getJobNo()); staffEntity1.setWorkNum(list.getJobNo());
...@@ -158,27 +170,89 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -158,27 +170,89 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
staffEntity1.setPhoneNumber(String.valueOf(list.getPhoneNo())); staffEntity1.setPhoneNumber(String.valueOf(list.getPhoneNo()));
} }
service.update(staffEntity1); service.update(staffEntity1);
//统计各级部门员工数量
DeptEntity deptEntity1 = deptService.get(staffEntity1.getDeptId()); DeptEntity deptEntity1 = deptService.get(staffEntity1.getDeptId());
String ancestor = deptEntity1.getAncestors().split(",", 2)[1]; String ancestor = deptEntity1.getAncestors().split(",", 2)[1];
String[] ancestors = ancestor.split(","); String[] ancestors = ancestor.split(",");
for (String newAncestor : ancestors) { for (String newAncestor : ancestors) {
DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor)); DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
if (Objects.nonNull(deptEntity2)) { if (Objects.nonNull(deptEntity2)) {
int personNumcount = staffDao.queryPersonNum(staffEntity1.getDeptId()); deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
if (Objects.nonNull(personNumcount) && Objects.nonNull(deptEntity2)) {
deptEntity2.setPersonNum(personNumcount);
deptService.update(deptEntity2); deptService.update(deptEntity2);
} }
} }
} }
//同步人员的考勤汇总信息
AttendanceVacationBalanceEntity balanceEntity = balanceDao.queryEntity(staffEntity1.getId());
AttendanceStatEntity statEntity = attendanceStatDao.queryEntity(staffEntity1.getId());
//为空执行新增
if (Objects.nonNull(statEntity)){
statEntity.initAttrValue();
statEntity.setStaffId(staffEntity1.getId());
statEntity.setStaffName(staffEntity1.getName());
statEntity.setDeptId(staffEntity1.getDeptId());
statEntity.setDeptName(staffEntity1.getDeptName());
//21假
statEntity.setBackToUnit(balanceEntity.getBackToUnit());
statEntity.setOnDutyLeave(balanceEntity.getOnDutyLeave());
statEntity.setOutOfOffice(balanceEntity.getOutOfOffice());
statEntity.setShiftCompensation(balanceEntity.getShiftCompensation());
statEntity.setPhysicalExamination(balanceEntity.getPhysicalExamination());
statEntity.setQuarantine(balanceEntity.getQuarantine());
statEntity.setBusinessTrip(balanceEntity.getBusinessTrip());
statEntity.setPublicHoliday(balanceEntity.getPublicHoliday());
statEntity.setSickLeave(balanceEntity.getSickLeaveDays());
statEntity.setFuneralLeave(balanceEntity.getBereavementLeaveDays());
statEntity.setMarriageLeave(balanceEntity.getMarriageLeaveDays());
statEntity.setChildRearingLeave(balanceEntity.getChildRearingLeave());
statEntity.setBreastfeedingLeaveDays(balanceEntity.getBreastfeedingLeaveDays());
statEntity.setMenstrualLeaveDays(balanceEntity.getMenstrualLeaveDays());
statEntity.setAnnualLeaveDays(balanceEntity.getAnnualLeaveDays());
statEntity.setCompensatedLeaveDays(balanceEntity.getCompensatedLeaveDays());
statEntity.setPaternityLeaveDays(balanceEntity.getPaternityLeaveDays());
statEntity.setMaternityLeave(balanceEntity.getMaternityLeaveDays());
statEntity.setTransferBack(balanceEntity.getTransferBack());
statEntity.setHomeLeave(balanceEntity.getHomeLeave());
statEntity.setPersonalLeave(balanceEntity.getPersonalLeaveDays());
attendanceStatDao.insert(statEntity);
}
//不为空执行修改
else {
statEntity.initAttrValue();
statEntity.setStaffId(staffEntity1.getId());
statEntity.setStaffName(staffEntity1.getName());
statEntity.setDeptId(staffEntity1.getDeptId());
statEntity.setDeptName(staffEntity1.getDeptName());
//21假
statEntity.setBackToUnit(balanceEntity.getBackToUnit());
statEntity.setOnDutyLeave(balanceEntity.getOnDutyLeave());
statEntity.setOutOfOffice(balanceEntity.getOutOfOffice());
statEntity.setShiftCompensation(balanceEntity.getShiftCompensation());
statEntity.setPhysicalExamination(balanceEntity.getPhysicalExamination());
statEntity.setQuarantine(balanceEntity.getQuarantine());
statEntity.setBusinessTrip(balanceEntity.getBusinessTrip());
statEntity.setPublicHoliday(balanceEntity.getPublicHoliday());
statEntity.setSickLeave(balanceEntity.getSickLeaveDays());
statEntity.setFuneralLeave(balanceEntity.getBereavementLeaveDays());
statEntity.setMarriageLeave(balanceEntity.getMarriageLeaveDays());
statEntity.setChildRearingLeave(balanceEntity.getChildRearingLeave());
statEntity.setBreastfeedingLeaveDays(balanceEntity.getBreastfeedingLeaveDays());
statEntity.setMenstrualLeaveDays(balanceEntity.getMenstrualLeaveDays());
statEntity.setAnnualLeaveDays(balanceEntity.getAnnualLeaveDays());
statEntity.setCompensatedLeaveDays(balanceEntity.getCompensatedLeaveDays());
statEntity.setPaternityLeaveDays(balanceEntity.getPaternityLeaveDays());
statEntity.setMaternityLeave(balanceEntity.getMaternityLeaveDays());
statEntity.setTransferBack(balanceEntity.getTransferBack());
statEntity.setHomeLeave(balanceEntity.getHomeLeave());
statEntity.setPersonalLeave(balanceEntity.getPersonalLeaveDays());
attendanceStatDao.update(statEntity);
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceStatDao.java
View file @ b5b610a3
...@@ -2,7 +2,7 @@ package com.mortals.xhx.module.attendance.dao; ...@@ -2,7 +2,7 @@ package com.mortals.xhx.module.attendance.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.attendance.model.AttendanceStatEntity; import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
import java.util.List;
/** /**
* 考勤汇总信息Dao * 考勤汇总信息Dao
* 考勤汇总信息 DAO接口 * 考勤汇总信息 DAO接口
...@@ -12,6 +12,9 @@ import java.util.List; ...@@ -12,6 +12,9 @@ import java.util.List;
*/ */
public interface AttendanceStatDao extends ICRUDDao<AttendanceStatEntity,Long>{ public interface AttendanceStatDao extends ICRUDDao<AttendanceStatEntity,Long>{
/**
* 通过员工id查询
* */
AttendanceStatEntity queryEntity(Long staffId);
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceVacationBalanceDao.java
View file @ b5b610a3
...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao; ...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity; import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
import java.util.List;
/** /**
* 员工假期余额信息Dao * 员工假期余额信息Dao
* 员工假期余额信息 DAO接口 * 员工假期余额信息 DAO接口
...@@ -13,5 +12,8 @@ import java.util.List; ...@@ -13,5 +12,8 @@ import java.util.List;
public interface AttendanceVacationBalanceDao extends ICRUDDao<AttendanceVacationBalanceEntity,Long>{ public interface AttendanceVacationBalanceDao extends ICRUDDao<AttendanceVacationBalanceEntity,Long>{
/**
* 通过员工id查询
* */
AttendanceVacationBalanceEntity queryEntity(Long staffId);
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceStatDaoImpl.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.dao.ibatis; package com.mortals.xhx.module.attendance.dao.ibatis;
import org.springframework.stereotype.Repository; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.attendance.dao.AttendanceStatDao; import com.mortals.xhx.module.attendance.dao.AttendanceStatDao;
import com.mortals.xhx.module.attendance.model.AttendanceStatEntity; import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
import java.util.Date; import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/** /**
* 考勤汇总信息DaoImpl DAO接口 * 考勤汇总信息DaoImpl DAO接口
* *
...@@ -17,5 +15,8 @@ import java.util.List; ...@@ -17,5 +15,8 @@ import java.util.List;
public class AttendanceStatDaoImpl extends BaseCRUDDaoMybatis<AttendanceStatEntity,Long> implements AttendanceStatDao { public class AttendanceStatDaoImpl extends BaseCRUDDaoMybatis<AttendanceStatEntity,Long> implements AttendanceStatDao {
@Override
public AttendanceStatEntity queryEntity(Long staffId) {
return getSqlSession().selectOne(getSqlId("queryEntity"),staffId);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceVacationBalanceDaoImpl.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.dao.ibatis; package com.mortals.xhx.module.attendance.dao.ibatis;
import org.springframework.stereotype.Repository; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.attendance.dao.AttendanceVacationBalanceDao; import com.mortals.xhx.module.attendance.dao.AttendanceVacationBalanceDao;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity; import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
import java.util.Date; import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/** /**
* 员工假期余额信息DaoImpl DAO接口 * 员工假期余额信息DaoImpl DAO接口
* *
...@@ -17,5 +15,8 @@ import java.util.List; ...@@ -17,5 +15,8 @@ import java.util.List;
public class AttendanceVacationBalanceDaoImpl extends BaseCRUDDaoMybatis<AttendanceVacationBalanceEntity,Long> implements AttendanceVacationBalanceDao { public class AttendanceVacationBalanceDaoImpl extends BaseCRUDDaoMybatis<AttendanceVacationBalanceEntity,Long> implements AttendanceVacationBalanceDao {
@Override
public AttendanceVacationBalanceEntity queryEntity(Long staffId) {
return getSqlSession().selectOne(getSqlId("queryEntity"),staffId);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceClassDetailEntity.java
View file @ b5b610a3
...@@ -3,6 +3,8 @@ package com.mortals.xhx.module.attendance.model; ...@@ -3,6 +3,8 @@ package com.mortals.xhx.module.attendance.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -28,6 +30,8 @@ public class AttendanceClassDetailEntity extends AttendanceClassDetailVo { ...@@ -28,6 +30,8 @@ public class AttendanceClassDetailEntity extends AttendanceClassDetailVo {
/** /**
* 上班打卡时间 * 上班打卡时间
*/ */
@JsonFormat(pattern = "HH:mm")
@JSONField(format = "HH:mm")
private Date goWorkDate; private Date goWorkDate;
/** /**
* 上班打卡前时间段,单位分钟 * 上班打卡前时间段,单位分钟
...@@ -40,6 +44,8 @@ public class AttendanceClassDetailEntity extends AttendanceClassDetailVo { ...@@ -40,6 +44,8 @@ public class AttendanceClassDetailEntity extends AttendanceClassDetailVo {
/** /**
* 下班打卡时间 * 下班打卡时间
*/ */
@JsonFormat(pattern = "HH:mm")
@JSONField(format = "HH:mm")
private Date offWorkDate; private Date offWorkDate;
/** /**
* 下班打卡前时间段,单位分钟 * 下班打卡前时间段,单位分钟
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceLeaveRecordVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceLeaveRecordVo;
import java.util.Date;
/** /**
* 请假记录信息实体对象 * 请假记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-14
*/ */
public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -39,7 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -39,7 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
*/ */
private String phoneNumber; private String phoneNumber;
/** /**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
*/ */
private Integer leaveType; private Integer leaveType;
/** /**
...@@ -153,14 +150,14 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -153,14 +150,14 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
this.phoneNumber = phoneNumber; this.phoneNumber = phoneNumber;
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return Integer * @return Integer
*/ */
public Integer getLeaveType(){ public Integer getLeaveType(){
return leaveType; return leaveType;
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveType * @param leaveType
*/ */
public void setLeaveType(Integer leaveType){ public void setLeaveType(Integer leaveType){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordQuery.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
/** /**
* 请假记录信息查询对象 * 请假记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-14
*/ */
public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -70,19 +68,19 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -70,19 +68,19 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 电话号码排除列表 */ /** 电话号码排除列表 */
private List <String> phoneNumberNotList; private List <String> phoneNumberNotList;
/** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer leaveTypeStart; private Integer leaveTypeStart;
/** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer leaveTypeEnd; private Integer leaveTypeEnd;
/** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer leaveTypeIncrement; private Integer leaveTypeIncrement;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)列表 */
private List <Integer> leaveTypeList; private List <Integer> leaveTypeList;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)排除列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)排除列表 */
private List <Integer> leaveTypeNotList; private List <Integer> leaveTypeNotList;
/** 开始 开始时间 */ /** 开始 开始时间 */
...@@ -542,7 +540,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -542,7 +540,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeStart * @return leaveTypeStart
*/ */
public Integer getLeaveTypeStart(){ public Integer getLeaveTypeStart(){
...@@ -550,7 +548,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -550,7 +548,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeStart * @param leaveTypeStart
*/ */
public void setLeaveTypeStart(Integer leaveTypeStart){ public void setLeaveTypeStart(Integer leaveTypeStart){
...@@ -558,7 +556,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -558,7 +556,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return $leaveTypeEnd * @return $leaveTypeEnd
*/ */
public Integer getLeaveTypeEnd(){ public Integer getLeaveTypeEnd(){
...@@ -566,7 +564,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -566,7 +564,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeEnd * @param leaveTypeEnd
*/ */
public void setLeaveTypeEnd(Integer leaveTypeEnd){ public void setLeaveTypeEnd(Integer leaveTypeEnd){
...@@ -574,7 +572,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -574,7 +572,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeIncrement * @return leaveTypeIncrement
*/ */
public Integer getLeaveTypeIncrement(){ public Integer getLeaveTypeIncrement(){
...@@ -582,7 +580,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -582,7 +580,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeIncrement * @param leaveTypeIncrement
*/ */
public void setLeaveTypeIncrement(Integer leaveTypeIncrement){ public void setLeaveTypeIncrement(Integer leaveTypeIncrement){
...@@ -590,7 +588,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -590,7 +588,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeList * @return leaveTypeList
*/ */
public List<Integer> getLeaveTypeList(){ public List<Integer> getLeaveTypeList(){
...@@ -598,7 +596,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -598,7 +596,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeList * @param leaveTypeList
*/ */
public void setLeaveTypeList(List<Integer> leaveTypeList){ public void setLeaveTypeList(List<Integer> leaveTypeList){
...@@ -606,7 +604,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -606,7 +604,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeNotList * @return leaveTypeNotList
*/ */
public List<Integer> getLeaveTypeNotList(){ public List<Integer> getLeaveTypeNotList(){
...@@ -614,7 +612,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -614,7 +612,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeNotList * @param leaveTypeNotList
*/ */
public void setLeaveTypeNotList(List<Integer> leaveTypeNotList){ public void setLeaveTypeNotList(List<Integer> leaveTypeNotList){
...@@ -1454,7 +1452,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1454,7 +1452,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveType * @param leaveType
*/ */
public AttendanceLeaveRecordQuery leaveType(Integer leaveType){ public AttendanceLeaveRecordQuery leaveType(Integer leaveType){
...@@ -1463,7 +1461,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1463,7 +1461,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeStart * @param leaveTypeStart
*/ */
public AttendanceLeaveRecordQuery leaveTypeStart(Integer leaveTypeStart){ public AttendanceLeaveRecordQuery leaveTypeStart(Integer leaveTypeStart){
...@@ -1472,7 +1470,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1472,7 +1470,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeEnd * @param leaveTypeEnd
*/ */
public AttendanceLeaveRecordQuery leaveTypeEnd(Integer leaveTypeEnd){ public AttendanceLeaveRecordQuery leaveTypeEnd(Integer leaveTypeEnd){
...@@ -1481,7 +1479,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1481,7 +1479,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeIncrement * @param leaveTypeIncrement
*/ */
public AttendanceLeaveRecordQuery leaveTypeIncrement(Integer leaveTypeIncrement){ public AttendanceLeaveRecordQuery leaveTypeIncrement(Integer leaveTypeIncrement){
...@@ -1490,7 +1488,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1490,7 +1488,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeList * @param leaveTypeList
*/ */
public AttendanceLeaveRecordQuery leaveTypeList(List<Integer> leaveTypeList){ public AttendanceLeaveRecordQuery leaveTypeList(List<Integer> leaveTypeList){
...@@ -1499,7 +1497,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1499,7 +1497,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeNotList * @param leaveTypeNotList
*/ */
public AttendanceLeaveRecordQuery leaveTypeNotList(List<Integer> leaveTypeNotList){ public AttendanceLeaveRecordQuery leaveTypeNotList(List<Integer> leaveTypeNotList){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordDetailEntity.java
View file @ b5b610a3
...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceRecordDetailVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceRecordDetailVo;
/** /**
* 考勤打卡记录详细信息实体对象 * 考勤打卡记录详细信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-09
*/ */
public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo { public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -49,6 +49,10 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo { ...@@ -49,6 +49,10 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 排序字段
*/
private Integer orderNum;
...@@ -165,6 +169,20 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo { ...@@ -165,6 +169,20 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
/**
* 获取 排序字段
* @return Integer
*/
public Integer getOrderNum(){
return orderNum;
}
/**
* 设置 排序字段
* @param orderNum
*/
public void setOrderNum(Integer orderNum){
this.orderNum = orderNum;
}
...@@ -195,6 +213,7 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo { ...@@ -195,6 +213,7 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo {
sb.append(",offWorkDate:").append(getOffWorkDate()); sb.append(",offWorkDate:").append(getOffWorkDate());
sb.append(",offWorkResult:").append(getOffWorkResult()); sb.append(",offWorkResult:").append(getOffWorkResult());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",orderNum:").append(getOrderNum());
return sb.toString(); return sb.toString();
} }
...@@ -215,5 +234,7 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo { ...@@ -215,5 +234,7 @@ public class AttendanceRecordDetailEntity extends AttendanceRecordDetailVo {
this.offWorkResult = null; this.offWorkResult = null;
this.remark = ""; this.remark = "";
this.orderNum = 1;
} }
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordDetailQuery.java
View file @ b5b610a3
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
/** /**
* 考勤打卡记录详细信息查询对象 * 考勤打卡记录详细信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-09
*/ */
public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity { public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -149,6 +149,21 @@ public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity { ...@@ -149,6 +149,21 @@ public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 排序字段 */
private Integer orderNumStart;
/** 结束 排序字段 */
private Integer orderNumEnd;
/** 增加 排序字段 */
private Integer orderNumIncrement;
/** 排序字段列表 */
private List <Integer> orderNumList;
/** 排序字段排除列表 */
private List <Integer> orderNumNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AttendanceRecordDetailQuery> orConditionList; private List<AttendanceRecordDetailQuery> orConditionList;
...@@ -916,6 +931,87 @@ public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity { ...@@ -916,6 +931,87 @@ public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 排序字段
* @return orderNumStart
*/
public Integer getOrderNumStart(){
return this.orderNumStart;
}
/**
* 设置 开始 排序字段
* @param orderNumStart
*/
public void setOrderNumStart(Integer orderNumStart){
this.orderNumStart = orderNumStart;
}
/**
* 获取 结束 排序字段
* @return $orderNumEnd
*/
public Integer getOrderNumEnd(){
return this.orderNumEnd;
}
/**
* 设置 结束 排序字段
* @param orderNumEnd
*/
public void setOrderNumEnd(Integer orderNumEnd){
this.orderNumEnd = orderNumEnd;
}
/**
* 获取 增加 排序字段
* @return orderNumIncrement
*/
public Integer getOrderNumIncrement(){
return this.orderNumIncrement;
}
/**
* 设置 增加 排序字段
* @param orderNumIncrement
*/
public void setOrderNumIncrement(Integer orderNumIncrement){
this.orderNumIncrement = orderNumIncrement;
}
/**
* 获取 排序字段
* @return orderNumList
*/
public List<Integer> getOrderNumList(){
return this.orderNumList;
}
/**
* 设置 排序字段
* @param orderNumList
*/
public void setOrderNumList(List<Integer> orderNumList){
this.orderNumList = orderNumList;
}
/**
* 获取 排序字段
* @return orderNumNotList
*/
public List<Integer> getOrderNumNotList(){
return this.orderNumNotList;
}
/**
* 设置 排序字段
* @param orderNumNotList
*/
public void setOrderNumNotList(List<Integer> orderNumNotList){
this.orderNumNotList = orderNumNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1336,6 +1432,60 @@ public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity { ...@@ -1336,6 +1432,60 @@ public class AttendanceRecordDetailQuery extends AttendanceRecordDetailEntity {
} }
/**
* 设置 排序字段
* @param orderNum
*/
public AttendanceRecordDetailQuery orderNum(Integer orderNum){
setOrderNum(orderNum);
return this;
}
/**
* 设置 开始 排序字段
* @param orderNumStart
*/
public AttendanceRecordDetailQuery orderNumStart(Integer orderNumStart){
this.orderNumStart = orderNumStart;
return this;
}
/**
* 设置 结束 排序字段
* @param orderNumEnd
*/
public AttendanceRecordDetailQuery orderNumEnd(Integer orderNumEnd){
this.orderNumEnd = orderNumEnd;
return this;
}
/**
* 设置 增加 排序字段
* @param orderNumIncrement
*/
public AttendanceRecordDetailQuery orderNumIncrement(Integer orderNumIncrement){
this.orderNumIncrement = orderNumIncrement;
return this;
}
/**
* 设置 排序字段
* @param orderNumList
*/
public AttendanceRecordDetailQuery orderNumList(List<Integer> orderNumList){
this.orderNumList = orderNumList;
return this;
}
/**
* 设置 排序字段
* @param orderNumNotList
*/
public AttendanceRecordDetailQuery orderNumNotList(List<Integer> orderNumNotList){
this.orderNumNotList = orderNumNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordHikEntity.java
View file @ b5b610a3
...@@ -24,7 +24,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { ...@@ -24,7 +24,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名") @Excel(name = "姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
...@@ -70,7 +70,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { ...@@ -70,7 +70,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
/** /**
* 考勤日期 * 考勤日期
*/ */
@Excel(name = "考勤日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "考勤时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date attendanceDate; private Date attendanceDate;
/** /**
* 考勤点名称 * 考勤点名称
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceStatVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceStatVo;
import java.math.BigDecimal;
/** /**
* 考勤汇总信息实体对象 * 考勤汇总信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class AttendanceStatEntity extends AttendanceStatVo { public class AttendanceStatEntity extends AttendanceStatVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -99,7 +96,7 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -99,7 +96,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
@Excel(name = "育儿假") @Excel(name = "育儿假")
private BigDecimal childRearingLeave; private BigDecimal childRearingLeave;
/** /**
* 产假（陪护假/天） * 产假（天））
*/ */
@Excel(name = "产假") @Excel(name = "产假")
private BigDecimal maternityLeave; private BigDecimal maternityLeave;
...@@ -189,6 +186,31 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -189,6 +186,31 @@ public class AttendanceStatEntity extends AttendanceStatVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 哺乳假（天）
*/
@Excel(name = "哺乳假")
private BigDecimal breastfeedingLeaveDays;
/**
* 例假（天）
*/
@Excel(name = "例假")
private BigDecimal menstrualLeaveDays;
/**
* 年假（天）
*/
@Excel(name = "年假")
private BigDecimal annualLeaveDays;
/**
* 调休（天）
*/
@Excel(name = "调休")
private BigDecimal compensatedLeaveDays;
/**
* 陪产假（天）
*/
@Excel(name = "陪产假")
private BigDecimal paternityLeaveDays;
...@@ -432,14 +454,14 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -432,14 +454,14 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.childRearingLeave = childRearingLeave; this.childRearingLeave = childRearingLeave;
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return BigDecimal * @return BigDecimal
*/ */
public BigDecimal getMaternityLeave(){ public BigDecimal getMaternityLeave(){
return maternityLeave; return maternityLeave;
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeave * @param maternityLeave
*/ */
public void setMaternityLeave(BigDecimal maternityLeave){ public void setMaternityLeave(BigDecimal maternityLeave){
...@@ -697,6 +719,76 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -697,6 +719,76 @@ public class AttendanceStatEntity extends AttendanceStatVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
/**
* 获取 哺乳假（天）
* @return BigDecimal
*/
public BigDecimal getBreastfeedingLeaveDays(){
return breastfeedingLeaveDays;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public void setBreastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
this.breastfeedingLeaveDays = breastfeedingLeaveDays;
}
/**
* 获取 例假（天）
* @return BigDecimal
*/
public BigDecimal getMenstrualLeaveDays(){
return menstrualLeaveDays;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public void setMenstrualLeaveDays(BigDecimal menstrualLeaveDays){
this.menstrualLeaveDays = menstrualLeaveDays;
}
/**
* 获取 年假（天）
* @return BigDecimal
*/
public BigDecimal getAnnualLeaveDays(){
return annualLeaveDays;
}
/**
* 设置 年假（天）
* @param annualLeaveDays
*/
public void setAnnualLeaveDays(BigDecimal annualLeaveDays){
this.annualLeaveDays = annualLeaveDays;
}
/**
* 获取 调休（天）
* @return BigDecimal
*/
public BigDecimal getCompensatedLeaveDays(){
return compensatedLeaveDays;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDays
*/
public void setCompensatedLeaveDays(BigDecimal compensatedLeaveDays){
this.compensatedLeaveDays = compensatedLeaveDays;
}
/**
* 获取 陪产假（天）
* @return BigDecimal
*/
public BigDecimal getPaternityLeaveDays(){
return paternityLeaveDays;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){
this.paternityLeaveDays = paternityLeaveDays;
}
...@@ -755,12 +847,17 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -755,12 +847,17 @@ public class AttendanceStatEntity extends AttendanceStatVo {
sb.append(",month:").append(getMonth()); sb.append(",month:").append(getMonth());
sb.append(",day:").append(getDay()); sb.append(",day:").append(getDay());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays());
sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays());
sb.append(",annualLeaveDays:").append(getAnnualLeaveDays());
sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays());
sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.windowCategory = ""; this.windowCategory = "考勤机打卡";
this.staffId = null; this.staffId = null;
...@@ -831,5 +928,15 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -831,5 +928,15 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.day = null; this.day = null;
this.remark = ""; this.remark = "";
this.breastfeedingLeaveDays = BigDecimal.valueOf(0.0);
this.menstrualLeaveDays = BigDecimal.valueOf(0.0);
this.annualLeaveDays = BigDecimal.valueOf(0.0);
this.compensatedLeaveDays = BigDecimal.valueOf(0.0);
this.paternityLeaveDays = BigDecimal.valueOf(0.0);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatQuery.java
View file @ b5b610a3
...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model; ...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
/** /**
* 考勤汇总信息查询对象 * 考勤汇总信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class AttendanceStatQuery extends AttendanceStatEntity { public class AttendanceStatQuery extends AttendanceStatEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -250,19 +249,19 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -250,19 +249,19 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** 育儿假（天）排除列表 */ /** 育儿假（天）排除列表 */
private List <BigDecimal> childRearingLeaveNotList; private List <BigDecimal> childRearingLeaveNotList;
/** 开始 产假（陪护假/天） */ /** 开始 产假（天）） */
private BigDecimal maternityLeaveStart; private BigDecimal maternityLeaveStart;
/** 结束 产假（陪护假/天） */ /** 结束 产假（天）） */
private BigDecimal maternityLeaveEnd; private BigDecimal maternityLeaveEnd;
/** 增加 产假（陪护假/天） */ /** 增加 产假（天）） */
private BigDecimal maternityLeaveIncrement; private BigDecimal maternityLeaveIncrement;
/** 产假（陪护假/天）列表 */ /** 产假（天））列表 */
private List <BigDecimal> maternityLeaveList; private List <BigDecimal> maternityLeaveList;
/** 产假（陪护假/天）排除列表 */ /** 产假（天））排除列表 */
private List <BigDecimal> maternityLeaveNotList; private List <BigDecimal> maternityLeaveNotList;
/** 开始 调回单位（或离职/天） */ /** 开始 调回单位（或离职/天） */
...@@ -567,6 +566,81 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -567,6 +566,81 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysStart;
/** 结束 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysEnd;
/** 增加 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysIncrement;
/** 哺乳假（天）列表 */
private List <BigDecimal> breastfeedingLeaveDaysList;
/** 哺乳假（天）排除列表 */
private List <BigDecimal> breastfeedingLeaveDaysNotList;
/** 开始 例假（天） */
private BigDecimal menstrualLeaveDaysStart;
/** 结束 例假（天） */
private BigDecimal menstrualLeaveDaysEnd;
/** 增加 例假（天） */
private BigDecimal menstrualLeaveDaysIncrement;
/** 例假（天）列表 */
private List <BigDecimal> menstrualLeaveDaysList;
/** 例假（天）排除列表 */
private List <BigDecimal> menstrualLeaveDaysNotList;
/** 开始 年假（天） */
private BigDecimal annualLeaveDaysStart;
/** 结束 年假（天） */
private BigDecimal annualLeaveDaysEnd;
/** 增加 年假（天） */
private BigDecimal annualLeaveDaysIncrement;
/** 年假（天）列表 */
private List <BigDecimal> annualLeaveDaysList;
/** 年假（天）排除列表 */
private List <BigDecimal> annualLeaveDaysNotList;
/** 开始 调休（天） */
private BigDecimal compensatedLeaveDaysStart;
/** 结束 调休（天） */
private BigDecimal compensatedLeaveDaysEnd;
/** 增加 调休（天） */
private BigDecimal compensatedLeaveDaysIncrement;
/** 调休（天）列表 */
private List <BigDecimal> compensatedLeaveDaysList;
/** 调休（天）排除列表 */
private List <BigDecimal> compensatedLeaveDaysNotList;
/** 开始 陪产假（天） */
private BigDecimal paternityLeaveDaysStart;
/** 结束 陪产假（天） */
private BigDecimal paternityLeaveDaysEnd;
/** 增加 陪产假（天） */
private BigDecimal paternityLeaveDaysIncrement;
/** 陪产假（天）列表 */
private List <BigDecimal> paternityLeaveDaysList;
/** 陪产假（天）排除列表 */
private List <BigDecimal> paternityLeaveDaysNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AttendanceStatQuery> orConditionList; private List<AttendanceStatQuery> orConditionList;
...@@ -1887,7 +1961,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1887,7 +1961,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** /**
* 获取 开始 产假（陪护假/天） * 获取 开始 产假（天））
* @return maternityLeaveStart * @return maternityLeaveStart
*/ */
public BigDecimal getMaternityLeaveStart(){ public BigDecimal getMaternityLeaveStart(){
...@@ -1895,7 +1969,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1895,7 +1969,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 开始 产假（陪护假/天） * 设置 开始 产假（天））
* @param maternityLeaveStart * @param maternityLeaveStart
*/ */
public void setMaternityLeaveStart(BigDecimal maternityLeaveStart){ public void setMaternityLeaveStart(BigDecimal maternityLeaveStart){
...@@ -1903,7 +1977,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1903,7 +1977,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 结束 产假（陪护假/天） * 获取 结束 产假（天））
* @return $maternityLeaveEnd * @return $maternityLeaveEnd
*/ */
public BigDecimal getMaternityLeaveEnd(){ public BigDecimal getMaternityLeaveEnd(){
...@@ -1911,7 +1985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1911,7 +1985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 结束 产假（陪护假/天） * 设置 结束 产假（天））
* @param maternityLeaveEnd * @param maternityLeaveEnd
*/ */
public void setMaternityLeaveEnd(BigDecimal maternityLeaveEnd){ public void setMaternityLeaveEnd(BigDecimal maternityLeaveEnd){
...@@ -1919,7 +1993,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1919,7 +1993,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 增加 产假（陪护假/天） * 获取 增加 产假（天））
* @return maternityLeaveIncrement * @return maternityLeaveIncrement
*/ */
public BigDecimal getMaternityLeaveIncrement(){ public BigDecimal getMaternityLeaveIncrement(){
...@@ -1927,7 +2001,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1927,7 +2001,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 增加 产假（陪护假/天） * 设置 增加 产假（天））
* @param maternityLeaveIncrement * @param maternityLeaveIncrement
*/ */
public void setMaternityLeaveIncrement(BigDecimal maternityLeaveIncrement){ public void setMaternityLeaveIncrement(BigDecimal maternityLeaveIncrement){
...@@ -1935,7 +2009,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1935,7 +2009,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return maternityLeaveList * @return maternityLeaveList
*/ */
public List<BigDecimal> getMaternityLeaveList(){ public List<BigDecimal> getMaternityLeaveList(){
...@@ -1943,7 +2017,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1943,7 +2017,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveList * @param maternityLeaveList
*/ */
public void setMaternityLeaveList(List<BigDecimal> maternityLeaveList){ public void setMaternityLeaveList(List<BigDecimal> maternityLeaveList){
...@@ -1951,7 +2025,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1951,7 +2025,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return maternityLeaveNotList * @return maternityLeaveNotList
*/ */
public List<BigDecimal> getMaternityLeaveNotList(){ public List<BigDecimal> getMaternityLeaveNotList(){
...@@ -1959,7 +2033,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1959,7 +2033,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveNotList * @param maternityLeaveNotList
*/ */
public void setMaternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){ public void setMaternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){
...@@ -3602,6 +3676,411 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -3602,6 +3676,411 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 哺乳假（天）
* @return breastfeedingLeaveDaysStart
*/
public BigDecimal getBreastfeedingLeaveDaysStart(){
return this.breastfeedingLeaveDaysStart;
}
/**
* 设置 开始 哺乳假（天）
* @param breastfeedingLeaveDaysStart
*/
public void setBreastfeedingLeaveDaysStart(BigDecimal breastfeedingLeaveDaysStart){
this.breastfeedingLeaveDaysStart = breastfeedingLeaveDaysStart;
}
/**
* 获取 结束 哺乳假（天）
* @return $breastfeedingLeaveDaysEnd
*/
public BigDecimal getBreastfeedingLeaveDaysEnd(){
return this.breastfeedingLeaveDaysEnd;
}
/**
* 设置 结束 哺乳假（天）
* @param breastfeedingLeaveDaysEnd
*/
public void setBreastfeedingLeaveDaysEnd(BigDecimal breastfeedingLeaveDaysEnd){
this.breastfeedingLeaveDaysEnd = breastfeedingLeaveDaysEnd;
}
/**
* 获取 增加 哺乳假（天）
* @return breastfeedingLeaveDaysIncrement
*/
public BigDecimal getBreastfeedingLeaveDaysIncrement(){
return this.breastfeedingLeaveDaysIncrement;
}
/**
* 设置 增加 哺乳假（天）
* @param breastfeedingLeaveDaysIncrement
*/
public void setBreastfeedingLeaveDaysIncrement(BigDecimal breastfeedingLeaveDaysIncrement){
this.breastfeedingLeaveDaysIncrement = breastfeedingLeaveDaysIncrement;
}
/**
* 获取 哺乳假（天）
* @return breastfeedingLeaveDaysList
*/
public List<BigDecimal> getBreastfeedingLeaveDaysList(){
return this.breastfeedingLeaveDaysList;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysList
*/
public void setBreastfeedingLeaveDaysList(List<BigDecimal> breastfeedingLeaveDaysList){
this.breastfeedingLeaveDaysList = breastfeedingLeaveDaysList;
}
/**
* 获取 哺乳假（天）
* @return breastfeedingLeaveDaysNotList
*/
public List<BigDecimal> getBreastfeedingLeaveDaysNotList(){
return this.breastfeedingLeaveDaysNotList;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysNotList
*/
public void setBreastfeedingLeaveDaysNotList(List<BigDecimal> breastfeedingLeaveDaysNotList){
this.breastfeedingLeaveDaysNotList = breastfeedingLeaveDaysNotList;
}
/**
* 获取 开始 例假（天）
* @return menstrualLeaveDaysStart
*/
public BigDecimal getMenstrualLeaveDaysStart(){
return this.menstrualLeaveDaysStart;
}
/**
* 设置 开始 例假（天）
* @param menstrualLeaveDaysStart
*/
public void setMenstrualLeaveDaysStart(BigDecimal menstrualLeaveDaysStart){
this.menstrualLeaveDaysStart = menstrualLeaveDaysStart;
}
/**
* 获取 结束 例假（天）
* @return $menstrualLeaveDaysEnd
*/
public BigDecimal getMenstrualLeaveDaysEnd(){
return this.menstrualLeaveDaysEnd;
}
/**
* 设置 结束 例假（天）
* @param menstrualLeaveDaysEnd
*/
public void setMenstrualLeaveDaysEnd(BigDecimal menstrualLeaveDaysEnd){
this.menstrualLeaveDaysEnd = menstrualLeaveDaysEnd;
}
/**
* 获取 增加 例假（天）
* @return menstrualLeaveDaysIncrement
*/
public BigDecimal getMenstrualLeaveDaysIncrement(){
return this.menstrualLeaveDaysIncrement;
}
/**
* 设置 增加 例假（天）
* @param menstrualLeaveDaysIncrement
*/
public void setMenstrualLeaveDaysIncrement(BigDecimal menstrualLeaveDaysIncrement){
this.menstrualLeaveDaysIncrement = menstrualLeaveDaysIncrement;
}
/**
* 获取 例假（天）
* @return menstrualLeaveDaysList
*/
public List<BigDecimal> getMenstrualLeaveDaysList(){
return this.menstrualLeaveDaysList;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysList
*/
public void setMenstrualLeaveDaysList(List<BigDecimal> menstrualLeaveDaysList){
this.menstrualLeaveDaysList = menstrualLeaveDaysList;
}
/**
* 获取 例假（天）
* @return menstrualLeaveDaysNotList
*/
public List<BigDecimal> getMenstrualLeaveDaysNotList(){
return this.menstrualLeaveDaysNotList;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysNotList
*/
public void setMenstrualLeaveDaysNotList(List<BigDecimal> menstrualLeaveDaysNotList){
this.menstrualLeaveDaysNotList = menstrualLeaveDaysNotList;
}
/**
* 获取 开始 年假（天）
* @return annualLeaveDaysStart
*/
public BigDecimal getAnnualLeaveDaysStart(){
return this.annualLeaveDaysStart;
}
/**
* 设置 开始 年假（天）
* @param annualLeaveDaysStart
*/
public void setAnnualLeaveDaysStart(BigDecimal annualLeaveDaysStart){
this.annualLeaveDaysStart = annualLeaveDaysStart;
}
/**
* 获取 结束 年假（天）
* @return $annualLeaveDaysEnd
*/
public BigDecimal getAnnualLeaveDaysEnd(){
return this.annualLeaveDaysEnd;
}
/**
* 设置 结束 年假（天）
* @param annualLeaveDaysEnd
*/
public void setAnnualLeaveDaysEnd(BigDecimal annualLeaveDaysEnd){
this.annualLeaveDaysEnd = annualLeaveDaysEnd;
}
/**
* 获取 增加 年假（天）
* @return annualLeaveDaysIncrement
*/
public BigDecimal getAnnualLeaveDaysIncrement(){
return this.annualLeaveDaysIncrement;
}
/**
* 设置 增加 年假（天）
* @param annualLeaveDaysIncrement
*/
public void setAnnualLeaveDaysIncrement(BigDecimal annualLeaveDaysIncrement){
this.annualLeaveDaysIncrement = annualLeaveDaysIncrement;
}
/**
* 获取 年假（天）
* @return annualLeaveDaysList
*/
public List<BigDecimal> getAnnualLeaveDaysList(){
return this.annualLeaveDaysList;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysList
*/
public void setAnnualLeaveDaysList(List<BigDecimal> annualLeaveDaysList){
this.annualLeaveDaysList = annualLeaveDaysList;
}
/**
* 获取 年假（天）
* @return annualLeaveDaysNotList
*/
public List<BigDecimal> getAnnualLeaveDaysNotList(){
return this.annualLeaveDaysNotList;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysNotList
*/
public void setAnnualLeaveDaysNotList(List<BigDecimal> annualLeaveDaysNotList){
this.annualLeaveDaysNotList = annualLeaveDaysNotList;
}
/**
* 获取 开始 调休（天）
* @return compensatedLeaveDaysStart
*/
public BigDecimal getCompensatedLeaveDaysStart(){
return this.compensatedLeaveDaysStart;
}
/**
* 设置 开始 调休（天）
* @param compensatedLeaveDaysStart
*/
public void setCompensatedLeaveDaysStart(BigDecimal compensatedLeaveDaysStart){
this.compensatedLeaveDaysStart = compensatedLeaveDaysStart;
}
/**
* 获取 结束 调休（天）
* @return $compensatedLeaveDaysEnd
*/
public BigDecimal getCompensatedLeaveDaysEnd(){
return this.compensatedLeaveDaysEnd;
}
/**
* 设置 结束 调休（天）
* @param compensatedLeaveDaysEnd
*/
public void setCompensatedLeaveDaysEnd(BigDecimal compensatedLeaveDaysEnd){
this.compensatedLeaveDaysEnd = compensatedLeaveDaysEnd;
}
/**
* 获取 增加 调休（天）
* @return compensatedLeaveDaysIncrement
*/
public BigDecimal getCompensatedLeaveDaysIncrement(){
return this.compensatedLeaveDaysIncrement;
}
/**
* 设置 增加 调休（天）
* @param compensatedLeaveDaysIncrement
*/
public void setCompensatedLeaveDaysIncrement(BigDecimal compensatedLeaveDaysIncrement){
this.compensatedLeaveDaysIncrement = compensatedLeaveDaysIncrement;
}
/**
* 获取 调休（天）
* @return compensatedLeaveDaysList
*/
public List<BigDecimal> getCompensatedLeaveDaysList(){
return this.compensatedLeaveDaysList;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysList
*/
public void setCompensatedLeaveDaysList(List<BigDecimal> compensatedLeaveDaysList){
this.compensatedLeaveDaysList = compensatedLeaveDaysList;
}
/**
* 获取 调休（天）
* @return compensatedLeaveDaysNotList
*/
public List<BigDecimal> getCompensatedLeaveDaysNotList(){
return this.compensatedLeaveDaysNotList;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysNotList
*/
public void setCompensatedLeaveDaysNotList(List<BigDecimal> compensatedLeaveDaysNotList){
this.compensatedLeaveDaysNotList = compensatedLeaveDaysNotList;
}
/**
* 获取 开始 陪产假（天）
* @return paternityLeaveDaysStart
*/
public BigDecimal getPaternityLeaveDaysStart(){
return this.paternityLeaveDaysStart;
}
/**
* 设置 开始 陪产假（天）
* @param paternityLeaveDaysStart
*/
public void setPaternityLeaveDaysStart(BigDecimal paternityLeaveDaysStart){
this.paternityLeaveDaysStart = paternityLeaveDaysStart;
}
/**
* 获取 结束 陪产假（天）
* @return $paternityLeaveDaysEnd
*/
public BigDecimal getPaternityLeaveDaysEnd(){
return this.paternityLeaveDaysEnd;
}
/**
* 设置 结束 陪产假（天）
* @param paternityLeaveDaysEnd
*/
public void setPaternityLeaveDaysEnd(BigDecimal paternityLeaveDaysEnd){
this.paternityLeaveDaysEnd = paternityLeaveDaysEnd;
}
/**
* 获取 增加 陪产假（天）
* @return paternityLeaveDaysIncrement
*/
public BigDecimal getPaternityLeaveDaysIncrement(){
return this.paternityLeaveDaysIncrement;
}
/**
* 设置 增加 陪产假（天）
* @param paternityLeaveDaysIncrement
*/
public void setPaternityLeaveDaysIncrement(BigDecimal paternityLeaveDaysIncrement){
this.paternityLeaveDaysIncrement = paternityLeaveDaysIncrement;
}
/**
* 获取 陪产假（天）
* @return paternityLeaveDaysList
*/
public List<BigDecimal> getPaternityLeaveDaysList(){
return this.paternityLeaveDaysList;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysList
*/
public void setPaternityLeaveDaysList(List<BigDecimal> paternityLeaveDaysList){
this.paternityLeaveDaysList = paternityLeaveDaysList;
}
/**
* 获取 陪产假（天）
* @return paternityLeaveDaysNotList
*/
public List<BigDecimal> getPaternityLeaveDaysNotList(){
return this.paternityLeaveDaysNotList;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysNotList
*/
public void setPaternityLeaveDaysNotList(List<BigDecimal> paternityLeaveDaysNotList){
this.paternityLeaveDaysNotList = paternityLeaveDaysNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -4470,7 +4949,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4470,7 +4949,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeave * @param maternityLeave
*/ */
public AttendanceStatQuery maternityLeave(BigDecimal maternityLeave){ public AttendanceStatQuery maternityLeave(BigDecimal maternityLeave){
...@@ -4479,7 +4958,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4479,7 +4958,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 开始 产假（陪护假/天） * 设置 开始 产假（天））
* @param maternityLeaveStart * @param maternityLeaveStart
*/ */
public AttendanceStatQuery maternityLeaveStart(BigDecimal maternityLeaveStart){ public AttendanceStatQuery maternityLeaveStart(BigDecimal maternityLeaveStart){
...@@ -4488,7 +4967,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4488,7 +4967,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 结束 产假（陪护假/天） * 设置 结束 产假（天））
* @param maternityLeaveEnd * @param maternityLeaveEnd
*/ */
public AttendanceStatQuery maternityLeaveEnd(BigDecimal maternityLeaveEnd){ public AttendanceStatQuery maternityLeaveEnd(BigDecimal maternityLeaveEnd){
...@@ -4497,7 +4976,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4497,7 +4976,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 增加 产假（陪护假/天） * 设置 增加 产假（天））
* @param maternityLeaveIncrement * @param maternityLeaveIncrement
*/ */
public AttendanceStatQuery maternityLeaveIncrement(BigDecimal maternityLeaveIncrement){ public AttendanceStatQuery maternityLeaveIncrement(BigDecimal maternityLeaveIncrement){
...@@ -4506,7 +4985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4506,7 +4985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveList * @param maternityLeaveList
*/ */
public AttendanceStatQuery maternityLeaveList(List<BigDecimal> maternityLeaveList){ public AttendanceStatQuery maternityLeaveList(List<BigDecimal> maternityLeaveList){
...@@ -4515,7 +4994,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4515,7 +4994,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveNotList * @param maternityLeaveNotList
*/ */
public AttendanceStatQuery maternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){ public AttendanceStatQuery maternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){
...@@ -5570,6 +6049,276 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -5570,6 +6049,276 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public AttendanceStatQuery breastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
setBreastfeedingLeaveDays(breastfeedingLeaveDays);
return this;
}
/**
* 设置 开始 哺乳假（天）
* @param breastfeedingLeaveDaysStart
*/
public AttendanceStatQuery breastfeedingLeaveDaysStart(BigDecimal breastfeedingLeaveDaysStart){
this.breastfeedingLeaveDaysStart = breastfeedingLeaveDaysStart;
return this;
}
/**
* 设置 结束 哺乳假（天）
* @param breastfeedingLeaveDaysEnd
*/
public AttendanceStatQuery breastfeedingLeaveDaysEnd(BigDecimal breastfeedingLeaveDaysEnd){
this.breastfeedingLeaveDaysEnd = breastfeedingLeaveDaysEnd;
return this;
}
/**
* 设置 增加 哺乳假（天）
* @param breastfeedingLeaveDaysIncrement
*/
public AttendanceStatQuery breastfeedingLeaveDaysIncrement(BigDecimal breastfeedingLeaveDaysIncrement){
this.breastfeedingLeaveDaysIncrement = breastfeedingLeaveDaysIncrement;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysList
*/
public AttendanceStatQuery breastfeedingLeaveDaysList(List<BigDecimal> breastfeedingLeaveDaysList){
this.breastfeedingLeaveDaysList = breastfeedingLeaveDaysList;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysNotList
*/
public AttendanceStatQuery breastfeedingLeaveDaysNotList(List<BigDecimal> breastfeedingLeaveDaysNotList){
this.breastfeedingLeaveDaysNotList = breastfeedingLeaveDaysNotList;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public AttendanceStatQuery menstrualLeaveDays(BigDecimal menstrualLeaveDays){
setMenstrualLeaveDays(menstrualLeaveDays);
return this;
}
/**
* 设置 开始 例假（天）
* @param menstrualLeaveDaysStart
*/
public AttendanceStatQuery menstrualLeaveDaysStart(BigDecimal menstrualLeaveDaysStart){
this.menstrualLeaveDaysStart = menstrualLeaveDaysStart;
return this;
}
/**
* 设置 结束 例假（天）
* @param menstrualLeaveDaysEnd
*/
public AttendanceStatQuery menstrualLeaveDaysEnd(BigDecimal menstrualLeaveDaysEnd){
this.menstrualLeaveDaysEnd = menstrualLeaveDaysEnd;
return this;
}
/**
* 设置 增加 例假（天）
* @param menstrualLeaveDaysIncrement
*/
public AttendanceStatQuery menstrualLeaveDaysIncrement(BigDecimal menstrualLeaveDaysIncrement){
this.menstrualLeaveDaysIncrement = menstrualLeaveDaysIncrement;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysList
*/
public AttendanceStatQuery menstrualLeaveDaysList(List<BigDecimal> menstrualLeaveDaysList){
this.menstrualLeaveDaysList = menstrualLeaveDaysList;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysNotList
*/
public AttendanceStatQuery menstrualLeaveDaysNotList(List<BigDecimal> menstrualLeaveDaysNotList){
this.menstrualLeaveDaysNotList = menstrualLeaveDaysNotList;
return this;
}
/**
* 设置 年假（天）
* @param annualLeaveDays
*/
public AttendanceStatQuery annualLeaveDays(BigDecimal annualLeaveDays){
setAnnualLeaveDays(annualLeaveDays);
return this;
}
/**
* 设置 开始 年假（天）
* @param annualLeaveDaysStart
*/
public AttendanceStatQuery annualLeaveDaysStart(BigDecimal annualLeaveDaysStart){
this.annualLeaveDaysStart = annualLeaveDaysStart;
return this;
}
/**
* 设置 结束 年假（天）
* @param annualLeaveDaysEnd
*/
public AttendanceStatQuery annualLeaveDaysEnd(BigDecimal annualLeaveDaysEnd){
this.annualLeaveDaysEnd = annualLeaveDaysEnd;
return this;
}
/**
* 设置 增加 年假（天）
* @param annualLeaveDaysIncrement
*/
public AttendanceStatQuery annualLeaveDaysIncrement(BigDecimal annualLeaveDaysIncrement){
this.annualLeaveDaysIncrement = annualLeaveDaysIncrement;
return this;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysList
*/
public AttendanceStatQuery annualLeaveDaysList(List<BigDecimal> annualLeaveDaysList){
this.annualLeaveDaysList = annualLeaveDaysList;
return this;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysNotList
*/
public AttendanceStatQuery annualLeaveDaysNotList(List<BigDecimal> annualLeaveDaysNotList){
this.annualLeaveDaysNotList = annualLeaveDaysNotList;
return this;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDays
*/
public AttendanceStatQuery compensatedLeaveDays(BigDecimal compensatedLeaveDays){
setCompensatedLeaveDays(compensatedLeaveDays);
return this;
}
/**
* 设置 开始 调休（天）
* @param compensatedLeaveDaysStart
*/
public AttendanceStatQuery compensatedLeaveDaysStart(BigDecimal compensatedLeaveDaysStart){
this.compensatedLeaveDaysStart = compensatedLeaveDaysStart;
return this;
}
/**
* 设置 结束 调休（天）
* @param compensatedLeaveDaysEnd
*/
public AttendanceStatQuery compensatedLeaveDaysEnd(BigDecimal compensatedLeaveDaysEnd){
this.compensatedLeaveDaysEnd = compensatedLeaveDaysEnd;
return this;
}
/**
* 设置 增加 调休（天）
* @param compensatedLeaveDaysIncrement
*/
public AttendanceStatQuery compensatedLeaveDaysIncrement(BigDecimal compensatedLeaveDaysIncrement){
this.compensatedLeaveDaysIncrement = compensatedLeaveDaysIncrement;
return this;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysList
*/
public AttendanceStatQuery compensatedLeaveDaysList(List<BigDecimal> compensatedLeaveDaysList){
this.compensatedLeaveDaysList = compensatedLeaveDaysList;
return this;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysNotList
*/
public AttendanceStatQuery compensatedLeaveDaysNotList(List<BigDecimal> compensatedLeaveDaysNotList){
this.compensatedLeaveDaysNotList = compensatedLeaveDaysNotList;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public AttendanceStatQuery paternityLeaveDays(BigDecimal paternityLeaveDays){
setPaternityLeaveDays(paternityLeaveDays);
return this;
}
/**
* 设置 开始 陪产假（天）
* @param paternityLeaveDaysStart
*/
public AttendanceStatQuery paternityLeaveDaysStart(BigDecimal paternityLeaveDaysStart){
this.paternityLeaveDaysStart = paternityLeaveDaysStart;
return this;
}
/**
* 设置 结束 陪产假（天）
* @param paternityLeaveDaysEnd
*/
public AttendanceStatQuery paternityLeaveDaysEnd(BigDecimal paternityLeaveDaysEnd){
this.paternityLeaveDaysEnd = paternityLeaveDaysEnd;
return this;
}
/**
* 设置 增加 陪产假（天）
* @param paternityLeaveDaysIncrement
*/
public AttendanceStatQuery paternityLeaveDaysIncrement(BigDecimal paternityLeaveDaysIncrement){
this.paternityLeaveDaysIncrement = paternityLeaveDaysIncrement;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysList
*/
public AttendanceStatQuery paternityLeaveDaysList(List<BigDecimal> paternityLeaveDaysList){
this.paternityLeaveDaysList = paternityLeaveDaysList;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysNotList
*/
public AttendanceStatQuery paternityLeaveDaysNotList(List<BigDecimal> paternityLeaveDaysNotList){
this.paternityLeaveDaysNotList = paternityLeaveDaysNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationBalanceEntity.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationBalanceVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationBalanceVo;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 员工假期余额信息实体对象 * 员工假期余额信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-11 * @date 2023-04-14
*/ */
public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo { public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo {
...@@ -55,6 +52,14 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -55,6 +52,14 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
* 年假（天） * 年假（天）
*/ */
private BigDecimal annualLeaveDays; private BigDecimal annualLeaveDays;
/**
* 婚假（天）
*/
private BigDecimal marriageLeaveDays;
/**
* 备注
*/
private String remark;
/** /**
* 产假（天） * 产假（天）
*/ */
...@@ -63,10 +68,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -63,10 +68,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
* 陪产假（天） * 陪产假（天）
*/ */
private BigDecimal paternityLeaveDays; private BigDecimal paternityLeaveDays;
/**
* 婚假（天）
*/
private BigDecimal marriageLeaveDays;
/** /**
* 例假（天） * 例假（天）
*/ */
...@@ -80,9 +81,49 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -80,9 +81,49 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
*/ */
private BigDecimal bereavementLeaveDays; private BigDecimal bereavementLeaveDays;
/** /**
* 备注 * 回单位（天）
*/ */
private String remark; private BigDecimal backToUnit;
/**
* 因公请假（天）
*/
private BigDecimal onDutyLeave;
/**
* 外出勘验（天）
*/
private BigDecimal outOfOffice;
/**
* 值班补班（天）
*/
private BigDecimal shiftCompensation;
/**
* 体检（天）
*/
private BigDecimal physicalExamination;
/**
* 隔离（天）
*/
private BigDecimal quarantine;
/**
* 因公外出（与窗口工作无关/天）
*/
private BigDecimal businessTrip;
/**
* 公休（天）
*/
private BigDecimal publicHoliday;
/**
* 育儿假（天）
*/
private BigDecimal childRearingLeave;
/**
* 调回单位（或离职/天）
*/
private BigDecimal transferBack;
/**
* 探亲假（天）
*/
private BigDecimal homeLeave;
...@@ -213,6 +254,34 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -213,6 +254,34 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
public void setAnnualLeaveDays(BigDecimal annualLeaveDays){ public void setAnnualLeaveDays(BigDecimal annualLeaveDays){
this.annualLeaveDays = annualLeaveDays; this.annualLeaveDays = annualLeaveDays;
} }
/**
* 获取 婚假（天）
* @return BigDecimal
*/
public BigDecimal getMarriageLeaveDays(){
return marriageLeaveDays;
}
/**
* 设置 婚假（天）
* @param marriageLeaveDays
*/
public void setMarriageLeaveDays(BigDecimal marriageLeaveDays){
this.marriageLeaveDays = marriageLeaveDays;
}
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
/** /**
* 获取 产假（天） * 获取 产假（天）
* @return BigDecimal * @return BigDecimal
...@@ -241,20 +310,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -241,20 +310,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){ public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){
this.paternityLeaveDays = paternityLeaveDays; this.paternityLeaveDays = paternityLeaveDays;
} }
/**
* 获取 婚假（天）
* @return BigDecimal
*/
public BigDecimal getMarriageLeaveDays(){
return marriageLeaveDays;
}
/**
* 设置 婚假（天）
* @param marriageLeaveDays
*/
public void setMarriageLeaveDays(BigDecimal marriageLeaveDays){
this.marriageLeaveDays = marriageLeaveDays;
}
/** /**
* 获取 例假（天） * 获取 例假（天）
* @return BigDecimal * @return BigDecimal
...@@ -298,18 +353,158 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -298,18 +353,158 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
this.bereavementLeaveDays = bereavementLeaveDays; this.bereavementLeaveDays = bereavementLeaveDays;
} }
/** /**
* 获取 备注 * 获取 回单位（天）
* @return String * @return BigDecimal
*/ */
public String getRemark(){ public BigDecimal getBackToUnit(){
return remark; return backToUnit;
} }
/** /**
* 设置 备注 * 设置 回单位（天）
* @param remark * @param backToUnit
*/ */
public void setRemark(String remark){ public void setBackToUnit(BigDecimal backToUnit){
this.remark = remark; this.backToUnit = backToUnit;
}
/**
* 获取 因公请假（天）
* @return BigDecimal
*/
public BigDecimal getOnDutyLeave(){
return onDutyLeave;
}
/**
* 设置 因公请假（天）
* @param onDutyLeave
*/
public void setOnDutyLeave(BigDecimal onDutyLeave){
this.onDutyLeave = onDutyLeave;
}
/**
* 获取 外出勘验（天）
* @return BigDecimal
*/
public BigDecimal getOutOfOffice(){
return outOfOffice;
}
/**
* 设置 外出勘验（天）
* @param outOfOffice
*/
public void setOutOfOffice(BigDecimal outOfOffice){
this.outOfOffice = outOfOffice;
}
/**
* 获取 值班补班（天）
* @return BigDecimal
*/
public BigDecimal getShiftCompensation(){
return shiftCompensation;
}
/**
* 设置 值班补班（天）
* @param shiftCompensation
*/
public void setShiftCompensation(BigDecimal shiftCompensation){
this.shiftCompensation = shiftCompensation;
}
/**
* 获取 体检（天）
* @return BigDecimal
*/
public BigDecimal getPhysicalExamination(){
return physicalExamination;
}
/**
* 设置 体检（天）
* @param physicalExamination
*/
public void setPhysicalExamination(BigDecimal physicalExamination){
this.physicalExamination = physicalExamination;
}
/**
* 获取 隔离（天）
* @return BigDecimal
*/
public BigDecimal getQuarantine(){
return quarantine;
}
/**
* 设置 隔离（天）
* @param quarantine
*/
public void setQuarantine(BigDecimal quarantine){
this.quarantine = quarantine;
}
/**
* 获取 因公外出（与窗口工作无关/天）
* @return BigDecimal
*/
public BigDecimal getBusinessTrip(){
return businessTrip;
}
/**
* 设置 因公外出（与窗口工作无关/天）
* @param businessTrip
*/
public void setBusinessTrip(BigDecimal businessTrip){
this.businessTrip = businessTrip;
}
/**
* 获取 公休（天）
* @return BigDecimal
*/
public BigDecimal getPublicHoliday(){
return publicHoliday;
}
/**
* 设置 公休（天）
* @param publicHoliday
*/
public void setPublicHoliday(BigDecimal publicHoliday){
this.publicHoliday = publicHoliday;
}
/**
* 获取 育儿假（天）
* @return BigDecimal
*/
public BigDecimal getChildRearingLeave(){
return childRearingLeave;
}
/**
* 设置 育儿假（天）
* @param childRearingLeave
*/
public void setChildRearingLeave(BigDecimal childRearingLeave){
this.childRearingLeave = childRearingLeave;
}
/**
* 获取 调回单位（或离职/天）
* @return BigDecimal
*/
public BigDecimal getTransferBack(){
return transferBack;
}
/**
* 设置 调回单位（或离职/天）
* @param transferBack
*/
public void setTransferBack(BigDecimal transferBack){
this.transferBack = transferBack;
}
/**
* 获取 探亲假（天）
* @return BigDecimal
*/
public BigDecimal getHomeLeave(){
return homeLeave;
}
/**
* 设置 探亲假（天）
* @param homeLeave
*/
public void setHomeLeave(BigDecimal homeLeave){
this.homeLeave = homeLeave;
} }
...@@ -342,13 +537,24 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -342,13 +537,24 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays()); sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays());
sb.append(",sickLeaveDays:").append(getSickLeaveDays()); sb.append(",sickLeaveDays:").append(getSickLeaveDays());
sb.append(",annualLeaveDays:").append(getAnnualLeaveDays()); sb.append(",annualLeaveDays:").append(getAnnualLeaveDays());
sb.append(",marriageLeaveDays:").append(getMarriageLeaveDays());
sb.append(",remark:").append(getRemark());
sb.append(",maternityLeaveDays:").append(getMaternityLeaveDays()); sb.append(",maternityLeaveDays:").append(getMaternityLeaveDays());
sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays()); sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays());
sb.append(",marriageLeaveDays:").append(getMarriageLeaveDays());
sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays()); sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays());
sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays()); sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays());
sb.append(",bereavementLeaveDays:").append(getBereavementLeaveDays()); sb.append(",bereavementLeaveDays:").append(getBereavementLeaveDays());
sb.append(",remark:").append(getRemark()); sb.append(",backToUnit:").append(getBackToUnit());
sb.append(",onDutyLeave:").append(getOnDutyLeave());
sb.append(",outOfOffice:").append(getOutOfOffice());
sb.append(",shiftCompensation:").append(getShiftCompensation());
sb.append(",physicalExamination:").append(getPhysicalExamination());
sb.append(",quarantine:").append(getQuarantine());
sb.append(",businessTrip:").append(getBusinessTrip());
sb.append(",publicHoliday:").append(getPublicHoliday());
sb.append(",childRearingLeave:").append(getChildRearingLeave());
sb.append(",transferBack:").append(getTransferBack());
sb.append(",homeLeave:").append(getHomeLeave());
return sb.toString(); return sb.toString();
} }
...@@ -372,18 +578,40 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -372,18 +578,40 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
this.annualLeaveDays = BigDecimal.valueOf(0); this.annualLeaveDays = BigDecimal.valueOf(0);
this.marriageLeaveDays = BigDecimal.valueOf(0);
this.remark = "";
this.maternityLeaveDays = BigDecimal.valueOf(0); this.maternityLeaveDays = BigDecimal.valueOf(0);
this.paternityLeaveDays = BigDecimal.valueOf(0); this.paternityLeaveDays = BigDecimal.valueOf(0);
this.marriageLeaveDays = BigDecimal.valueOf(0);
this.menstrualLeaveDays = BigDecimal.valueOf(0); this.menstrualLeaveDays = BigDecimal.valueOf(0);
this.breastfeedingLeaveDays = BigDecimal.valueOf(0); this.breastfeedingLeaveDays = BigDecimal.valueOf(0);
this.bereavementLeaveDays = BigDecimal.valueOf(0); this.bereavementLeaveDays = BigDecimal.valueOf(0);
this.remark = ""; this.backToUnit = BigDecimal.valueOf(0);
this.onDutyLeave = BigDecimal.valueOf(0);
this.outOfOffice = BigDecimal.valueOf(0);
this.shiftCompensation = BigDecimal.valueOf(0);
this.physicalExamination = BigDecimal.valueOf(0);
this.quarantine = BigDecimal.valueOf(0);
this.businessTrip = BigDecimal.valueOf(0);
this.publicHoliday = BigDecimal.valueOf(0);
this.childRearingLeave = BigDecimal.valueOf(0);
this.transferBack = BigDecimal.valueOf(0);
this.homeLeave = BigDecimal.valueOf(0);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordEntity.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo;
import java.math.BigDecimal;
/** /**
* 员工假期记录信息实体对象 * 员工假期记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2023-04-14
*/ */
public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,7 +24,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -27,7 +24,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
*/ */
private String staffName; private String staffName;
/** /**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
*/ */
private Integer type; private Integer type;
/** /**
...@@ -91,14 +88,14 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -91,14 +88,14 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
this.staffName = staffName; this.staffName = staffName;
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return Integer * @return Integer
*/ */
public Integer getType(){ public Integer getType(){
return type; return type;
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param type * @param type
*/ */
public void setType(Integer type){ public void setType(Integer type){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordQuery.java
View file @ b5b610a3
...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model; ...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
/** /**
* 员工假期记录信息查询对象 * 员工假期记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2023-04-14
*/ */
public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntity { public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -45,19 +44,19 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -45,19 +44,19 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
/** 员工姓名排除列表 */ /** 员工姓名排除列表 */
private List <String> staffNameNotList; private List <String> staffNameNotList;
/** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer typeStart; private Integer typeStart;
/** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer typeEnd; private Integer typeEnd;
/** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer typeIncrement; private Integer typeIncrement;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)列表 */
private List <Integer> typeList; private List <Integer> typeList;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)排除列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)排除列表 */
private List <Integer> typeNotList; private List <Integer> typeNotList;
/** 开始 增减类型(1.增加,2.扣除) */ /** 开始 增减类型(1.增加,2.扣除) */
...@@ -360,7 +359,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -360,7 +359,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeStart * @return typeStart
*/ */
public Integer getTypeStart(){ public Integer getTypeStart(){
...@@ -368,7 +367,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -368,7 +367,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeStart * @param typeStart
*/ */
public void setTypeStart(Integer typeStart){ public void setTypeStart(Integer typeStart){
...@@ -376,7 +375,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -376,7 +375,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return $typeEnd * @return $typeEnd
*/ */
public Integer getTypeEnd(){ public Integer getTypeEnd(){
...@@ -384,7 +383,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -384,7 +383,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeEnd * @param typeEnd
*/ */
public void setTypeEnd(Integer typeEnd){ public void setTypeEnd(Integer typeEnd){
...@@ -392,7 +391,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -392,7 +391,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeIncrement * @return typeIncrement
*/ */
public Integer getTypeIncrement(){ public Integer getTypeIncrement(){
...@@ -400,7 +399,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -400,7 +399,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeIncrement * @param typeIncrement
*/ */
public void setTypeIncrement(Integer typeIncrement){ public void setTypeIncrement(Integer typeIncrement){
...@@ -408,7 +407,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -408,7 +407,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeList * @return typeList
*/ */
public List<Integer> getTypeList(){ public List<Integer> getTypeList(){
...@@ -416,7 +415,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -416,7 +415,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeList * @param typeList
*/ */
public void setTypeList(List<Integer> typeList){ public void setTypeList(List<Integer> typeList){
...@@ -424,7 +423,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -424,7 +423,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeNotList * @return typeNotList
*/ */
public List<Integer> getTypeNotList(){ public List<Integer> getTypeNotList(){
...@@ -432,7 +431,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -432,7 +431,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeNotList * @param typeNotList
*/ */
public void setTypeNotList(List<Integer> typeNotList){ public void setTypeNotList(List<Integer> typeNotList){
...@@ -1116,7 +1115,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1116,7 +1115,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param type * @param type
*/ */
public AttendanceVacationRecordQuery type(Integer type){ public AttendanceVacationRecordQuery type(Integer type){
...@@ -1125,7 +1124,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1125,7 +1124,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeStart * @param typeStart
*/ */
public AttendanceVacationRecordQuery typeStart(Integer typeStart){ public AttendanceVacationRecordQuery typeStart(Integer typeStart){
...@@ -1134,7 +1133,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1134,7 +1133,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeEnd * @param typeEnd
*/ */
public AttendanceVacationRecordQuery typeEnd(Integer typeEnd){ public AttendanceVacationRecordQuery typeEnd(Integer typeEnd){
...@@ -1143,7 +1142,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1143,7 +1142,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeIncrement * @param typeIncrement
*/ */
public AttendanceVacationRecordQuery typeIncrement(Integer typeIncrement){ public AttendanceVacationRecordQuery typeIncrement(Integer typeIncrement){
...@@ -1152,7 +1151,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1152,7 +1151,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeList * @param typeList
*/ */
public AttendanceVacationRecordQuery typeList(List<Integer> typeList){ public AttendanceVacationRecordQuery typeList(List<Integer> typeList){
...@@ -1161,7 +1160,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1161,7 +1160,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeNotList * @param typeNotList
*/ */
public AttendanceVacationRecordQuery typeNotList(List<Integer> typeNotList){ public AttendanceVacationRecordQuery typeNotList(List<Integer> typeNotList){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceClassDetailVo.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model.vo; package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity; import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +11,16 @@ import java.util.List; ...@@ -9,6 +11,16 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-08
*/ */
@Data
public class AttendanceClassDetailVo extends BaseEntityLong { public class AttendanceClassDetailVo extends BaseEntityLong {
//2023-04-01
/** 开始 上班打卡时间 */
private String goWorkDateStart;
//2023-04-02
/** 结束 上班打卡时间 */
private String goWorkDateEnd;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceGroupVo.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model.vo; package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceGroupEntity; import com.mortals.xhx.module.attendance.model.AttendanceGroupEntity;
import com.mortals.xhx.module.attendance.model.AttendanceGroupFixedworkEntity;
import com.mortals.xhx.module.attendance.model.AttendanceGroupFixedworkSpecialEntity;
import com.mortals.xhx.module.attendance.model.AttendanceGroupResponsibleEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +14,19 @@ import java.util.List; ...@@ -9,6 +14,19 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-08
*/ */
@Data
public class AttendanceGroupVo extends BaseEntityLong { public class AttendanceGroupVo extends BaseEntityLong {
/**
* 考勤组班次实体类
*/
private AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity;
/**
* 考勤组固定班次特殊日期配置
*/
private List<AttendanceGroupFixedworkSpecialEntity> fixedworkSpecial;
private AttendanceGroupResponsibleEntity groupResponsibleEntity;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordHikVo.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model.vo; package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +12,10 @@ import java.util.List; ...@@ -9,6 +12,10 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-08
*/ */
@Data
public class AttendanceRecordHikVo extends BaseEntityLong { public class AttendanceRecordHikVo extends BaseEntityLong {
@Excel(name = "所属组织")
private String orgName;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordVo.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.model.vo; package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +12,11 @@ import java.util.List; ...@@ -9,6 +12,11 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-07
*/ */
@Data
public class AttendanceRecordVo extends BaseEntityLong { public class AttendanceRecordVo extends BaseEntityLong {
private List<AttendanceGroupFixedworkSpecialVo> list;
private AttendanceRecordDetailEntity attendanceRecordDetailEntity;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordServiceImpl.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.service.impl; package com.mortals.xhx.module.attendance.service.impl;
import com.mortals.framework.model.PageInfo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -14,6 +15,7 @@ import org.springframework.util.ObjectUtils; ...@@ -14,6 +15,7 @@ import org.springframework.util.ObjectUtils;
import java.util.Date; import java.util.Date;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* AttendanceRecordService * AttendanceRecordService
...@@ -27,6 +29,22 @@ public class AttendanceRecordServiceImpl extends AbstractCRUDServiceImpl<Attenda ...@@ -27,6 +29,22 @@ public class AttendanceRecordServiceImpl extends AbstractCRUDServiceImpl<Attenda
@Autowired @Autowired
private AttendanceRecordDetailService attendanceRecordDetailService; private AttendanceRecordDetailService attendanceRecordDetailService;
@Override
protected void findAfter(AttendanceRecordEntity params, PageInfo pageInfo, Context context, List<AttendanceRecordEntity> list) throws AppException {
list.stream().map(item->{
//chax
List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery().recordId(item.getId()));
item.setAttendanceRecordDetailList(attendanceRecordDetailEntities);
return item;
}).collect(Collectors.toList());
super.findAfter(params, pageInfo, context, list);
}
@Override @Override
protected void saveAfter(AttendanceRecordEntity entity, Context context) throws AppException { protected void saveAfter(AttendanceRecordEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getAttendanceRecordDetailList())){ if(!ObjectUtils.isEmpty(entity.getAttendanceRecordDetailList())){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceClassController.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.model.WorkmanQuery;
import com.mortals.xhx.module.workman.service.WorkmanService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -13,12 +18,10 @@ import com.mortals.xhx.module.attendance.model.AttendanceClassEntity; ...@@ -13,12 +18,10 @@ import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
import com.mortals.xhx.module.attendance.service.AttendanceClassService; import com.mortals.xhx.module.attendance.service.AttendanceClassService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
...@@ -35,6 +38,8 @@ public class AttendanceClassController extends BaseCRUDJsonBodyMappingController ...@@ -35,6 +38,8 @@ public class AttendanceClassController extends BaseCRUDJsonBodyMappingController
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private WorkmanService workmanService;
public AttendanceClassController(){ public AttendanceClassController(){
super.setModuleDesc( "考勤班次信息"); super.setModuleDesc( "考勤班次信息");
...@@ -42,8 +47,13 @@ public class AttendanceClassController extends BaseCRUDJsonBodyMappingController ...@@ -42,8 +47,13 @@ public class AttendanceClassController extends BaseCRUDJsonBodyMappingController
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model,"workManId",workmanService.find(new WorkmanQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getName(),(o,n)->n)));
super.init(model, context); super.init(model, context);
} }
@Override
protected void saveBefore(AttendanceClassEntity entity, Map<String, Object> model, Context context) throws AppException {
entity.setClassResponsiblePersonName(workmanService.selectOne(new WorkmanQuery().id(entity.getClassResponsiblePersonId())).getName());
super.saveBefore(entity, model, context);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceGroupController.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import cn.hutool.core.stream.CollectorUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.attendance.model.*;
import com.mortals.xhx.module.attendance.service.*;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.model.DeptTreeSelect;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.workman.model.WorkmanQuery;
import com.mortals.xhx.module.workman.service.WorkmanService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.attendance.model.AttendanceGroupEntity;
import com.mortals.xhx.module.attendance.service.AttendanceGroupService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/** /**
* *
* 考勤组信息 * 考勤组信息
...@@ -35,6 +33,18 @@ public class AttendanceGroupController extends BaseCRUDJsonBodyMappingController ...@@ -35,6 +33,18 @@ public class AttendanceGroupController extends BaseCRUDJsonBodyMappingController
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private WorkmanService workmanService;
@Autowired
private AttendanceClassService attendanceClassService;
@Autowired
private DeptService deptService;
@Autowired
private AttendanceGroupFixedworkService attendanceGroupFixedworkService;
@Autowired
private AttendanceGroupFixedworkSpecialService specialService;
@Autowired
private AttendanceGroupResponsibleService groupResponsibleService;
public AttendanceGroupController(){ public AttendanceGroupController(){
super.setModuleDesc( "考勤组信息"); super.setModuleDesc( "考勤组信息");
...@@ -44,8 +54,31 @@ public class AttendanceGroupController extends BaseCRUDJsonBodyMappingController ...@@ -44,8 +54,31 @@ public class AttendanceGroupController extends BaseCRUDJsonBodyMappingController
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "type", paramService.getParamBySecondOrganize("AttendanceGroup","type")); this.addDict(model, "type", paramService.getParamBySecondOrganize("AttendanceGroup","type"));
this.addDict(model, "attendanceType", paramService.getParamBySecondOrganize("AttendanceGroup","attendanceType")); this.addDict(model, "attendanceType", paramService.getParamBySecondOrganize("AttendanceGroup","attendanceType"));
List<DeptEntity> list = deptService.find(new DeptQuery());
List<DeptTreeSelect> treeSelects = deptService.buildDeptTreeSelect(list);
this.addDict(model,"deptId",treeSelects);
List<AttendanceClassEntity> attendanceClassEntities = attendanceClassService.find(new AttendanceClassQuery());
this.addDict(model,"classId",attendanceClassEntities);
this.addDict(model,"workMan",workmanService.find(new WorkmanQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getName(),(o, n)->n)));
super.init(model, context); super.init(model, context);
} }
@Override
protected int saveAfter(AttendanceGroupEntity entity, Map<String, Object> model, Context context) throws AppException {
entity.getAttendanceGroupFixedworkEntity().setGroupId(entity.getId());
entity.getAttendanceGroupFixedworkEntity().setGroupName(entity.getGroupName());
AttendanceGroupFixedworkEntity save = attendanceGroupFixedworkService.save(entity.getAttendanceGroupFixedworkEntity());
List<AttendanceGroupFixedworkSpecialEntity> fixedworkSpecial = entity.getFixedworkSpecial();
if (fixedworkSpecial!=null && fixedworkSpecial.size()>0){
fixedworkSpecial.forEach(item->{
item.setFixedWorkId(save.getId());
});
}
specialService.save(fixedworkSpecial);
AttendanceGroupResponsibleEntity responsibleEntity = entity.getGroupResponsibleEntity();
responsibleEntity.setGroupId(entity.getId());
responsibleEntity.setGroupName(entity.getGroupName());
groupResponsibleService.save(responsibleEntity);
return super.saveAfter(entity, model, context);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java
View file @ b5b610a3
...@@ -46,4 +46,5 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -46,4 +46,5 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
} }
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceVacationBalanceController.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
...@@ -32,5 +33,10 @@ public class AttendanceVacationBalanceController extends BaseCRUDJsonBodyMapping ...@@ -32,5 +33,10 @@ public class AttendanceVacationBalanceController extends BaseCRUDJsonBodyMapping
super.init(model, context); super.init(model, context);
} }
@Override
protected int infoAfter(Long id, Map<String, Object> model, AttendanceVacationBalanceEntity entity, Context context) throws AppException {
AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = service.get(id);
model.put("allHoliday",attendanceVacationBalanceEntity);
return super.infoAfter(id, model, entity, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceVacationRecordController.java
View file @ b5b610a3
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity; import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
import com.mortals.xhx.module.attendance.service.AttendanceVacationBalanceService;
import com.mortals.xhx.module.attendance.service.AttendanceVacationRecordService; import com.mortals.xhx.module.attendance.service.AttendanceVacationRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -25,8 +22,7 @@ public class AttendanceVacationRecordController extends BaseCRUDJsonBodyMappingC ...@@ -25,8 +22,7 @@ public class AttendanceVacationRecordController extends BaseCRUDJsonBodyMappingC
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private AttendanceVacationBalanceService attendanceVacationBalanceService;
public AttendanceVacationRecordController(){ public AttendanceVacationRecordController(){
super.setModuleDesc( "员工假期记录信息"); super.setModuleDesc( "员工假期记录信息");
...@@ -39,11 +35,4 @@ public class AttendanceVacationRecordController extends BaseCRUDJsonBodyMappingC ...@@ -39,11 +35,4 @@ public class AttendanceVacationRecordController extends BaseCRUDJsonBodyMappingC
super.init(model, context); super.init(model, context);
} }
@Override
protected int saveAfter(AttendanceVacationRecordEntity entity, Map<String, Object> model, Context context) throws AppException {
AttendanceVacationBalanceEntity attendanceVacationBalanceEntity=attendanceVacationBalanceService.get(entity.getStaffId());
model.put("allHoliday",attendanceVacationBalanceEntity);
return super.saveAfter(entity, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java
View file @ b5b610a3
...@@ -36,8 +36,5 @@ public interface DeptDao extends ICRUDDao<DeptEntity,Long>{ ...@@ -36,8 +36,5 @@ public interface DeptDao extends ICRUDDao<DeptEntity,Long>{
* */ * */
DeptEntity queryDeptParient(String parentCode); DeptEntity queryDeptParient(String parentCode);
/**
*
* */
int queryDeptParentId(Long deptId);
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java
View file @ b5b610a3
...@@ -37,10 +37,7 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements ...@@ -37,10 +37,7 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements
return getSqlSession().selectOne(getSqlId("queryDeptParient"),parentCode); return getSqlSession().selectOne(getSqlId("queryDeptParient"),parentCode);
} }
@Override
public int queryDeptParentId(Long deptId) {
return getSqlSession().selectOne(getSqlId("queryDeptParentId"),deptId);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptTreeSelect.java
View file @ b5b610a3
...@@ -4,10 +4,12 @@ import java.util.List; ...@@ -4,10 +4,12 @@ import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.mortals.xhx.module.dept.model.vo.DeptVo; import com.mortals.xhx.module.dept.model.vo.DeptVo;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.mortals.xhx.module.staff.model.StaffEntity;
import lombok.Data; import lombok.Data;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* 部门信息前端映射树结构实体类 * 部门信息前端映射树结构实体类
...@@ -35,12 +37,19 @@ public class DeptTreeSelect implements Serializable { ...@@ -35,12 +37,19 @@ public class DeptTreeSelect implements Serializable {
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<DeptTreeSelect> children; private List<DeptTreeSelect> children;
/**
* 子节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<Map<String,Object>> personList;
public DeptTreeSelect(DeptEntity entity) { public DeptTreeSelect(DeptEntity entity) {
this.id = entity.getId(); this.id = entity.getId();
this.label = entity.getDeptName(); this.label = entity.getDeptName();
if(!ObjectUtils.isEmpty(entity.getChildren())){ if(!ObjectUtils.isEmpty(entity.getChildren())){
this.children = entity.getChildren().stream().map(DeptTreeSelect::new).collect(Collectors.toList()); this.children = entity.getChildren().stream().map(DeptTreeSelect::new).collect(Collectors.toList());
} }
this.personList = entity.getPersonList();
} }
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/vo/DeptVo.java
View file @ b5b610a3
package com.mortals.xhx.module.dept.model.vo; package com.mortals.xhx.module.dept.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.staff.model.StaffEntity;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 部门信息视图对象 * 部门信息视图对象
* *
...@@ -16,7 +19,7 @@ public class DeptVo extends BaseEntityLong { ...@@ -16,7 +19,7 @@ public class DeptVo extends BaseEntityLong {
/** 子部门信息 */ /** 子部门信息 */
private List<DeptEntity> children = new ArrayList<>(); private List<DeptEntity> children = new ArrayList<>();
/** 子节点人员信息 */
private List<Map<String,Object>> personList = new ArrayList<>();
//成员数量 //成员数量
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/DeptService.java
View file @ b5b610a3
...@@ -51,6 +51,4 @@ public interface DeptService extends ICRUDService<DeptEntity,Long>{ ...@@ -51,6 +51,4 @@ public interface DeptService extends ICRUDService<DeptEntity,Long>{
int queryParentId(Long deptId);
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ b5b610a3
package com.mortals.xhx.module.dept.service.impl; package com.mortals.xhx.module.dept.service.impl;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.StaffQuery;
import com.mortals.xhx.module.staff.service.StaffService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
...@@ -25,6 +29,9 @@ import java.util.stream.Collectors; ...@@ -25,6 +29,9 @@ import java.util.stream.Collectors;
@Service("deptService") @Service("deptService")
public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity, Long> implements DeptService { public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity, Long> implements DeptService {
@Autowired
private StaffService staffService;
@Override @Override
protected void saveBefore(DeptEntity entity, Context context) throws AppException { protected void saveBefore(DeptEntity entity, Context context) throws AppException {
if(ObjectUtils.isEmpty(entity.getParentId())){ if(ObjectUtils.isEmpty(entity.getParentId())){
...@@ -49,7 +56,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -49,7 +56,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
DeptEntity newParentEntity = this.get(entity.getParentId()); DeptEntity newParentEntity = this.get(entity.getParentId());
DeptEntity oldEntity = this.get(entity.getId()); DeptEntity oldEntity = this.get(entity.getId());
if (!ObjectUtils.isEmpty(newParentEntity) && !ObjectUtils.isEmpty(oldEntity)) { if (!ObjectUtils.isEmpty(newParentEntity) && !ObjectUtils.isEmpty(oldEntity)) {
String newAncestors = newParentEntity.getAncestors() + "," + newParentEntity.getId(); String newAncestors = newParentEntity.getAncestors() + "," +entity.getId();
String oldAncestors = oldEntity.getAncestors(); String oldAncestors = oldEntity.getAncestors();
entity.setAncestors(newAncestors); entity.setAncestors(newAncestors);
updateDeptChildren(entity.getId(), newAncestors, oldAncestors, context); updateDeptChildren(entity.getId(), newAncestors, oldAncestors, context);
...@@ -130,7 +137,16 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -130,7 +137,16 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
for (Iterator<DeptEntity> iterator = list.iterator(); iterator.hasNext(); ) { for (Iterator<DeptEntity> iterator = list.iterator(); iterator.hasNext(); ) {
DeptEntity deptEntity = iterator.next(); DeptEntity deptEntity = iterator.next();
List<StaffEntity> staffEntities = staffService.find(new StaffQuery().deptId(deptEntity.getId()));
List<Map<String,Object>> personList = new ArrayList<>();
staffEntities.forEach(item->{
Map<String,Object> map= new HashMap<>();
map.put("staffId",item.getId());
map.put("staffName",item.getName());
map.put("deptId",item.getDeptId());
personList.add(map);
});
deptEntity.setPersonList(personList);
if (!tempList.contains(deptEntity.getParentId())) { if (!tempList.contains(deptEntity.getParentId())) {
recursionFn(list, deptEntity); recursionFn(list, deptEntity);
returnList.add(deptEntity); returnList.add(deptEntity);
...@@ -139,7 +155,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -139,7 +155,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
if (returnList.isEmpty()) { if (returnList.isEmpty()) {
returnList = list; returnList = list;
} }
return returnList.stream().map(DeptTreeSelect::new).collect(Collectors.toList()); return returnList.stream().map(DeptTreeSelect::new).collect(Collectors.toList());
} }
...@@ -194,9 +209,5 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -194,9 +209,5 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
@Override
public int queryParentId(Long deptId) {
return dao.queryDeptParentId(deptId);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
View file @ b5b610a3
...@@ -132,8 +132,17 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -132,8 +132,17 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
@Override @Override
protected int doListAfter(DeptEntity query, Map<String, Object> model, Context context) throws AppException { protected int doListAfter(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
int Allperson =staffService.queryAllPerson(); int allPerson =staffService.queryAllPerson();
model.put("AllPerson",Allperson); model.put("allPerson",allPerson);
return super.doListAfter(query, model, context); return super.doListAfter(query, model, context);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffDao.java
View file @ b5b610a3
...@@ -52,11 +52,6 @@ public interface StaffDao extends ICRUDDao<StaffEntity,Long>{ ...@@ -52,11 +52,6 @@ public interface StaffDao extends ICRUDDao<StaffEntity,Long>{
* */ * */
int queryConcurrently(); int queryConcurrently();
/**
* 统计部门
* */
int queryPersonNum(Long deptId);
/** /**
* 查询部门信息 * 查询部门信息
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java
View file @ b5b610a3
...@@ -53,10 +53,6 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement ...@@ -53,10 +53,6 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement
return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently")); return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently"));
} }
@Override
public int queryPersonNum(Long deptId) {
return this.getSqlSession().selectOne(this.getSqlId("queryPersonNum"),deptId);
}
@Override @Override
public StaffEntity queryHik(String remarkId) { public StaffEntity queryHik(String remarkId) {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
View file @ b5b610a3
...@@ -7,7 +7,7 @@ import java.util.Date; ...@@ -7,7 +7,7 @@ import java.util.Date;
* 员工基本信息实体对象 * 员工基本信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class StaffEntity extends StaffVo { public class StaffEntity extends StaffVo {
...@@ -97,6 +97,14 @@ public class StaffEntity extends StaffVo { ...@@ -97,6 +97,14 @@ public class StaffEntity extends StaffVo {
* 员工来源(1.外部,2.内部) * 员工来源(1.外部,2.内部)
*/ */
private Integer source; private Integer source;
/**
* 相对图片pic
*/
private String picUri;
/**
* 图片资源唯一标识
*/
private String serverIndexCode;
...@@ -395,6 +403,34 @@ public class StaffEntity extends StaffVo { ...@@ -395,6 +403,34 @@ public class StaffEntity extends StaffVo {
public void setSource(Integer source){ public void setSource(Integer source){
this.source = source; this.source = source;
} }
/**
* 获取 相对图片pic
* @return String
*/
public String getPicUri(){
return picUri;
}
/**
* 设置 相对图片pic
* @param picUri
*/
public void setPicUri(String picUri){
this.picUri = picUri;
}
/**
* 获取 图片资源唯一标识
* @return String
*/
public String getServerIndexCode(){
return serverIndexCode;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public void setServerIndexCode(String serverIndexCode){
this.serverIndexCode = serverIndexCode;
}
...@@ -438,6 +474,8 @@ public class StaffEntity extends StaffVo { ...@@ -438,6 +474,8 @@ public class StaffEntity extends StaffVo {
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",remarkId:").append(getRemarkId()); sb.append(",remarkId:").append(getRemarkId());
sb.append(",source:").append(getSource()); sb.append(",source:").append(getSource());
sb.append(",picUri:").append(getPicUri());
sb.append(",serverIndexCode:").append(getServerIndexCode());
return sb.toString(); return sb.toString();
} }
...@@ -483,6 +521,10 @@ public class StaffEntity extends StaffVo { ...@@ -483,6 +521,10 @@ public class StaffEntity extends StaffVo {
this.remarkId = ""; this.remarkId = "";
this.source = 2; this.source = 1;
this.picUri = "";
this.serverIndexCode = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
View file @ b5b610a3
...@@ -5,7 +5,7 @@ import java.util.List; ...@@ -5,7 +5,7 @@ import java.util.List;
* 员工基本信息查询对象 * 员工基本信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-14
*/ */
public class StaffQuery extends StaffEntity { public class StaffQuery extends StaffEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -244,6 +244,16 @@ public class StaffQuery extends StaffEntity { ...@@ -244,6 +244,16 @@ public class StaffQuery extends StaffEntity {
/** 员工来源(1.外部,2.内部)排除列表 */ /** 员工来源(1.外部,2.内部)排除列表 */
private List <Integer> sourceNotList; private List <Integer> sourceNotList;
/** 相对图片pic */
private List<String> picUriList;
/** 相对图片pic排除列表 */
private List <String> picUriNotList;
/** 图片资源唯一标识 */
private List<String> serverIndexCodeList;
/** 图片资源唯一标识排除列表 */
private List <String> serverIndexCodeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<StaffQuery> orConditionList; private List<StaffQuery> orConditionList;
...@@ -1574,6 +1584,70 @@ public class StaffQuery extends StaffEntity { ...@@ -1574,6 +1584,70 @@ public class StaffQuery extends StaffEntity {
} }
/**
* 获取 相对图片pic
* @return picUriList
*/
public List<String> getPicUriList(){
return this.picUriList;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public void setPicUriList(List<String> picUriList){
this.picUriList = picUriList;
}
/**
* 获取 相对图片pic
* @return picUriNotList
*/
public List<String> getPicUriNotList(){
return this.picUriNotList;
}
/**
* 设置 相对图片pic
* @param picUriNotList
*/
public void setPicUriNotList(List<String> picUriNotList){
this.picUriNotList = picUriNotList;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeList
*/
public List<String> getServerIndexCodeList(){
return this.serverIndexCodeList;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public void setServerIndexCodeList(List<String> serverIndexCodeList){
this.serverIndexCodeList = serverIndexCodeList;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeNotList
*/
public List<String> getServerIndexCodeNotList(){
return this.serverIndexCodeNotList;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeNotList
*/
public void setServerIndexCodeNotList(List<String> serverIndexCodeNotList){
this.serverIndexCodeNotList = serverIndexCodeNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2310,6 +2384,44 @@ public class StaffQuery extends StaffEntity { ...@@ -2310,6 +2384,44 @@ public class StaffQuery extends StaffEntity {
return this; return this;
} }
/**
* 设置 相对图片pic
* @param picUri
*/
public StaffQuery picUri(String picUri){
setPicUri(picUri);
return this;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public StaffQuery picUriList(List<String> picUriList){
this.picUriList = picUriList;
return this;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public StaffQuery serverIndexCode(String serverIndexCode){
setServerIndexCode(serverIndexCode);
return this;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public StaffQuery serverIndexCodeList(List<String> serverIndexCodeList){
this.serverIndexCodeList = serverIndexCodeList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java
View file @ b5b610a3
...@@ -18,5 +18,4 @@ public class StaffVo extends BaseEntityLong { ...@@ -18,5 +18,4 @@ public class StaffVo extends BaseEntityLong {
private List<StaffInfoVo>staffInfoVos; private List<StaffInfoVo>staffInfoVos;
private Integer personNum;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java
View file @ b5b610a3
...@@ -15,7 +15,6 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> { ...@@ -15,7 +15,6 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
StaffInfoVo queryAll(); StaffInfoVo queryAll();
int queryDeptNum(Long deptId);
int queryAllPerson(); int queryAllPerson();
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @ b5b610a3
...@@ -54,10 +54,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -54,10 +54,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
return staffInfoVo; return staffInfoVo;
} }
@Override
public int queryDeptNum(Long deptId) {
return staffDao.queryPersonNum(deptId);
}
@Override @Override
public int queryAllPerson() { public int queryAllPerson() {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @ b5b610a3
...@@ -4,6 +4,9 @@ import com.mortals.framework.exception.AppException; ...@@ -4,6 +4,9 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.model.DeptTreeSelect;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.job.model.JobQuery; import com.mortals.xhx.module.job.model.JobQuery;
import com.mortals.xhx.module.job.service.JobService; import com.mortals.xhx.module.job.service.JobService;
...@@ -50,7 +53,9 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -50,7 +53,9 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff","staffType")); this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff","staffType"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Staff","status")); this.addDict(model, "status", paramService.getParamBySecondOrganize("Staff","status"));
this.addDict(model, "positionId", jobService.find(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getJobName(),(o,n)->n))); this.addDict(model, "positionId", jobService.find(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getJobName(),(o,n)->n)));
List<DeptEntity> list = deptService.find(new DeptQuery());
List<DeptTreeSelect> treeSelects = deptService.buildDeptTreeSelect(list);
this.addDict(model,"deptPerson",treeSelects);
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ b5b610a3
...@@ -55,4 +55,11 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -55,4 +55,11 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
deptEntity.setWorkName(entity.getName()); deptEntity.setWorkName(entity.getName());
return super.saveAfter(entity, model, context); return super.saveAfter(entity, model, context);
} }
@Override
protected void saveBefore(WorkmanEntity entity, Map<String, Object> model, Context context) throws AppException {
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().id(entity.getDeptId()));
entity.setDeptName(deptEntity.getDeptName());
super.saveBefore(entity, model, context);
}
} }
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceLeaveRecordMapper.xml
View file @ b5b610a3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceLeaveRecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceLeaveRecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -500,13 +500,13 @@ ...@@ -500,13 +500,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -527,13 +527,13 @@ ...@@ -527,13 +527,13 @@
${_conditionType_} a.leavePersonId is null ${_conditionType_} a.leavePersonId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonIdList')"> <if test="conditionParamRef.containsKey('leavePersonIdList') and conditionParamRef.leavePersonIdList.size() > 0">
${_conditionType_} a.leavePersonId in ${_conditionType_} a.leavePersonId in
<foreach collection="conditionParamRef.leavePersonIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonIdNotList')"> <if test="conditionParamRef.containsKey('leavePersonIdNotList') and conditionParamRef.leavePersonIdNotList.size() > 0">
${_conditionType_} a.leavePersonId not in ${_conditionType_} a.leavePersonId not in
<foreach collection="conditionParamRef.leavePersonIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -555,13 +555,13 @@ ...@@ -555,13 +555,13 @@
${_conditionType_} a.leavePerson is null ${_conditionType_} a.leavePerson is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonList')"> <if test="conditionParamRef.containsKey('leavePersonList') and conditionParamRef.leavePersonList.size() > 0">
${_conditionType_} a.leavePerson in ${_conditionType_} a.leavePerson in
<foreach collection="conditionParamRef.leavePersonList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonNotList')"> <if test="conditionParamRef.containsKey('leavePersonNotList') and conditionParamRef.leavePersonNotList.size() > 0">
${_conditionType_} a.leavePerson not in ${_conditionType_} a.leavePerson not in
<foreach collection="conditionParamRef.leavePersonNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -575,13 +575,13 @@ ...@@ -575,13 +575,13 @@
${_conditionType_} a.deptId is null ${_conditionType_} a.deptId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdList')"> <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in ${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdNotList')"> <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in ${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -603,13 +603,13 @@ ...@@ -603,13 +603,13 @@
${_conditionType_} a.deptName is null ${_conditionType_} a.deptName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameList')"> <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in ${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameNotList')"> <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in ${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -624,13 +624,13 @@ ...@@ -624,13 +624,13 @@
${_conditionType_} a.phoneNumber is null ${_conditionType_} a.phoneNumber is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNumberList')"> <if test="conditionParamRef.containsKey('phoneNumberList') and conditionParamRef.phoneNumberList.size() > 0">
${_conditionType_} a.phoneNumber in ${_conditionType_} a.phoneNumber in
<foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNumberNotList')"> <if test="conditionParamRef.containsKey('phoneNumberNotList') and conditionParamRef.phoneNumberNotList.size() > 0">
${_conditionType_} a.phoneNumber not in ${_conditionType_} a.phoneNumber not in
<foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -644,13 +644,13 @@ ...@@ -644,13 +644,13 @@
${_conditionType_} a.leaveType is null ${_conditionType_} a.leaveType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leaveTypeList')"> <if test="conditionParamRef.containsKey('leaveTypeList') and conditionParamRef.leaveTypeList.size() > 0">
${_conditionType_} a.leaveType in ${_conditionType_} a.leaveType in
<foreach collection="conditionParamRef.leaveTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leaveTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leaveTypeNotList')"> <if test="conditionParamRef.containsKey('leaveTypeNotList') and conditionParamRef.leaveTypeNotList.size() > 0">
${_conditionType_} a.leaveType not in ${_conditionType_} a.leaveType not in
<foreach collection="conditionParamRef.leaveTypeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leaveTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -701,13 +701,13 @@ ...@@ -701,13 +701,13 @@
${_conditionType_} a.duration is null ${_conditionType_} a.duration is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('durationList')"> <if test="conditionParamRef.containsKey('durationList') and conditionParamRef.durationList.size() > 0">
${_conditionType_} a.duration in ${_conditionType_} a.duration in
<foreach collection="conditionParamRef.durationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.durationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('durationNotList')"> <if test="conditionParamRef.containsKey('durationNotList') and conditionParamRef.durationNotList.size() > 0">
${_conditionType_} a.duration not in ${_conditionType_} a.duration not in
<foreach collection="conditionParamRef.durationNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.durationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -729,13 +729,13 @@ ...@@ -729,13 +729,13 @@
${_conditionType_} a.reason is null ${_conditionType_} a.reason is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('reasonList')"> <if test="conditionParamRef.containsKey('reasonList') and conditionParamRef.reasonList.size() > 0">
${_conditionType_} a.reason in ${_conditionType_} a.reason in
<foreach collection="conditionParamRef.reasonList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.reasonList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('reasonNotList')"> <if test="conditionParamRef.containsKey('reasonNotList') and conditionParamRef.reasonNotList.size() > 0">
${_conditionType_} a.reason not in ${_conditionType_} a.reason not in
<foreach collection="conditionParamRef.reasonNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.reasonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -749,13 +749,13 @@ ...@@ -749,13 +749,13 @@
${_conditionType_} a.approverId is null ${_conditionType_} a.approverId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('approverIdList')"> <if test="conditionParamRef.containsKey('approverIdList') and conditionParamRef.approverIdList.size() > 0">
${_conditionType_} a.approverId in ${_conditionType_} a.approverId in
<foreach collection="conditionParamRef.approverIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('approverIdNotList')"> <if test="conditionParamRef.containsKey('approverIdNotList') and conditionParamRef.approverIdNotList.size() > 0">
${_conditionType_} a.approverId not in ${_conditionType_} a.approverId not in
<foreach collection="conditionParamRef.approverIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -777,13 +777,13 @@ ...@@ -777,13 +777,13 @@
${_conditionType_} a.approver is null ${_conditionType_} a.approver is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('approverList')"> <if test="conditionParamRef.containsKey('approverList') and conditionParamRef.approverList.size() > 0">
${_conditionType_} a.approver in ${_conditionType_} a.approver in
<foreach collection="conditionParamRef.approverList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('approverNotList')"> <if test="conditionParamRef.containsKey('approverNotList') and conditionParamRef.approverNotList.size() > 0">
${_conditionType_} a.approver not in ${_conditionType_} a.approver not in
<foreach collection="conditionParamRef.approverNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -798,13 +798,13 @@ ...@@ -798,13 +798,13 @@
${_conditionType_} a.attachment is null ${_conditionType_} a.attachment is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentList')"> <if test="conditionParamRef.containsKey('attachmentList') and conditionParamRef.attachmentList.size() > 0">
${_conditionType_} a.attachment in ${_conditionType_} a.attachment in
<foreach collection="conditionParamRef.attachmentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentNotList')"> <if test="conditionParamRef.containsKey('attachmentNotList') and conditionParamRef.attachmentNotList.size() > 0">
${_conditionType_} a.attachment not in ${_conditionType_} a.attachment not in
<foreach collection="conditionParamRef.attachmentNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -819,13 +819,13 @@ ...@@ -819,13 +819,13 @@
${_conditionType_} a.attachmentPath is null ${_conditionType_} a.attachmentPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentPathList')"> <if test="conditionParamRef.containsKey('attachmentPathList') and conditionParamRef.attachmentPathList.size() > 0">
${_conditionType_} a.attachmentPath in ${_conditionType_} a.attachmentPath in
<foreach collection="conditionParamRef.attachmentPathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentPathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentPathNotList')"> <if test="conditionParamRef.containsKey('attachmentPathNotList') and conditionParamRef.attachmentPathNotList.size() > 0">
${_conditionType_} a.attachmentPath not in ${_conditionType_} a.attachmentPath not in
<foreach collection="conditionParamRef.attachmentPathNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -840,13 +840,13 @@ ...@@ -840,13 +840,13 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList')"> <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -860,13 +860,13 @@ ...@@ -860,13 +860,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -902,13 +902,13 @@ ...@@ -902,13 +902,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordDetailMapper.xml
View file @ b5b610a3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceRecordDetailDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceRecordDetailDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="orderNum" column="orderNum" />
</resultMap> </resultMap>
...@@ -64,23 +65,26 @@ ...@@ -64,23 +65,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderNum') or colPickMode == 1 and data.containsKey('orderNum')))">
a.orderNum,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceRecordDetailEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceRecordDetailEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_record_detail insert into mortals_xhx_attendance_record_detail
(recordId,shiftsId,shiftsName,goWorkDate,goWorkResult,offWorkDate,offWorkResult,remark,createUserId,createTime,updateUserId,updateTime) (recordId,shiftsId,shiftsName,goWorkDate,goWorkResult,offWorkDate,offWorkResult,remark,createUserId,createTime,updateUserId,updateTime,orderNum)
VALUES VALUES
(#{recordId},#{shiftsId},#{shiftsName},#{goWorkDate},#{goWorkResult},#{offWorkDate},#{offWorkResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{shiftsId},#{shiftsName},#{goWorkDate},#{goWorkResult},#{offWorkDate},#{offWorkResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{orderNum})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_record_detail insert into mortals_xhx_attendance_record_detail
(recordId,shiftsId,shiftsName,goWorkDate,goWorkResult,offWorkDate,offWorkResult,remark,createUserId,createTime,updateUserId,updateTime) (recordId,shiftsId,shiftsName,goWorkDate,goWorkResult,offWorkDate,offWorkResult,remark,createUserId,createTime,updateUserId,updateTime,orderNum)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.shiftsId},#{item.shiftsName},#{item.goWorkDate},#{item.goWorkResult},#{item.offWorkDate},#{item.offWorkResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.shiftsId},#{item.shiftsName},#{item.goWorkDate},#{item.goWorkResult},#{item.offWorkDate},#{item.offWorkResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.orderNum})
</foreach> </foreach>
</insert> </insert>
...@@ -144,6 +148,12 @@ ...@@ -144,6 +148,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('orderNum')) or (colPickMode==1 and !data.containsKey('orderNum'))">
a.orderNum=#{data.orderNum},
</if>
<if test="(colPickMode==0 and data.containsKey('orderNumIncrement')) or (colPickMode==1 and !data.containsKey('orderNumIncrement'))">
a.orderNum=ifnull(a.orderNum,0) + #{data.orderNumIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -270,6 +280,18 @@ ...@@ -270,6 +280,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="orderNum=(case" suffix="ELSE orderNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('orderNum')) or (colPickMode==1 and !item.containsKey('orderNum'))">
when a.id=#{item.id} then #{item.orderNum}
</when>
<when test="(colPickMode==0 and item.containsKey('orderNumIncrement')) or (colPickMode==1 and !item.containsKey('orderNumIncrement'))">
when a.id=#{item.id} then ifnull(a.orderNum,0) + #{item.orderNumIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -677,6 +699,33 @@ ...@@ -677,6 +699,33 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('orderNum')">
<if test="conditionParamRef.orderNum != null ">
${_conditionType_} a.orderNum = #{${_conditionParam_}.orderNum}
</if>
<if test="conditionParamRef.orderNum == null">
${_conditionType_} a.orderNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('orderNumList')">
${_conditionType_} a.orderNum in
<foreach collection="conditionParamRef.orderNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orderNumNotList')">
${_conditionType_} a.orderNum not in
<foreach collection="conditionParamRef.orderNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orderNumStart') and conditionParamRef.orderNumStart != null">
${_conditionType_} a.orderNum <![CDATA[ >= ]]> #{${_conditionParam_}.orderNumStart}
</if>
<if test="conditionParamRef.containsKey('orderNumEnd') and conditionParamRef.orderNumEnd != null">
${_conditionType_} a.orderNum <![CDATA[ <= ]]> #{${_conditionParam_}.orderNumEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -755,6 +804,11 @@ ...@@ -755,6 +804,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('orderNum')">
a.orderNum
<if test='orderCol.orderNum != null and "DESC".equalsIgnoreCase(orderCol.orderNum)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordMapper.xml
View file @ b5b610a3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceRecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceRecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="orderNum" column="orderNum" />
</resultMap> </resultMap>
...@@ -104,7 +105,7 @@ ...@@ -104,7 +105,7 @@
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
b.id,b.recordId,b.shiftsId,b.shiftsName,b.goWorkDate,b.goWorkResult,b.offWorkDate,b.offWorkResult,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime, b.id,b.recordId,b.shiftsId,b.shiftsName,b.goWorkDate,b.goWorkResult,b.offWorkDate,b.offWorkResult,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.orderNum,
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapper.xml
View file @ b5b610a3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceStatDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceStatDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -46,6 +46,11 @@ ...@@ -46,6 +46,11 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="breastfeedingLeaveDays" column="breastfeedingLeaveDays" />
<result property="menstrualLeaveDays" column="menstrualLeaveDays" />
<result property="annualLeaveDays" column="annualLeaveDays" />
<result property="compensatedLeaveDays" column="compensatedLeaveDays" />
<result property="paternityLeaveDays" column="paternityLeaveDays" />
</resultMap> </resultMap>
...@@ -176,23 +181,38 @@ ...@@ -176,23 +181,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('breastfeedingLeaveDays') or colPickMode == 1 and data.containsKey('breastfeedingLeaveDays')))">
a.breastfeedingLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menstrualLeaveDays') or colPickMode == 1 and data.containsKey('menstrualLeaveDays')))">
a.menstrualLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annualLeaveDays') or colPickMode == 1 and data.containsKey('annualLeaveDays')))">
a.annualLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('compensatedLeaveDays') or colPickMode == 1 and data.containsKey('compensatedLeaveDays')))">
a.compensatedLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paternityLeaveDays') or colPickMode == 1 and data.containsKey('paternityLeaveDays')))">
a.paternityLeaveDays,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceStatEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceStatEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_stat insert into mortals_xhx_attendance_stat
(windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime) (windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime,breastfeedingLeaveDays,menstrualLeaveDays,annualLeaveDays,compensatedLeaveDays,paternityLeaveDays)
VALUES VALUES
(#{windowCategory},#{staffId},#{staffName},#{deptId},#{deptName},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{sickLeave},#{funeralLeave},#{marriageLeave},#{childRearingLeave},#{maternityLeave},#{transferBack},#{homeLeave},#{personalLeave},#{absenteeismDays},#{otherDays},#{attendanceRate},#{nonCompliancePunch},#{lateTimes},#{surfingMobileTimes},#{overtimeTimes},#{vacancy},#{nonStandardDressTimes},#{unexcusedMeetingAbsence},#{earlyLeaveMeeting},#{year},#{month},#{day},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{windowCategory},#{staffId},#{staffName},#{deptId},#{deptName},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{sickLeave},#{funeralLeave},#{marriageLeave},#{childRearingLeave},#{maternityLeave},#{transferBack},#{homeLeave},#{personalLeave},#{absenteeismDays},#{otherDays},#{attendanceRate},#{nonCompliancePunch},#{lateTimes},#{surfingMobileTimes},#{overtimeTimes},#{vacancy},#{nonStandardDressTimes},#{unexcusedMeetingAbsence},#{earlyLeaveMeeting},#{year},#{month},#{day},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{breastfeedingLeaveDays},#{menstrualLeaveDays},#{annualLeaveDays},#{compensatedLeaveDays},#{paternityLeaveDays})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_stat insert into mortals_xhx_attendance_stat
(windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime) (windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime,breastfeedingLeaveDays,menstrualLeaveDays,annualLeaveDays,compensatedLeaveDays,paternityLeaveDays)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.windowCategory},#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.sickLeave},#{item.funeralLeave},#{item.marriageLeave},#{item.childRearingLeave},#{item.maternityLeave},#{item.transferBack},#{item.homeLeave},#{item.personalLeave},#{item.absenteeismDays},#{item.otherDays},#{item.attendanceRate},#{item.nonCompliancePunch},#{item.lateTimes},#{item.surfingMobileTimes},#{item.overtimeTimes},#{item.vacancy},#{item.nonStandardDressTimes},#{item.unexcusedMeetingAbsence},#{item.earlyLeaveMeeting},#{item.year},#{item.month},#{item.day},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.windowCategory},#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.sickLeave},#{item.funeralLeave},#{item.marriageLeave},#{item.childRearingLeave},#{item.maternityLeave},#{item.transferBack},#{item.homeLeave},#{item.personalLeave},#{item.absenteeismDays},#{item.otherDays},#{item.attendanceRate},#{item.nonCompliancePunch},#{item.lateTimes},#{item.surfingMobileTimes},#{item.overtimeTimes},#{item.vacancy},#{item.nonStandardDressTimes},#{item.unexcusedMeetingAbsence},#{item.earlyLeaveMeeting},#{item.year},#{item.month},#{item.day},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.breastfeedingLeaveDays},#{item.menstrualLeaveDays},#{item.annualLeaveDays},#{item.compensatedLeaveDays},#{item.paternityLeaveDays})
</foreach> </foreach>
</insert> </insert>
...@@ -424,6 +444,36 @@ ...@@ -424,6 +444,36 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('breastfeedingLeaveDays')) or (colPickMode==1 and !data.containsKey('breastfeedingLeaveDays'))">
a.breastfeedingLeaveDays=#{data.breastfeedingLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('breastfeedingLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('breastfeedingLeaveDaysIncrement'))">
a.breastfeedingLeaveDays=ifnull(a.breastfeedingLeaveDays,0) + #{data.breastfeedingLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDays'))">
a.menstrualLeaveDays=#{data.menstrualLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('menstrualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDaysIncrement'))">
a.menstrualLeaveDays=ifnull(a.menstrualLeaveDays,0) + #{data.menstrualLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('annualLeaveDays')) or (colPickMode==1 and !data.containsKey('annualLeaveDays'))">
a.annualLeaveDays=#{data.annualLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('annualLeaveDaysIncrement'))">
a.annualLeaveDays=ifnull(a.annualLeaveDays,0) + #{data.annualLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('compensatedLeaveDays')) or (colPickMode==1 and !data.containsKey('compensatedLeaveDays'))">
a.compensatedLeaveDays=#{data.compensatedLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('compensatedLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('compensatedLeaveDaysIncrement'))">
a.compensatedLeaveDays=ifnull(a.compensatedLeaveDays,0) + #{data.compensatedLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('paternityLeaveDays')) or (colPickMode==1 and !data.containsKey('paternityLeaveDays'))">
a.paternityLeaveDays=#{data.paternityLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('paternityLeaveDaysIncrement'))">
a.paternityLeaveDays=ifnull(a.paternityLeaveDays,0) + #{data.paternityLeaveDaysIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -886,6 +936,66 @@ ...@@ -886,6 +936,66 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="breastfeedingLeaveDays=(case" suffix="ELSE breastfeedingLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('breastfeedingLeaveDays')) or (colPickMode==1 and !item.containsKey('breastfeedingLeaveDays'))">
when a.id=#{item.id} then #{item.breastfeedingLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('breastfeedingLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('breastfeedingLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.breastfeedingLeaveDays,0) + #{item.breastfeedingLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="menstrualLeaveDays=(case" suffix="ELSE menstrualLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !item.containsKey('menstrualLeaveDays'))">
when a.id=#{item.id} then #{item.menstrualLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('menstrualLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('menstrualLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.menstrualLeaveDays,0) + #{item.menstrualLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="annualLeaveDays=(case" suffix="ELSE annualLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('annualLeaveDays')) or (colPickMode==1 and !item.containsKey('annualLeaveDays'))">
when a.id=#{item.id} then #{item.annualLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('annualLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.annualLeaveDays,0) + #{item.annualLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="compensatedLeaveDays=(case" suffix="ELSE compensatedLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('compensatedLeaveDays')) or (colPickMode==1 and !item.containsKey('compensatedLeaveDays'))">
when a.id=#{item.id} then #{item.compensatedLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('compensatedLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('compensatedLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.compensatedLeaveDays,0) + #{item.compensatedLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="paternityLeaveDays=(case" suffix="ELSE paternityLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('paternityLeaveDays')) or (colPickMode==1 and !item.containsKey('paternityLeaveDays'))">
when a.id=#{item.id} then #{item.paternityLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('paternityLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.paternityLeaveDays,0) + #{item.paternityLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1010,13 +1120,13 @@ ...@@ -1010,13 +1120,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1038,13 +1148,13 @@ ...@@ -1038,13 +1148,13 @@
${_conditionType_} a.windowCategory is null ${_conditionType_} a.windowCategory is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('windowCategoryList')"> <if test="conditionParamRef.containsKey('windowCategoryList') and conditionParamRef.windowCategoryList.size() > 0">
${_conditionType_} a.windowCategory in ${_conditionType_} a.windowCategory in
<foreach collection="conditionParamRef.windowCategoryList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.windowCategoryList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('windowCategoryNotList')"> <if test="conditionParamRef.containsKey('windowCategoryNotList') and conditionParamRef.windowCategoryNotList.size() > 0">
${_conditionType_} a.windowCategory not in ${_conditionType_} a.windowCategory not in
<foreach collection="conditionParamRef.windowCategoryNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.windowCategoryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1058,13 +1168,13 @@ ...@@ -1058,13 +1168,13 @@
${_conditionType_} a.staffId is null ${_conditionType_} a.staffId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdList')"> <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
${_conditionType_} a.staffId in ${_conditionType_} a.staffId in
<foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdNotList')"> <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
${_conditionType_} a.staffId not in ${_conditionType_} a.staffId not in
<foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1086,13 +1196,13 @@ ...@@ -1086,13 +1196,13 @@
${_conditionType_} a.staffName is null ${_conditionType_} a.staffName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('staffNameList')"> <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
${_conditionType_} a.staffName in ${_conditionType_} a.staffName in
<foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffNameNotList')"> <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
${_conditionType_} a.staffName not in ${_conditionType_} a.staffName not in
<foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1106,13 +1216,13 @@ ...@@ -1106,13 +1216,13 @@
${_conditionType_} a.deptId is null ${_conditionType_} a.deptId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdList')"> <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in ${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdNotList')"> <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in ${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1134,13 +1244,13 @@ ...@@ -1134,13 +1244,13 @@
${_conditionType_} a.deptName is null ${_conditionType_} a.deptName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameList')"> <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in ${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameNotList')"> <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in ${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1154,13 +1264,13 @@ ...@@ -1154,13 +1264,13 @@
${_conditionType_} a.backToUnit is null ${_conditionType_} a.backToUnit is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('backToUnitList')"> <if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
${_conditionType_} a.backToUnit in ${_conditionType_} a.backToUnit in
<foreach collection="conditionParamRef.backToUnitList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.backToUnitList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('backToUnitNotList')"> <if test="conditionParamRef.containsKey('backToUnitNotList') and conditionParamRef.backToUnitNotList.size() > 0">
${_conditionType_} a.backToUnit not in ${_conditionType_} a.backToUnit not in
<foreach collection="conditionParamRef.backToUnitNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.backToUnitNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1181,13 +1291,13 @@ ...@@ -1181,13 +1291,13 @@
${_conditionType_} a.onDutyLeave is null ${_conditionType_} a.onDutyLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('onDutyLeaveList')"> <if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
${_conditionType_} a.onDutyLeave in ${_conditionType_} a.onDutyLeave in
<foreach collection="conditionParamRef.onDutyLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('onDutyLeaveNotList')"> <if test="conditionParamRef.containsKey('onDutyLeaveNotList') and conditionParamRef.onDutyLeaveNotList.size() > 0">
${_conditionType_} a.onDutyLeave not in ${_conditionType_} a.onDutyLeave not in
<foreach collection="conditionParamRef.onDutyLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1208,13 +1318,13 @@ ...@@ -1208,13 +1318,13 @@
${_conditionType_} a.outOfOffice is null ${_conditionType_} a.outOfOffice is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('outOfOfficeList')"> <if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
${_conditionType_} a.outOfOffice in ${_conditionType_} a.outOfOffice in
<foreach collection="conditionParamRef.outOfOfficeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.outOfOfficeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('outOfOfficeNotList')"> <if test="conditionParamRef.containsKey('outOfOfficeNotList') and conditionParamRef.outOfOfficeNotList.size() > 0">
${_conditionType_} a.outOfOffice not in ${_conditionType_} a.outOfOffice not in
<foreach collection="conditionParamRef.outOfOfficeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.outOfOfficeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1235,13 +1345,13 @@ ...@@ -1235,13 +1345,13 @@
${_conditionType_} a.shiftCompensation is null ${_conditionType_} a.shiftCompensation is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('shiftCompensationList')"> <if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
${_conditionType_} a.shiftCompensation in ${_conditionType_} a.shiftCompensation in
<foreach collection="conditionParamRef.shiftCompensationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.shiftCompensationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('shiftCompensationNotList')"> <if test="conditionParamRef.containsKey('shiftCompensationNotList') and conditionParamRef.shiftCompensationNotList.size() > 0">
${_conditionType_} a.shiftCompensation not in ${_conditionType_} a.shiftCompensation not in
<foreach collection="conditionParamRef.shiftCompensationNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.shiftCompensationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1262,13 +1372,13 @@ ...@@ -1262,13 +1372,13 @@
${_conditionType_} a.physicalExamination is null ${_conditionType_} a.physicalExamination is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('physicalExaminationList')"> <if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
${_conditionType_} a.physicalExamination in ${_conditionType_} a.physicalExamination in
<foreach collection="conditionParamRef.physicalExaminationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.physicalExaminationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('physicalExaminationNotList')"> <if test="conditionParamRef.containsKey('physicalExaminationNotList') and conditionParamRef.physicalExaminationNotList.size() > 0">
${_conditionType_} a.physicalExamination not in ${_conditionType_} a.physicalExamination not in
<foreach collection="conditionParamRef.physicalExaminationNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.physicalExaminationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1289,13 +1399,13 @@ ...@@ -1289,13 +1399,13 @@
${_conditionType_} a.quarantine is null ${_conditionType_} a.quarantine is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('quarantineList')"> <if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
${_conditionType_} a.quarantine in ${_conditionType_} a.quarantine in
<foreach collection="conditionParamRef.quarantineList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.quarantineList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('quarantineNotList')"> <if test="conditionParamRef.containsKey('quarantineNotList') and conditionParamRef.quarantineNotList.size() > 0">
${_conditionType_} a.quarantine not in ${_conditionType_} a.quarantine not in
<foreach collection="conditionParamRef.quarantineNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.quarantineNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1316,13 +1426,13 @@ ...@@ -1316,13 +1426,13 @@
${_conditionType_} a.businessTrip is null ${_conditionType_} a.businessTrip is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('businessTripList')"> <if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
${_conditionType_} a.businessTrip in ${_conditionType_} a.businessTrip in
<foreach collection="conditionParamRef.businessTripList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.businessTripList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('businessTripNotList')"> <if test="conditionParamRef.containsKey('businessTripNotList') and conditionParamRef.businessTripNotList.size() > 0">
${_conditionType_} a.businessTrip not in ${_conditionType_} a.businessTrip not in
<foreach collection="conditionParamRef.businessTripNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.businessTripNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1343,13 +1453,13 @@ ...@@ -1343,13 +1453,13 @@
${_conditionType_} a.publicHoliday is null ${_conditionType_} a.publicHoliday is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('publicHolidayList')"> <if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
${_conditionType_} a.publicHoliday in ${_conditionType_} a.publicHoliday in
<foreach collection="conditionParamRef.publicHolidayList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.publicHolidayList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('publicHolidayNotList')"> <if test="conditionParamRef.containsKey('publicHolidayNotList') and conditionParamRef.publicHolidayNotList.size() > 0">
${_conditionType_} a.publicHoliday not in ${_conditionType_} a.publicHoliday not in
<foreach collection="conditionParamRef.publicHolidayNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.publicHolidayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1370,13 +1480,13 @@ ...@@ -1370,13 +1480,13 @@
${_conditionType_} a.sickLeave is null ${_conditionType_} a.sickLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sickLeaveList')"> <if test="conditionParamRef.containsKey('sickLeaveList') and conditionParamRef.sickLeaveList.size() > 0">
${_conditionType_} a.sickLeave in ${_conditionType_} a.sickLeave in
<foreach collection="conditionParamRef.sickLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sickLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sickLeaveNotList')"> <if test="conditionParamRef.containsKey('sickLeaveNotList') and conditionParamRef.sickLeaveNotList.size() > 0">
${_conditionType_} a.sickLeave not in ${_conditionType_} a.sickLeave not in
<foreach collection="conditionParamRef.sickLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sickLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1397,13 +1507,13 @@ ...@@ -1397,13 +1507,13 @@
${_conditionType_} a.funeralLeave is null ${_conditionType_} a.funeralLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('funeralLeaveList')"> <if test="conditionParamRef.containsKey('funeralLeaveList') and conditionParamRef.funeralLeaveList.size() > 0">
${_conditionType_} a.funeralLeave in ${_conditionType_} a.funeralLeave in
<foreach collection="conditionParamRef.funeralLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.funeralLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('funeralLeaveNotList')"> <if test="conditionParamRef.containsKey('funeralLeaveNotList') and conditionParamRef.funeralLeaveNotList.size() > 0">
${_conditionType_} a.funeralLeave not in ${_conditionType_} a.funeralLeave not in
<foreach collection="conditionParamRef.funeralLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.funeralLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1424,13 +1534,13 @@ ...@@ -1424,13 +1534,13 @@
${_conditionType_} a.marriageLeave is null ${_conditionType_} a.marriageLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveList')"> <if test="conditionParamRef.containsKey('marriageLeaveList') and conditionParamRef.marriageLeaveList.size() > 0">
${_conditionType_} a.marriageLeave in ${_conditionType_} a.marriageLeave in
<foreach collection="conditionParamRef.marriageLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.marriageLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveNotList')"> <if test="conditionParamRef.containsKey('marriageLeaveNotList') and conditionParamRef.marriageLeaveNotList.size() > 0">
${_conditionType_} a.marriageLeave not in ${_conditionType_} a.marriageLeave not in
<foreach collection="conditionParamRef.marriageLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.marriageLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1451,13 +1561,13 @@ ...@@ -1451,13 +1561,13 @@
${_conditionType_} a.childRearingLeave is null ${_conditionType_} a.childRearingLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('childRearingLeaveList')"> <if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
${_conditionType_} a.childRearingLeave in ${_conditionType_} a.childRearingLeave in
<foreach collection="conditionParamRef.childRearingLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.childRearingLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('childRearingLeaveNotList')"> <if test="conditionParamRef.containsKey('childRearingLeaveNotList') and conditionParamRef.childRearingLeaveNotList.size() > 0">
${_conditionType_} a.childRearingLeave not in ${_conditionType_} a.childRearingLeave not in
<foreach collection="conditionParamRef.childRearingLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.childRearingLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1478,13 +1588,13 @@ ...@@ -1478,13 +1588,13 @@
${_conditionType_} a.maternityLeave is null ${_conditionType_} a.maternityLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveList')"> <if test="conditionParamRef.containsKey('maternityLeaveList') and conditionParamRef.maternityLeaveList.size() > 0">
${_conditionType_} a.maternityLeave in ${_conditionType_} a.maternityLeave in
<foreach collection="conditionParamRef.maternityLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.maternityLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveNotList')"> <if test="conditionParamRef.containsKey('maternityLeaveNotList') and conditionParamRef.maternityLeaveNotList.size() > 0">
${_conditionType_} a.maternityLeave not in ${_conditionType_} a.maternityLeave not in
<foreach collection="conditionParamRef.maternityLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.maternityLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1505,13 +1615,13 @@ ...@@ -1505,13 +1615,13 @@
${_conditionType_} a.transferBack is null ${_conditionType_} a.transferBack is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('transferBackList')"> <if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
${_conditionType_} a.transferBack in ${_conditionType_} a.transferBack in
<foreach collection="conditionParamRef.transferBackList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.transferBackList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('transferBackNotList')"> <if test="conditionParamRef.containsKey('transferBackNotList') and conditionParamRef.transferBackNotList.size() > 0">
${_conditionType_} a.transferBack not in ${_conditionType_} a.transferBack not in
<foreach collection="conditionParamRef.transferBackNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.transferBackNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1532,13 +1642,13 @@ ...@@ -1532,13 +1642,13 @@
${_conditionType_} a.homeLeave is null ${_conditionType_} a.homeLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('homeLeaveList')"> <if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
${_conditionType_} a.homeLeave in ${_conditionType_} a.homeLeave in
<foreach collection="conditionParamRef.homeLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.homeLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('homeLeaveNotList')"> <if test="conditionParamRef.containsKey('homeLeaveNotList') and conditionParamRef.homeLeaveNotList.size() > 0">
${_conditionType_} a.homeLeave not in ${_conditionType_} a.homeLeave not in
<foreach collection="conditionParamRef.homeLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.homeLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1559,13 +1669,13 @@ ...@@ -1559,13 +1669,13 @@
${_conditionType_} a.personalLeave is null ${_conditionType_} a.personalLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('personalLeaveList')"> <if test="conditionParamRef.containsKey('personalLeaveList') and conditionParamRef.personalLeaveList.size() > 0">
${_conditionType_} a.personalLeave in ${_conditionType_} a.personalLeave in
<foreach collection="conditionParamRef.personalLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.personalLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('personalLeaveNotList')"> <if test="conditionParamRef.containsKey('personalLeaveNotList') and conditionParamRef.personalLeaveNotList.size() > 0">
${_conditionType_} a.personalLeave not in ${_conditionType_} a.personalLeave not in
<foreach collection="conditionParamRef.personalLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.personalLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1586,13 +1696,13 @@ ...@@ -1586,13 +1696,13 @@
${_conditionType_} a.absenteeismDays is null ${_conditionType_} a.absenteeismDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('absenteeismDaysList')"> <if test="conditionParamRef.containsKey('absenteeismDaysList') and conditionParamRef.absenteeismDaysList.size() > 0">
${_conditionType_} a.absenteeismDays in ${_conditionType_} a.absenteeismDays in
<foreach collection="conditionParamRef.absenteeismDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.absenteeismDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('absenteeismDaysNotList')"> <if test="conditionParamRef.containsKey('absenteeismDaysNotList') and conditionParamRef.absenteeismDaysNotList.size() > 0">
${_conditionType_} a.absenteeismDays not in ${_conditionType_} a.absenteeismDays not in
<foreach collection="conditionParamRef.absenteeismDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.absenteeismDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1613,13 +1723,13 @@ ...@@ -1613,13 +1723,13 @@
${_conditionType_} a.otherDays is null ${_conditionType_} a.otherDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('otherDaysList')"> <if test="conditionParamRef.containsKey('otherDaysList') and conditionParamRef.otherDaysList.size() > 0">
${_conditionType_} a.otherDays in ${_conditionType_} a.otherDays in
<foreach collection="conditionParamRef.otherDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.otherDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('otherDaysNotList')"> <if test="conditionParamRef.containsKey('otherDaysNotList') and conditionParamRef.otherDaysNotList.size() > 0">
${_conditionType_} a.otherDays not in ${_conditionType_} a.otherDays not in
<foreach collection="conditionParamRef.otherDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.otherDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1640,13 +1750,13 @@ ...@@ -1640,13 +1750,13 @@
${_conditionType_} a.attendanceRate is null ${_conditionType_} a.attendanceRate is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('attendanceRateList')"> <if test="conditionParamRef.containsKey('attendanceRateList') and conditionParamRef.attendanceRateList.size() > 0">
${_conditionType_} a.attendanceRate in ${_conditionType_} a.attendanceRate in
<foreach collection="conditionParamRef.attendanceRateList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attendanceRateList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('attendanceRateNotList')"> <if test="conditionParamRef.containsKey('attendanceRateNotList') and conditionParamRef.attendanceRateNotList.size() > 0">
${_conditionType_} a.attendanceRate not in ${_conditionType_} a.attendanceRate not in
<foreach collection="conditionParamRef.attendanceRateNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attendanceRateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1667,13 +1777,13 @@ ...@@ -1667,13 +1777,13 @@
${_conditionType_} a.nonCompliancePunch is null ${_conditionType_} a.nonCompliancePunch is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nonCompliancePunchList')"> <if test="conditionParamRef.containsKey('nonCompliancePunchList') and conditionParamRef.nonCompliancePunchList.size() > 0">
${_conditionType_} a.nonCompliancePunch in ${_conditionType_} a.nonCompliancePunch in
<foreach collection="conditionParamRef.nonCompliancePunchList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonCompliancePunchList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nonCompliancePunchNotList')"> <if test="conditionParamRef.containsKey('nonCompliancePunchNotList') and conditionParamRef.nonCompliancePunchNotList.size() > 0">
${_conditionType_} a.nonCompliancePunch not in ${_conditionType_} a.nonCompliancePunch not in
<foreach collection="conditionParamRef.nonCompliancePunchNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonCompliancePunchNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1694,13 +1804,13 @@ ...@@ -1694,13 +1804,13 @@
${_conditionType_} a.lateTimes is null ${_conditionType_} a.lateTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('lateTimesList')"> <if test="conditionParamRef.containsKey('lateTimesList') and conditionParamRef.lateTimesList.size() > 0">
${_conditionType_} a.lateTimes in ${_conditionType_} a.lateTimes in
<foreach collection="conditionParamRef.lateTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lateTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('lateTimesNotList')"> <if test="conditionParamRef.containsKey('lateTimesNotList') and conditionParamRef.lateTimesNotList.size() > 0">
${_conditionType_} a.lateTimes not in ${_conditionType_} a.lateTimes not in
<foreach collection="conditionParamRef.lateTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lateTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1721,13 +1831,13 @@ ...@@ -1721,13 +1831,13 @@
${_conditionType_} a.surfingMobileTimes is null ${_conditionType_} a.surfingMobileTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('surfingMobileTimesList')"> <if test="conditionParamRef.containsKey('surfingMobileTimesList') and conditionParamRef.surfingMobileTimesList.size() > 0">
${_conditionType_} a.surfingMobileTimes in ${_conditionType_} a.surfingMobileTimes in
<foreach collection="conditionParamRef.surfingMobileTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.surfingMobileTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('surfingMobileTimesNotList')"> <if test="conditionParamRef.containsKey('surfingMobileTimesNotList') and conditionParamRef.surfingMobileTimesNotList.size() > 0">
${_conditionType_} a.surfingMobileTimes not in ${_conditionType_} a.surfingMobileTimes not in
<foreach collection="conditionParamRef.surfingMobileTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.surfingMobileTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1748,13 +1858,13 @@ ...@@ -1748,13 +1858,13 @@
${_conditionType_} a.overtimeTimes is null ${_conditionType_} a.overtimeTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('overtimeTimesList')"> <if test="conditionParamRef.containsKey('overtimeTimesList') and conditionParamRef.overtimeTimesList.size() > 0">
${_conditionType_} a.overtimeTimes in ${_conditionType_} a.overtimeTimes in
<foreach collection="conditionParamRef.overtimeTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.overtimeTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('overtimeTimesNotList')"> <if test="conditionParamRef.containsKey('overtimeTimesNotList') and conditionParamRef.overtimeTimesNotList.size() > 0">
${_conditionType_} a.overtimeTimes not in ${_conditionType_} a.overtimeTimes not in
<foreach collection="conditionParamRef.overtimeTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.overtimeTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1775,13 +1885,13 @@ ...@@ -1775,13 +1885,13 @@
${_conditionType_} a.vacancy is null ${_conditionType_} a.vacancy is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('vacancyList')"> <if test="conditionParamRef.containsKey('vacancyList') and conditionParamRef.vacancyList.size() > 0">
${_conditionType_} a.vacancy in ${_conditionType_} a.vacancy in
<foreach collection="conditionParamRef.vacancyList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.vacancyList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('vacancyNotList')"> <if test="conditionParamRef.containsKey('vacancyNotList') and conditionParamRef.vacancyNotList.size() > 0">
${_conditionType_} a.vacancy not in ${_conditionType_} a.vacancy not in
<foreach collection="conditionParamRef.vacancyNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.vacancyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1802,13 +1912,13 @@ ...@@ -1802,13 +1912,13 @@
${_conditionType_} a.nonStandardDressTimes is null ${_conditionType_} a.nonStandardDressTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nonStandardDressTimesList')"> <if test="conditionParamRef.containsKey('nonStandardDressTimesList') and conditionParamRef.nonStandardDressTimesList.size() > 0">
${_conditionType_} a.nonStandardDressTimes in ${_conditionType_} a.nonStandardDressTimes in
<foreach collection="conditionParamRef.nonStandardDressTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonStandardDressTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nonStandardDressTimesNotList')"> <if test="conditionParamRef.containsKey('nonStandardDressTimesNotList') and conditionParamRef.nonStandardDressTimesNotList.size() > 0">
${_conditionType_} a.nonStandardDressTimes not in ${_conditionType_} a.nonStandardDressTimes not in
<foreach collection="conditionParamRef.nonStandardDressTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonStandardDressTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1829,13 +1939,13 @@ ...@@ -1829,13 +1939,13 @@
${_conditionType_} a.unexcusedMeetingAbsence is null ${_conditionType_} a.unexcusedMeetingAbsence is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceList')"> <if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceList') and conditionParamRef.unexcusedMeetingAbsenceList.size() > 0">
${_conditionType_} a.unexcusedMeetingAbsence in ${_conditionType_} a.unexcusedMeetingAbsence in
<foreach collection="conditionParamRef.unexcusedMeetingAbsenceList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.unexcusedMeetingAbsenceList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceNotList')"> <if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceNotList') and conditionParamRef.unexcusedMeetingAbsenceNotList.size() > 0">
${_conditionType_} a.unexcusedMeetingAbsence not in ${_conditionType_} a.unexcusedMeetingAbsence not in
<foreach collection="conditionParamRef.unexcusedMeetingAbsenceNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.unexcusedMeetingAbsenceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1856,13 +1966,13 @@ ...@@ -1856,13 +1966,13 @@
${_conditionType_} a.earlyLeaveMeeting is null ${_conditionType_} a.earlyLeaveMeeting is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('earlyLeaveMeetingList')"> <if test="conditionParamRef.containsKey('earlyLeaveMeetingList') and conditionParamRef.earlyLeaveMeetingList.size() > 0">
${_conditionType_} a.earlyLeaveMeeting in ${_conditionType_} a.earlyLeaveMeeting in
<foreach collection="conditionParamRef.earlyLeaveMeetingList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.earlyLeaveMeetingList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('earlyLeaveMeetingNotList')"> <if test="conditionParamRef.containsKey('earlyLeaveMeetingNotList') and conditionParamRef.earlyLeaveMeetingNotList.size() > 0">
${_conditionType_} a.earlyLeaveMeeting not in ${_conditionType_} a.earlyLeaveMeeting not in
<foreach collection="conditionParamRef.earlyLeaveMeetingNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.earlyLeaveMeetingNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1883,13 +1993,13 @@ ...@@ -1883,13 +1993,13 @@
${_conditionType_} a.year is null ${_conditionType_} a.year is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('yearList')"> <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
${_conditionType_} a.year in ${_conditionType_} a.year in
<foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('yearNotList')"> <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
${_conditionType_} a.year not in ${_conditionType_} a.year not in
<foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1910,13 +2020,13 @@ ...@@ -1910,13 +2020,13 @@
${_conditionType_} a.month is null ${_conditionType_} a.month is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('monthList')"> <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
${_conditionType_} a.month in ${_conditionType_} a.month in
<foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('monthNotList')"> <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
${_conditionType_} a.month not in ${_conditionType_} a.month not in
<foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1937,13 +2047,13 @@ ...@@ -1937,13 +2047,13 @@
${_conditionType_} a.day is null ${_conditionType_} a.day is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dayList')"> <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
${_conditionType_} a.day in ${_conditionType_} a.day in
<foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('dayNotList')"> <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
${_conditionType_} a.day not in ${_conditionType_} a.day not in
<foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1965,13 +2075,13 @@ ...@@ -1965,13 +2075,13 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList')"> <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1985,13 +2095,13 @@ ...@@ -1985,13 +2095,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -2027,13 +2137,13 @@ ...@@ -2027,13 +2137,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -2061,6 +2171,141 @@ ...@@ -2061,6 +2171,141 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDays')">
<if test="conditionParamRef.breastfeedingLeaveDays != null ">
${_conditionType_} a.breastfeedingLeaveDays = #{${_conditionParam_}.breastfeedingLeaveDays}
</if>
<if test="conditionParamRef.breastfeedingLeaveDays == null">
${_conditionType_} a.breastfeedingLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysList') and conditionParamRef.breastfeedingLeaveDaysList.size() > 0">
${_conditionType_} a.breastfeedingLeaveDays in
<foreach collection="conditionParamRef.breastfeedingLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysNotList') and conditionParamRef.breastfeedingLeaveDaysNotList.size() > 0">
${_conditionType_} a.breastfeedingLeaveDays not in
<foreach collection="conditionParamRef.breastfeedingLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysStart') and conditionParamRef.breastfeedingLeaveDaysStart != null">
${_conditionType_} a.breastfeedingLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.breastfeedingLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysEnd') and conditionParamRef.breastfeedingLeaveDaysEnd != null">
${_conditionType_} a.breastfeedingLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.breastfeedingLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDays')">
<if test="conditionParamRef.menstrualLeaveDays != null ">
${_conditionType_} a.menstrualLeaveDays = #{${_conditionParam_}.menstrualLeaveDays}
</if>
<if test="conditionParamRef.menstrualLeaveDays == null">
${_conditionType_} a.menstrualLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysList') and conditionParamRef.menstrualLeaveDaysList.size() > 0">
${_conditionType_} a.menstrualLeaveDays in
<foreach collection="conditionParamRef.menstrualLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysNotList') and conditionParamRef.menstrualLeaveDaysNotList.size() > 0">
${_conditionType_} a.menstrualLeaveDays not in
<foreach collection="conditionParamRef.menstrualLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysStart') and conditionParamRef.menstrualLeaveDaysStart != null">
${_conditionType_} a.menstrualLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.menstrualLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysEnd') and conditionParamRef.menstrualLeaveDaysEnd != null">
${_conditionType_} a.menstrualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.menstrualLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('annualLeaveDays')">
<if test="conditionParamRef.annualLeaveDays != null ">
${_conditionType_} a.annualLeaveDays = #{${_conditionParam_}.annualLeaveDays}
</if>
<if test="conditionParamRef.annualLeaveDays == null">
${_conditionType_} a.annualLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
${_conditionType_} a.annualLeaveDays in
<foreach collection="conditionParamRef.annualLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysNotList') and conditionParamRef.annualLeaveDaysNotList.size() > 0">
${_conditionType_} a.annualLeaveDays not in
<foreach collection="conditionParamRef.annualLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysStart') and conditionParamRef.annualLeaveDaysStart != null">
${_conditionType_} a.annualLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.annualLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysEnd') and conditionParamRef.annualLeaveDaysEnd != null">
${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDays')">
<if test="conditionParamRef.compensatedLeaveDays != null ">
${_conditionType_} a.compensatedLeaveDays = #{${_conditionParam_}.compensatedLeaveDays}
</if>
<if test="conditionParamRef.compensatedLeaveDays == null">
${_conditionType_} a.compensatedLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
${_conditionType_} a.compensatedLeaveDays in
<foreach collection="conditionParamRef.compensatedLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysNotList') and conditionParamRef.compensatedLeaveDaysNotList.size() > 0">
${_conditionType_} a.compensatedLeaveDays not in
<foreach collection="conditionParamRef.compensatedLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysStart') and conditionParamRef.compensatedLeaveDaysStart != null">
${_conditionType_} a.compensatedLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.compensatedLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysEnd') and conditionParamRef.compensatedLeaveDaysEnd != null">
${_conditionType_} a.compensatedLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.compensatedLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDays')">
<if test="conditionParamRef.paternityLeaveDays != null ">
${_conditionType_} a.paternityLeaveDays = #{${_conditionParam_}.paternityLeaveDays}
</if>
<if test="conditionParamRef.paternityLeaveDays == null">
${_conditionType_} a.paternityLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysList') and conditionParamRef.paternityLeaveDaysList.size() > 0">
${_conditionType_} a.paternityLeaveDays in
<foreach collection="conditionParamRef.paternityLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysNotList') and conditionParamRef.paternityLeaveDaysNotList.size() > 0">
${_conditionType_} a.paternityLeaveDays not in
<foreach collection="conditionParamRef.paternityLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysStart') and conditionParamRef.paternityLeaveDaysStart != null">
${_conditionType_} a.paternityLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.paternityLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysEnd') and conditionParamRef.paternityLeaveDaysEnd != null">
${_conditionType_} a.paternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.paternityLeaveDaysEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -2279,6 +2524,31 @@ ...@@ -2279,6 +2524,31 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('breastfeedingLeaveDays')">
a.breastfeedingLeaveDays
<if test='orderCol.breastfeedingLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.breastfeedingLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('menstrualLeaveDays')">
a.menstrualLeaveDays
<if test='orderCol.menstrualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.menstrualLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('annualLeaveDays')">
a.annualLeaveDays
<if test='orderCol.annualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.annualLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('compensatedLeaveDays')">
a.compensatedLeaveDays
<if test='orderCol.compensatedLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.compensatedLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paternityLeaveDays')">
a.paternityLeaveDays
<if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
...@@ -2292,4 +2562,7 @@ ...@@ -2292,4 +2562,7 @@
</trim> </trim>
</if> </if>
</sql> </sql>
<select id="queryEntity" resultType="com.mortals.xhx.module.attendance.model.AttendanceStatEntity">
select * from mortals_xhx_attendance_vacation_balance where staffId = #{staffId}
</select>
</mapper> </mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationBalanceMapper.xml
View file @ b5b610a3
...@@ -15,17 +15,28 @@ ...@@ -15,17 +15,28 @@
<result property="compensatedLeaveDays" column="compensatedLeaveDays" /> <result property="compensatedLeaveDays" column="compensatedLeaveDays" />
<result property="sickLeaveDays" column="sickLeaveDays" /> <result property="sickLeaveDays" column="sickLeaveDays" />
<result property="annualLeaveDays" column="annualLeaveDays" /> <result property="annualLeaveDays" column="annualLeaveDays" />
<result property="maternityLeaveDays" column="maternityLeaveDays" />
<result property="paternityLeaveDays" column="paternityLeaveDays" />
<result property="marriageLeaveDays" column="marriageLeaveDays" /> <result property="marriageLeaveDays" column="marriageLeaveDays" />
<result property="menstrualLeaveDays" column="menstrualLeaveDays" />
<result property="breastfeedingLeaveDays" column="breastfeedingLeaveDays" />
<result property="bereavementLeaveDays" column="bereavementLeaveDays" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="maternityLeaveDays" column="maternityLeaveDays" />
<result property="paternityLeaveDays" column="paternityLeaveDays" />
<result property="menstrualLeaveDays" column="menstrualLeaveDays" />
<result property="breastfeedingLeaveDays" column="breastfeedingLeaveDays" />
<result property="bereavementLeaveDays" column="bereavementLeaveDays" />
<result property="backToUnit" column="backToUnit" />
<result property="onDutyLeave" column="onDutyLeave" />
<result property="outOfOffice" column="outOfOffice" />
<result property="shiftCompensation" column="shiftCompensation" />
<result property="physicalExamination" column="physicalExamination" />
<result property="quarantine" column="quarantine" />
<result property="businessTrip" column="businessTrip" />
<result property="publicHoliday" column="publicHoliday" />
<result property="childRearingLeave" column="childRearingLeave" />
<result property="transferBack" column="transferBack" />
<result property="homeLeave" column="homeLeave" />
</resultMap> </resultMap>
...@@ -63,15 +74,30 @@ ...@@ -63,15 +74,30 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annualLeaveDays') or colPickMode == 1 and data.containsKey('annualLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annualLeaveDays') or colPickMode == 1 and data.containsKey('annualLeaveDays')))">
a.annualLeaveDays, a.annualLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('marriageLeaveDays') or colPickMode == 1 and data.containsKey('marriageLeaveDays')))">
a.marriageLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('maternityLeaveDays') or colPickMode == 1 and data.containsKey('maternityLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('maternityLeaveDays') or colPickMode == 1 and data.containsKey('maternityLeaveDays')))">
a.maternityLeaveDays, a.maternityLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paternityLeaveDays') or colPickMode == 1 and data.containsKey('paternityLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paternityLeaveDays') or colPickMode == 1 and data.containsKey('paternityLeaveDays')))">
a.paternityLeaveDays, a.paternityLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('marriageLeaveDays') or colPickMode == 1 and data.containsKey('marriageLeaveDays')))">
a.marriageLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menstrualLeaveDays') or colPickMode == 1 and data.containsKey('menstrualLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menstrualLeaveDays') or colPickMode == 1 and data.containsKey('menstrualLeaveDays')))">
a.menstrualLeaveDays, a.menstrualLeaveDays,
</if> </if>
...@@ -81,38 +107,56 @@ ...@@ -81,38 +107,56 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bereavementLeaveDays') or colPickMode == 1 and data.containsKey('bereavementLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bereavementLeaveDays') or colPickMode == 1 and data.containsKey('bereavementLeaveDays')))">
a.bereavementLeaveDays, a.bereavementLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('backToUnit') or colPickMode == 1 and data.containsKey('backToUnit')))">
a.remark, a.backToUnit,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onDutyLeave') or colPickMode == 1 and data.containsKey('onDutyLeave')))">
a.createUserId, a.onDutyLeave,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('outOfOffice') or colPickMode == 1 and data.containsKey('outOfOffice')))">
a.createTime, a.outOfOffice,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shiftCompensation') or colPickMode == 1 and data.containsKey('shiftCompensation')))">
a.updateUserId, a.shiftCompensation,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('physicalExamination') or colPickMode == 1 and data.containsKey('physicalExamination')))">
a.updateTime, a.physicalExamination,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('quarantine') or colPickMode == 1 and data.containsKey('quarantine')))">
a.quarantine,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessTrip') or colPickMode == 1 and data.containsKey('businessTrip')))">
a.businessTrip,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('publicHoliday') or colPickMode == 1 and data.containsKey('publicHoliday')))">
a.publicHoliday,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('childRearingLeave') or colPickMode == 1 and data.containsKey('childRearingLeave')))">
a.childRearingLeave,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('transferBack') or colPickMode == 1 and data.containsKey('transferBack')))">
a.transferBack,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('homeLeave') or colPickMode == 1 and data.containsKey('homeLeave')))">
a.homeLeave,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceVacationBalanceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceVacationBalanceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_vacation_balance insert into mortals_xhx_attendance_vacation_balance
(staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,maternityLeaveDays,paternityLeaveDays,marriageLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave)
VALUES VALUES
(#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{maternityLeaveDays},#{paternityLeaveDays},#{marriageLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{marriageLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{maternityLeaveDays},#{paternityLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{childRearingLeave},#{transferBack},#{homeLeave})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_vacation_balance insert into mortals_xhx_attendance_vacation_balance
(staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,maternityLeaveDays,paternityLeaveDays,marriageLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.entryTime},#{item.personalLeaveDays},#{item.compensatedLeaveDays},#{item.sickLeaveDays},#{item.annualLeaveDays},#{item.maternityLeaveDays},#{item.paternityLeaveDays},#{item.marriageLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.entryTime},#{item.personalLeaveDays},#{item.compensatedLeaveDays},#{item.sickLeaveDays},#{item.annualLeaveDays},#{item.marriageLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.maternityLeaveDays},#{item.paternityLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.childRearingLeave},#{item.transferBack},#{item.homeLeave})
</foreach> </foreach>
</insert> </insert>
...@@ -167,6 +211,33 @@ ...@@ -167,6 +211,33 @@
<if test="(colPickMode==0 and data.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('annualLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('annualLeaveDaysIncrement'))">
a.annualLeaveDays=ifnull(a.annualLeaveDays,0) + #{data.annualLeaveDaysIncrement}, a.annualLeaveDays=ifnull(a.annualLeaveDays,0) + #{data.annualLeaveDaysIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDays')) or (colPickMode==1 and !data.containsKey('marriageLeaveDays'))">
a.marriageLeaveDays=#{data.marriageLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('marriageLeaveDaysIncrement'))">
a.marriageLeaveDays=ifnull(a.marriageLeaveDays,0) + #{data.marriageLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('maternityLeaveDays')) or (colPickMode==1 and !data.containsKey('maternityLeaveDays'))"> <if test="(colPickMode==0 and data.containsKey('maternityLeaveDays')) or (colPickMode==1 and !data.containsKey('maternityLeaveDays'))">
a.maternityLeaveDays=#{data.maternityLeaveDays}, a.maternityLeaveDays=#{data.maternityLeaveDays},
</if> </if>
...@@ -179,12 +250,6 @@ ...@@ -179,12 +250,6 @@
<if test="(colPickMode==0 and data.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('paternityLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('paternityLeaveDaysIncrement'))">
a.paternityLeaveDays=ifnull(a.paternityLeaveDays,0) + #{data.paternityLeaveDaysIncrement}, a.paternityLeaveDays=ifnull(a.paternityLeaveDays,0) + #{data.paternityLeaveDaysIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDays')) or (colPickMode==1 and !data.containsKey('marriageLeaveDays'))">
a.marriageLeaveDays=#{data.marriageLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('marriageLeaveDaysIncrement'))">
a.marriageLeaveDays=ifnull(a.marriageLeaveDays,0) + #{data.marriageLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDays'))"> <if test="(colPickMode==0 and data.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDays'))">
a.menstrualLeaveDays=#{data.menstrualLeaveDays}, a.menstrualLeaveDays=#{data.menstrualLeaveDays},
</if> </if>
...@@ -203,26 +268,71 @@ ...@@ -203,26 +268,71 @@
<if test="(colPickMode==0 and data.containsKey('bereavementLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('bereavementLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('bereavementLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('bereavementLeaveDaysIncrement'))">
a.bereavementLeaveDays=ifnull(a.bereavementLeaveDays,0) + #{data.bereavementLeaveDaysIncrement}, a.bereavementLeaveDays=ifnull(a.bereavementLeaveDays,0) + #{data.bereavementLeaveDaysIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('backToUnit')) or (colPickMode==1 and !data.containsKey('backToUnit'))">
a.remark=#{data.remark}, a.backToUnit=#{data.backToUnit},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))"> <if test="(colPickMode==0 and data.containsKey('backToUnitIncrement')) or (colPickMode==1 and !data.containsKey('backToUnitIncrement'))">
a.createUserId=#{data.createUserId}, a.backToUnit=ifnull(a.backToUnit,0) + #{data.backToUnitIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('onDutyLeave')) or (colPickMode==1 and !data.containsKey('onDutyLeave'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement}, a.onDutyLeave=#{data.onDutyLeave},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('onDutyLeaveIncrement')) or (colPickMode==1 and !data.containsKey('onDutyLeaveIncrement'))">
a.createTime=#{data.createTime}, a.onDutyLeave=ifnull(a.onDutyLeave,0) + #{data.onDutyLeaveIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))"> <if test="(colPickMode==0 and data.containsKey('outOfOffice')) or (colPickMode==1 and !data.containsKey('outOfOffice'))">
a.updateUserId=#{data.updateUserId}, a.outOfOffice=#{data.outOfOffice},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('outOfOfficeIncrement')) or (colPickMode==1 and !data.containsKey('outOfOfficeIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement}, a.outOfOffice=ifnull(a.outOfOffice,0) + #{data.outOfOfficeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('shiftCompensation')) or (colPickMode==1 and !data.containsKey('shiftCompensation'))">
a.updateTime=#{data.updateTime}, a.shiftCompensation=#{data.shiftCompensation},
</if>
<if test="(colPickMode==0 and data.containsKey('shiftCompensationIncrement')) or (colPickMode==1 and !data.containsKey('shiftCompensationIncrement'))">
a.shiftCompensation=ifnull(a.shiftCompensation,0) + #{data.shiftCompensationIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('physicalExamination')) or (colPickMode==1 and !data.containsKey('physicalExamination'))">
a.physicalExamination=#{data.physicalExamination},
</if>
<if test="(colPickMode==0 and data.containsKey('physicalExaminationIncrement')) or (colPickMode==1 and !data.containsKey('physicalExaminationIncrement'))">
a.physicalExamination=ifnull(a.physicalExamination,0) + #{data.physicalExaminationIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('quarantine')) or (colPickMode==1 and !data.containsKey('quarantine'))">
a.quarantine=#{data.quarantine},
</if>
<if test="(colPickMode==0 and data.containsKey('quarantineIncrement')) or (colPickMode==1 and !data.containsKey('quarantineIncrement'))">
a.quarantine=ifnull(a.quarantine,0) + #{data.quarantineIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('businessTrip')) or (colPickMode==1 and !data.containsKey('businessTrip'))">
a.businessTrip=#{data.businessTrip},
</if>
<if test="(colPickMode==0 and data.containsKey('businessTripIncrement')) or (colPickMode==1 and !data.containsKey('businessTripIncrement'))">
a.businessTrip=ifnull(a.businessTrip,0) + #{data.businessTripIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('publicHoliday')) or (colPickMode==1 and !data.containsKey('publicHoliday'))">
a.publicHoliday=#{data.publicHoliday},
</if>
<if test="(colPickMode==0 and data.containsKey('publicHolidayIncrement')) or (colPickMode==1 and !data.containsKey('publicHolidayIncrement'))">
a.publicHoliday=ifnull(a.publicHoliday,0) + #{data.publicHolidayIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('childRearingLeave')) or (colPickMode==1 and !data.containsKey('childRearingLeave'))">
a.childRearingLeave=#{data.childRearingLeave},
</if>
<if test="(colPickMode==0 and data.containsKey('childRearingLeaveIncrement')) or (colPickMode==1 and !data.containsKey('childRearingLeaveIncrement'))">
a.childRearingLeave=ifnull(a.childRearingLeave,0) + #{data.childRearingLeaveIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('transferBack')) or (colPickMode==1 and !data.containsKey('transferBack'))">
a.transferBack=#{data.transferBack},
</if>
<if test="(colPickMode==0 and data.containsKey('transferBackIncrement')) or (colPickMode==1 and !data.containsKey('transferBackIncrement'))">
a.transferBack=ifnull(a.transferBack,0) + #{data.transferBackIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('homeLeave')) or (colPickMode==1 and !data.containsKey('homeLeave'))">
a.homeLeave=#{data.homeLeave},
</if>
<if test="(colPickMode==0 and data.containsKey('homeLeaveIncrement')) or (colPickMode==1 and !data.containsKey('homeLeaveIncrement'))">
a.homeLeave=ifnull(a.homeLeave,0) + #{data.homeLeaveIncrement},
</if> </if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
...@@ -329,6 +439,63 @@ ...@@ -329,6 +439,63 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="marriageLeaveDays=(case" suffix="ELSE marriageLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDays')) or (colPickMode==1 and !item.containsKey('marriageLeaveDays'))">
when a.id=#{item.id} then #{item.marriageLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('marriageLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.marriageLeaveDays,0) + #{item.marriageLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="maternityLeaveDays=(case" suffix="ELSE maternityLeaveDays end),"> <trim prefix="maternityLeaveDays=(case" suffix="ELSE maternityLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -353,18 +520,6 @@ ...@@ -353,18 +520,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="marriageLeaveDays=(case" suffix="ELSE marriageLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDays')) or (colPickMode==1 and !item.containsKey('marriageLeaveDays'))">
when a.id=#{item.id} then #{item.marriageLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('marriageLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.marriageLeaveDays,0) + #{item.marriageLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="menstrualLeaveDays=(case" suffix="ELSE menstrualLeaveDays end),"> <trim prefix="menstrualLeaveDays=(case" suffix="ELSE menstrualLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -401,49 +556,136 @@ ...@@ -401,49 +556,136 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="remark=(case" suffix="ELSE remark end),"> <trim prefix="backToUnit=(case" suffix="ELSE backToUnit end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))"> <choose>
when a.id=#{item.id} then #{item.remark} <when test="(colPickMode==0 and item.containsKey('backToUnit')) or (colPickMode==1 and !item.containsKey('backToUnit'))">
</if> when a.id=#{item.id} then #{item.backToUnit}
</when>
<when test="(colPickMode==0 and item.containsKey('backToUnitIncrement')) or (colPickMode==1 and !item.containsKey('backToUnitIncrement'))">
when a.id=#{item.id} then ifnull(a.backToUnit,0) + #{item.backToUnitIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="onDutyLeave=(case" suffix="ELSE onDutyLeave end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('onDutyLeave')) or (colPickMode==1 and !item.containsKey('onDutyLeave'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.onDutyLeave}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('onDutyLeaveIncrement')) or (colPickMode==1 and !item.containsKey('onDutyLeaveIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.onDutyLeave,0) + #{item.onDutyLeaveIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="outOfOffice=(case" suffix="ELSE outOfOffice end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <choose>
when a.id=#{item.id} then #{item.createTime} <when test="(colPickMode==0 and item.containsKey('outOfOffice')) or (colPickMode==1 and !item.containsKey('outOfOffice'))">
</if> when a.id=#{item.id} then #{item.outOfOffice}
</when>
<when test="(colPickMode==0 and item.containsKey('outOfOfficeIncrement')) or (colPickMode==1 and !item.containsKey('outOfOfficeIncrement'))">
when a.id=#{item.id} then ifnull(a.outOfOffice,0) + #{item.outOfOfficeIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <trim prefix="shiftCompensation=(case" suffix="ELSE shiftCompensation end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> <when test="(colPickMode==0 and item.containsKey('shiftCompensation')) or (colPickMode==1 and !item.containsKey('shiftCompensation'))">
when a.id=#{item.id} then #{item.updateUserId} when a.id=#{item.id} then #{item.shiftCompensation}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('shiftCompensationIncrement')) or (colPickMode==1 and !item.containsKey('shiftCompensationIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} when a.id=#{item.id} then ifnull(a.shiftCompensation,0) + #{item.shiftCompensationIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="physicalExamination=(case" suffix="ELSE physicalExamination end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <choose>
when a.id=#{item.id} then #{item.updateTime} <when test="(colPickMode==0 and item.containsKey('physicalExamination')) or (colPickMode==1 and !item.containsKey('physicalExamination'))">
</if> when a.id=#{item.id} then #{item.physicalExamination}
</when>
<when test="(colPickMode==0 and item.containsKey('physicalExaminationIncrement')) or (colPickMode==1 and !item.containsKey('physicalExaminationIncrement'))">
when a.id=#{item.id} then ifnull(a.physicalExamination,0) + #{item.physicalExaminationIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="quarantine=(case" suffix="ELSE quarantine end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('quarantine')) or (colPickMode==1 and !item.containsKey('quarantine'))">
when a.id=#{item.id} then #{item.quarantine}
</when>
<when test="(colPickMode==0 and item.containsKey('quarantineIncrement')) or (colPickMode==1 and !item.containsKey('quarantineIncrement'))">
when a.id=#{item.id} then ifnull(a.quarantine,0) + #{item.quarantineIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="businessTrip=(case" suffix="ELSE businessTrip end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('businessTrip')) or (colPickMode==1 and !item.containsKey('businessTrip'))">
when a.id=#{item.id} then #{item.businessTrip}
</when>
<when test="(colPickMode==0 and item.containsKey('businessTripIncrement')) or (colPickMode==1 and !item.containsKey('businessTripIncrement'))">
when a.id=#{item.id} then ifnull(a.businessTrip,0) + #{item.businessTripIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="publicHoliday=(case" suffix="ELSE publicHoliday end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('publicHoliday')) or (colPickMode==1 and !item.containsKey('publicHoliday'))">
when a.id=#{item.id} then #{item.publicHoliday}
</when>
<when test="(colPickMode==0 and item.containsKey('publicHolidayIncrement')) or (colPickMode==1 and !item.containsKey('publicHolidayIncrement'))">
when a.id=#{item.id} then ifnull(a.publicHoliday,0) + #{item.publicHolidayIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="childRearingLeave=(case" suffix="ELSE childRearingLeave end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('childRearingLeave')) or (colPickMode==1 and !item.containsKey('childRearingLeave'))">
when a.id=#{item.id} then #{item.childRearingLeave}
</when>
<when test="(colPickMode==0 and item.containsKey('childRearingLeaveIncrement')) or (colPickMode==1 and !item.containsKey('childRearingLeaveIncrement'))">
when a.id=#{item.id} then ifnull(a.childRearingLeave,0) + #{item.childRearingLeaveIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="transferBack=(case" suffix="ELSE transferBack end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('transferBack')) or (colPickMode==1 and !item.containsKey('transferBack'))">
when a.id=#{item.id} then #{item.transferBack}
</when>
<when test="(colPickMode==0 and item.containsKey('transferBackIncrement')) or (colPickMode==1 and !item.containsKey('transferBackIncrement'))">
when a.id=#{item.id} then ifnull(a.transferBack,0) + #{item.transferBackIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="homeLeave=(case" suffix="ELSE homeLeave end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('homeLeave')) or (colPickMode==1 and !item.containsKey('homeLeave'))">
when a.id=#{item.id} then #{item.homeLeave}
</when>
<when test="(colPickMode==0 and item.containsKey('homeLeaveIncrement')) or (colPickMode==1 and !item.containsKey('homeLeaveIncrement'))">
when a.id=#{item.id} then ifnull(a.homeLeave,0) + #{item.homeLeaveIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
</trim> </trim>
...@@ -808,8 +1050,140 @@ ...@@ -808,8 +1050,140 @@
${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd} ${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveDays')"> <if test="conditionParamRef.containsKey('marriageLeaveDays')">
<if test="conditionParamRef.maternityLeaveDays != null "> <if test="conditionParamRef.marriageLeaveDays != null ">
${_conditionType_} a.marriageLeaveDays = #{${_conditionParam_}.marriageLeaveDays}
</if>
<if test="conditionParamRef.marriageLeaveDays == null">
${_conditionType_} a.marriageLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
${_conditionType_} a.marriageLeaveDays in
<foreach collection="conditionParamRef.marriageLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysNotList') and conditionParamRef.marriageLeaveDaysNotList.size() > 0">
${_conditionType_} a.marriageLeaveDays not in
<foreach collection="conditionParamRef.marriageLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysStart') and conditionParamRef.marriageLeaveDaysStart != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.marriageLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysEnd') and conditionParamRef.marriageLeaveDaysEnd != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.marriageLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('maternityLeaveDays')">
<if test="conditionParamRef.maternityLeaveDays != null ">
${_conditionType_} a.maternityLeaveDays = #{${_conditionParam_}.maternityLeaveDays} ${_conditionType_} a.maternityLeaveDays = #{${_conditionParam_}.maternityLeaveDays}
</if> </if>
<if test="conditionParamRef.maternityLeaveDays == null"> <if test="conditionParamRef.maternityLeaveDays == null">
...@@ -862,33 +1236,6 @@ ...@@ -862,33 +1236,6 @@
${_conditionType_} a.paternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.paternityLeaveDaysEnd} ${_conditionType_} a.paternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.paternityLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveDays')">
<if test="conditionParamRef.marriageLeaveDays != null ">
${_conditionType_} a.marriageLeaveDays = #{${_conditionParam_}.marriageLeaveDays}
</if>
<if test="conditionParamRef.marriageLeaveDays == null">
${_conditionType_} a.marriageLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
${_conditionType_} a.marriageLeaveDays in
<foreach collection="conditionParamRef.marriageLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysNotList') and conditionParamRef.marriageLeaveDaysNotList.size() > 0">
${_conditionType_} a.marriageLeaveDays not in
<foreach collection="conditionParamRef.marriageLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysStart') and conditionParamRef.marriageLeaveDaysStart != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.marriageLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysEnd') and conditionParamRef.marriageLeaveDaysEnd != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.marriageLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDays')"> <if test="conditionParamRef.containsKey('menstrualLeaveDays')">
<if test="conditionParamRef.menstrualLeaveDays != null "> <if test="conditionParamRef.menstrualLeaveDays != null ">
${_conditionType_} a.menstrualLeaveDays = #{${_conditionParam_}.menstrualLeaveDays} ${_conditionType_} a.menstrualLeaveDays = #{${_conditionParam_}.menstrualLeaveDays}
...@@ -970,111 +1317,303 @@ ...@@ -970,111 +1317,303 @@
${_conditionType_} a.bereavementLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.bereavementLeaveDaysEnd} ${_conditionType_} a.bereavementLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.bereavementLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('backToUnit')">
<if test="conditionParamRef.backToUnit != null ">
${_conditionType_} a.backToUnit = #{${_conditionParam_}.backToUnit}
</if>
<if test="conditionParamRef.backToUnit == null">
${_conditionType_} a.backToUnit is null
</if>
</if>
<if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
${_conditionType_} a.backToUnit in
<foreach collection="conditionParamRef.backToUnitList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('backToUnitNotList') and conditionParamRef.backToUnitNotList.size() > 0">
${_conditionType_} a.backToUnit not in
<foreach collection="conditionParamRef.backToUnitNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('backToUnitStart') and conditionParamRef.backToUnitStart != null">
${_conditionType_} a.backToUnit <![CDATA[ >= ]]> #{${_conditionParam_}.backToUnitStart}
</if>
<if test="conditionParamRef.containsKey('backToUnitEnd') and conditionParamRef.backToUnitEnd != null">
${_conditionType_} a.backToUnit <![CDATA[ <= ]]> #{${_conditionParam_}.backToUnitEnd}
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('onDutyLeave')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.onDutyLeave != null ">
${_conditionType_} a.remark like #{${_conditionParam_}.remark} ${_conditionType_} a.onDutyLeave = #{${_conditionParam_}.onDutyLeave}
</if> </if>
<if test="conditionParamRef.remark == null"> <if test="conditionParamRef.onDutyLeave == null">
${_conditionType_} a.remark is null ${_conditionType_} a.onDutyLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0"> <if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.onDutyLeave in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0"> <if test="conditionParamRef.containsKey('onDutyLeaveNotList') and conditionParamRef.onDutyLeaveNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.onDutyLeave not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('onDutyLeaveStart') and conditionParamRef.onDutyLeaveStart != null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.onDutyLeave <![CDATA[ >= ]]> #{${_conditionParam_}.onDutyLeaveStart}
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.containsKey('onDutyLeaveEnd') and conditionParamRef.onDutyLeaveEnd != null">
${_conditionType_} a.createUserId is null ${_conditionType_} a.onDutyLeave <![CDATA[ <= ]]> #{${_conditionParam_}.onDutyLeaveEnd}
</if> </if>
<if test="conditionParamRef.containsKey('outOfOffice')">
<if test="conditionParamRef.outOfOffice != null ">
${_conditionType_} a.outOfOffice = #{${_conditionParam_}.outOfOffice}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.outOfOffice == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.outOfOffice is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> </if>
</if>
<if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
${_conditionType_} a.outOfOffice in
<foreach collection="conditionParamRef.outOfOfficeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('outOfOfficeNotList') and conditionParamRef.outOfOfficeNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.outOfOffice not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.outOfOfficeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('outOfOfficeStart') and conditionParamRef.outOfOfficeStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.outOfOffice <![CDATA[ >= ]]> #{${_conditionParam_}.outOfOfficeStart}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.containsKey('outOfOfficeEnd') and conditionParamRef.outOfOfficeEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.outOfOffice <![CDATA[ <= ]]> #{${_conditionParam_}.outOfOfficeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('shiftCompensation')">
<if test="conditionParamRef.shiftCompensation != null ">
${_conditionType_} a.shiftCompensation = #{${_conditionParam_}.shiftCompensation}
</if>
<if test="conditionParamRef.shiftCompensation == null">
${_conditionType_} a.shiftCompensation is null
</if>
</if>
<if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
${_conditionType_} a.shiftCompensation in
<foreach collection="conditionParamRef.shiftCompensationList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shiftCompensationNotList') and conditionParamRef.shiftCompensationNotList.size() > 0">
${_conditionType_} a.shiftCompensation not in
<foreach collection="conditionParamRef.shiftCompensationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shiftCompensationStart') and conditionParamRef.shiftCompensationStart != null">
${_conditionType_} a.shiftCompensation <![CDATA[ >= ]]> #{${_conditionParam_}.shiftCompensationStart}
</if>
<if test="conditionParamRef.containsKey('shiftCompensationEnd') and conditionParamRef.shiftCompensationEnd != null">
${_conditionType_} a.shiftCompensation <![CDATA[ <= ]]> #{${_conditionParam_}.shiftCompensationEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('physicalExamination')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.physicalExamination != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.physicalExamination = #{${_conditionParam_}.physicalExamination}
</if> </if>
<if test="conditionParamRef.createTime == null"> <if test="conditionParamRef.physicalExamination == null">
${_conditionType_} a.createTime is null ${_conditionType_} a.physicalExamination is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.physicalExamination in
<foreach collection="conditionParamRef.physicalExaminationList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.containsKey('physicalExaminationNotList') and conditionParamRef.physicalExaminationNotList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.physicalExamination not in
<foreach collection="conditionParamRef.physicalExaminationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserId')"> <if test="conditionParamRef.containsKey('physicalExaminationStart') and conditionParamRef.physicalExaminationStart != null">
<if test="conditionParamRef.updateUserId != null "> ${_conditionType_} a.physicalExamination <![CDATA[ >= ]]> #{${_conditionParam_}.physicalExaminationStart}
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.updateUserId == null"> <if test="conditionParamRef.containsKey('physicalExaminationEnd') and conditionParamRef.physicalExaminationEnd != null">
${_conditionType_} a.updateUserId is null ${_conditionType_} a.physicalExamination <![CDATA[ <= ]]> #{${_conditionParam_}.physicalExaminationEnd}
</if>
<if test="conditionParamRef.containsKey('quarantine')">
<if test="conditionParamRef.quarantine != null ">
${_conditionType_} a.quarantine = #{${_conditionParam_}.quarantine}
</if> </if>
<if test="conditionParamRef.quarantine == null">
${_conditionType_} a.quarantine is null
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0"> </if>
${_conditionType_} a.updateUserId in <if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.quarantine in
<foreach collection="conditionParamRef.quarantineList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('quarantineNotList') and conditionParamRef.quarantineNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.quarantine not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.quarantineNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('quarantineStart') and conditionParamRef.quarantineStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.quarantine <![CDATA[ >= ]]> #{${_conditionParam_}.quarantineStart}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.containsKey('quarantineEnd') and conditionParamRef.quarantineEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.quarantine <![CDATA[ <= ]]> #{${_conditionParam_}.quarantineEnd}
</if>
<if test="conditionParamRef.containsKey('businessTrip')">
<if test="conditionParamRef.businessTrip != null ">
${_conditionType_} a.businessTrip = #{${_conditionParam_}.businessTrip}
</if>
<if test="conditionParamRef.businessTrip == null">
${_conditionType_} a.businessTrip is null
</if>
</if>
<if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
${_conditionType_} a.businessTrip in
<foreach collection="conditionParamRef.businessTripList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessTripNotList') and conditionParamRef.businessTripNotList.size() > 0">
${_conditionType_} a.businessTrip not in
<foreach collection="conditionParamRef.businessTripNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessTripStart') and conditionParamRef.businessTripStart != null">
${_conditionType_} a.businessTrip <![CDATA[ >= ]]> #{${_conditionParam_}.businessTripStart}
</if>
<if test="conditionParamRef.containsKey('businessTripEnd') and conditionParamRef.businessTripEnd != null">
${_conditionType_} a.businessTrip <![CDATA[ <= ]]> #{${_conditionParam_}.businessTripEnd}
</if> </if>
<if test="conditionParamRef.containsKey('publicHoliday')">
<if test="conditionParamRef.publicHoliday != null ">
${_conditionType_} a.publicHoliday = #{${_conditionParam_}.publicHoliday}
</if>
<if test="conditionParamRef.publicHoliday == null">
${_conditionType_} a.publicHoliday is null
</if>
</if>
<if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
${_conditionType_} a.publicHoliday in
<foreach collection="conditionParamRef.publicHolidayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('publicHolidayNotList') and conditionParamRef.publicHolidayNotList.size() > 0">
${_conditionType_} a.publicHoliday not in
<foreach collection="conditionParamRef.publicHolidayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('publicHolidayStart') and conditionParamRef.publicHolidayStart != null">
${_conditionType_} a.publicHoliday <![CDATA[ >= ]]> #{${_conditionParam_}.publicHolidayStart}
</if>
<if test="conditionParamRef.containsKey('publicHolidayEnd') and conditionParamRef.publicHolidayEnd != null">
${_conditionType_} a.publicHoliday <![CDATA[ <= ]]> #{${_conditionParam_}.publicHolidayEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('childRearingLeave')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.childRearingLeave != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.childRearingLeave = #{${_conditionParam_}.childRearingLeave}
</if> </if>
<if test="conditionParamRef.updateTime == null"> <if test="conditionParamRef.childRearingLeave == null">
${_conditionType_} a.updateTime is null ${_conditionType_} a.childRearingLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.childRearingLeave in
<foreach collection="conditionParamRef.childRearingLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('childRearingLeaveNotList') and conditionParamRef.childRearingLeaveNotList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.childRearingLeave not in
<foreach collection="conditionParamRef.childRearingLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveStart') and conditionParamRef.childRearingLeaveStart != null">
${_conditionType_} a.childRearingLeave <![CDATA[ >= ]]> #{${_conditionParam_}.childRearingLeaveStart}
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveEnd') and conditionParamRef.childRearingLeaveEnd != null">
${_conditionType_} a.childRearingLeave <![CDATA[ <= ]]> #{${_conditionParam_}.childRearingLeaveEnd}
</if>
<if test="conditionParamRef.containsKey('transferBack')">
<if test="conditionParamRef.transferBack != null ">
${_conditionType_} a.transferBack = #{${_conditionParam_}.transferBack}
</if>
<if test="conditionParamRef.transferBack == null">
${_conditionType_} a.transferBack is null
</if>
</if>
<if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
${_conditionType_} a.transferBack in
<foreach collection="conditionParamRef.transferBackList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('transferBackNotList') and conditionParamRef.transferBackNotList.size() > 0">
${_conditionType_} a.transferBack not in
<foreach collection="conditionParamRef.transferBackNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('transferBackStart') and conditionParamRef.transferBackStart != null">
${_conditionType_} a.transferBack <![CDATA[ >= ]]> #{${_conditionParam_}.transferBackStart}
</if>
<if test="conditionParamRef.containsKey('transferBackEnd') and conditionParamRef.transferBackEnd != null">
${_conditionType_} a.transferBack <![CDATA[ <= ]]> #{${_conditionParam_}.transferBackEnd}
</if>
<if test="conditionParamRef.containsKey('homeLeave')">
<if test="conditionParamRef.homeLeave != null ">
${_conditionType_} a.homeLeave = #{${_conditionParam_}.homeLeave}
</if>
<if test="conditionParamRef.homeLeave == null">
${_conditionType_} a.homeLeave is null
</if>
</if>
<if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
${_conditionType_} a.homeLeave in
<foreach collection="conditionParamRef.homeLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('homeLeaveNotList') and conditionParamRef.homeLeaveNotList.size() > 0">
${_conditionType_} a.homeLeave not in
<foreach collection="conditionParamRef.homeLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('homeLeaveStart') and conditionParamRef.homeLeaveStart != null">
${_conditionType_} a.homeLeave <![CDATA[ >= ]]> #{${_conditionParam_}.homeLeaveStart}
</if>
<if test="conditionParamRef.containsKey('homeLeaveEnd') and conditionParamRef.homeLeaveEnd != null">
${_conditionType_} a.homeLeave <![CDATA[ <= ]]> #{${_conditionParam_}.homeLeaveEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1138,6 +1677,36 @@ ...@@ -1138,6 +1677,36 @@
<if test='orderCol.annualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.annualLeaveDays)'>DESC</if> <if test='orderCol.annualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.annualLeaveDays)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('marriageLeaveDays')">
a.marriageLeaveDays
<if test='orderCol.marriageLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.marriageLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('maternityLeaveDays')"> <if test="orderCol.containsKey('maternityLeaveDays')">
a.maternityLeaveDays a.maternityLeaveDays
<if test='orderCol.maternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.maternityLeaveDays)'>DESC</if> <if test='orderCol.maternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.maternityLeaveDays)'>DESC</if>
...@@ -1148,11 +1717,6 @@ ...@@ -1148,11 +1717,6 @@
<if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if> <if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('marriageLeaveDays')">
a.marriageLeaveDays
<if test='orderCol.marriageLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.marriageLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('menstrualLeaveDays')"> <if test="orderCol.containsKey('menstrualLeaveDays')">
a.menstrualLeaveDays a.menstrualLeaveDays
<if test='orderCol.menstrualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.menstrualLeaveDays)'>DESC</if> <if test='orderCol.menstrualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.menstrualLeaveDays)'>DESC</if>
...@@ -1168,29 +1732,59 @@ ...@@ -1168,29 +1732,59 @@
<if test='orderCol.bereavementLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.bereavementLeaveDays)'>DESC</if> <if test='orderCol.bereavementLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.bereavementLeaveDays)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('backToUnit')">
a.remark a.backToUnit
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.backToUnit != null and "DESC".equalsIgnoreCase(orderCol.backToUnit)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('onDutyLeave')">
a.createUserId a.onDutyLeave
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.onDutyLeave != null and "DESC".equalsIgnoreCase(orderCol.onDutyLeave)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('outOfOffice')">
a.createTime a.outOfOffice
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.outOfOffice != null and "DESC".equalsIgnoreCase(orderCol.outOfOffice)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('shiftCompensation')">
a.updateUserId a.shiftCompensation
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.shiftCompensation != null and "DESC".equalsIgnoreCase(orderCol.shiftCompensation)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('physicalExamination')">
a.updateTime a.physicalExamination
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.physicalExamination != null and "DESC".equalsIgnoreCase(orderCol.physicalExamination)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('quarantine')">
a.quarantine
<if test='orderCol.quarantine != null and "DESC".equalsIgnoreCase(orderCol.quarantine)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('businessTrip')">
a.businessTrip
<if test='orderCol.businessTrip != null and "DESC".equalsIgnoreCase(orderCol.businessTrip)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('publicHoliday')">
a.publicHoliday
<if test='orderCol.publicHoliday != null and "DESC".equalsIgnoreCase(orderCol.publicHoliday)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('childRearingLeave')">
a.childRearingLeave
<if test='orderCol.childRearingLeave != null and "DESC".equalsIgnoreCase(orderCol.childRearingLeave)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('transferBack')">
a.transferBack
<if test='orderCol.transferBack != null and "DESC".equalsIgnoreCase(orderCol.transferBack)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('homeLeave')">
a.homeLeave
<if test='orderCol.homeLeave != null and "DESC".equalsIgnoreCase(orderCol.homeLeave)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
...@@ -1206,4 +1800,7 @@ ...@@ -1206,4 +1800,7 @@
</trim> </trim>
</if> </if>
</sql> </sql>
<select id="queryEntity" resultType="com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity">
select * from mortals_xhx_attendance_vacation_balance where staffId = #{staffId}
</select>
</mapper> </mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationRecordMapper.xml
View file @ b5b610a3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationRecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationRecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
......
attendance-performance-manager/src/main/resources/sqlmap/module/dept/DeptMapper.xml
View file @ b5b610a3
...@@ -884,7 +884,5 @@ ...@@ -884,7 +884,5 @@
<select id="queryDeptParient" resultType="com.mortals.xhx.module.dept.model.DeptEntity"> <select id="queryDeptParient" resultType="com.mortals.xhx.module.dept.model.DeptEntity">
select * from mortals_xhx_dept where deptCode = #{parentCode} select * from mortals_xhx_dept where deptCode = #{parentCode}
</select> </select>
<select id="queryDeptParentId" resultType="integer">
select parentId from mortals_xhx_dept where deptId = #{deptId}
</select>
</mapper> </mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @ b5b610a3
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="remarkId" column="remarkId" /> <result property="remarkId" column="remarkId" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="picUri" column="picUri" />
<result property="serverIndexCode" column="serverIndexCode" />
</resultMap> </resultMap>
...@@ -116,23 +118,29 @@ ...@@ -116,23 +118,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source, a.source,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picUri') or colPickMode == 1 and data.containsKey('picUri')))">
a.picUri,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serverIndexCode') or colPickMode == 1 and data.containsKey('serverIndexCode')))">
a.serverIndexCode,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_staff insert into mortals_xhx_staff
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source) (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source,picUri,serverIndexCode)
VALUES VALUES
(#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{source}) (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{source},#{picUri},#{serverIndexCode})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_staff insert into mortals_xhx_staff
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source) (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source,picUri,serverIndexCode)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.source}) (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.source},#{item.picUri},#{item.serverIndexCode})
</foreach> </foreach>
</insert> </insert>
...@@ -244,6 +252,12 @@ ...@@ -244,6 +252,12 @@
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))"> <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement}, a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('picUri')) or (colPickMode==1 and !data.containsKey('picUri'))">
a.picUri=#{data.picUri},
</if>
<if test="(colPickMode==0 and data.containsKey('serverIndexCode')) or (colPickMode==1 and !data.containsKey('serverIndexCode'))">
a.serverIndexCode=#{data.serverIndexCode},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -476,6 +490,20 @@ ...@@ -476,6 +490,20 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="picUri=(case" suffix="ELSE picUri end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('picUri')) or (colPickMode==1 and !item.containsKey('picUri'))">
when a.id=#{item.id} then #{item.picUri}
</if>
</foreach>
</trim>
<trim prefix="serverIndexCode=(case" suffix="ELSE serverIndexCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serverIndexCode')) or (colPickMode==1 and !item.containsKey('serverIndexCode'))">
when a.id=#{item.id} then #{item.serverIndexCode}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -600,13 +628,13 @@ ...@@ -600,13 +628,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -628,13 +656,13 @@ ...@@ -628,13 +656,13 @@
${_conditionType_} a.name is null ${_conditionType_} a.name is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nameList')"> <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
${_conditionType_} a.name in ${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nameNotList')"> <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
${_conditionType_} a.name not in ${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -648,13 +676,13 @@ ...@@ -648,13 +676,13 @@
${_conditionType_} a.gender is null ${_conditionType_} a.gender is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('genderList')"> <if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
${_conditionType_} a.gender in ${_conditionType_} a.gender in
<foreach collection="conditionParamRef.genderList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.genderList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('genderNotList')"> <if test="conditionParamRef.containsKey('genderNotList') and conditionParamRef.genderNotList.size() > 0">
${_conditionType_} a.gender not in ${_conditionType_} a.gender not in
<foreach collection="conditionParamRef.genderNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.genderNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -691,13 +719,13 @@ ...@@ -691,13 +719,13 @@
${_conditionType_} a.photoPath is null ${_conditionType_} a.photoPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('photoPathList')"> <if test="conditionParamRef.containsKey('photoPathList') and conditionParamRef.photoPathList.size() > 0">
${_conditionType_} a.photoPath in ${_conditionType_} a.photoPath in
<foreach collection="conditionParamRef.photoPathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.photoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('photoPathNotList')"> <if test="conditionParamRef.containsKey('photoPathNotList') and conditionParamRef.photoPathNotList.size() > 0">
${_conditionType_} a.photoPath not in ${_conditionType_} a.photoPath not in
<foreach collection="conditionParamRef.photoPathNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.photoPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -712,13 +740,13 @@ ...@@ -712,13 +740,13 @@
${_conditionType_} a.phoneNumber is null ${_conditionType_} a.phoneNumber is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNumberList')"> <if test="conditionParamRef.containsKey('phoneNumberList') and conditionParamRef.phoneNumberList.size() > 0">
${_conditionType_} a.phoneNumber in ${_conditionType_} a.phoneNumber in
<foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNumberNotList')"> <if test="conditionParamRef.containsKey('phoneNumberNotList') and conditionParamRef.phoneNumberNotList.size() > 0">
${_conditionType_} a.phoneNumber not in ${_conditionType_} a.phoneNumber not in
<foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -733,13 +761,13 @@ ...@@ -733,13 +761,13 @@
${_conditionType_} a.idCard is null ${_conditionType_} a.idCard is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idCardList')"> <if test="conditionParamRef.containsKey('idCardList') and conditionParamRef.idCardList.size() > 0">
${_conditionType_} a.idCard in ${_conditionType_} a.idCard in
<foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idCardNotList')"> <if test="conditionParamRef.containsKey('idCardNotList') and conditionParamRef.idCardNotList.size() > 0">
${_conditionType_} a.idCard not in ${_conditionType_} a.idCard not in
<foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -754,13 +782,13 @@ ...@@ -754,13 +782,13 @@
${_conditionType_} a.workNum is null ${_conditionType_} a.workNum is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workNumList')"> <if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
${_conditionType_} a.workNum in ${_conditionType_} a.workNum in
<foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workNumNotList')"> <if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
${_conditionType_} a.workNum not in ${_conditionType_} a.workNum not in
<foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -774,13 +802,13 @@ ...@@ -774,13 +802,13 @@
${_conditionType_} a.politicalstatus is null ${_conditionType_} a.politicalstatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('politicalstatusList')"> <if test="conditionParamRef.containsKey('politicalstatusList') and conditionParamRef.politicalstatusList.size() > 0">
${_conditionType_} a.politicalstatus in ${_conditionType_} a.politicalstatus in
<foreach collection="conditionParamRef.politicalstatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.politicalstatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('politicalstatusNotList')"> <if test="conditionParamRef.containsKey('politicalstatusNotList') and conditionParamRef.politicalstatusNotList.size() > 0">
${_conditionType_} a.politicalstatus not in ${_conditionType_} a.politicalstatus not in
<foreach collection="conditionParamRef.politicalstatusNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.politicalstatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -801,13 +829,13 @@ ...@@ -801,13 +829,13 @@
${_conditionType_} a.deptId is null ${_conditionType_} a.deptId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdList')"> <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in ${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdNotList')"> <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in ${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -829,13 +857,13 @@ ...@@ -829,13 +857,13 @@
${_conditionType_} a.deptName is null ${_conditionType_} a.deptName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameList')"> <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in ${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameNotList')"> <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in ${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -849,13 +877,13 @@ ...@@ -849,13 +877,13 @@
${_conditionType_} a.positionId is null ${_conditionType_} a.positionId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('positionIdList')"> <if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
${_conditionType_} a.positionId in ${_conditionType_} a.positionId in
<foreach collection="conditionParamRef.positionIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.positionIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('positionIdNotList')"> <if test="conditionParamRef.containsKey('positionIdNotList') and conditionParamRef.positionIdNotList.size() > 0">
${_conditionType_} a.positionId not in ${_conditionType_} a.positionId not in
<foreach collection="conditionParamRef.positionIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.positionIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -877,13 +905,13 @@ ...@@ -877,13 +905,13 @@
${_conditionType_} a.positionName is null ${_conditionType_} a.positionName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('positionNameList')"> <if test="conditionParamRef.containsKey('positionNameList') and conditionParamRef.positionNameList.size() > 0">
${_conditionType_} a.positionName in ${_conditionType_} a.positionName in
<foreach collection="conditionParamRef.positionNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.positionNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('positionNameNotList')"> <if test="conditionParamRef.containsKey('positionNameNotList') and conditionParamRef.positionNameNotList.size() > 0">
${_conditionType_} a.positionName not in ${_conditionType_} a.positionName not in
<foreach collection="conditionParamRef.positionNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.positionNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -897,13 +925,13 @@ ...@@ -897,13 +925,13 @@
${_conditionType_} a.staffType is null ${_conditionType_} a.staffType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('staffTypeList')"> <if test="conditionParamRef.containsKey('staffTypeList') and conditionParamRef.staffTypeList.size() > 0">
${_conditionType_} a.staffType in ${_conditionType_} a.staffType in
<foreach collection="conditionParamRef.staffTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffTypeNotList')"> <if test="conditionParamRef.containsKey('staffTypeNotList') and conditionParamRef.staffTypeNotList.size() > 0">
${_conditionType_} a.staffType not in ${_conditionType_} a.staffType not in
<foreach collection="conditionParamRef.staffTypeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -924,13 +952,13 @@ ...@@ -924,13 +952,13 @@
${_conditionType_} a.status is null ${_conditionType_} a.status is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('statusList')"> <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in ${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusNotList')"> <if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
${_conditionType_} a.status not in ${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -952,13 +980,13 @@ ...@@ -952,13 +980,13 @@
${_conditionType_} a.registerPath is null ${_conditionType_} a.registerPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('registerPathList')"> <if test="conditionParamRef.containsKey('registerPathList') and conditionParamRef.registerPathList.size() > 0">
${_conditionType_} a.registerPath in ${_conditionType_} a.registerPath in
<foreach collection="conditionParamRef.registerPathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.registerPathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('registerPathNotList')"> <if test="conditionParamRef.containsKey('registerPathNotList') and conditionParamRef.registerPathNotList.size() > 0">
${_conditionType_} a.registerPath not in ${_conditionType_} a.registerPath not in
<foreach collection="conditionParamRef.registerPathNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.registerPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1018,13 +1046,13 @@ ...@@ -1018,13 +1046,13 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList')"> <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1038,13 +1066,13 @@ ...@@ -1038,13 +1066,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1080,13 +1108,13 @@ ...@@ -1080,13 +1108,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1123,13 +1151,13 @@ ...@@ -1123,13 +1151,13 @@
${_conditionType_} a.remarkId is null ${_conditionType_} a.remarkId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkIdList')"> <if test="conditionParamRef.containsKey('remarkIdList') and conditionParamRef.remarkIdList.size() > 0">
${_conditionType_} a.remarkId in ${_conditionType_} a.remarkId in
<foreach collection="conditionParamRef.remarkIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkIdNotList')"> <if test="conditionParamRef.containsKey('remarkIdNotList') and conditionParamRef.remarkIdNotList.size() > 0">
${_conditionType_} a.remarkId not in ${_conditionType_} a.remarkId not in
<foreach collection="conditionParamRef.remarkIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1143,13 +1171,13 @@ ...@@ -1143,13 +1171,13 @@
${_conditionType_} a.source is null ${_conditionType_} a.source is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sourceList')"> <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
${_conditionType_} a.source in ${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sourceNotList')"> <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
${_conditionType_} a.source not in ${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1162,6 +1190,48 @@ ...@@ -1162,6 +1190,48 @@
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd} ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if> </if>
<if test="conditionParamRef.containsKey('picUri')">
<if test="conditionParamRef.picUri != null and conditionParamRef.picUri != ''">
${_conditionType_} a.picUri like #{${_conditionParam_}.picUri}
</if>
<if test="conditionParamRef.picUri == null">
${_conditionType_} a.picUri is null
</if>
</if>
<if test="conditionParamRef.containsKey('picUriList') and conditionParamRef.picUriList.size() > 0">
${_conditionType_} a.picUri in
<foreach collection="conditionParamRef.picUriList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('picUriNotList') and conditionParamRef.picUriNotList.size() > 0">
${_conditionType_} a.picUri not in
<foreach collection="conditionParamRef.picUriNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serverIndexCode')">
<if test="conditionParamRef.serverIndexCode != null and conditionParamRef.serverIndexCode != ''">
${_conditionType_} a.serverIndexCode like #{${_conditionParam_}.serverIndexCode}
</if>
<if test="conditionParamRef.serverIndexCode == null">
${_conditionType_} a.serverIndexCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('serverIndexCodeList') and conditionParamRef.serverIndexCodeList.size() > 0">
${_conditionType_} a.serverIndexCode in
<foreach collection="conditionParamRef.serverIndexCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serverIndexCodeNotList') and conditionParamRef.serverIndexCodeNotList.size() > 0">
${_conditionType_} a.serverIndexCode not in
<foreach collection="conditionParamRef.serverIndexCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1305,6 +1375,16 @@ ...@@ -1305,6 +1375,16 @@
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if> <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('picUri')">
a.picUri
<if test='orderCol.picUri != null and "DESC".equalsIgnoreCase(orderCol.picUri)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('serverIndexCode')">
a.serverIndexCode
<if test='orderCol.serverIndexCode != null and "DESC".equalsIgnoreCase(orderCol.serverIndexCode)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
...@@ -1337,11 +1417,7 @@ ...@@ -1337,11 +1417,7 @@
select count(1) pricateStaff from mortals_xhx_staff where staffType = 3 select count(1) pricateStaff from mortals_xhx_staff where staffType = 3
</select> </select>
<select id="queryPersonNum" resultType="integer">
select count(1) personNum from mortals_xhx_staff where deptId = #{deptId}
</select>
<select id="queryHik" resultType="com.mortals.xhx.module.staff.model.StaffEntity"> <select id="queryHik" resultType="com.mortals.xhx.module.staff.model.StaffEntity">
select * from mortals_xhx_staff where remarkId = #{remarkId} select * from mortals_xhx_staff where remarkId = #{remarkId}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
db/menu.sql
View file @ b5b610a3
...@@ -546,6 +546,16 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio ...@@ -546,6 +546,16 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '11', '回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '12', '因公请假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '13', '外出勘验', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '14', '值班补班', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '15', '体检', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '16', '隔离', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '17', '因公外出', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '18', '公休', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '19', '育儿假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '20', '调回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '21', '探亲假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file
db/module.sql
View file @ b5b610a3
...@@ -54,6 +54,8 @@ CREATE TABLE mortals_xhx_staff( ...@@ -54,6 +54,8 @@ CREATE TABLE mortals_xhx_staff(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`remarkId` varchar(255) COMMENT '备注id', `remarkId` varchar(255) COMMENT '备注id',
`source` tinyint(2) DEFAULT '1' COMMENT '员工来源(1.外部,2.内部)', `source` tinyint(2) DEFAULT '1' COMMENT '员工来源(1.外部,2.内部)',
`picUri` varchar(255) COMMENT '相对图片pic',
`serverIndexCode` varchar(255) COMMENT '图片资源唯一标识',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息';
...@@ -327,6 +329,7 @@ PRIMARY KEY (`id`) ...@@ -327,6 +329,7 @@ PRIMARY KEY (`id`)
-- ---------------------------- -- ----------------------------
-- 请假记录信息表 -- 请假记录信息表
-- ---------------------------- -- ----------------------------
...@@ -338,8 +341,7 @@ CREATE TABLE mortals_xhx_attendance_leave_record( ...@@ -338,8 +341,7 @@ CREATE TABLE mortals_xhx_attendance_leave_record(
`deptId` bigint(20) COMMENT '所属部门id', `deptId` bigint(20) COMMENT '所属部门id',
`deptName` varchar(256) COMMENT '所属部门', `deptName` varchar(256) COMMENT '所属部门',
`phoneNumber` varchar(20) COMMENT '电话号码', `phoneNumber` varchar(20) COMMENT '电话号码',
`leaveType` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)', `leaveType` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)', `startTime` datetime COMMENT '开始时间',
`startTime` datetime COMMENT '开始时间',
`endTime` datetime COMMENT '结束时间', `endTime` datetime COMMENT '结束时间',
`duration` int(9) COMMENT '时长,单位秒', `duration` int(9) COMMENT '时长,单位秒',
`reason` text COMMENT '请假事由', `reason` text COMMENT '请假事由',
...@@ -370,17 +372,28 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance( ...@@ -370,17 +372,28 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance(
`compensatedLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '调休（天）', `compensatedLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '调休（天）',
`sickLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '病假（天）', `sickLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '病假（天）',
`annualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '年假（天）', `annualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '年假（天）',
`maternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '产假（天）',
`paternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '陪产假（天）',
`marriageLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '婚假（天）', `marriageLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '婚假（天）',
`menstrualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '例假（天）',
`breastfeedingLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '哺乳假（天）',
`bereavementLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '丧假（天）',
`remark` varchar(255) COMMENT '备注', `remark` varchar(255) COMMENT '备注',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`maternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '产假（天）',
`paternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '陪产假（天）',
`menstrualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '例假（天）',
`breastfeedingLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '哺乳假（天）',
`bereavementLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '丧假（天）',
`backToUnit` decimal(10,2) DEFAULT '0' COMMENT '回单位（天）',
`onDutyLeave` decimal(10,2) DEFAULT '0' COMMENT '因公请假（天）',
`outOfOffice` decimal(10,2) DEFAULT '0' COMMENT '外出勘验（天）',
`shiftCompensation` decimal(10,2) DEFAULT '0' COMMENT '值班补班（天）',
`physicalExamination` decimal(10,2) DEFAULT '0' COMMENT '体检（天）',
`quarantine` decimal(10,2) DEFAULT '0' COMMENT '隔离（天）',
`businessTrip` decimal(10,2) DEFAULT '0' COMMENT '因公外出（与窗口工作无关/天）',
`publicHoliday` decimal(10,2) DEFAULT '0' COMMENT '公休（天）',
`childRearingLeave` decimal(10,2) DEFAULT '0' COMMENT '育儿假（天）',
`transferBack` decimal(10,2) DEFAULT '0' COMMENT '调回单位（或离职/天）',
`homeLeave` decimal(10,2) DEFAULT '0' COMMENT '探亲假（天）',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息';
...@@ -392,7 +405,7 @@ CREATE TABLE mortals_xhx_attendance_vacation_record( ...@@ -392,7 +405,7 @@ CREATE TABLE mortals_xhx_attendance_vacation_record(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`staffId` bigint(20) COMMENT '员工id', `staffId` bigint(20) COMMENT '员工id',
`staffName` varchar(255) COMMENT '员工姓名', `staffName` varchar(255) COMMENT '员工姓名',
`type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)', `type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)',
`subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)', `subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)',
`validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期', `validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期',
`subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）', `subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）',
...@@ -451,7 +464,7 @@ CREATE TABLE mortals_xhx_attendance_stat( ...@@ -451,7 +464,7 @@ CREATE TABLE mortals_xhx_attendance_stat(
`funeralLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '丧假（天）', `funeralLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '丧假（天）',
`marriageLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '婚假（天）', `marriageLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '婚假（天）',
`childRearingLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '育儿假（天）', `childRearingLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '育儿假（天）',
`maternityLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '产假（陪护假/天）', `maternityLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '产假（天））',
`transferBack` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调回单位（或离职/天）', `transferBack` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调回单位（或离职/天）',
`homeLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '探亲假（天）', `homeLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '探亲假（天）',
`personalLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '事假（天）', `personalLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '事假（天）',
...@@ -474,6 +487,11 @@ CREATE TABLE mortals_xhx_attendance_stat( ...@@ -474,6 +487,11 @@ CREATE TABLE mortals_xhx_attendance_stat(
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`breastfeedingLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '哺乳假（天）',
`menstrualLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '例假（天）',
`annualLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '年假（天）',
`compensatedLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调休（天）',
`paternityLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '陪产假（天）',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤汇总信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤汇总信息';
......
doc/api.md
View file @ b5b610a3
...@@ -6925,7 +6925,7 @@ data|object|数据对象 ...@@ -6925,7 +6925,7 @@ data|object|数据对象
&emsp;&emsp;groupName|String|考勤组名称 &emsp;&emsp;groupName|String|考勤组名称
&emsp;&emsp;personNum|Integer|人数 &emsp;&emsp;personNum|Integer|人数
&emsp;&emsp;responsiblePerson|String|负责人 &emsp;&emsp;responsiblePerson|String|负责人
&emsp;&emsp;type|Integer|类型(1.固定班指) &emsp;&emsp;type|Integer|类型(1.固定班制)
&emsp;&emsp;attendanceTime|Integer|考勤时间 &emsp;&emsp;attendanceTime|Integer|考勤时间
&emsp;&emsp;remark|String|备注 &emsp;&emsp;remark|String|备注
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
...@@ -6975,7 +6975,7 @@ data|object|数据对象 ...@@ -6975,7 +6975,7 @@ data|object|数据对象
&emsp;groupName|String|考勤组名称 &emsp;groupName|String|考勤组名称
&emsp;personNum|Integer|人数 &emsp;personNum|Integer|人数
&emsp;responsiblePerson|String|负责人 &emsp;responsiblePerson|String|负责人
&emsp;type|Integer|类型(1.固定班指) &emsp;type|Integer|类型(1.固定班制)
&emsp;attendanceTime|Integer|考勤时间 &emsp;attendanceTime|Integer|考勤时间
&emsp;remark|String|备注 &emsp;remark|String|备注
&emsp;createUserId|Long|创建用户 &emsp;createUserId|Long|创建用户
...@@ -7022,7 +7022,7 @@ dict|object|字典对象 ...@@ -7022,7 +7022,7 @@ dict|object|字典对象
groupName|String|否|考勤组名称 groupName|String|否|考勤组名称
personNum|Integer|否|人数 personNum|Integer|否|人数
responsiblePerson|String|否|负责人 responsiblePerson|String|否|负责人
type|Integer|否|类型(1.固定班指) type|Integer|否|类型(1.固定班制)
attendanceTime|Integer|否|考勤时间 attendanceTime|Integer|否|考勤时间
remark|String|否|备注 remark|String|否|备注
...@@ -7051,7 +7051,7 @@ data|object|数据对象 ...@@ -7051,7 +7051,7 @@ data|object|数据对象
&emsp;&emsp;groupName|String|考勤组名称 &emsp;&emsp;groupName|String|考勤组名称
&emsp;&emsp;personNum|Integer|人数 &emsp;&emsp;personNum|Integer|人数
&emsp;&emsp;responsiblePerson|String|负责人 &emsp;&emsp;responsiblePerson|String|负责人
&emsp;&emsp;type|Integer|类型(1.固定班指) &emsp;&emsp;type|Integer|类型(1.固定班制)
&emsp;&emsp;attendanceTime|Integer|考勤时间 &emsp;&emsp;attendanceTime|Integer|考勤时间
&emsp;&emsp;remark|String|备注 &emsp;&emsp;remark|String|备注
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
...@@ -10707,7 +10707,7 @@ msg|String|消息|- ...@@ -10707,7 +10707,7 @@ msg|String|消息|-
### type ### type
字典参数key|字典参数值|其它 字典参数key|字典参数值|其它
:---|:---|:--- :---|:---|:---
1|固定班指|- 1|固定班制|-
### leaveType ### leaveType
字典参数key|字典参数值|其它 字典参数key|字典参数值|其它
:---|:---|:--- :---|:---|:---
......
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