Skip to content

A
attendance-performance-platform
Commit 991a067c authored by dll's avatar dll
Browse files
Options

提交

parents 767f6e95 4dffb1e2
Show whitespace changes
Inline Side-by-side
Showing with 9250 additions and 3671 deletions
attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/drawershow.vue
View file @ 991a067c
...@@ -35,20 +35,14 @@ ...@@ -35,20 +35,14 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' noCancelBtn />
</el-form> --> </el-form> -->
<div>
</div>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
export default { export default {
name: "AttendanceVacationBalanceDetail", name: "AttendanceVacationBalanceDetail",
mixins: [form], mixins: [form],
components: { components: {},
},
created() { created() {
this.changePath("attendance/vacation/balance") this.changePath("attendance/vacation/balance")
}, },
...@@ -121,11 +115,16 @@ ...@@ -121,11 +115,16 @@
deptId : null, deptId : null,
deptName : "", deptName : "",
entryTime : null, entryTime : null,
personalLeaveDays : BigDecimal.valueOf(0), personalLeaveDays : 0,
compensatedLeaveDays : BigDecimal.valueOf(0), compensatedLeaveDays : 0,
sickLeaveDays : BigDecimal.valueOf(0), sickLeaveDays : 0,
annualLeaveDays : BigDecimal.valueOf(0), annualLeaveDays : 0,
marriageLeaveDays : BigDecimal.valueOf(0), maternityLeaveDays : 0,
paternityLeaveDays : 0,
marriageLeaveDays : 0,
menstrualLeaveDays : 0,
breastfeedingLeaveDays : 0,
bereavementLeaveDays : 0,
remark : "", remark : "",
}; };
this.resetForm("form"); this.resetForm("form");
...@@ -136,9 +135,9 @@ ...@@ -136,9 +135,9 @@
} }
}, },
}, },
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.tips{ .tips{
font-size: 14px; font-size: 14px;
color: #999; color: #999;
......
attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue
View file @ 991a067c
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "AttendanceVacationBalanceList", name: "AttendanceVacationBalanceList",
components: { components: {
drawerShow drawerShow
}, },
mixins: [table], mixins: [table],
created() { created() {
}, },
...@@ -33,60 +33,42 @@ ...@@ -33,60 +33,42 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
doExport(){ /** 查看不同类型假期记录 */
this.isExport = true; handleCountDays(row,leavetype){
this.$download("/leave/record/exportExcel", { this.$post("/attendance/vacation/record/list", {
"idList": this.selection, page: 1,
'name': this.$route.query['name'], size: -1,
}, { type: "excel" }).then(() => this.isExport = false).catch(error => { type:leavetype,
this.isExport = false; staffId:row.staffId
this.$message.error(error.message);
}) })
}, .then((res) => {
if (res.code == 1) {
//todo 抽屉打开 假期明细信息
//this.$message.success("激活设备成功！");
}
})
.catch((error) => {
this.$message.error(error.message);
});
}
}, },
data() { data() {
return { return {
isExport:false,
config: { config: {
isshowTabPane:true,
search: [ search: [
{
name: "staffId",
type: "text",
label: "员工",
fuzzy: true
},
{
name: "deptId",
type: "select",
label: "全部部门",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
// {label: "员工id", prop: "staffId", formatter: this.formatter},
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
// {label: "部门id", prop: "deptId", formatter: this.formatter},
{label: "部门名称", prop: "deptName"}, {label: "部门名称", prop: "deptName"},
{label: "入职时间", prop: "entryTime", formatter: this.formatterDate}, {label: "入职时间", prop: "entryTime", formatter: this.formatterDate},
{label: "事假（天）", prop: "personalLeaveDays", formatter: this.formatterMoney}, {label: "事假（天）", prop: "personalLeaveDays", formatter: this.formatterMoney},
{label: "调休（天）", prop: "compensatedLeaveDays", formatter: this.formatterMoney}, {label: "调休（天）", prop: "compensatedLeaveDays", formatter: this.formatterMoney},
{label: "病假（天）", prop: "sickLeaveDays", formatter: this.formatterMoney}, {label: "病假（天）", prop: "sickLeaveDays", formatter: this.formatterMoney},
{label: "年假（天）", prop: "annualLeaveDays", formatter: this.formatterMoney}, {label: "年假（天）", prop: "annualLeaveDays", formatter: this.formatterMoney},
{label: "婚假（tian)", prop: "marriageLeaveDays", formatter: this.formatterMoney}, {label: "婚假（tian)", prop: "marriageLeaveDays", formatter: this.formatterMoney},
// {label: "创建用户", prop: "createUserId", formatter: this.formatter}, // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
{ {
label: "操作", label: "操作",
...@@ -95,12 +77,12 @@ ...@@ -95,12 +77,12 @@
return ( return (
<table-buttons noAdd noEdit noView noDel row={row} <table-buttons noAdd noEdit noView noDel row={row}
onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
); )
} }
} }
] ]
} }
};
} }
}; }
}
</script> </script>
attendance-performance-manager-ui/admin/src/views/views/attendance/vacation/record/dialogshow.vue 0 → 100644
View file @ 991a067c
<template>
<!-- 弹出框表单 -->
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<Field label="员工id" prop="staffId" v-model="form.staffId" placeholder="请输入员工id"/>
<Field label="员工姓名" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入员工姓名"/>
<Field label="请假类型" prop="type" v-model="form.type" type="select" :enumData="dict.type" placeholder="请选择请假类型"/>
<Field label="增减类型" prop="subAddType" v-model="form.subAddType" type="select" :enumData="dict.subAddType" placeholder="请选择增减类型"/>
<Field label="有效期" prop="validityPeriod" v-model="form.validityPeriod" type="textarea" placeholder="请输入有效期"/>
<Field label="增加或扣减天数" prop="subOrAddDays" v-model="form.subOrAddDays" placeholder="请输入增加或扣减天数"/>
<Field label="内容"><editor v-model="form.content" :min-height="256"/></Field>
<Field label="规则" prop="rule" v-model="form.rule" type="textarea" placeholder="请输入规则"/>
<Field label="理由" prop="reason" v-model="form.reason" type="textarea" placeholder="请输入理由"/>
<Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow";
import Editor from '@/components/Editor';
export default {
mixins: [form],
components: {
dialogShow ,
Editor,
},
data() {
return {
// 遮罩层
loading: true,
// 弹出层标题
title: "员工假期记录信息",
// 是否显示弹出层
open: false,
toString:[
"type",
"subAddType",
],
// 表单校验
rules: {
}
};
},
methods: {
/** 编辑 */
edit(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl ="attendance/vacation/record/edit";
this.getData();
this.pageInfo.type="edit"
this.title = "修改员工假期记录信息";
},
/** 新增 */
add(row) {
this.reset()
this.urls.currUrl = "attendance/vacation/record/add";
this.getData();
this.pageInfo.type="add"
this.title = "新增员工假期记录信息";
},
/** 查看*/
view(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl ="attendance/vacation/record/view";
this.getData();
this.pageInfo.type="view"
this.title = "员工假期记录信息详细";
},
/**取消按钮 */
cancel() {
this.open = false;
},
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
},
afterSubmit(data) {
this.open = false;
this.$emit("ok");
},
// 表单重置
reset() {
this.form = {
staffId : null,
staffName : "",
type : null,
subAddType : 1,
validityPeriod : "0",
subOrAddDays : BigDecimal.valueOf(0),
content : "",
rule : "",
reason : "",
remark : "",
};
this.resetForm("form");
},
resetForm(refName) {
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
},
},
};
</script>
attendance-performance-manager-ui/admin/src/views/views/attendance/vacation/record/list.vue 0 → 100644
View file @ 991a067c
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig">
</LayoutTable>
<dialog-show ref="dialogform" @ok="getData" />
</div>
</template>
<script>
/** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table";
export default {
name: "AttendanceVacationRecordList",
components: {
dialogShow
},
mixins: [table],
created() {
},
methods: {
/** 重写新增方法 */
toAdd(row) {
this.$refs.dialogform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
this.$refs.dialogform.edit(row);
},
/** 重写查看方法 */
toView(row) {
this.$refs.dialogform.view(row);
},
},
data() {
return {
config: {
search: [
],
columns: [
{type: "selection", width: 60},
{type: "index",label: "序号",width: 50},
{label: "员工id", prop: "staffId", formatter: this.formatter},
{label: "员工姓名", prop: "staffName"},
{label: "请假类型", prop: "type",formatter: this.formatter},
{label: "增减类型", prop: "subAddType",formatter: this.formatter},
{label: "有效期", prop: "validityPeriod"},
{label: "增加或扣减天数", prop: "subOrAddDays", formatter: this.formatterMoney},
{label: "创建用户", prop: "createUserId", formatter: this.formatter},
{
label: "操作",
width: 240,
formatter: row => {
return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
);
}
}
]
}
};
}
};
</script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/views/attendance/vacation/record/view.vue 0 → 100644
View file @ 991a067c
<template>
<layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border>
<template slot="title">
<i class="el-icon-tickets"></i>
基本详细信息
</template>
<template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
</template>
<el-descriptions-item label="员工id" label-class-name="labelClass" content-class-name="contentClass">
{{form.staffId}}
</el-descriptions-item>
<el-descriptions-item label="员工姓名" label-class-name="labelClass" content-class-name="contentClass">
{{form.staffName}}
</el-descriptions-item>
<el-descriptions-item label="请假类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("type", form.type) }}
</el-descriptions-item>
<el-descriptions-item label="增减类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subAddType", form.subAddType) }}
</el-descriptions-item>
<el-descriptions-item label="有效期" label-class-name="labelClass" content-class-name="contentClass">
{{form.validityPeriod}}
</el-descriptions-item>
<el-descriptions-item label="增加或扣减天数" label-class-name="labelClass" content-class-name="contentClass">
{{form.subOrAddDays}}
</el-descriptions-item>
<el-descriptions-item label="内容" label-class-name="labelClass" content-class-name="contentClass">
<editor v-model="form.content" :min-height="256"/>
</el-descriptions-item>
<el-descriptions-item label="规则" label-class-name="labelClass" content-class-name="contentClass">
{{form.rule}}
</el-descriptions-item>
<el-descriptions-item label="理由" label-class-name="labelClass" content-class-name="contentClass">
{{form.reason}}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}}
</el-descriptions-item>
</el-descriptions>
</layout-view>
</template>
<script>
import view from "@/assets/mixins/view";
import Editor from '@/components/Editor';
export default {
mixins: [view],
components: {
Editor,
},
methods: {
},
data() {
return {
size:"small",
column:2,
toString:[
"type",
"subAddType",
],
toArrays: [
],
toDate: [
]
}
}
}
</script>
<style lang="less">
.labelClass{
width: 200px;
}
.el-descriptions__body{
margin-left: 5px;
margin-right: 5px;
color: #606266;
background-color: #FFF;
}
.contentClass{
width: 600px;
}
</style>
\ No newline at end of file
attendance-performance-manager/pom.xml
View file @ 991a067c
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov-dev</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<package.environment>test</package.environment> <package.environment>test</package.environment>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<groupId>com.hikvision.ga</groupId> <groupId>com.hikvision.ga</groupId>
<artifactId>artemis-http-client</artifactId> <artifactId>artemis-http-client</artifactId>
<version>1.1.8</version> <version>1.1.8</version>
<!--<systemPath>${project.basedir}/src/main/resources/lib/artemis-http-client-1.1.8.jar</systemPath>--> <!-- <systemPath>${project.basedir}/src/main/resources/lib/artemis-http-client-1.1.8.jar</systemPath>-->
</dependency> </dependency>
<dependency> <dependency>
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/hik/ArtemisPostTest.java
View file @ 991a067c
...@@ -93,12 +93,6 @@ public class ArtemisPostTest { ...@@ -93,12 +93,6 @@ public class ArtemisPostTest {
return ArtemisHttpUtil.doPostStringArtemis(config,path, body, null, null, "application/json"); return ArtemisHttpUtil.doPostStringArtemis(config,path, body, null, null, "application/json");
} }
public static String callPostApiGetDeptList() throws Exception { public static String callPostApiGetDeptList() throws Exception {
/** /**
* https://ip:port/artemis/api/resource/v1/org/orgList * https://ip:port/artemis/api/resource/v1/org/orgList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/SubAddTypeEnum.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 增减类型(1.增加,2.扣除)枚举类
*
* @author zxfei
*/
public enum SubAddTypeEnum {
增加(1, "增加"),
扣除(2, "扣除");
private Integer value;
private String desc;
SubAddTypeEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static SubAddTypeEnum getByValue(Integer value) {
for (SubAddTypeEnum subAddTypeEnum : SubAddTypeEnum.values()) {
if (subAddTypeEnum.getValue() == value) {
return subAddTypeEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (SubAddTypeEnum item : SubAddTypeEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @ 991a067c
...@@ -4,7 +4,6 @@ import com.mortals.framework.exception.AppException; ...@@ -4,7 +4,6 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ITask; import com.mortals.framework.service.ITask;
import com.mortals.framework.service.ITaskExcuteService; import com.mortals.framework.service.ITaskExcuteService;
import com.mortals.xhx.base.framework.config.JsonUtils; import com.mortals.xhx.base.framework.config.JsonUtils;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.busiz.hik.ArtemisPostTest; import com.mortals.xhx.busiz.hik.ArtemisPostTest;
import com.mortals.xhx.busiz.rsp.DeptHikData; import com.mortals.xhx.busiz.rsp.DeptHikData;
import com.mortals.xhx.busiz.rsp.ListDept; import com.mortals.xhx.busiz.rsp.ListDept;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceVacationRecordDao.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
import java.util.List;
/**
* 员工假期记录信息Dao
* 员工假期记录信息 DAO接口
*
* @author zxfei
* @date 2023-04-12
*/
public interface AttendanceVacationRecordDao extends ICRUDDao<AttendanceVacationRecordEntity,Long>{
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceVacationRecordDaoImpl.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.attendance.dao.AttendanceVacationRecordDao;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 员工假期记录信息DaoImpl DAO接口
*
* @author zxfei
* @date 2023-04-12
*/
@Repository("attendanceVacationRecordDao")
public class AttendanceVacationRecordDaoImpl extends BaseCRUDDaoMybatis<AttendanceVacationRecordEntity,Long> implements AttendanceVacationRecordDao {
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationBalanceEntity.java
View file @ 991a067c
...@@ -9,11 +9,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -9,11 +9,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.AttendanceVacationBalanceVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationBalanceVo;
/** /**
* 员工假期余额信息实体对象 * 员工假期余额信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-11
*/ */
public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo { public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -55,10 +55,30 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -55,10 +55,30 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
* 年假（天） * 年假（天）
*/ */
private BigDecimal annualLeaveDays; private BigDecimal annualLeaveDays;
/**
* 产假（天）
*/
private BigDecimal maternityLeaveDays;
/**
* 陪产假（天）
*/
private BigDecimal paternityLeaveDays;
/** /**
* 婚假（天） * 婚假（天）
*/ */
private BigDecimal marriageLeaveDays; private BigDecimal marriageLeaveDays;
/**
* 例假（天）
*/
private BigDecimal menstrualLeaveDays;
/**
* 哺乳假（天）
*/
private BigDecimal breastfeedingLeaveDays;
/**
* 丧假（天）
*/
private BigDecimal bereavementLeaveDays;
/** /**
* 备注 * 备注
*/ */
...@@ -193,6 +213,34 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -193,6 +213,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 getMaternityLeaveDays(){
return maternityLeaveDays;
}
/**
* 设置 产假（天）
* @param maternityLeaveDays
*/
public void setMaternityLeaveDays(BigDecimal maternityLeaveDays){
this.maternityLeaveDays = maternityLeaveDays;
}
/**
* 获取 陪产假（天）
* @return BigDecimal
*/
public BigDecimal getPaternityLeaveDays(){
return paternityLeaveDays;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){
this.paternityLeaveDays = paternityLeaveDays;
}
/** /**
* 获取 婚假（天） * 获取 婚假（天）
* @return BigDecimal * @return BigDecimal
...@@ -207,6 +255,48 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -207,6 +255,48 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
public void setMarriageLeaveDays(BigDecimal marriageLeaveDays){ public void setMarriageLeaveDays(BigDecimal marriageLeaveDays){
this.marriageLeaveDays = marriageLeaveDays; this.marriageLeaveDays = marriageLeaveDays;
} }
/**
* 获取 例假（天）
* @return BigDecimal
*/
public BigDecimal getMenstrualLeaveDays(){
return menstrualLeaveDays;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public void setMenstrualLeaveDays(BigDecimal menstrualLeaveDays){
this.menstrualLeaveDays = menstrualLeaveDays;
}
/**
* 获取 哺乳假（天）
* @return BigDecimal
*/
public BigDecimal getBreastfeedingLeaveDays(){
return breastfeedingLeaveDays;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public void setBreastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
this.breastfeedingLeaveDays = breastfeedingLeaveDays;
}
/**
* 获取 丧假（天）
* @return BigDecimal
*/
public BigDecimal getBereavementLeaveDays(){
return bereavementLeaveDays;
}
/**
* 设置 丧假（天）
* @param bereavementLeaveDays
*/
public void setBereavementLeaveDays(BigDecimal bereavementLeaveDays){
this.bereavementLeaveDays = bereavementLeaveDays;
}
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
...@@ -252,7 +342,12 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -252,7 +342,12 @@ 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(",maternityLeaveDays:").append(getMaternityLeaveDays());
sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays());
sb.append(",marriageLeaveDays:").append(getMarriageLeaveDays()); sb.append(",marriageLeaveDays:").append(getMarriageLeaveDays());
sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays());
sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays());
sb.append(",bereavementLeaveDays:").append(getBereavementLeaveDays());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
return sb.toString(); return sb.toString();
} }
...@@ -277,8 +372,18 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -277,8 +372,18 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
this.annualLeaveDays = BigDecimal.valueOf(0); this.annualLeaveDays = BigDecimal.valueOf(0);
this.maternityLeaveDays = BigDecimal.valueOf(0);
this.paternityLeaveDays = BigDecimal.valueOf(0);
this.marriageLeaveDays = BigDecimal.valueOf(0); this.marriageLeaveDays = BigDecimal.valueOf(0);
this.menstrualLeaveDays = BigDecimal.valueOf(0);
this.breastfeedingLeaveDays = BigDecimal.valueOf(0);
this.bereavementLeaveDays = BigDecimal.valueOf(0);
this.remark = ""; this.remark = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationBalanceQuery.java
View file @ 991a067c
...@@ -5,11 +5,11 @@ import java.util.Date; ...@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity; import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
/** /**
* 员工假期余额信息查询对象 * 员工假期余额信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-11
*/ */
public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEntity { public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -132,6 +132,36 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt ...@@ -132,6 +132,36 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
/** 年假（天）排除列表 */ /** 年假（天）排除列表 */
private List <BigDecimal> annualLeaveDaysNotList; private List <BigDecimal> annualLeaveDaysNotList;
/** 开始 产假（天） */
private BigDecimal maternityLeaveDaysStart;
/** 结束 产假（天） */
private BigDecimal maternityLeaveDaysEnd;
/** 增加 产假（天） */
private BigDecimal maternityLeaveDaysIncrement;
/** 产假（天）列表 */
private List <BigDecimal> maternityLeaveDaysList;
/** 产假（天）排除列表 */
private List <BigDecimal> maternityLeaveDaysNotList;
/** 开始 陪产假（天） */
private BigDecimal paternityLeaveDaysStart;
/** 结束 陪产假（天） */
private BigDecimal paternityLeaveDaysEnd;
/** 增加 陪产假（天） */
private BigDecimal paternityLeaveDaysIncrement;
/** 陪产假（天）列表 */
private List <BigDecimal> paternityLeaveDaysList;
/** 陪产假（天）排除列表 */
private List <BigDecimal> paternityLeaveDaysNotList;
/** 开始 婚假（天） */ /** 开始 婚假（天） */
private BigDecimal marriageLeaveDaysStart; private BigDecimal marriageLeaveDaysStart;
...@@ -147,6 +177,51 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt ...@@ -147,6 +177,51 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
/** 婚假（天）排除列表 */ /** 婚假（天）排除列表 */
private List <BigDecimal> marriageLeaveDaysNotList; private List <BigDecimal> marriageLeaveDaysNotList;
/** 开始 例假（天） */
private BigDecimal menstrualLeaveDaysStart;
/** 结束 例假（天） */
private BigDecimal menstrualLeaveDaysEnd;
/** 增加 例假（天） */
private BigDecimal menstrualLeaveDaysIncrement;
/** 例假（天）列表 */
private List <BigDecimal> menstrualLeaveDaysList;
/** 例假（天）排除列表 */
private List <BigDecimal> menstrualLeaveDaysNotList;
/** 开始 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysStart;
/** 结束 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysEnd;
/** 增加 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysIncrement;
/** 哺乳假（天）列表 */
private List <BigDecimal> breastfeedingLeaveDaysList;
/** 哺乳假（天）排除列表 */
private List <BigDecimal> breastfeedingLeaveDaysNotList;
/** 开始 丧假（天） */
private BigDecimal bereavementLeaveDaysStart;
/** 结束 丧假（天） */
private BigDecimal bereavementLeaveDaysEnd;
/** 增加 丧假（天） */
private BigDecimal bereavementLeaveDaysIncrement;
/** 丧假（天）列表 */
private List <BigDecimal> bereavementLeaveDaysList;
/** 丧假（天）排除列表 */
private List <BigDecimal> bereavementLeaveDaysNotList;
/** 备注 */ /** 备注 */
private List<String> remarkList; private List<String> remarkList;
...@@ -865,6 +940,168 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt ...@@ -865,6 +940,168 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
} }
/**
* 获取 开始 产假（天）
* @return maternityLeaveDaysStart
*/
public BigDecimal getMaternityLeaveDaysStart(){
return this.maternityLeaveDaysStart;
}
/**
* 设置 开始 产假（天）
* @param maternityLeaveDaysStart
*/
public void setMaternityLeaveDaysStart(BigDecimal maternityLeaveDaysStart){
this.maternityLeaveDaysStart = maternityLeaveDaysStart;
}
/**
* 获取 结束 产假（天）
* @return $maternityLeaveDaysEnd
*/
public BigDecimal getMaternityLeaveDaysEnd(){
return this.maternityLeaveDaysEnd;
}
/**
* 设置 结束 产假（天）
* @param maternityLeaveDaysEnd
*/
public void setMaternityLeaveDaysEnd(BigDecimal maternityLeaveDaysEnd){
this.maternityLeaveDaysEnd = maternityLeaveDaysEnd;
}
/**
* 获取 增加 产假（天）
* @return maternityLeaveDaysIncrement
*/
public BigDecimal getMaternityLeaveDaysIncrement(){
return this.maternityLeaveDaysIncrement;
}
/**
* 设置 增加 产假（天）
* @param maternityLeaveDaysIncrement
*/
public void setMaternityLeaveDaysIncrement(BigDecimal maternityLeaveDaysIncrement){
this.maternityLeaveDaysIncrement = maternityLeaveDaysIncrement;
}
/**
* 获取 产假（天）
* @return maternityLeaveDaysList
*/
public List<BigDecimal> getMaternityLeaveDaysList(){
return this.maternityLeaveDaysList;
}
/**
* 设置 产假（天）
* @param maternityLeaveDaysList
*/
public void setMaternityLeaveDaysList(List<BigDecimal> maternityLeaveDaysList){
this.maternityLeaveDaysList = maternityLeaveDaysList;
}
/**
* 获取 产假（天）
* @return maternityLeaveDaysNotList
*/
public List<BigDecimal> getMaternityLeaveDaysNotList(){
return this.maternityLeaveDaysNotList;
}
/**
* 设置 产假（天）
* @param maternityLeaveDaysNotList
*/
public void setMaternityLeaveDaysNotList(List<BigDecimal> maternityLeaveDaysNotList){
this.maternityLeaveDaysNotList = maternityLeaveDaysNotList;
}
/**
* 获取 开始 陪产假（天）
* @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;
}
/** /**
* 获取 开始 婚假（天） * 获取 开始 婚假（天）
* @return marriageLeaveDaysStart * @return marriageLeaveDaysStart
...@@ -946,6 +1183,249 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt ...@@ -946,6 +1183,249 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
} }
/**
* 获取 开始 例假（天）
* @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 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 bereavementLeaveDaysStart
*/
public BigDecimal getBereavementLeaveDaysStart(){
return this.bereavementLeaveDaysStart;
}
/**
* 设置 开始 丧假（天）
* @param bereavementLeaveDaysStart
*/
public void setBereavementLeaveDaysStart(BigDecimal bereavementLeaveDaysStart){
this.bereavementLeaveDaysStart = bereavementLeaveDaysStart;
}
/**
* 获取 结束 丧假（天）
* @return $bereavementLeaveDaysEnd
*/
public BigDecimal getBereavementLeaveDaysEnd(){
return this.bereavementLeaveDaysEnd;
}
/**
* 设置 结束 丧假（天）
* @param bereavementLeaveDaysEnd
*/
public void setBereavementLeaveDaysEnd(BigDecimal bereavementLeaveDaysEnd){
this.bereavementLeaveDaysEnd = bereavementLeaveDaysEnd;
}
/**
* 获取 增加 丧假（天）
* @return bereavementLeaveDaysIncrement
*/
public BigDecimal getBereavementLeaveDaysIncrement(){
return this.bereavementLeaveDaysIncrement;
}
/**
* 设置 增加 丧假（天）
* @param bereavementLeaveDaysIncrement
*/
public void setBereavementLeaveDaysIncrement(BigDecimal bereavementLeaveDaysIncrement){
this.bereavementLeaveDaysIncrement = bereavementLeaveDaysIncrement;
}
/**
* 获取 丧假（天）
* @return bereavementLeaveDaysList
*/
public List<BigDecimal> getBereavementLeaveDaysList(){
return this.bereavementLeaveDaysList;
}
/**
* 设置 丧假（天）
* @param bereavementLeaveDaysList
*/
public void setBereavementLeaveDaysList(List<BigDecimal> bereavementLeaveDaysList){
this.bereavementLeaveDaysList = bereavementLeaveDaysList;
}
/**
* 获取 丧假（天）
* @return bereavementLeaveDaysNotList
*/
public List<BigDecimal> getBereavementLeaveDaysNotList(){
return this.bereavementLeaveDaysNotList;
}
/**
* 设置 丧假（天）
* @param bereavementLeaveDaysNotList
*/
public void setBereavementLeaveDaysNotList(List<BigDecimal> bereavementLeaveDaysNotList){
this.bereavementLeaveDaysNotList = bereavementLeaveDaysNotList;
}
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
...@@ -1621,6 +2101,114 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt ...@@ -1621,6 +2101,114 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
return this; return this;
} }
/**
* 设置 产假（天）
* @param maternityLeaveDays
*/
public AttendanceVacationBalanceQuery maternityLeaveDays(BigDecimal maternityLeaveDays){
setMaternityLeaveDays(maternityLeaveDays);
return this;
}
/**
* 设置 开始 产假（天）
* @param maternityLeaveDaysStart
*/
public AttendanceVacationBalanceQuery maternityLeaveDaysStart(BigDecimal maternityLeaveDaysStart){
this.maternityLeaveDaysStart = maternityLeaveDaysStart;
return this;
}
/**
* 设置 结束 产假（天）
* @param maternityLeaveDaysEnd
*/
public AttendanceVacationBalanceQuery maternityLeaveDaysEnd(BigDecimal maternityLeaveDaysEnd){
this.maternityLeaveDaysEnd = maternityLeaveDaysEnd;
return this;
}
/**
* 设置 增加 产假（天）
* @param maternityLeaveDaysIncrement
*/
public AttendanceVacationBalanceQuery maternityLeaveDaysIncrement(BigDecimal maternityLeaveDaysIncrement){
this.maternityLeaveDaysIncrement = maternityLeaveDaysIncrement;
return this;
}
/**
* 设置 产假（天）
* @param maternityLeaveDaysList
*/
public AttendanceVacationBalanceQuery maternityLeaveDaysList(List<BigDecimal> maternityLeaveDaysList){
this.maternityLeaveDaysList = maternityLeaveDaysList;
return this;
}
/**
* 设置 产假（天）
* @param maternityLeaveDaysNotList
*/
public AttendanceVacationBalanceQuery maternityLeaveDaysNotList(List<BigDecimal> maternityLeaveDaysNotList){
this.maternityLeaveDaysNotList = maternityLeaveDaysNotList;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public AttendanceVacationBalanceQuery paternityLeaveDays(BigDecimal paternityLeaveDays){
setPaternityLeaveDays(paternityLeaveDays);
return this;
}
/**
* 设置 开始 陪产假（天）
* @param paternityLeaveDaysStart
*/
public AttendanceVacationBalanceQuery paternityLeaveDaysStart(BigDecimal paternityLeaveDaysStart){
this.paternityLeaveDaysStart = paternityLeaveDaysStart;
return this;
}
/**
* 设置 结束 陪产假（天）
* @param paternityLeaveDaysEnd
*/
public AttendanceVacationBalanceQuery paternityLeaveDaysEnd(BigDecimal paternityLeaveDaysEnd){
this.paternityLeaveDaysEnd = paternityLeaveDaysEnd;
return this;
}
/**
* 设置 增加 陪产假（天）
* @param paternityLeaveDaysIncrement
*/
public AttendanceVacationBalanceQuery paternityLeaveDaysIncrement(BigDecimal paternityLeaveDaysIncrement){
this.paternityLeaveDaysIncrement = paternityLeaveDaysIncrement;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysList
*/
public AttendanceVacationBalanceQuery paternityLeaveDaysList(List<BigDecimal> paternityLeaveDaysList){
this.paternityLeaveDaysList = paternityLeaveDaysList;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysNotList
*/
public AttendanceVacationBalanceQuery paternityLeaveDaysNotList(List<BigDecimal> paternityLeaveDaysNotList){
this.paternityLeaveDaysNotList = paternityLeaveDaysNotList;
return this;
}
/** /**
* 设置 婚假（天） * 设置 婚假（天）
* @param marriageLeaveDays * @param marriageLeaveDays
...@@ -1675,6 +2263,168 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt ...@@ -1675,6 +2263,168 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
return this; return this;
} }
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public AttendanceVacationBalanceQuery menstrualLeaveDays(BigDecimal menstrualLeaveDays){
setMenstrualLeaveDays(menstrualLeaveDays);
return this;
}
/**
* 设置 开始 例假（天）
* @param menstrualLeaveDaysStart
*/
public AttendanceVacationBalanceQuery menstrualLeaveDaysStart(BigDecimal menstrualLeaveDaysStart){
this.menstrualLeaveDaysStart = menstrualLeaveDaysStart;
return this;
}
/**
* 设置 结束 例假（天）
* @param menstrualLeaveDaysEnd
*/
public AttendanceVacationBalanceQuery menstrualLeaveDaysEnd(BigDecimal menstrualLeaveDaysEnd){
this.menstrualLeaveDaysEnd = menstrualLeaveDaysEnd;
return this;
}
/**
* 设置 增加 例假（天）
* @param menstrualLeaveDaysIncrement
*/
public AttendanceVacationBalanceQuery menstrualLeaveDaysIncrement(BigDecimal menstrualLeaveDaysIncrement){
this.menstrualLeaveDaysIncrement = menstrualLeaveDaysIncrement;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysList
*/
public AttendanceVacationBalanceQuery menstrualLeaveDaysList(List<BigDecimal> menstrualLeaveDaysList){
this.menstrualLeaveDaysList = menstrualLeaveDaysList;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysNotList
*/
public AttendanceVacationBalanceQuery menstrualLeaveDaysNotList(List<BigDecimal> menstrualLeaveDaysNotList){
this.menstrualLeaveDaysNotList = menstrualLeaveDaysNotList;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public AttendanceVacationBalanceQuery breastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
setBreastfeedingLeaveDays(breastfeedingLeaveDays);
return this;
}
/**
* 设置 开始 哺乳假（天）
* @param breastfeedingLeaveDaysStart
*/
public AttendanceVacationBalanceQuery breastfeedingLeaveDaysStart(BigDecimal breastfeedingLeaveDaysStart){
this.breastfeedingLeaveDaysStart = breastfeedingLeaveDaysStart;
return this;
}
/**
* 设置 结束 哺乳假（天）
* @param breastfeedingLeaveDaysEnd
*/
public AttendanceVacationBalanceQuery breastfeedingLeaveDaysEnd(BigDecimal breastfeedingLeaveDaysEnd){
this.breastfeedingLeaveDaysEnd = breastfeedingLeaveDaysEnd;
return this;
}
/**
* 设置 增加 哺乳假（天）
* @param breastfeedingLeaveDaysIncrement
*/
public AttendanceVacationBalanceQuery breastfeedingLeaveDaysIncrement(BigDecimal breastfeedingLeaveDaysIncrement){
this.breastfeedingLeaveDaysIncrement = breastfeedingLeaveDaysIncrement;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysList
*/
public AttendanceVacationBalanceQuery breastfeedingLeaveDaysList(List<BigDecimal> breastfeedingLeaveDaysList){
this.breastfeedingLeaveDaysList = breastfeedingLeaveDaysList;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysNotList
*/
public AttendanceVacationBalanceQuery breastfeedingLeaveDaysNotList(List<BigDecimal> breastfeedingLeaveDaysNotList){
this.breastfeedingLeaveDaysNotList = breastfeedingLeaveDaysNotList;
return this;
}
/**
* 设置 丧假（天）
* @param bereavementLeaveDays
*/
public AttendanceVacationBalanceQuery bereavementLeaveDays(BigDecimal bereavementLeaveDays){
setBereavementLeaveDays(bereavementLeaveDays);
return this;
}
/**
* 设置 开始 丧假（天）
* @param bereavementLeaveDaysStart
*/
public AttendanceVacationBalanceQuery bereavementLeaveDaysStart(BigDecimal bereavementLeaveDaysStart){
this.bereavementLeaveDaysStart = bereavementLeaveDaysStart;
return this;
}
/**
* 设置 结束 丧假（天）
* @param bereavementLeaveDaysEnd
*/
public AttendanceVacationBalanceQuery bereavementLeaveDaysEnd(BigDecimal bereavementLeaveDaysEnd){
this.bereavementLeaveDaysEnd = bereavementLeaveDaysEnd;
return this;
}
/**
* 设置 增加 丧假（天）
* @param bereavementLeaveDaysIncrement
*/
public AttendanceVacationBalanceQuery bereavementLeaveDaysIncrement(BigDecimal bereavementLeaveDaysIncrement){
this.bereavementLeaveDaysIncrement = bereavementLeaveDaysIncrement;
return this;
}
/**
* 设置 丧假（天）
* @param bereavementLeaveDaysList
*/
public AttendanceVacationBalanceQuery bereavementLeaveDaysList(List<BigDecimal> bereavementLeaveDaysList){
this.bereavementLeaveDaysList = bereavementLeaveDaysList;
return this;
}
/**
* 设置 丧假（天）
* @param bereavementLeaveDaysNotList
*/
public AttendanceVacationBalanceQuery bereavementLeaveDaysNotList(List<BigDecimal> bereavementLeaveDaysNotList){
this.bereavementLeaveDaysNotList = bereavementLeaveDaysNotList;
return this;
}
/** /**
* 设置 备注 * 设置 备注
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordEntity.java 0 → 100644
View file @ 991a067c
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.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo;
/**
* 员工假期记录信息实体对象
*
* @author zxfei
* @date 2023-04-12
*/
public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
private static final long serialVersionUID = 1L;
/**
* 员工id
*/
@Excel(name = "员工id")
private Long staffId;
/**
* 员工姓名
*/
private String staffName;
/**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
*/
private Integer type;
/**
* 增减类型(1.增加,2.扣除)
*/
private Integer subAddType;
/**
* 有效期
*/
private String validityPeriod;
/**
* 增加或扣减天数（天）
*/
private BigDecimal subOrAddDays;
/**
* 内容
*/
private String content;
/**
* 规则
*/
private String rule;
/**
* 理由
*/
private String reason;
/**
* 备注
*/
private String remark;
public AttendanceVacationRecordEntity(){}
/**
* 获取 员工id
* @return Long
*/
public Long getStaffId(){
return staffId;
}
/**
* 设置 员工id
* @param staffId
*/
public void setStaffId(Long staffId){
this.staffId = staffId;
}
/**
* 获取 员工姓名
* @return String
*/
public String getStaffName(){
return staffName;
}
/**
* 设置 员工姓名
* @param staffName
*/
public void setStaffName(String staffName){
this.staffName = staffName;
}
/**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @return Integer
*/
public Integer getType(){
return type;
}
/**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param type
*/
public void setType(Integer type){
this.type = type;
}
/**
* 获取 增减类型(1.增加,2.扣除)
* @return Integer
*/
public Integer getSubAddType(){
return subAddType;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddType
*/
public void setSubAddType(Integer subAddType){
this.subAddType = subAddType;
}
/**
* 获取 有效期
* @return String
*/
public String getValidityPeriod(){
return validityPeriod;
}
/**
* 设置 有效期
* @param validityPeriod
*/
public void setValidityPeriod(String validityPeriod){
this.validityPeriod = validityPeriod;
}
/**
* 获取 增加或扣减天数（天）
* @return BigDecimal
*/
public BigDecimal getSubOrAddDays(){
return subOrAddDays;
}
/**
* 设置 增加或扣减天数（天）
* @param subOrAddDays
*/
public void setSubOrAddDays(BigDecimal subOrAddDays){
this.subOrAddDays = subOrAddDays;
}
/**
* 获取 内容
* @return String
*/
public String getContent(){
return content;
}
/**
* 设置 内容
* @param content
*/
public void setContent(String content){
this.content = content;
}
/**
* 获取 规则
* @return String
*/
public String getRule(){
return rule;
}
/**
* 设置 规则
* @param rule
*/
public void setRule(String rule){
this.rule = rule;
}
/**
* 获取 理由
* @return String
*/
public String getReason(){
return reason;
}
/**
* 设置 理由
* @param reason
*/
public void setReason(String reason){
this.reason = reason;
}
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof AttendanceVacationRecordEntity) {
AttendanceVacationRecordEntity tmp = (AttendanceVacationRecordEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",staffName:").append(getStaffName());
sb.append(",type:").append(getType());
sb.append(",subAddType:").append(getSubAddType());
sb.append(",validityPeriod:").append(getValidityPeriod());
sb.append(",subOrAddDays:").append(getSubOrAddDays());
sb.append(",content:").append(getContent());
sb.append(",rule:").append(getRule());
sb.append(",reason:").append(getReason());
sb.append(",remark:").append(getRemark());
return sb.toString();
}
public void initAttrValue(){
this.staffId = null;
this.staffName = "";
this.type = null;
this.subAddType = 1;
this.validityPeriod = "0";
this.subOrAddDays = BigDecimal.valueOf(0);
this.content = "";
this.rule = "";
this.reason = "";
this.remark = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordQuery.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
/**
* 员工假期记录信息查询对象
*
* @author zxfei
* @date 2023-04-12
*/
public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 员工id */
private Long staffIdStart;
/** 结束 员工id */
private Long staffIdEnd;
/** 增加 员工id */
private Long staffIdIncrement;
/** 员工id列表 */
private List <Long> staffIdList;
/** 员工id排除列表 */
private List <Long> staffIdNotList;
/** 员工姓名 */
private List<String> staffNameList;
/** 员工姓名排除列表 */
private List <String> staffNameNotList;
/** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */
private Integer typeStart;
/** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */
private Integer typeEnd;
/** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */
private Integer typeIncrement;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)列表 */
private List <Integer> typeList;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)排除列表 */
private List <Integer> typeNotList;
/** 开始 增减类型(1.增加,2.扣除) */
private Integer subAddTypeStart;
/** 结束 增减类型(1.增加,2.扣除) */
private Integer subAddTypeEnd;
/** 增加 增减类型(1.增加,2.扣除) */
private Integer subAddTypeIncrement;
/** 增减类型(1.增加,2.扣除)列表 */
private List <Integer> subAddTypeList;
/** 增减类型(1.增加,2.扣除)排除列表 */
private List <Integer> subAddTypeNotList;
/** 有效期 */
private List<String> validityPeriodList;
/** 有效期排除列表 */
private List <String> validityPeriodNotList;
/** 开始 增加或扣减天数（天） */
private BigDecimal subOrAddDaysStart;
/** 结束 增加或扣减天数（天） */
private BigDecimal subOrAddDaysEnd;
/** 增加 增加或扣减天数（天） */
private BigDecimal subOrAddDaysIncrement;
/** 增加或扣减天数（天）列表 */
private List <BigDecimal> subOrAddDaysList;
/** 增加或扣减天数（天）排除列表 */
private List <BigDecimal> subOrAddDaysNotList;
/** 内容 */
private List<String> contentList;
/** 内容排除列表 */
private List <String> contentNotList;
/** 规则 */
private List<String> ruleList;
/** 规则排除列表 */
private List <String> ruleNotList;
/** 理由 */
private List<String> reasonList;
/** 理由排除列表 */
private List <String> reasonNotList;
/** 备注 */
private List<String> remarkList;
/** 备注排除列表 */
private List <String> remarkNotList;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AttendanceVacationRecordQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<AttendanceVacationRecordQuery> andConditionList;
public AttendanceVacationRecordQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 员工id
* @return staffIdStart
*/
public Long getStaffIdStart(){
return this.staffIdStart;
}
/**
* 设置 开始 员工id
* @param staffIdStart
*/
public void setStaffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart;
}
/**
* 获取 结束 员工id
* @return $staffIdEnd
*/
public Long getStaffIdEnd(){
return this.staffIdEnd;
}
/**
* 设置 结束 员工id
* @param staffIdEnd
*/
public void setStaffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd;
}
/**
* 获取 增加 员工id
* @return staffIdIncrement
*/
public Long getStaffIdIncrement(){
return this.staffIdIncrement;
}
/**
* 设置 增加 员工id
* @param staffIdIncrement
*/
public void setStaffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement;
}
/**
* 获取 员工id
* @return staffIdList
*/
public List<Long> getStaffIdList(){
return this.staffIdList;
}
/**
* 设置 员工id
* @param staffIdList
*/
public void setStaffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
}
/**
* 获取 员工id
* @return staffIdNotList
*/
public List<Long> getStaffIdNotList(){
return this.staffIdNotList;
}
/**
* 设置 员工id
* @param staffIdNotList
*/
public void setStaffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
}
/**
* 获取 员工姓名
* @return staffNameList
*/
public List<String> getStaffNameList(){
return this.staffNameList;
}
/**
* 设置 员工姓名
* @param staffNameList
*/
public void setStaffNameList(List<String> staffNameList){
this.staffNameList = staffNameList;
}
/**
* 获取 员工姓名
* @return staffNameNotList
*/
public List<String> getStaffNameNotList(){
return this.staffNameNotList;
}
/**
* 设置 员工姓名
* @param staffNameNotList
*/
public void setStaffNameNotList(List<String> staffNameNotList){
this.staffNameNotList = staffNameNotList;
}
/**
* 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @return typeStart
*/
public Integer getTypeStart(){
return this.typeStart;
}
/**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeStart
*/
public void setTypeStart(Integer typeStart){
this.typeStart = typeStart;
}
/**
* 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @return $typeEnd
*/
public Integer getTypeEnd(){
return this.typeEnd;
}
/**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeEnd
*/
public void setTypeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
}
/**
* 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @return typeIncrement
*/
public Integer getTypeIncrement(){
return this.typeIncrement;
}
/**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeIncrement
*/
public void setTypeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
}
/**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @return typeList
*/
public List<Integer> getTypeList(){
return this.typeList;
}
/**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeList
*/
public void setTypeList(List<Integer> typeList){
this.typeList = typeList;
}
/**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @return typeNotList
*/
public List<Integer> getTypeNotList(){
return this.typeNotList;
}
/**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeNotList
*/
public void setTypeNotList(List<Integer> typeNotList){
this.typeNotList = typeNotList;
}
/**
* 获取 开始 增减类型(1.增加,2.扣除)
* @return subAddTypeStart
*/
public Integer getSubAddTypeStart(){
return this.subAddTypeStart;
}
/**
* 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart
*/
public void setSubAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart;
}
/**
* 获取 结束 增减类型(1.增加,2.扣除)
* @return $subAddTypeEnd
*/
public Integer getSubAddTypeEnd(){
return this.subAddTypeEnd;
}
/**
* 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd
*/
public void setSubAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd;
}
/**
* 获取 增加 增减类型(1.增加,2.扣除)
* @return subAddTypeIncrement
*/
public Integer getSubAddTypeIncrement(){
return this.subAddTypeIncrement;
}
/**
* 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement
*/
public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement;
}
/**
* 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeList
*/
public List<Integer> getSubAddTypeList(){
return this.subAddTypeList;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList
*/
public void setSubAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList;
}
/**
* 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeNotList
*/
public List<Integer> getSubAddTypeNotList(){
return this.subAddTypeNotList;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList
*/
public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList;
}
/**
* 获取 有效期
* @return validityPeriodList
*/
public List<String> getValidityPeriodList(){
return this.validityPeriodList;
}
/**
* 设置 有效期
* @param validityPeriodList
*/
public void setValidityPeriodList(List<String> validityPeriodList){
this.validityPeriodList = validityPeriodList;
}
/**
* 获取 有效期
* @return validityPeriodNotList
*/
public List<String> getValidityPeriodNotList(){
return this.validityPeriodNotList;
}
/**
* 设置 有效期
* @param validityPeriodNotList
*/
public void setValidityPeriodNotList(List<String> validityPeriodNotList){
this.validityPeriodNotList = validityPeriodNotList;
}
/**
* 获取 开始 增加或扣减天数（天）
* @return subOrAddDaysStart
*/
public BigDecimal getSubOrAddDaysStart(){
return this.subOrAddDaysStart;
}
/**
* 设置 开始 增加或扣减天数（天）
* @param subOrAddDaysStart
*/
public void setSubOrAddDaysStart(BigDecimal subOrAddDaysStart){
this.subOrAddDaysStart = subOrAddDaysStart;
}
/**
* 获取 结束 增加或扣减天数（天）
* @return $subOrAddDaysEnd
*/
public BigDecimal getSubOrAddDaysEnd(){
return this.subOrAddDaysEnd;
}
/**
* 设置 结束 增加或扣减天数（天）
* @param subOrAddDaysEnd
*/
public void setSubOrAddDaysEnd(BigDecimal subOrAddDaysEnd){
this.subOrAddDaysEnd = subOrAddDaysEnd;
}
/**
* 获取 增加 增加或扣减天数（天）
* @return subOrAddDaysIncrement
*/
public BigDecimal getSubOrAddDaysIncrement(){
return this.subOrAddDaysIncrement;
}
/**
* 设置 增加 增加或扣减天数（天）
* @param subOrAddDaysIncrement
*/
public void setSubOrAddDaysIncrement(BigDecimal subOrAddDaysIncrement){
this.subOrAddDaysIncrement = subOrAddDaysIncrement;
}
/**
* 获取 增加或扣减天数（天）
* @return subOrAddDaysList
*/
public List<BigDecimal> getSubOrAddDaysList(){
return this.subOrAddDaysList;
}
/**
* 设置 增加或扣减天数（天）
* @param subOrAddDaysList
*/
public void setSubOrAddDaysList(List<BigDecimal> subOrAddDaysList){
this.subOrAddDaysList = subOrAddDaysList;
}
/**
* 获取 增加或扣减天数（天）
* @return subOrAddDaysNotList
*/
public List<BigDecimal> getSubOrAddDaysNotList(){
return this.subOrAddDaysNotList;
}
/**
* 设置 增加或扣减天数（天）
* @param subOrAddDaysNotList
*/
public void setSubOrAddDaysNotList(List<BigDecimal> subOrAddDaysNotList){
this.subOrAddDaysNotList = subOrAddDaysNotList;
}
/**
* 获取 内容
* @return contentList
*/
public List<String> getContentList(){
return this.contentList;
}
/**
* 设置 内容
* @param contentList
*/
public void setContentList(List<String> contentList){
this.contentList = contentList;
}
/**
* 获取 内容
* @return contentNotList
*/
public List<String> getContentNotList(){
return this.contentNotList;
}
/**
* 设置 内容
* @param contentNotList
*/
public void setContentNotList(List<String> contentNotList){
this.contentNotList = contentNotList;
}
/**
* 获取 规则
* @return ruleList
*/
public List<String> getRuleList(){
return this.ruleList;
}
/**
* 设置 规则
* @param ruleList
*/
public void setRuleList(List<String> ruleList){
this.ruleList = ruleList;
}
/**
* 获取 规则
* @return ruleNotList
*/
public List<String> getRuleNotList(){
return this.ruleNotList;
}
/**
* 设置 规则
* @param ruleNotList
*/
public void setRuleNotList(List<String> ruleNotList){
this.ruleNotList = ruleNotList;
}
/**
* 获取 理由
* @return reasonList
*/
public List<String> getReasonList(){
return this.reasonList;
}
/**
* 设置 理由
* @param reasonList
*/
public void setReasonList(List<String> reasonList){
this.reasonList = reasonList;
}
/**
* 获取 理由
* @return reasonNotList
*/
public List<String> getReasonNotList(){
return this.reasonNotList;
}
/**
* 设置 理由
* @param reasonNotList
*/
public void setReasonNotList(List<String> reasonNotList){
this.reasonNotList = reasonNotList;
}
/**
* 获取 备注
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 备注
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 备注
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public AttendanceVacationRecordQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public AttendanceVacationRecordQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public AttendanceVacationRecordQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public AttendanceVacationRecordQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public AttendanceVacationRecordQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public AttendanceVacationRecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 员工id
* @param staffId
*/
public AttendanceVacationRecordQuery staffId(Long staffId){
setStaffId(staffId);
return this;
}
/**
* 设置 开始 员工id
* @param staffIdStart
*/
public AttendanceVacationRecordQuery staffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart;
return this;
}
/**
* 设置 结束 员工id
* @param staffIdEnd
*/
public AttendanceVacationRecordQuery staffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd;
return this;
}
/**
* 设置 增加 员工id
* @param staffIdIncrement
*/
public AttendanceVacationRecordQuery staffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement;
return this;
}
/**
* 设置 员工id
* @param staffIdList
*/
public AttendanceVacationRecordQuery staffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
return this;
}
/**
* 设置 员工id
* @param staffIdNotList
*/
public AttendanceVacationRecordQuery staffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
return this;
}
/**
* 设置 员工姓名
* @param staffName
*/
public AttendanceVacationRecordQuery staffName(String staffName){
setStaffName(staffName);
return this;
}
/**
* 设置 员工姓名
* @param staffNameList
*/
public AttendanceVacationRecordQuery staffNameList(List<String> staffNameList){
this.staffNameList = staffNameList;
return this;
}
/**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param type
*/
public AttendanceVacationRecordQuery type(Integer type){
setType(type);
return this;
}
/**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeStart
*/
public AttendanceVacationRecordQuery typeStart(Integer typeStart){
this.typeStart = typeStart;
return this;
}
/**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeEnd
*/
public AttendanceVacationRecordQuery typeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
return this;
}
/**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeIncrement
*/
public AttendanceVacationRecordQuery typeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
return this;
}
/**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeList
*/
public AttendanceVacationRecordQuery typeList(List<Integer> typeList){
this.typeList = typeList;
return this;
}
/**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
* @param typeNotList
*/
public AttendanceVacationRecordQuery typeNotList(List<Integer> typeNotList){
this.typeNotList = typeNotList;
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddType
*/
public AttendanceVacationRecordQuery subAddType(Integer subAddType){
setSubAddType(subAddType);
return this;
}
/**
* 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart
*/
public AttendanceVacationRecordQuery subAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart;
return this;
}
/**
* 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd
*/
public AttendanceVacationRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd;
return this;
}
/**
* 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement
*/
public AttendanceVacationRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement;
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList
*/
public AttendanceVacationRecordQuery subAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList;
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList
*/
public AttendanceVacationRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList;
return this;
}
/**
* 设置 有效期
* @param validityPeriod
*/
public AttendanceVacationRecordQuery validityPeriod(String validityPeriod){
setValidityPeriod(validityPeriod);
return this;
}
/**
* 设置 有效期
* @param validityPeriodList
*/
public AttendanceVacationRecordQuery validityPeriodList(List<String> validityPeriodList){
this.validityPeriodList = validityPeriodList;
return this;
}
/**
* 设置 增加或扣减天数（天）
* @param subOrAddDays
*/
public AttendanceVacationRecordQuery subOrAddDays(BigDecimal subOrAddDays){
setSubOrAddDays(subOrAddDays);
return this;
}
/**
* 设置 开始 增加或扣减天数（天）
* @param subOrAddDaysStart
*/
public AttendanceVacationRecordQuery subOrAddDaysStart(BigDecimal subOrAddDaysStart){
this.subOrAddDaysStart = subOrAddDaysStart;
return this;
}
/**
* 设置 结束 增加或扣减天数（天）
* @param subOrAddDaysEnd
*/
public AttendanceVacationRecordQuery subOrAddDaysEnd(BigDecimal subOrAddDaysEnd){
this.subOrAddDaysEnd = subOrAddDaysEnd;
return this;
}
/**
* 设置 增加 增加或扣减天数（天）
* @param subOrAddDaysIncrement
*/
public AttendanceVacationRecordQuery subOrAddDaysIncrement(BigDecimal subOrAddDaysIncrement){
this.subOrAddDaysIncrement = subOrAddDaysIncrement;
return this;
}
/**
* 设置 增加或扣减天数（天）
* @param subOrAddDaysList
*/
public AttendanceVacationRecordQuery subOrAddDaysList(List<BigDecimal> subOrAddDaysList){
this.subOrAddDaysList = subOrAddDaysList;
return this;
}
/**
* 设置 增加或扣减天数（天）
* @param subOrAddDaysNotList
*/
public AttendanceVacationRecordQuery subOrAddDaysNotList(List<BigDecimal> subOrAddDaysNotList){
this.subOrAddDaysNotList = subOrAddDaysNotList;
return this;
}
/**
* 设置 内容
* @param content
*/
public AttendanceVacationRecordQuery content(String content){
setContent(content);
return this;
}
/**
* 设置 内容
* @param contentList
*/
public AttendanceVacationRecordQuery contentList(List<String> contentList){
this.contentList = contentList;
return this;
}
/**
* 设置 规则
* @param rule
*/
public AttendanceVacationRecordQuery rule(String rule){
setRule(rule);
return this;
}
/**
* 设置 规则
* @param ruleList
*/
public AttendanceVacationRecordQuery ruleList(List<String> ruleList){
this.ruleList = ruleList;
return this;
}
/**
* 设置 理由
* @param reason
*/
public AttendanceVacationRecordQuery reason(String reason){
setReason(reason);
return this;
}
/**
* 设置 理由
* @param reasonList
*/
public AttendanceVacationRecordQuery reasonList(List<String> reasonList){
this.reasonList = reasonList;
return this;
}
/**
* 设置 备注
* @param remark
*/
public AttendanceVacationRecordQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 备注
* @param remarkList
*/
public AttendanceVacationRecordQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public AttendanceVacationRecordQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public AttendanceVacationRecordQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public AttendanceVacationRecordQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public AttendanceVacationRecordQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public AttendanceVacationRecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public AttendanceVacationRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public AttendanceVacationRecordQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public AttendanceVacationRecordQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public AttendanceVacationRecordQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public AttendanceVacationRecordQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public AttendanceVacationRecordQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public AttendanceVacationRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<AttendanceVacationRecordQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<AttendanceVacationRecordQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<AttendanceVacationRecordQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<AttendanceVacationRecordQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceVacationRecordVo.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
/**
* 员工假期记录信息视图对象
*
* @author zxfei
* @date 2023-04-12
*/
@Data
public class AttendanceVacationRecordVo extends BaseEntityLong {
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceVacationRecordService.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
/**
* AttendanceVacationRecordService
*
* 员工假期记录信息 service接口
*
* @author zxfei
* @date 2023-04-12
*/
public interface AttendanceVacationRecordService extends ICRUDService<AttendanceVacationRecordEntity,Long>{
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceVacationRecordServiceImpl.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.attendance.dao.AttendanceVacationRecordDao;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
import com.mortals.xhx.module.attendance.service.AttendanceVacationRecordService;
/**
* AttendanceVacationRecordService
* 员工假期记录信息 service实现
*
* @author zxfei
* @date 2023-04-12
*/
@Service("attendanceVacationRecordService")
public class AttendanceVacationRecordServiceImpl extends AbstractCRUDServiceImpl<AttendanceVacationRecordDao, AttendanceVacationRecordEntity, Long> implements AttendanceVacationRecordService {
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceVacationRecordController.java 0 → 100644
View file @ 991a067c
package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
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.AttendanceVacationRecordEntity;
import com.mortals.xhx.module.attendance.service.AttendanceVacationRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.*;
/**
*
* 员工假期记录信息
*
* @author zxfei
* @date 2023-04-12
*/
@RestController
@RequestMapping("attendance/vacation/record")
public class AttendanceVacationRecordController extends BaseCRUDJsonBodyMappingController<AttendanceVacationRecordService,AttendanceVacationRecordEntity,Long> {
@Autowired
private ParamService paramService;
public AttendanceVacationRecordController(){
super.setModuleDesc( "员工假期记录信息");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "type", paramService.getParamBySecondOrganize("AttendanceVacationRecord","type"));
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("AttendanceVacationRecord","subAddType"));
super.init(model, context);
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java
View file @ 991a067c
...@@ -26,4 +26,9 @@ public interface DeptDao extends ICRUDDao<DeptEntity,Long>{ ...@@ -26,4 +26,9 @@ public interface DeptDao extends ICRUDDao<DeptEntity,Long>{
* */ * */
List<DeptEntity> queryAllList(); List<DeptEntity> queryAllList();
/**
* 统计部门人数
* */
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java
View file @ 991a067c
...@@ -24,7 +24,6 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements ...@@ -24,7 +24,6 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements
@Override @Override
public List<DeptEntity> queryAllList() { public List<DeptEntity> queryAllList() {
return this.getList(new DeptEntity()); return this.getList(new DeptEntity());
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java
View file @ 991a067c
...@@ -6,11 +6,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -6,11 +6,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.dept.model.vo.DeptVo; import com.mortals.xhx.module.dept.model.vo.DeptVo;
/** /**
* 部门信息实体对象 * 部门信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-06 * @date 2023-04-11
*/ */
public class DeptEntity extends DeptVo { public class DeptEntity extends DeptVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -29,6 +29,11 @@ public class DeptEntity extends DeptVo { ...@@ -29,6 +29,11 @@ public class DeptEntity extends DeptVo {
*/ */
@Excel(name = "部门名称") @Excel(name = "部门名称")
private String deptName; private String deptName;
/**
* 部门编码
*/
@Excel(name = "部门编码")
private String deptCode;
/** /**
* 部门状态(0.停用,1.启用) * 部门状态(0.停用,1.启用)
*/ */
...@@ -37,6 +42,18 @@ public class DeptEntity extends DeptVo { ...@@ -37,6 +42,18 @@ public class DeptEntity extends DeptVo {
* 顺序 * 顺序
*/ */
private Integer orderNum; private Integer orderNum;
/**
* 部门人数
*/
private Integer personNum;
/**
* 负责人id
*/
private Long workId;
/**
* 负责人名称
*/
private String workName;
/** /**
* 备注 * 备注
*/ */
...@@ -87,6 +104,20 @@ public class DeptEntity extends DeptVo { ...@@ -87,6 +104,20 @@ public class DeptEntity extends DeptVo {
public void setDeptName(String deptName){ public void setDeptName(String deptName){
this.deptName = deptName; this.deptName = deptName;
} }
/**
* 获取 部门编码
* @return String
*/
public String getDeptCode(){
return deptCode;
}
/**
* 设置 部门编码
* @param deptCode
*/
public void setDeptCode(String deptCode){
this.deptCode = deptCode;
}
/** /**
* 获取 部门状态(0.停用,1.启用) * 获取 部门状态(0.停用,1.启用)
* @return Integer * @return Integer
...@@ -115,6 +146,48 @@ public class DeptEntity extends DeptVo { ...@@ -115,6 +146,48 @@ public class DeptEntity extends DeptVo {
public void setOrderNum(Integer orderNum){ public void setOrderNum(Integer orderNum){
this.orderNum = orderNum; this.orderNum = orderNum;
} }
/**
* 获取 部门人数
* @return Integer
*/
public Integer getPersonNum(){
return personNum;
}
/**
* 设置 部门人数
* @param personNum
*/
public void setPersonNum(Integer personNum){
this.personNum = personNum;
}
/**
* 获取 负责人id
* @return Long
*/
public Long getWorkId(){
return workId;
}
/**
* 设置 负责人id
* @param workId
*/
public void setWorkId(Long workId){
this.workId = workId;
}
/**
* 获取 负责人名称
* @return String
*/
public String getWorkName(){
return workName;
}
/**
* 设置 负责人名称
* @param workName
*/
public void setWorkName(String workName){
this.workName = workName;
}
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
...@@ -154,24 +227,36 @@ public class DeptEntity extends DeptVo { ...@@ -154,24 +227,36 @@ public class DeptEntity extends DeptVo {
sb.append(",parentId:").append(getParentId()); sb.append(",parentId:").append(getParentId());
sb.append(",ancestors:").append(getAncestors()); sb.append(",ancestors:").append(getAncestors());
sb.append(",deptName:").append(getDeptName()); sb.append(",deptName:").append(getDeptName());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",deptStatus:").append(getDeptStatus()); sb.append(",deptStatus:").append(getDeptStatus());
sb.append(",orderNum:").append(getOrderNum()); sb.append(",orderNum:").append(getOrderNum());
sb.append(",personNum:").append(getPersonNum());
sb.append(",workId:").append(getWorkId());
sb.append(",workName:").append(getWorkName());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.parentId = null; this.parentId = 0L;
this.ancestors = ""; this.ancestors = "";
this.deptName = ""; this.deptName = "";
this.deptCode = "";
this.deptStatus = 1; this.deptStatus = 1;
this.orderNum = 0; this.orderNum = 0;
this.personNum = 0;
this.workId = null;
this.workName = "";
this.remark = ""; this.remark = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptQuery.java
View file @ 991a067c
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.dept.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.dept.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
/** /**
* 部门信息查询对象 * 部门信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-06 * @date 2023-04-11
*/ */
public class DeptQuery extends DeptEntity { public class DeptQuery extends DeptEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -49,6 +49,11 @@ public class DeptQuery extends DeptEntity { ...@@ -49,6 +49,11 @@ public class DeptQuery extends DeptEntity {
/** 部门名称排除列表 */ /** 部门名称排除列表 */
private List <String> deptNameNotList; private List <String> deptNameNotList;
/** 部门编码 */
private List<String> deptCodeList;
/** 部门编码排除列表 */
private List <String> deptCodeNotList;
/** 开始 部门状态(0.停用,1.启用) */ /** 开始 部门状态(0.停用,1.启用) */
private Integer deptStatusStart; private Integer deptStatusStart;
...@@ -79,6 +84,41 @@ public class DeptQuery extends DeptEntity { ...@@ -79,6 +84,41 @@ public class DeptQuery extends DeptEntity {
/** 顺序排除列表 */ /** 顺序排除列表 */
private List <Integer> orderNumNotList; private List <Integer> orderNumNotList;
/** 开始 部门人数 */
private Integer personNumStart;
/** 结束 部门人数 */
private Integer personNumEnd;
/** 增加 部门人数 */
private Integer personNumIncrement;
/** 部门人数列表 */
private List <Integer> personNumList;
/** 部门人数排除列表 */
private List <Integer> personNumNotList;
/** 开始 负责人id */
private Long workIdStart;
/** 结束 负责人id */
private Long workIdEnd;
/** 增加 负责人id */
private Long workIdIncrement;
/** 负责人id列表 */
private List <Long> workIdList;
/** 负责人id排除列表 */
private List <Long> workIdNotList;
/** 负责人名称 */
private List<String> workNameList;
/** 负责人名称排除列表 */
private List <String> workNameNotList;
/** 备注 */ /** 备注 */
private List<String> remarkList; private List<String> remarkList;
...@@ -360,6 +400,38 @@ public class DeptQuery extends DeptEntity { ...@@ -360,6 +400,38 @@ public class DeptQuery extends DeptEntity {
this.deptNameNotList = deptNameNotList; this.deptNameNotList = deptNameNotList;
} }
/**
* 获取 部门编码
* @return deptCodeList
*/
public List<String> getDeptCodeList(){
return this.deptCodeList;
}
/**
* 设置 部门编码
* @param deptCodeList
*/
public void setDeptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
}
/**
* 获取 部门编码
* @return deptCodeNotList
*/
public List<String> getDeptCodeNotList(){
return this.deptCodeNotList;
}
/**
* 设置 部门编码
* @param deptCodeNotList
*/
public void setDeptCodeNotList(List<String> deptCodeNotList){
this.deptCodeNotList = deptCodeNotList;
}
/** /**
* 获取 开始 部门状态(0.停用,1.启用) * 获取 开始 部门状态(0.停用,1.启用)
* @return deptStatusStart * @return deptStatusStart
...@@ -522,6 +594,200 @@ public class DeptQuery extends DeptEntity { ...@@ -522,6 +594,200 @@ public class DeptQuery extends DeptEntity {
} }
/**
* 获取 开始 部门人数
* @return personNumStart
*/
public Integer getPersonNumStart(){
return this.personNumStart;
}
/**
* 设置 开始 部门人数
* @param personNumStart
*/
public void setPersonNumStart(Integer personNumStart){
this.personNumStart = personNumStart;
}
/**
* 获取 结束 部门人数
* @return $personNumEnd
*/
public Integer getPersonNumEnd(){
return this.personNumEnd;
}
/**
* 设置 结束 部门人数
* @param personNumEnd
*/
public void setPersonNumEnd(Integer personNumEnd){
this.personNumEnd = personNumEnd;
}
/**
* 获取 增加 部门人数
* @return personNumIncrement
*/
public Integer getPersonNumIncrement(){
return this.personNumIncrement;
}
/**
* 设置 增加 部门人数
* @param personNumIncrement
*/
public void setPersonNumIncrement(Integer personNumIncrement){
this.personNumIncrement = personNumIncrement;
}
/**
* 获取 部门人数
* @return personNumList
*/
public List<Integer> getPersonNumList(){
return this.personNumList;
}
/**
* 设置 部门人数
* @param personNumList
*/
public void setPersonNumList(List<Integer> personNumList){
this.personNumList = personNumList;
}
/**
* 获取 部门人数
* @return personNumNotList
*/
public List<Integer> getPersonNumNotList(){
return this.personNumNotList;
}
/**
* 设置 部门人数
* @param personNumNotList
*/
public void setPersonNumNotList(List<Integer> personNumNotList){
this.personNumNotList = personNumNotList;
}
/**
* 获取 开始 负责人id
* @return workIdStart
*/
public Long getWorkIdStart(){
return this.workIdStart;
}
/**
* 设置 开始 负责人id
* @param workIdStart
*/
public void setWorkIdStart(Long workIdStart){
this.workIdStart = workIdStart;
}
/**
* 获取 结束 负责人id
* @return $workIdEnd
*/
public Long getWorkIdEnd(){
return this.workIdEnd;
}
/**
* 设置 结束 负责人id
* @param workIdEnd
*/
public void setWorkIdEnd(Long workIdEnd){
this.workIdEnd = workIdEnd;
}
/**
* 获取 增加 负责人id
* @return workIdIncrement
*/
public Long getWorkIdIncrement(){
return this.workIdIncrement;
}
/**
* 设置 增加 负责人id
* @param workIdIncrement
*/
public void setWorkIdIncrement(Long workIdIncrement){
this.workIdIncrement = workIdIncrement;
}
/**
* 获取 负责人id
* @return workIdList
*/
public List<Long> getWorkIdList(){
return this.workIdList;
}
/**
* 设置 负责人id
* @param workIdList
*/
public void setWorkIdList(List<Long> workIdList){
this.workIdList = workIdList;
}
/**
* 获取 负责人id
* @return workIdNotList
*/
public List<Long> getWorkIdNotList(){
return this.workIdNotList;
}
/**
* 设置 负责人id
* @param workIdNotList
*/
public void setWorkIdNotList(List<Long> workIdNotList){
this.workIdNotList = workIdNotList;
}
/**
* 获取 负责人名称
* @return workNameList
*/
public List<String> getWorkNameList(){
return this.workNameList;
}
/**
* 设置 负责人名称
* @param workNameList
*/
public void setWorkNameList(List<String> workNameList){
this.workNameList = workNameList;
}
/**
* 获取 负责人名称
* @return workNameNotList
*/
public List<String> getWorkNameNotList(){
return this.workNameNotList;
}
/**
* 设置 负责人名称
* @param workNameNotList
*/
public void setWorkNameNotList(List<String> workNameNotList){
this.workNameNotList = workNameNotList;
}
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
...@@ -926,6 +1192,25 @@ public class DeptQuery extends DeptEntity { ...@@ -926,6 +1192,25 @@ public class DeptQuery extends DeptEntity {
return this; return this;
} }
/**
* 设置 部门编码
* @param deptCode
*/
public DeptQuery deptCode(String deptCode){
setDeptCode(deptCode);
return this;
}
/**
* 设置 部门编码
* @param deptCodeList
*/
public DeptQuery deptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
return this;
}
/** /**
* 设置 部门状态(0.停用,1.启用) * 设置 部门状态(0.停用,1.启用)
* @param deptStatus * @param deptStatus
...@@ -1034,6 +1319,133 @@ public class DeptQuery extends DeptEntity { ...@@ -1034,6 +1319,133 @@ public class DeptQuery extends DeptEntity {
return this; return this;
} }
/**
* 设置 部门人数
* @param personNum
*/
public DeptQuery personNum(Integer personNum){
setPersonNum(personNum);
return this;
}
/**
* 设置 开始 部门人数
* @param personNumStart
*/
public DeptQuery personNumStart(Integer personNumStart){
this.personNumStart = personNumStart;
return this;
}
/**
* 设置 结束 部门人数
* @param personNumEnd
*/
public DeptQuery personNumEnd(Integer personNumEnd){
this.personNumEnd = personNumEnd;
return this;
}
/**
* 设置 增加 部门人数
* @param personNumIncrement
*/
public DeptQuery personNumIncrement(Integer personNumIncrement){
this.personNumIncrement = personNumIncrement;
return this;
}
/**
* 设置 部门人数
* @param personNumList
*/
public DeptQuery personNumList(List<Integer> personNumList){
this.personNumList = personNumList;
return this;
}
/**
* 设置 部门人数
* @param personNumNotList
*/
public DeptQuery personNumNotList(List<Integer> personNumNotList){
this.personNumNotList = personNumNotList;
return this;
}
/**
* 设置 负责人id
* @param workId
*/
public DeptQuery workId(Long workId){
setWorkId(workId);
return this;
}
/**
* 设置 开始 负责人id
* @param workIdStart
*/
public DeptQuery workIdStart(Long workIdStart){
this.workIdStart = workIdStart;
return this;
}
/**
* 设置 结束 负责人id
* @param workIdEnd
*/
public DeptQuery workIdEnd(Long workIdEnd){
this.workIdEnd = workIdEnd;
return this;
}
/**
* 设置 增加 负责人id
* @param workIdIncrement
*/
public DeptQuery workIdIncrement(Long workIdIncrement){
this.workIdIncrement = workIdIncrement;
return this;
}
/**
* 设置 负责人id
* @param workIdList
*/
public DeptQuery workIdList(List<Long> workIdList){
this.workIdList = workIdList;
return this;
}
/**
* 设置 负责人id
* @param workIdNotList
*/
public DeptQuery workIdNotList(List<Long> workIdNotList){
this.workIdNotList = workIdNotList;
return this;
}
/**
* 设置 负责人名称
* @param workName
*/
public DeptQuery workName(String workName){
setWorkName(workName);
return this;
}
/**
* 设置 负责人名称
* @param workNameList
*/
public DeptQuery workNameList(List<String> workNameList){
this.workNameList = workNameList;
return this;
}
/** /**
* 设置 备注 * 设置 备注
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/vo/DeptVo.java
View file @ 991a067c
...@@ -16,4 +16,7 @@ public class DeptVo extends BaseEntityLong { ...@@ -16,4 +16,7 @@ public class DeptVo extends BaseEntityLong {
/** 子部门信息 */ /** 子部门信息 */
private List<DeptEntity> children = new ArrayList<>(); private List<DeptEntity> children = new ArrayList<>();
//成员数量
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java
View file @ 991a067c
package com.mortals.xhx.module.dept.web; package com.mortals.xhx.module.dept.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.alibaba.fastjson.JSONObject;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.framework.exception.AppException;
import com.mortals.xhx.module.dept.model.DeptQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
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 com.mortals.framework.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.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.model.DeptQuery;
import com.mortals.xhx.module.dept.model.DeptTreeSelect; 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.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap; 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 static com.mortals.framework.ap.SysConstains.RESULT_KEY;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/** /**
* 部门信息 * 部门信息
...@@ -47,6 +37,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -47,6 +37,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
private ParamService paramService; private ParamService paramService;
@Autowired @Autowired
private DeptService deptService; private DeptService deptService;
@Autowired
private WorkmanService workmanService;
public DeptController() { public DeptController() {
...@@ -56,7 +48,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -56,7 +48,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "deptStatus", paramService.getParamBySecondOrganize("Dept", "deptStatus")); this.addDict(model, "deptStatus", paramService.getParamBySecondOrganize("Dept", "deptStatus"));
this.addDict(model, "id", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
this.addDict(model, "remark", 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);
} }
...@@ -134,4 +127,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic ...@@ -134,4 +127,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
} }
@Override
protected int doListAfter(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
return super.doListAfter(query, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/model/JobEntity.java
View file @ 991a067c
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.job.model.vo.JobVo; import com.mortals.xhx.module.job.model.vo.JobVo;
/** /**
* 职位信息实体对象 * 职位信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-11
*/ */
public class JobEntity extends JobVo { public class JobEntity extends JobVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +36,10 @@ public class JobEntity extends JobVo { ...@@ -36,6 +36,10 @@ public class JobEntity extends JobVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 节点类型(1.分组,2.职位)
*/
private Integer type;
...@@ -110,6 +114,20 @@ public class JobEntity extends JobVo { ...@@ -110,6 +114,20 @@ public class JobEntity extends JobVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
/**
* 获取 节点类型(1.分组,2.职位)
* @return Integer
*/
public Integer getType(){
return type;
}
/**
* 设置 节点类型(1.分组,2.职位)
* @param type
*/
public void setType(Integer type){
this.type = type;
}
...@@ -137,6 +155,7 @@ public class JobEntity extends JobVo { ...@@ -137,6 +155,7 @@ public class JobEntity extends JobVo {
sb.append(",jobCode:").append(getJobCode()); sb.append(",jobCode:").append(getJobCode());
sb.append(",jobName:").append(getJobName()); sb.append(",jobName:").append(getJobName());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",type:").append(getType());
return sb.toString(); return sb.toString();
} }
...@@ -151,5 +170,7 @@ public class JobEntity extends JobVo { ...@@ -151,5 +170,7 @@ public class JobEntity extends JobVo {
this.jobName = ""; this.jobName = "";
this.remark = ""; this.remark = "";
this.type = 1;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/model/JobQuery.java
View file @ 991a067c
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.job.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.job.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.job.model.JobEntity; import com.mortals.xhx.module.job.model.JobEntity;
/** /**
* 职位信息查询对象 * 职位信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-11
*/ */
public class JobQuery extends JobEntity { public class JobQuery extends JobEntity {
/** 开始 主键，自增长 */ /** 开始 主键，自增长 */
private Long idStart; private Long idStart;
...@@ -101,6 +101,21 @@ public class JobQuery extends JobEntity { ...@@ -101,6 +101,21 @@ public class JobQuery extends JobEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 节点类型(1.分组,2.职位) */
private Integer typeStart;
/** 结束 节点类型(1.分组,2.职位) */
private Integer typeEnd;
/** 增加 节点类型(1.分组,2.职位) */
private Integer typeIncrement;
/** 节点类型(1.分组,2.职位)列表 */
private List <Integer> typeList;
/** 节点类型(1.分组,2.职位)排除列表 */
private List <Integer> typeNotList;
/** 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<JobQuery> orConditionList; private List<JobQuery> orConditionList;
...@@ -625,6 +640,87 @@ public class JobQuery extends JobEntity { ...@@ -625,6 +640,87 @@ public class JobQuery extends JobEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 节点类型(1.分组,2.职位)
* @return typeStart
*/
public Integer getTypeStart(){
return this.typeStart;
}
/**
* 设置 开始 节点类型(1.分组,2.职位)
* @param typeStart
*/
public void setTypeStart(Integer typeStart){
this.typeStart = typeStart;
}
/**
* 获取 结束 节点类型(1.分组,2.职位)
* @return $typeEnd
*/
public Integer getTypeEnd(){
return this.typeEnd;
}
/**
* 设置 结束 节点类型(1.分组,2.职位)
* @param typeEnd
*/
public void setTypeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
}
/**
* 获取 增加 节点类型(1.分组,2.职位)
* @return typeIncrement
*/
public Integer getTypeIncrement(){
return this.typeIncrement;
}
/**
* 设置 增加 节点类型(1.分组,2.职位)
* @param typeIncrement
*/
public void setTypeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
}
/**
* 获取 节点类型(1.分组,2.职位)
* @return typeList
*/
public List<Integer> getTypeList(){
return this.typeList;
}
/**
* 设置 节点类型(1.分组,2.职位)
* @param typeList
*/
public void setTypeList(List<Integer> typeList){
this.typeList = typeList;
}
/**
* 获取 节点类型(1.分组,2.职位)
* @return typeNotList
*/
public List<Integer> getTypeNotList(){
return this.typeNotList;
}
/**
* 设置 节点类型(1.分组,2.职位)
* @param typeNotList
*/
public void setTypeNotList(List<Integer> typeNotList){
this.typeNotList = typeNotList;
}
/** /**
* 设置 主键，自增长 * 设置 主键，自增长
* @param id * @param id
...@@ -919,6 +1015,60 @@ public class JobQuery extends JobEntity { ...@@ -919,6 +1015,60 @@ public class JobQuery extends JobEntity {
} }
/**
* 设置 节点类型(1.分组,2.职位)
* @param type
*/
public JobQuery type(Integer type){
setType(type);
return this;
}
/**
* 设置 开始 节点类型(1.分组,2.职位)
* @param typeStart
*/
public JobQuery typeStart(Integer typeStart){
this.typeStart = typeStart;
return this;
}
/**
* 设置 结束 节点类型(1.分组,2.职位)
* @param typeEnd
*/
public JobQuery typeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
return this;
}
/**
* 设置 增加 节点类型(1.分组,2.职位)
* @param typeIncrement
*/
public JobQuery typeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
return this;
}
/**
* 设置 节点类型(1.分组,2.职位)
* @param typeList
*/
public JobQuery typeList(List<Integer> typeList){
this.typeList = typeList;
return this;
}
/**
* 设置 节点类型(1.分组,2.职位)
* @param typeNotList
*/
public JobQuery typeNotList(List<Integer> typeNotList){
this.typeNotList = typeNotList;
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/dao/StaffDao.java
View file @ 991a067c
...@@ -51,4 +51,9 @@ public interface StaffDao extends ICRUDDao<StaffEntity,Long>{ ...@@ -51,4 +51,9 @@ public interface StaffDao extends ICRUDDao<StaffEntity,Long>{
* 兼职 * 兼职
* */ * */
int queryConcurrently(); int queryConcurrently();
/**
* 查询职位
* */
List<StaffEntity> queryDetp();
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java
View file @ 991a067c
...@@ -53,4 +53,11 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement ...@@ -53,4 +53,11 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement
return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently")); return this.getSqlSession().selectOne(this.getSqlId("queryConcurrently"));
} }
@Override
public List<StaffEntity> queryDetp(){
return this.getSqlSession().selectList(this.getSqlId("queryDetp"));
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffInfoVo.java
View file @ 991a067c
...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.staff.model.vo; ...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.staff.model.vo;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
public class StaffInfoVo { public class StaffInfoVo {
...@@ -19,4 +21,7 @@ public class StaffInfoVo { ...@@ -19,4 +21,7 @@ public class StaffInfoVo {
private Integer resignationStaff; private Integer resignationStaff;
//兼职 //兼职
private Integer concurrentlyStaff; private Integer concurrentlyStaff;
//刷新时间
private Date refreshDate;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java
View file @ 991a067c
...@@ -3,6 +3,8 @@ import com.mortals.framework.service.ICRUDCacheService; ...@@ -3,6 +3,8 @@ import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.xhx.module.staff.model.StaffEntity; import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.vo.StaffInfoVo; import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
import java.util.List;
/** /**
* StaffService * StaffService
* *
...@@ -14,4 +16,6 @@ import com.mortals.xhx.module.staff.model.vo.StaffInfoVo; ...@@ -14,4 +16,6 @@ import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
public interface StaffService extends ICRUDCacheService<StaffEntity,Long> { public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
StaffInfoVo queryAll(); StaffInfoVo queryAll();
List<StaffEntity> queryDept();
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @ 991a067c
...@@ -10,6 +10,8 @@ import com.mortals.xhx.module.staff.service.StaffService; ...@@ -10,6 +10,8 @@ import com.mortals.xhx.module.staff.service.StaffService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* StaffService * StaffService
* 员工基本信息 service实现 * 员工基本信息 service实现
...@@ -53,4 +55,10 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -53,4 +55,10 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
staffInfoVo.setResignationStaff(staffLeaveDao.queryResignation()); staffInfoVo.setResignationStaff(staffLeaveDao.queryResignation());
return staffInfoVo; return staffInfoVo;
} }
@Override
public List<StaffEntity> queryDept() {
return staffDao.queryDetp();
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @ 991a067c
...@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
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;
...@@ -59,6 +60,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -59,6 +60,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException { protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException {
//todo 员工信息统计--员工关系统计 //todo 员工信息统计--员工关系统计
StaffInfoVo staffInfoVo = this.service.queryAll(); StaffInfoVo staffInfoVo = this.service.queryAll();
staffInfoVo.setRefreshDate(new Date());
model.put("staff", staffInfoVo); model.put("staff", staffInfoVo);
return super.doListAfter(query, model, context); return super.doListAfter(query, model, context);
} }
...@@ -94,4 +96,13 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -94,4 +96,13 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
return super.infoAfter(id, model, entity, context); return super.infoAfter(id, model, entity, context);
} }
@Override
protected int saveAfter(StaffEntity entity, Map<String, Object> model, Context context) throws AppException {
return super.saveAfter(entity, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ 991a067c
package com.mortals.xhx.module.workman.web; package com.mortals.xhx.module.workman.web;
import com.mortals.framework.exception.AppException;
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.service.DeptService;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.service.WorkmanService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
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.*;
/** /**
* *
* 工作人员 * 工作人员
...@@ -36,14 +29,25 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -36,14 +29,25 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private DeptService deptService;
public WorkmanController(){ public WorkmanController(){
super.setModuleDesc( "工作人员"); super.setModuleDesc( "工作人员");
} }
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "positionId",deptService .find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
super.init(model, context); super.init(model, context);
} }
@Override
protected int saveAfter(WorkmanEntity entity, Map<String, Object> model, Context context) throws AppException {
DeptEntity deptEntity = new DeptEntity();
deptEntity.setRemark(entity.getName());
return super.saveAfter(entity, model, context);
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/resources/bootstrap.yml
View file @ 991a067c
...@@ -17,8 +17,8 @@ spring: ...@@ -17,8 +17,8 @@ spring:
serialization: serialization:
WRITE_DATES_AS_TIMESTAMPS: true WRITE_DATES_AS_TIMESTAMPS: true
default-property-inclusion: NON_NULL default-property-inclusion: NON_NULL
# time-zone: GMT+8 time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
dao: dao:
exceptiontranslation: exceptiontranslation:
enabled: false enabled: false
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationBalanceMapper.xml
View file @ 991a067c
<?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.AttendanceVacationBalanceDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationBalanceDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -15,7 +15,12 @@ ...@@ -15,7 +15,12 @@
<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" />
...@@ -58,9 +63,24 @@ ...@@ -58,9 +63,24 @@
<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('maternityLeaveDays') or colPickMode == 1 and data.containsKey('maternityLeaveDays')))">
a.maternityLeaveDays,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('marriageLeaveDays') or colPickMode == 1 and data.containsKey('marriageLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('marriageLeaveDays') or colPickMode == 1 and data.containsKey('marriageLeaveDays')))">
a.marriageLeaveDays, a.marriageLeaveDays,
</if> </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('breastfeedingLeaveDays') or colPickMode == 1 and data.containsKey('breastfeedingLeaveDays')))">
a.breastfeedingLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bereavementLeaveDays') or colPickMode == 1 and data.containsKey('bereavementLeaveDays')))">
a.bereavementLeaveDays,
</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('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
...@@ -81,18 +101,18 @@ ...@@ -81,18 +101,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<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,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,maternityLeaveDays,paternityLeaveDays,marriageLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,remark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{marriageLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{maternityLeaveDays},#{paternityLeaveDays},#{marriageLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</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,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,maternityLeaveDays,paternityLeaveDays,marriageLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,remark,createUserId,createTime,updateUserId,updateTime)
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.marriageLeaveDays},#{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.maternityLeaveDays},#{item.paternityLeaveDays},#{item.marriageLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -147,12 +167,42 @@ ...@@ -147,12 +167,42 @@
<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('maternityLeaveDays')) or (colPickMode==1 and !data.containsKey('maternityLeaveDays'))">
a.maternityLeaveDays=#{data.maternityLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('maternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('maternityLeaveDaysIncrement'))">
a.maternityLeaveDays=ifnull(a.maternityLeaveDays,0) + #{data.maternityLeaveDaysIncrement},
</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>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDays')) or (colPickMode==1 and !data.containsKey('marriageLeaveDays'))"> <if test="(colPickMode==0 and data.containsKey('marriageLeaveDays')) or (colPickMode==1 and !data.containsKey('marriageLeaveDays'))">
a.marriageLeaveDays=#{data.marriageLeaveDays}, a.marriageLeaveDays=#{data.marriageLeaveDays},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('marriageLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('marriageLeaveDaysIncrement'))">
a.marriageLeaveDays=ifnull(a.marriageLeaveDays,0) + #{data.marriageLeaveDaysIncrement}, a.marriageLeaveDays=ifnull(a.marriageLeaveDays,0) + #{data.marriageLeaveDaysIncrement},
</if> </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('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('bereavementLeaveDays')) or (colPickMode==1 and !data.containsKey('bereavementLeaveDays'))">
a.bereavementLeaveDays=#{data.bereavementLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('bereavementLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('bereavementLeaveDaysIncrement'))">
a.bereavementLeaveDays=ifnull(a.bereavementLeaveDays,0) + #{data.bereavementLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
...@@ -279,6 +329,30 @@ ...@@ -279,6 +329,30 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="maternityLeaveDays=(case" suffix="ELSE maternityLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('maternityLeaveDays')) or (colPickMode==1 and !item.containsKey('maternityLeaveDays'))">
when a.id=#{item.id} then #{item.maternityLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('maternityLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('maternityLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.maternityLeaveDays,0) + #{item.maternityLeaveDaysIncrement}
</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 prefix="marriageLeaveDays=(case" suffix="ELSE marriageLeaveDays end),"> <trim prefix="marriageLeaveDays=(case" suffix="ELSE marriageLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -291,6 +365,42 @@ ...@@ -291,6 +365,42 @@
</choose> </choose>
</foreach> </foreach>
</trim> </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="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="bereavementLeaveDays=(case" suffix="ELSE bereavementLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('bereavementLeaveDays')) or (colPickMode==1 and !item.containsKey('bereavementLeaveDays'))">
when a.id=#{item.id} then #{item.bereavementLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('bereavementLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('bereavementLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.bereavementLeaveDays,0) + #{item.bereavementLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),"> <trim prefix="remark=(case" suffix="ELSE remark 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'))"> <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
...@@ -460,13 +570,13 @@ ...@@ -460,13 +570,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}
...@@ -487,13 +597,13 @@ ...@@ -487,13 +597,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}
...@@ -515,13 +625,13 @@ ...@@ -515,13 +625,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}
...@@ -535,13 +645,13 @@ ...@@ -535,13 +645,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}
...@@ -563,13 +673,13 @@ ...@@ -563,13 +673,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}
...@@ -598,13 +708,13 @@ ...@@ -598,13 +708,13 @@
${_conditionType_} a.personalLeaveDays is null ${_conditionType_} a.personalLeaveDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('personalLeaveDaysList')"> <if test="conditionParamRef.containsKey('personalLeaveDaysList') and conditionParamRef.personalLeaveDaysList.size() > 0">
${_conditionType_} a.personalLeaveDays in ${_conditionType_} a.personalLeaveDays in
<foreach collection="conditionParamRef.personalLeaveDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.personalLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('personalLeaveDaysNotList')"> <if test="conditionParamRef.containsKey('personalLeaveDaysNotList') and conditionParamRef.personalLeaveDaysNotList.size() > 0">
${_conditionType_} a.personalLeaveDays not in ${_conditionType_} a.personalLeaveDays not in
<foreach collection="conditionParamRef.personalLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.personalLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -625,13 +735,13 @@ ...@@ -625,13 +735,13 @@
${_conditionType_} a.compensatedLeaveDays is null ${_conditionType_} a.compensatedLeaveDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysList')"> <if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
${_conditionType_} a.compensatedLeaveDays in ${_conditionType_} a.compensatedLeaveDays in
<foreach collection="conditionParamRef.compensatedLeaveDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.compensatedLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysNotList')"> <if test="conditionParamRef.containsKey('compensatedLeaveDaysNotList') and conditionParamRef.compensatedLeaveDaysNotList.size() > 0">
${_conditionType_} a.compensatedLeaveDays not in ${_conditionType_} a.compensatedLeaveDays not in
<foreach collection="conditionParamRef.compensatedLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.compensatedLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -652,13 +762,13 @@ ...@@ -652,13 +762,13 @@
${_conditionType_} a.sickLeaveDays is null ${_conditionType_} a.sickLeaveDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sickLeaveDaysList')"> <if test="conditionParamRef.containsKey('sickLeaveDaysList') and conditionParamRef.sickLeaveDaysList.size() > 0">
${_conditionType_} a.sickLeaveDays in ${_conditionType_} a.sickLeaveDays in
<foreach collection="conditionParamRef.sickLeaveDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sickLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sickLeaveDaysNotList')"> <if test="conditionParamRef.containsKey('sickLeaveDaysNotList') and conditionParamRef.sickLeaveDaysNotList.size() > 0">
${_conditionType_} a.sickLeaveDays not in ${_conditionType_} a.sickLeaveDays not in
<foreach collection="conditionParamRef.sickLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sickLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -679,13 +789,13 @@ ...@@ -679,13 +789,13 @@
${_conditionType_} a.annualLeaveDays is null ${_conditionType_} a.annualLeaveDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('annualLeaveDaysList')"> <if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
${_conditionType_} a.annualLeaveDays in ${_conditionType_} a.annualLeaveDays in
<foreach collection="conditionParamRef.annualLeaveDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.annualLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('annualLeaveDaysNotList')"> <if test="conditionParamRef.containsKey('annualLeaveDaysNotList') and conditionParamRef.annualLeaveDaysNotList.size() > 0">
${_conditionType_} a.annualLeaveDays not in ${_conditionType_} a.annualLeaveDays not in
<foreach collection="conditionParamRef.annualLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.annualLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -698,6 +808,60 @@ ...@@ -698,6 +808,60 @@
${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd} ${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveDays')">
<if test="conditionParamRef.maternityLeaveDays != null ">
${_conditionType_} a.maternityLeaveDays = #{${_conditionParam_}.maternityLeaveDays}
</if>
<if test="conditionParamRef.maternityLeaveDays == null">
${_conditionType_} a.maternityLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('maternityLeaveDaysList') and conditionParamRef.maternityLeaveDaysList.size() > 0">
${_conditionType_} a.maternityLeaveDays in
<foreach collection="conditionParamRef.maternityLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('maternityLeaveDaysNotList') and conditionParamRef.maternityLeaveDaysNotList.size() > 0">
${_conditionType_} a.maternityLeaveDays not in
<foreach collection="conditionParamRef.maternityLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('maternityLeaveDaysStart') and conditionParamRef.maternityLeaveDaysStart != null">
${_conditionType_} a.maternityLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.maternityLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('maternityLeaveDaysEnd') and conditionParamRef.maternityLeaveDaysEnd != null">
${_conditionType_} a.maternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.maternityLeaveDaysEnd}
</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>
<if test="conditionParamRef.containsKey('marriageLeaveDays')"> <if test="conditionParamRef.containsKey('marriageLeaveDays')">
<if test="conditionParamRef.marriageLeaveDays != null "> <if test="conditionParamRef.marriageLeaveDays != null ">
${_conditionType_} a.marriageLeaveDays = #{${_conditionParam_}.marriageLeaveDays} ${_conditionType_} a.marriageLeaveDays = #{${_conditionParam_}.marriageLeaveDays}
...@@ -706,13 +870,13 @@ ...@@ -706,13 +870,13 @@
${_conditionType_} a.marriageLeaveDays is null ${_conditionType_} a.marriageLeaveDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysList')"> <if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
${_conditionType_} a.marriageLeaveDays in ${_conditionType_} a.marriageLeaveDays in
<foreach collection="conditionParamRef.marriageLeaveDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.marriageLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysNotList')"> <if test="conditionParamRef.containsKey('marriageLeaveDaysNotList') and conditionParamRef.marriageLeaveDaysNotList.size() > 0">
${_conditionType_} a.marriageLeaveDays not in ${_conditionType_} a.marriageLeaveDays not in
<foreach collection="conditionParamRef.marriageLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.marriageLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -725,6 +889,87 @@ ...@@ -725,6 +889,87 @@
${_conditionType_} a.marriageLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.marriageLeaveDaysEnd} ${_conditionType_} a.marriageLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.marriageLeaveDaysEnd}
</if> </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('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('bereavementLeaveDays')">
<if test="conditionParamRef.bereavementLeaveDays != null ">
${_conditionType_} a.bereavementLeaveDays = #{${_conditionParam_}.bereavementLeaveDays}
</if>
<if test="conditionParamRef.bereavementLeaveDays == null">
${_conditionType_} a.bereavementLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('bereavementLeaveDaysList') and conditionParamRef.bereavementLeaveDaysList.size() > 0">
${_conditionType_} a.bereavementLeaveDays in
<foreach collection="conditionParamRef.bereavementLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('bereavementLeaveDaysNotList') and conditionParamRef.bereavementLeaveDaysNotList.size() > 0">
${_conditionType_} a.bereavementLeaveDays not in
<foreach collection="conditionParamRef.bereavementLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('bereavementLeaveDaysStart') and conditionParamRef.bereavementLeaveDaysStart != null">
${_conditionType_} a.bereavementLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.bereavementLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('bereavementLeaveDaysEnd') and conditionParamRef.bereavementLeaveDaysEnd != null">
${_conditionType_} a.bereavementLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.bereavementLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
...@@ -734,13 +979,13 @@ ...@@ -734,13 +979,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}
...@@ -754,13 +999,13 @@ ...@@ -754,13 +999,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}
...@@ -796,13 +1041,13 @@ ...@@ -796,13 +1041,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}
...@@ -893,11 +1138,36 @@ ...@@ -893,11 +1138,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('maternityLeaveDays')">
a.maternityLeaveDays
<if test='orderCol.maternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.maternityLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paternityLeaveDays')">
a.paternityLeaveDays
<if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('marriageLeaveDays')"> <if test="orderCol.containsKey('marriageLeaveDays')">
a.marriageLeaveDays a.marriageLeaveDays
<if test='orderCol.marriageLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.marriageLeaveDays)'>DESC</if> <if test='orderCol.marriageLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.marriageLeaveDays)'>DESC</if>
, ,
</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('breastfeedingLeaveDays')">
a.breastfeedingLeaveDays
<if test='orderCol.breastfeedingLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.breastfeedingLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('bereavementLeaveDays')">
a.bereavementLeaveDays
<if test='orderCol.bereavementLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.bereavementLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
a.remark a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationRecordMapper.xml 0 → 100644
View file @ 991a067c
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationRecordDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="AttendanceVacationRecordEntity" id="AttendanceVacationRecordEntity-Map">
<id property="id" column="id" />
<result property="staffId" column="staffId" />
<result property="staffName" column="staffName" />
<result property="type" column="type" />
<result property="subAddType" column="subAddType" />
<result property="validityPeriod" column="validityPeriod" />
<result property="subOrAddDays" column="subOrAddDays" />
<result property="content" column="content" />
<result property="rule" column="rule" />
<result property="reason" column="reason" />
<result property="remark" column="remark" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
a.staffId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffName') or colPickMode == 1 and data.containsKey('staffName')))">
a.staffName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
a.type,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
a.subAddType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityPeriod') or colPickMode == 1 and data.containsKey('validityPeriod')))">
a.validityPeriod,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subOrAddDays') or colPickMode == 1 and data.containsKey('subOrAddDays')))">
a.subOrAddDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
a.content,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('rule') or colPickMode == 1 and data.containsKey('rule')))">
a.rule,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reason') or colPickMode == 1 and data.containsKey('reason')))">
a.reason,
</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>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceVacationRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_vacation_record
(staffId,staffName,type,subAddType,validityPeriod,subOrAddDays,content,rule,reason,remark,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{staffId},#{staffName},#{type},#{subAddType},#{validityPeriod},#{subOrAddDays},#{content},#{rule},#{reason},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_vacation_record
(staffId,staffName,type,subAddType,validityPeriod,subOrAddDays,content,rule,reason,remark,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.type},#{item.subAddType},#{item.validityPeriod},#{item.subOrAddDays},#{item.content},#{item.rule},#{item.reason},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_attendance_vacation_record as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('staffId')) or (colPickMode==1 and !data.containsKey('staffId'))">
a.staffId=#{data.staffId},
</if>
<if test="(colPickMode==0 and data.containsKey('staffIdIncrement')) or (colPickMode==1 and !data.containsKey('staffIdIncrement'))">
a.staffId=ifnull(a.staffId,0) + #{data.staffIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('staffName')) or (colPickMode==1 and !data.containsKey('staffName'))">
a.staffName=#{data.staffName},
</if>
<if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
a.type=#{data.type},
</if>
<if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
a.type=ifnull(a.type,0) + #{data.typeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('subAddType')) or (colPickMode==1 and !data.containsKey('subAddType'))">
a.subAddType=#{data.subAddType},
</if>
<if test="(colPickMode==0 and data.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !data.containsKey('subAddTypeIncrement'))">
a.subAddType=ifnull(a.subAddType,0) + #{data.subAddTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('validityPeriod')) or (colPickMode==1 and !data.containsKey('validityPeriod'))">
a.validityPeriod=#{data.validityPeriod},
</if>
<if test="(colPickMode==0 and data.containsKey('subOrAddDays')) or (colPickMode==1 and !data.containsKey('subOrAddDays'))">
a.subOrAddDays=#{data.subOrAddDays},
</if>
<if test="(colPickMode==0 and data.containsKey('subOrAddDaysIncrement')) or (colPickMode==1 and !data.containsKey('subOrAddDaysIncrement'))">
a.subOrAddDays=ifnull(a.subOrAddDays,0) + #{data.subOrAddDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
a.content=#{data.content},
</if>
<if test="(colPickMode==0 and data.containsKey('rule')) or (colPickMode==1 and !data.containsKey('rule'))">
a.rule=#{data.rule},
</if>
<if test="(colPickMode==0 and data.containsKey('reason')) or (colPickMode==1 and !data.containsKey('reason'))">
a.reason=#{data.reason},
</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>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_attendance_vacation_record as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="staffId=(case" suffix="ELSE staffId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
when a.id=#{item.id} then #{item.staffId}
</when>
<when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="staffName=(case" suffix="ELSE staffName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('staffName')) or (colPickMode==1 and !item.containsKey('staffName'))">
when a.id=#{item.id} then #{item.staffName}
</if>
</foreach>
</trim>
<trim prefix="type=(case" suffix="ELSE type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('type')) or (colPickMode==1 and !item.containsKey('type'))">
when a.id=#{item.id} then #{item.type}
</when>
<when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))">
when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
when a.id=#{item.id} then #{item.subAddType}
</when>
<when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="validityPeriod=(case" suffix="ELSE validityPeriod end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('validityPeriod')) or (colPickMode==1 and !item.containsKey('validityPeriod'))">
when a.id=#{item.id} then #{item.validityPeriod}
</if>
</foreach>
</trim>
<trim prefix="subOrAddDays=(case" suffix="ELSE subOrAddDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('subOrAddDays')) or (colPickMode==1 and !item.containsKey('subOrAddDays'))">
when a.id=#{item.id} then #{item.subOrAddDays}
</when>
<when test="(colPickMode==0 and item.containsKey('subOrAddDaysIncrement')) or (colPickMode==1 and !item.containsKey('subOrAddDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.subOrAddDays,0) + #{item.subOrAddDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="content=(case" suffix="ELSE content end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
when a.id=#{item.id} then #{item.content}
</if>
</foreach>
</trim>
<trim prefix="rule=(case" suffix="ELSE rule end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('rule')) or (colPickMode==1 and !item.containsKey('rule'))">
when a.id=#{item.id} then #{item.rule}
</if>
</foreach>
</trim>
<trim prefix="reason=(case" suffix="ELSE reason end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('reason')) or (colPickMode==1 and !item.containsKey('reason'))">
when a.id=#{item.id} then #{item.reason}
</if>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="AttendanceVacationRecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_attendance_vacation_record as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_attendance_vacation_record as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_attendance_vacation_record where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_attendance_vacation_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_attendance_vacation_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_attendance_vacation_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="AttendanceVacationRecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_attendance_vacation_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_attendance_vacation_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('staffId')">
<if test="conditionParamRef.staffId != null ">
${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
</if>
<if test="conditionParamRef.staffId == null">
${_conditionType_} a.staffId is null
</if>
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
${_conditionType_} a.staffId in
<foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
${_conditionType_} a.staffId not in
<foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
</if>
<if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
</if>
<if test="conditionParamRef.containsKey('staffName')">
<if test="conditionParamRef.staffName != null and conditionParamRef.staffName != ''">
${_conditionType_} a.staffName like #{${_conditionParam_}.staffName}
</if>
<if test="conditionParamRef.staffName == null">
${_conditionType_} a.staffName is null
</if>
</if>
<if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
${_conditionType_} a.staffName in
<foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
${_conditionType_} a.staffName not in
<foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('type')">
<if test="conditionParamRef.type != null ">
${_conditionType_} a.type = #{${_conditionParam_}.type}
</if>
<if test="conditionParamRef.type == null">
${_conditionType_} a.type is null
</if>
</if>
<if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0">
${_conditionType_} a.type in
<foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeNotList') and conditionParamRef.typeNotList.size() > 0">
${_conditionType_} a.type not in
<foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
</if>
<if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null">
${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
</if>
<if test="conditionParamRef.containsKey('subAddType')">
<if test="conditionParamRef.subAddType != null ">
${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
</if>
<if test="conditionParamRef.subAddType == null">
${_conditionType_} a.subAddType is null
</if>
</if>
<if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
${_conditionType_} a.subAddType in
<foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
${_conditionType_} a.subAddType not in
<foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
</if>
<if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
</if>
<if test="conditionParamRef.containsKey('validityPeriod')">
<if test="conditionParamRef.validityPeriod != null and conditionParamRef.validityPeriod != ''">
${_conditionType_} a.validityPeriod like #{${_conditionParam_}.validityPeriod}
</if>
<if test="conditionParamRef.validityPeriod == null">
${_conditionType_} a.validityPeriod is null
</if>
</if>
<if test="conditionParamRef.containsKey('validityPeriodList') and conditionParamRef.validityPeriodList.size() > 0">
${_conditionType_} a.validityPeriod in
<foreach collection="conditionParamRef.validityPeriodList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('validityPeriodNotList') and conditionParamRef.validityPeriodNotList.size() > 0">
${_conditionType_} a.validityPeriod not in
<foreach collection="conditionParamRef.validityPeriodNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('subOrAddDays')">
<if test="conditionParamRef.subOrAddDays != null ">
${_conditionType_} a.subOrAddDays = #{${_conditionParam_}.subOrAddDays}
</if>
<if test="conditionParamRef.subOrAddDays == null">
${_conditionType_} a.subOrAddDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('subOrAddDaysList') and conditionParamRef.subOrAddDaysList.size() > 0">
${_conditionType_} a.subOrAddDays in
<foreach collection="conditionParamRef.subOrAddDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('subOrAddDaysNotList') and conditionParamRef.subOrAddDaysNotList.size() > 0">
${_conditionType_} a.subOrAddDays not in
<foreach collection="conditionParamRef.subOrAddDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('subOrAddDaysStart') and conditionParamRef.subOrAddDaysStart != null">
${_conditionType_} a.subOrAddDays <![CDATA[ >= ]]> #{${_conditionParam_}.subOrAddDaysStart}
</if>
<if test="conditionParamRef.containsKey('subOrAddDaysEnd') and conditionParamRef.subOrAddDaysEnd != null">
${_conditionType_} a.subOrAddDays <![CDATA[ <= ]]> #{${_conditionParam_}.subOrAddDaysEnd}
</if>
<if test="conditionParamRef.containsKey('content')">
<if test="conditionParamRef.content != null and conditionParamRef.content != ''">
${_conditionType_} a.content like #{${_conditionParam_}.content}
</if>
<if test="conditionParamRef.content == null">
${_conditionType_} a.content is null
</if>
</if>
<if test="conditionParamRef.containsKey('contentList') and conditionParamRef.contentList.size() > 0">
${_conditionType_} a.content in
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('contentNotList') and conditionParamRef.contentNotList.size() > 0">
${_conditionType_} a.content not in
<foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('rule')">
<if test="conditionParamRef.rule != null and conditionParamRef.rule != ''">
${_conditionType_} a.rule like #{${_conditionParam_}.rule}
</if>
<if test="conditionParamRef.rule == null">
${_conditionType_} a.rule is null
</if>
</if>
<if test="conditionParamRef.containsKey('ruleList') and conditionParamRef.ruleList.size() > 0">
${_conditionType_} a.rule in
<foreach collection="conditionParamRef.ruleList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ruleNotList') and conditionParamRef.ruleNotList.size() > 0">
${_conditionType_} a.rule not in
<foreach collection="conditionParamRef.ruleNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('reason')">
<if test="conditionParamRef.reason != null and conditionParamRef.reason != ''">
${_conditionType_} a.reason like #{${_conditionParam_}.reason}
</if>
<if test="conditionParamRef.reason == null">
${_conditionType_} a.reason is null
</if>
</if>
<if test="conditionParamRef.containsKey('reasonList') and conditionParamRef.reasonList.size() > 0">
${_conditionType_} a.reason in
<foreach collection="conditionParamRef.reasonList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('reasonNotList') and conditionParamRef.reasonNotList.size() > 0">
${_conditionType_} a.reason not in
<foreach collection="conditionParamRef.reasonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('staffId')">
a.staffId
<if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('staffName')">
a.staffName
<if test='orderCol.staffName != null and "DESC".equalsIgnoreCase(orderCol.staffName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('type')">
a.type
<if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('subAddType')">
a.subAddType
<if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('validityPeriod')">
a.validityPeriod
<if test='orderCol.validityPeriod != null and "DESC".equalsIgnoreCase(orderCol.validityPeriod)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('subOrAddDays')">
a.subOrAddDays
<if test='orderCol.subOrAddDays != null and "DESC".equalsIgnoreCase(orderCol.subOrAddDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('content')">
a.content
<if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('rule')">
a.rule
<if test='orderCol.rule != null and "DESC".equalsIgnoreCase(orderCol.rule)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('reason')">
a.reason
<if test='orderCol.reason != null and "DESC".equalsIgnoreCase(orderCol.reason)'>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>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/dept/DeptMapper.xml
View file @ 991a067c
<?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.dept.dao.ibatis.DeptDaoImpl"> <mapper namespace="com.mortals.xhx.module.dept.dao.ibatis.DeptDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -9,8 +9,12 @@ ...@@ -9,8 +9,12 @@
<result property="parentId" column="parentId" /> <result property="parentId" column="parentId" />
<result property="ancestors" column="ancestors" /> <result property="ancestors" column="ancestors" />
<result property="deptName" column="deptName" /> <result property="deptName" column="deptName" />
<result property="deptCode" column="deptCode" />
<result property="deptStatus" column="deptStatus" /> <result property="deptStatus" column="deptStatus" />
<result property="orderNum" column="orderNum" /> <result property="orderNum" column="orderNum" />
<result property="personNum" column="personNum" />
<result property="workId" column="workId" />
<result property="workName" column="workName" />
<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" />
...@@ -35,12 +39,24 @@ ...@@ -35,12 +39,24 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName, a.deptName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
a.deptCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptStatus') or colPickMode == 1 and data.containsKey('deptStatus')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptStatus') or colPickMode == 1 and data.containsKey('deptStatus')))">
a.deptStatus, a.deptStatus,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderNum') or colPickMode == 1 and data.containsKey('orderNum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderNum') or colPickMode == 1 and data.containsKey('orderNum')))">
a.orderNum, a.orderNum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('personNum') or colPickMode == 1 and data.containsKey('personNum')))">
a.personNum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workId') or colPickMode == 1 and data.containsKey('workId')))">
a.workId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workName') or colPickMode == 1 and data.containsKey('workName')))">
a.workName,
</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('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
...@@ -61,18 +77,18 @@ ...@@ -61,18 +77,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeptEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeptEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_dept insert into mortals_xhx_dept
(parentId,ancestors,deptName,deptStatus,orderNum,remark,createUserId,createTime,updateUserId,updateTime) (parentId,ancestors,deptName,deptCode,deptStatus,orderNum,personNum,workId,workName,remark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{parentId},#{ancestors},#{deptName},#{deptStatus},#{orderNum},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{parentId},#{ancestors},#{deptName},#{deptCode},#{deptStatus},#{orderNum},#{personNum},#{workId},#{workName},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_dept insert into mortals_xhx_dept
(parentId,ancestors,deptName,deptStatus,orderNum,remark,createUserId,createTime,updateUserId,updateTime) (parentId,ancestors,deptName,deptCode,deptStatus,orderNum,personNum,workId,workName,remark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.parentId},#{item.ancestors},#{item.deptName},#{item.deptStatus},#{item.orderNum},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.parentId},#{item.ancestors},#{item.deptName},#{item.deptCode},#{item.deptStatus},#{item.orderNum},#{item.personNum},#{item.workId},#{item.workName},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -94,6 +110,9 @@ ...@@ -94,6 +110,9 @@
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))"> <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName}, a.deptName=#{data.deptName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
a.deptCode=#{data.deptCode},
</if>
<if test="(colPickMode==0 and data.containsKey('deptStatus')) or (colPickMode==1 and !data.containsKey('deptStatus'))"> <if test="(colPickMode==0 and data.containsKey('deptStatus')) or (colPickMode==1 and !data.containsKey('deptStatus'))">
a.deptStatus=#{data.deptStatus}, a.deptStatus=#{data.deptStatus},
</if> </if>
...@@ -106,6 +125,21 @@ ...@@ -106,6 +125,21 @@
<if test="(colPickMode==0 and data.containsKey('orderNumIncrement')) or (colPickMode==1 and !data.containsKey('orderNumIncrement'))"> <if test="(colPickMode==0 and data.containsKey('orderNumIncrement')) or (colPickMode==1 and !data.containsKey('orderNumIncrement'))">
a.orderNum=ifnull(a.orderNum,0) + #{data.orderNumIncrement}, a.orderNum=ifnull(a.orderNum,0) + #{data.orderNumIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('personNum')) or (colPickMode==1 and !data.containsKey('personNum'))">
a.personNum=#{data.personNum},
</if>
<if test="(colPickMode==0 and data.containsKey('personNumIncrement')) or (colPickMode==1 and !data.containsKey('personNumIncrement'))">
a.personNum=ifnull(a.personNum,0) + #{data.personNumIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('workId')) or (colPickMode==1 and !data.containsKey('workId'))">
a.workId=#{data.workId},
</if>
<if test="(colPickMode==0 and data.containsKey('workIdIncrement')) or (colPickMode==1 and !data.containsKey('workIdIncrement'))">
a.workId=ifnull(a.workId,0) + #{data.workIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('workName')) or (colPickMode==1 and !data.containsKey('workName'))">
a.workName=#{data.workName},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
...@@ -165,6 +199,13 @@ ...@@ -165,6 +199,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
when a.id=#{item.id} then #{item.deptCode}
</if>
</foreach>
</trim>
<trim prefix="deptStatus=(case" suffix="ELSE deptStatus end),"> <trim prefix="deptStatus=(case" suffix="ELSE deptStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -189,6 +230,37 @@ ...@@ -189,6 +230,37 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="personNum=(case" suffix="ELSE personNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('personNum')) or (colPickMode==1 and !item.containsKey('personNum'))">
when a.id=#{item.id} then #{item.personNum}
</when>
<when test="(colPickMode==0 and item.containsKey('personNumIncrement')) or (colPickMode==1 and !item.containsKey('personNumIncrement'))">
when a.id=#{item.id} then ifnull(a.personNum,0) + #{item.personNumIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="workId=(case" suffix="ELSE workId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('workId')) or (colPickMode==1 and !item.containsKey('workId'))">
when a.id=#{item.id} then #{item.workId}
</when>
<when test="(colPickMode==0 and item.containsKey('workIdIncrement')) or (colPickMode==1 and !item.containsKey('workIdIncrement'))">
when a.id=#{item.id} then ifnull(a.workId,0) + #{item.workIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="workName=(case" suffix="ELSE workName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('workName')) or (colPickMode==1 and !item.containsKey('workName'))">
when a.id=#{item.id} then #{item.workName}
</if>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),"> <trim prefix="remark=(case" suffix="ELSE remark 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'))"> <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
...@@ -450,6 +522,27 @@ ...@@ -450,6 +522,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptCode')">
<if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
</if>
<if test="conditionParamRef.deptCode == null">
${_conditionType_} a.deptCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptCodeList') and conditionParamRef.deptCodeList.size() > 0">
${_conditionType_} a.deptCode in
<foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptCodeNotList') and conditionParamRef.deptCodeNotList.size() > 0">
${_conditionType_} a.deptCode not in
<foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptStatus')"> <if test="conditionParamRef.containsKey('deptStatus')">
<if test="conditionParamRef.deptStatus != null "> <if test="conditionParamRef.deptStatus != null ">
${_conditionType_} a.deptStatus = #{${_conditionParam_}.deptStatus} ${_conditionType_} a.deptStatus = #{${_conditionParam_}.deptStatus}
...@@ -504,6 +597,81 @@ ...@@ -504,6 +597,81 @@
${_conditionType_} a.orderNum <![CDATA[ <= ]]> #{${_conditionParam_}.orderNumEnd} ${_conditionType_} a.orderNum <![CDATA[ <= ]]> #{${_conditionParam_}.orderNumEnd}
</if> </if>
<if test="conditionParamRef.containsKey('personNum')">
<if test="conditionParamRef.personNum != null ">
${_conditionType_} a.personNum = #{${_conditionParam_}.personNum}
</if>
<if test="conditionParamRef.personNum == null">
${_conditionType_} a.personNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('personNumList') and conditionParamRef.personNumList.size() > 0">
${_conditionType_} a.personNum in
<foreach collection="conditionParamRef.personNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('personNumNotList') and conditionParamRef.personNumNotList.size() > 0">
${_conditionType_} a.personNum not in
<foreach collection="conditionParamRef.personNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('personNumStart') and conditionParamRef.personNumStart != null">
${_conditionType_} a.personNum <![CDATA[ >= ]]> #{${_conditionParam_}.personNumStart}
</if>
<if test="conditionParamRef.containsKey('personNumEnd') and conditionParamRef.personNumEnd != null">
${_conditionType_} a.personNum <![CDATA[ <= ]]> #{${_conditionParam_}.personNumEnd}
</if>
<if test="conditionParamRef.containsKey('workId')">
<if test="conditionParamRef.workId != null ">
${_conditionType_} a.workId = #{${_conditionParam_}.workId}
</if>
<if test="conditionParamRef.workId == null">
${_conditionType_} a.workId is null
</if>
</if>
<if test="conditionParamRef.containsKey('workIdList') and conditionParamRef.workIdList.size() > 0">
${_conditionType_} a.workId in
<foreach collection="conditionParamRef.workIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workIdNotList') and conditionParamRef.workIdNotList.size() > 0">
${_conditionType_} a.workId not in
<foreach collection="conditionParamRef.workIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workIdStart') and conditionParamRef.workIdStart != null">
${_conditionType_} a.workId <![CDATA[ >= ]]> #{${_conditionParam_}.workIdStart}
</if>
<if test="conditionParamRef.containsKey('workIdEnd') and conditionParamRef.workIdEnd != null">
${_conditionType_} a.workId <![CDATA[ <= ]]> #{${_conditionParam_}.workIdEnd}
</if>
<if test="conditionParamRef.containsKey('workName')">
<if test="conditionParamRef.workName != null and conditionParamRef.workName != ''">
${_conditionType_} a.workName like #{${_conditionParam_}.workName}
</if>
<if test="conditionParamRef.workName == null">
${_conditionType_} a.workName is null
</if>
</if>
<if test="conditionParamRef.containsKey('workNameList') and conditionParamRef.workNameList.size() > 0">
${_conditionType_} a.workName in
<foreach collection="conditionParamRef.workNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workNameNotList') and conditionParamRef.workNameNotList.size() > 0">
${_conditionType_} a.workName not in
<foreach collection="conditionParamRef.workNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
...@@ -642,6 +810,11 @@ ...@@ -642,6 +810,11 @@
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if> <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deptCode')">
a.deptCode
<if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptStatus')"> <if test="orderCol.containsKey('deptStatus')">
a.deptStatus a.deptStatus
<if test='orderCol.deptStatus != null and "DESC".equalsIgnoreCase(orderCol.deptStatus)'>DESC</if> <if test='orderCol.deptStatus != null and "DESC".equalsIgnoreCase(orderCol.deptStatus)'>DESC</if>
...@@ -652,6 +825,21 @@ ...@@ -652,6 +825,21 @@
<if test='orderCol.orderNum != null and "DESC".equalsIgnoreCase(orderCol.orderNum)'>DESC</if> <if test='orderCol.orderNum != null and "DESC".equalsIgnoreCase(orderCol.orderNum)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('personNum')">
a.personNum
<if test='orderCol.personNum != null and "DESC".equalsIgnoreCase(orderCol.personNum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('workId')">
a.workId
<if test='orderCol.workId != null and "DESC".equalsIgnoreCase(orderCol.workId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('workName')">
a.workName
<if test='orderCol.workName != null and "DESC".equalsIgnoreCase(orderCol.workName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
a.remark a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
......
attendance-performance-manager/src/main/resources/sqlmap/module/job/JobMapper.xml
View file @ 991a067c
<?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.job.dao.ibatis.JobDaoImpl"> <mapper namespace="com.mortals.xhx.module.job.dao.ibatis.JobDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="type" column="type" />
</resultMap> </resultMap>
...@@ -52,23 +53,26 @@ ...@@ -52,23 +53,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('type') or colPickMode == 1 and data.containsKey('type')))">
a.type,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="JobEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="JobEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_job insert into mortals_xhx_job
(groupId,groupName,jobCode,jobName,remark,createTime,createUserId,updateUserId,updateTime) (groupId,groupName,jobCode,jobName,remark,createTime,createUserId,updateUserId,updateTime,type)
VALUES VALUES
(#{groupId},#{groupName},#{jobCode},#{jobName},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime}) (#{groupId},#{groupName},#{jobCode},#{jobName},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{type})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_job insert into mortals_xhx_job
(groupId,groupName,jobCode,jobName,remark,createTime,createUserId,updateUserId,updateTime) (groupId,groupName,jobCode,jobName,remark,createTime,createUserId,updateUserId,updateTime,type)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.groupId},#{item.groupName},#{item.jobCode},#{item.jobName},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime}) (#{item.groupId},#{item.groupName},#{item.jobCode},#{item.jobName},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.type})
</foreach> </foreach>
</insert> </insert>
...@@ -114,6 +118,12 @@ ...@@ -114,6 +118,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('type')) or (colPickMode==1 and !data.containsKey('type'))">
a.type=#{data.type},
</if>
<if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
a.type=ifnull(a.type,0) + #{data.typeIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -204,6 +214,18 @@ ...@@ -204,6 +214,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="type=(case" suffix="ELSE type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('type')) or (colPickMode==1 and !item.containsKey('type'))">
when a.id=#{item.id} then #{item.type}
</when>
<when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))">
when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement}
</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=")">
...@@ -328,13 +350,13 @@ ...@@ -328,13 +350,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}
...@@ -355,13 +377,13 @@ ...@@ -355,13 +377,13 @@
${_conditionType_} a.groupId is null ${_conditionType_} a.groupId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('groupIdList')"> <if test="conditionParamRef.containsKey('groupIdList') and conditionParamRef.groupIdList.size() > 0">
${_conditionType_} a.groupId in ${_conditionType_} a.groupId in
<foreach collection="conditionParamRef.groupIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.groupIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('groupIdNotList')"> <if test="conditionParamRef.containsKey('groupIdNotList') and conditionParamRef.groupIdNotList.size() > 0">
${_conditionType_} a.groupId not in ${_conditionType_} a.groupId not in
<foreach collection="conditionParamRef.groupIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.groupIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -383,13 +405,13 @@ ...@@ -383,13 +405,13 @@
${_conditionType_} a.groupName is null ${_conditionType_} a.groupName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('groupNameList')"> <if test="conditionParamRef.containsKey('groupNameList') and conditionParamRef.groupNameList.size() > 0">
${_conditionType_} a.groupName in ${_conditionType_} a.groupName in
<foreach collection="conditionParamRef.groupNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.groupNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('groupNameNotList')"> <if test="conditionParamRef.containsKey('groupNameNotList') and conditionParamRef.groupNameNotList.size() > 0">
${_conditionType_} a.groupName not in ${_conditionType_} a.groupName not in
<foreach collection="conditionParamRef.groupNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.groupNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -404,13 +426,13 @@ ...@@ -404,13 +426,13 @@
${_conditionType_} a.jobCode is null ${_conditionType_} a.jobCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('jobCodeList')"> <if test="conditionParamRef.containsKey('jobCodeList') and conditionParamRef.jobCodeList.size() > 0">
${_conditionType_} a.jobCode in ${_conditionType_} a.jobCode in
<foreach collection="conditionParamRef.jobCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('jobCodeNotList')"> <if test="conditionParamRef.containsKey('jobCodeNotList') and conditionParamRef.jobCodeNotList.size() > 0">
${_conditionType_} a.jobCode not in ${_conditionType_} a.jobCode not in
<foreach collection="conditionParamRef.jobCodeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -425,13 +447,13 @@ ...@@ -425,13 +447,13 @@
${_conditionType_} a.jobName is null ${_conditionType_} a.jobName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('jobNameList')"> <if test="conditionParamRef.containsKey('jobNameList') and conditionParamRef.jobNameList.size() > 0">
${_conditionType_} a.jobName in ${_conditionType_} a.jobName in
<foreach collection="conditionParamRef.jobNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('jobNameNotList')"> <if test="conditionParamRef.containsKey('jobNameNotList') and conditionParamRef.jobNameNotList.size() > 0">
${_conditionType_} a.jobName not in ${_conditionType_} a.jobName not in
<foreach collection="conditionParamRef.jobNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -446,13 +468,13 @@ ...@@ -446,13 +468,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}
...@@ -481,13 +503,13 @@ ...@@ -481,13 +503,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}
...@@ -508,13 +530,13 @@ ...@@ -508,13 +530,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}
...@@ -542,6 +564,33 @@ ...@@ -542,6 +564,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('type')">
<if test="conditionParamRef.type != null ">
${_conditionType_} a.type = #{${_conditionParam_}.type}
</if>
<if test="conditionParamRef.type == null">
${_conditionType_} a.type is null
</if>
</if>
<if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0">
${_conditionType_} a.type in
<foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeNotList') and conditionParamRef.typeNotList.size() > 0">
${_conditionType_} a.type not in
<foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
</if>
<if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null">
${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -605,6 +654,11 @@ ...@@ -605,6 +654,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('type')">
a.type
<if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @ 991a067c
...@@ -1337,4 +1337,7 @@ ...@@ -1337,4 +1337,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="queryDetp" resultType="com.mortals.xhx.module.staff.model.StaffEntity">
select deptName from mortals_xhx_staff group by deptName
</select>
</mapper> </mapper>
\ No newline at end of file
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceClassController.http
View file @ 991a067c
...@@ -33,7 +33,7 @@ Content-Type: application/json ...@@ -33,7 +33,7 @@ Content-Type: application/json
"className":"rkd3tw", "className":"rkd3tw",
"classResponsiblePersonId":291, "classResponsiblePersonId":291,
"classResponsiblePersonName":"mbga7i", "classResponsiblePersonName":"mbga7i",
"remark":"l73cn1", "remark":"l73cn1"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceClassDetailController.http
View file @ 991a067c
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"offWorkDate":"1680883200000", "offWorkDate":"1680883200000",
"offWorkDateBefore":558, "offWorkDateBefore":558,
"offWorkDateAfter":772, "offWorkDateAfter":772,
"remark":"38en8a", "remark":"38en8a"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFixedworkController.http
View file @ 991a067c
...@@ -54,7 +54,7 @@ Content-Type: application/json ...@@ -54,7 +54,7 @@ Content-Type: application/json
"sundayClassId":546, "sundayClassId":546,
"sundayClassName":"uq3lhu", "sundayClassName":"uq3lhu",
"holidays":1, "holidays":1,
"remark":"u6z76o", "remark":"u6z76o"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFixedworkSpecialController.http
View file @ 991a067c
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"specialTime":"1680883200000", "specialTime":"1680883200000",
"specialTimeStart":"1680883200000", "specialTimeStart":"1680883200000",
"specialTimeEnd":"1680883200000", "specialTimeEnd":"1680883200000",
"remark":"eun5vs", "remark":"eun5vs"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFreeworkController.http
View file @ 991a067c
...@@ -41,7 +41,7 @@ Content-Type: application/json ...@@ -41,7 +41,7 @@ Content-Type: application/json
"sunday":0, "sunday":0,
"holidays":1, "holidays":1,
"workTime":0, "workTime":0,
"remark":"pbndzz", "remark":"pbndzz"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupFreeworkSpecialController.http
View file @ 991a067c
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"specialTime":"1680883200000", "specialTime":"1680883200000",
"specialTimeStart":"1680883200000", "specialTimeStart":"1680883200000",
"specialTimeEnd":"1680883200000", "specialTimeEnd":"1680883200000",
"remark":"482xif", "remark":"482xif"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupResponsibleController.http
View file @ 991a067c
...@@ -36,7 +36,7 @@ Content-Type: application/json ...@@ -36,7 +36,7 @@ Content-Type: application/json
"responsibleId":395, "responsibleId":395,
"responsibleName":"uwo4fh", "responsibleName":"uwo4fh",
"responsibleType":768, "responsibleType":768,
"remark":"y4pguf", "remark":"y4pguf"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceGroupStaffController.http
View file @ 991a067c
...@@ -36,7 +36,7 @@ Content-Type: application/json ...@@ -36,7 +36,7 @@ Content-Type: application/json
"staffId":289, "staffId":289,
"staffName":"s1l6xv", "staffName":"s1l6xv",
"partAttendance":82, "partAttendance":82,
"remark":"jjogmm", "remark":"jjogmm"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceLeaveRecordController.http
View file @ 991a067c
...@@ -50,7 +50,7 @@ Content-Type: application/json ...@@ -50,7 +50,7 @@ Content-Type: application/json
"approver":"7ihkp2", "approver":"7ihkp2",
"attachment":"3ho9of", "attachment":"3ho9of",
"attachmentPath":"p9ovhu", "attachmentPath":"p9ovhu",
"remark":"uxsqrs", "remark":"uxsqrs"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordController.http
View file @ 991a067c
...@@ -43,7 +43,7 @@ Content-Type: application/json ...@@ -43,7 +43,7 @@ Content-Type: application/json
"shiftsId":439, "shiftsId":439,
"shiftsName":"1zzktm", "shiftsName":"1zzktm",
"attendanceDate":"1680796800000", "attendanceDate":"1680796800000",
"remark":"0rlbnv", "remark":"0rlbnv"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordDetailController.http
View file @ 991a067c
...@@ -37,7 +37,7 @@ Content-Type: application/json ...@@ -37,7 +37,7 @@ Content-Type: application/json
"goWorkResult":642, "goWorkResult":642,
"offWorkDate":"1680796800000", "offWorkDate":"1680796800000",
"offWorkResult":656, "offWorkResult":656,
"remark":"h0anyu", "remark":"h0anyu"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordErrorController.http
View file @ 991a067c
...@@ -53,7 +53,7 @@ Content-Type: application/json ...@@ -53,7 +53,7 @@ Content-Type: application/json
"errorStatus":0, "errorStatus":0,
"processStatus":0, "processStatus":0,
"processResult":"s1gyfc", "processResult":"s1gyfc",
"remark":"4t1f2x", "remark":"4t1f2x"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceRecordHikController.http
View file @ 991a067c
...@@ -48,7 +48,7 @@ Content-Type: application/json ...@@ -48,7 +48,7 @@ Content-Type: application/json
"attendanceDate":"1680883200000", "attendanceDate":"1680883200000",
"attendanceAddress":"zta8r5", "attendanceAddress":"zta8r5",
"eventSource":"42l4jh", "eventSource":"42l4jh",
"remark":"ftcbb3", "remark":"ftcbb3"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceStaffStatController.http
View file @ 991a067c
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"year":269, "year":269,
"month":903, "month":903,
"day":431, "day":431,
"remark":"4e0w24", "remark":"4e0w24"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceStatController.http
View file @ 991a067c
...@@ -95,7 +95,7 @@ Content-Type: application/json ...@@ -95,7 +95,7 @@ Content-Type: application/json
"year":593, "year":593,
"month":333, "month":333,
"day":983, "day":983,
"remark":"no1wds", "remark":"no1wds"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceVacationBalanceController.http
View file @ 991a067c
...@@ -50,7 +50,7 @@ Content-Type: application/json ...@@ -50,7 +50,7 @@ Content-Type: application/json
"sickLeaveDays":0, "sickLeaveDays":0,
"annualLeaveDays":0, "annualLeaveDays":0,
"marriageLeaveDays":0, "marriageLeaveDays":0,
"remark":"rmgjgc", "remark":"rmgjgc"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/attendance/AttendanceVacationRecordController.http 0 → 100644
View file @ 991a067c
###登录
POST {{baseUrl}}/login/login
Content-Type: application/json
{
"loginName":"admin",
"password":"admin",
"securityCode":"8888"
}
> {%
client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
client.global.set("authToken", JSON.parse(response.body).data.token);
%}
###员工假期记录信息列表
POST {{baseUrl}}/attendance/vacation/record/list
Authorization: {{authToken}}
Content-Type: application/json
{
"page":1,
"size":10
}
###员工假期记录信息更新与保存
POST {{baseUrl}}/attendance/vacation/record/save
Authorization: {{authToken}}
Content-Type: application/json
{
"staffId":419,
"staffName":"ae63fr",
"type":363,
"subAddType":1,
"validityPeriod":"0",
"subOrAddDays":0,
"content":"quz3f7",
"rule":"zrag9p",
"reason":"kze1qs",
"remark":"88vnyt",
}
> {%
client.global.set("AttendanceVacationRecord_id", JSON.parse(response.body).data.id);
%}
###员工假期记录信息查看
GET {{baseUrl}}/attendance/vacation/record/info?id={{AttendanceVacationRecord_id}}
Authorization: {{authToken}}
Accept: application/json
###员工假期记录信息编辑
GET {{baseUrl}}/attendance/vacation/record/edit?id={{AttendanceVacationRecord_id}}
Authorization: {{authToken}}
Accept: application/json
###员工假期记录信息删除
GET {{baseUrl}}/attendance/vacation/record/delete?id={{AttendanceVacationRecord_id}}
Authorization: {{authToken}}
Accept: application/json
attendance-performance-manager/src/test/java/com/mortals/httpclient/care/CareTemplateController.http
View file @ 991a067c
...@@ -34,7 +34,7 @@ Content-Type: application/json ...@@ -34,7 +34,7 @@ Content-Type: application/json
{ {
"careType":1, "careType":1,
"sms":1, "sms":1,
"smsTemplate":"ukqfvp", "smsTemplate":"ukqfvp"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http
View file @ 991a067c
...@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token); ...@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
%} %}
###职位信息列表 ###职位信息列表
POST {{baseUrl}}/job/list POST {{baseUrl}}/dept/list
Authorization: {{authToken}} Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
...@@ -25,7 +25,7 @@ Content-Type: application/json ...@@ -25,7 +25,7 @@ Content-Type: application/json
###职位信息更新与保存 ###职位信息更新与保存
POST {{baseUrl}}/job/save POST {{baseUrl}}/dept/save
Authorization: {{authToken}} Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
...@@ -34,26 +34,26 @@ Content-Type: application/json ...@@ -34,26 +34,26 @@ Content-Type: application/json
"groupName":"2g2sug", "groupName":"2g2sug",
"jobCode":"p0m3o4", "jobCode":"p0m3o4",
"jobName":"3dnfdt", "jobName":"3dnfdt",
"remark":"brj4yu", "remark":"brj4yu"
} }
> {% > {%
client.global.set("Job_id", JSON.parse(response.body).data.id); client.global.set("Dept_id", JSON.parse(response.body).data.id);
%} %}
###职位信息查看 ###职位信息查看
GET {{baseUrl}}/job/info?id={{Job_id}} GET {{baseUrl}}/dept/info?id=1
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
###职位信息编辑 ###职位信息编辑
GET {{baseUrl}}/job/edit?id={{Job_id}} GET {{baseUrl}}/dept/edit?id={{Job_id}}
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
###职位信息删除 ###职位信息删除
GET {{baseUrl}}/job/delete?id={{Job_id}} GET {{baseUrl}}/dept/delete?id={{Job_id}}
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/job/JobController.http
View file @ 991a067c
...@@ -37,7 +37,7 @@ Content-Type: application/json ...@@ -37,7 +37,7 @@ Content-Type: application/json
"groupName":"2g2sug", "groupName":"2g2sug",
"jobCode":"p0m3o4", "jobCode":"p0m3o4",
"jobName":"3dnfdt", "jobName":"3dnfdt",
"remark":"brj4yu", "remark":"brj4yu"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffAdjustLogController.http
View file @ 991a067c
...@@ -56,7 +56,7 @@ Content-Type: application/json ...@@ -56,7 +56,7 @@ Content-Type: application/json
"newDeptName":"vg2kiw", "newDeptName":"vg2kiw",
"newJobId":149, "newJobId":149,
"newJobName":"fxbleu", "newJobName":"fxbleu",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffBlackController.http
View file @ 991a067c
...@@ -38,7 +38,7 @@ Content-Type: application/json ...@@ -38,7 +38,7 @@ Content-Type: application/json
"leaveDate":"1680796800000", "leaveDate":"1680796800000",
"leaveReason":"njhiuz", "leaveReason":"njhiuz",
"blackDate":"1680796800000", "blackDate":"1680796800000",
"blackReason":"2le6y8", "blackReason":"2le6y8"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffCareController.http
View file @ 991a067c
...@@ -43,7 +43,7 @@ Content-Type: application/json ...@@ -43,7 +43,7 @@ Content-Type: application/json
"entryDate":"1680796800000", "entryDate":"1680796800000",
"careType":1, "careType":1,
"sendStatus":0, "sendStatus":0,
"content":"yaqglc", "content":"yaqglc"
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffContractController.http
View file @ 991a067c
...@@ -59,7 +59,7 @@ Content-Type: application/json ...@@ -59,7 +59,7 @@ Content-Type: application/json
"contractType":1, "contractType":1,
"newStartDate":"1680796800000", "newStartDate":"1680796800000",
"newEndDate":"1680796800000", "newEndDate":"1680796800000",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffLeaveController.http
View file @ 991a067c
...@@ -54,7 +54,7 @@ Content-Type: application/json ...@@ -54,7 +54,7 @@ Content-Type: application/json
"entryDate":"1680796800000", "entryDate":"1680796800000",
"leaveDate":"1680796800000", "leaveDate":"1680796800000",
"leaveReason":"c7jgln", "leaveReason":"c7jgln",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/staff/StaffRegularController.http
View file @ 991a067c
...@@ -53,7 +53,7 @@ Content-Type: application/json ...@@ -53,7 +53,7 @@ Content-Type: application/json
"status":1, "status":1,
"entryDate":"1680796800000", "entryDate":"1680796800000",
"regularDate":"1680796800000", "regularDate":"1680796800000",
"auditStatus":0, "auditStatus":0
} }
> {% > {%
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http
View file @ 991a067c
...@@ -31,12 +31,12 @@ Authorization: {{authToken}} ...@@ -31,12 +31,12 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"deptId":0, "deptId":1,
"deptName":"ovcky1", "deptName":"技术部",
"name":"rvylk9", "name":"李林琳",
"number":"d0r6u9", "number":"9527",
"phone":"otc9xw", "phone":"13088088888",
"photoPath":"yelfqx", "photoPath":"http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E7%B3%BB%E7%BB%9F%E8%AE%BE%E7%BD%AE/u11719.png"
} }
> {% > {%
...@@ -44,7 +44,7 @@ client.global.set("Workman_id", JSON.parse(response.body).data.id); ...@@ -44,7 +44,7 @@ client.global.set("Workman_id", JSON.parse(response.body).data.id);
%} %}
###工作人员查看 ###工作人员查看
GET {{baseUrl}}/workman/info?id={{Workman_id}} GET {{baseUrl}}/workman/info?id=1
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
......
db/menu.sql
View file @ 991a067c
...@@ -522,3 +522,29 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '考勤方式', 'AttendanceGroup', ...@@ -522,3 +522,29 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '考勤方式', 'AttendanceGroup',
INSERT INTO `mortals_xhx_param` VALUES (null, '考勤方式', 'AttendanceGroup', 'attendanceType', '蓝牙打卡. 蓝牙打卡', '蓝牙打卡. 蓝牙打卡', 1, 4, 0, 'attendanceType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '考勤方式', 'AttendanceGroup', 'attendanceType', '蓝牙打卡. 蓝牙打卡', '蓝牙打卡. 蓝牙打卡', 1, 4, 0, 'attendanceType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '考勤方式', 'AttendanceGroup', 'attendanceType', '考勤机打卡. 考勤机打卡', '考勤机打卡. 考勤机打卡', 1, 4, 0, 'attendanceType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '考勤方式', 'AttendanceGroup', 'attendanceType', '考勤机打卡. 考勤机打卡', '考勤机打卡. 考勤机打卡', 1, 4, 0, 'attendanceType', NULL, NULL, NULL);
-- ----------------------------
-- 员工假期记录信息菜单 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '员工假期记录信息', '/attendance/vacation/record/list', 0,'', 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ----------------------------
-- 员工假期记录信息资源路径 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '员工假期记录信息-菜单管理-查看', '/attendance/vacation/record/list,/attendance/vacation/record/view,/attendance/vacation/record/info,/attendance/vacation/record/export,/attendance/vacation/record/exportExcel,/attendance/vacation/record/downloadTemplate,/attendance/vacation/record/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '员工假期记录信息-菜单管理-维护', '/attendance/vacation/record/add,/attendance/vacation/record/edit,/attendance/vacation/record/delete,/attendance/vacation/record/logicDelete,/attendance/vacation/record/save,/attendance/vacation/record/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 员工假期记录信息参数 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '1', '事假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '2', '调休', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '3', '病假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '4', '年假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '5', '产假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '6', '陪产假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '7', '婚假', 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', '10', '丧假', 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', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file
db/module.sql
View file @ 991a067c
...@@ -2,23 +2,25 @@ ...@@ -2,23 +2,25 @@
-- 部门信息表 -- 部门信息表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_dept`; DROP TABLE IF EXISTS `mortals_xhx_dept`;
CREATE TABLE `mortals_xhx_dept` ( CREATE TABLE mortals_xhx_dept(
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`parentId` bigint(20) DEFAULT NULL COMMENT '父id', `parentId` bigint(20) COMMENT '父id',
`ancestors` varchar(256) NOT NULL COMMENT '祖级列表', `ancestors` varchar(256) NOT NULL COMMENT '祖级列表',
`deptName` varchar(256) NOT NULL COMMENT '部门名称', `deptName` varchar(256) NOT NULL COMMENT '部门名称',
`deptCode` varchar(256) NOT NULL COMMENT '部门编码',
`deptStatus` tinyint(2) NOT NULL DEFAULT '1' COMMENT '部门状态(0.停用,1.启用)', `deptStatus` tinyint(2) NOT NULL DEFAULT '1' COMMENT '部门状态(0.停用,1.启用)',
`orderNum` int(4) NOT NULL DEFAULT '0' COMMENT '顺序', `orderNum` int(4) NOT NULL DEFAULT '0' COMMENT '顺序',
`remark` varchar(256) DEFAULT NULL COMMENT '备注', `personNum` int(4) NOT NULL DEFAULT '0' COMMENT '部门人数',
`workId` bigint(20) COMMENT '负责人id',
`workName` varchar(128) COMMENT '负责人名称',
`remark` varchar(256) COMMENT '备注',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户', `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime DEFAULT NULL COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`)
KEY `deptStatus` (`deptStatus`) USING BTREE, ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='部门信息';
KEY `orderNum` (`orderNum`) USING BTREE,
KEY `createUserId` (`createUserId`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='部门信息';
-- ---------------------------- -- ----------------------------
...@@ -113,9 +115,14 @@ CREATE TABLE mortals_xhx_job( ...@@ -113,9 +115,14 @@ CREATE TABLE mortals_xhx_job(
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '修改时间', `updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`) `type` tinyint(2) DEFAULT '1' COMMENT '节点类型(1.分组,2.职位)',
PRIMARY KEY (`id`)
,KEY `groupName` (`groupName`) USING BTREE
,KEY `jobCode` (`jobCode`) USING BTREE
,KEY `jobName` (`jobName`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='职位信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='职位信息';
-- ---------------------------- -- ----------------------------
-- 员工黑名单信息表 -- 员工黑名单信息表
-- ---------------------------- -- ----------------------------
...@@ -310,14 +317,16 @@ CREATE TABLE mortals_xhx_attendance_record_detail( ...@@ -310,14 +317,16 @@ CREATE TABLE mortals_xhx_attendance_record_detail(
`offWorkDate` datetime COMMENT '下班打卡时间', `offWorkDate` datetime COMMENT '下班打卡时间',
`offWorkResult` tinyint(2) COMMENT '下班打卡结果(1.正常,2.请假,3.缺卡,4.迟到,5.早退)', `offWorkResult` tinyint(2) COMMENT '下班打卡结果(1.正常,2.请假,3.缺卡,4.迟到,5.早退)',
`remark` varchar(255) COMMENT '备注', `remark` varchar(255) COMMENT '备注',
`orderNum` int(4) DEFAULT '1' COMMENT '排序字段',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户', `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤打卡记录详细信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤打卡记录详细信息';
-- ---------------------------- -- ----------------------------
-- 请假记录信息表 -- 请假记录信息表
-- ---------------------------- -- ----------------------------
...@@ -361,15 +370,43 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance( ...@@ -361,15 +370,43 @@ 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 '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息';
-- ----------------------------
-- 员工假期记录信息表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_attendance_vacation_record`;
CREATE TABLE mortals_xhx_attendance_vacation_record(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`staffId` bigint(20) COMMENT '员工id',
`staffName` varchar(255) COMMENT '员工姓名',
`type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)',
`subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)',
`validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期',
`subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）',
`content` varchar(255) COMMENT '内容',
`rule` varchar(255) COMMENT '规则',
`reason` varchar(255) COMMENT '理由',
`remark` varchar(255) COMMENT '备注',
`createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期记录信息';
-- ---------------------------- -- ----------------------------
-- 考勤人员汇总信息表 -- 考勤人员汇总信息表
......
doc/api.md
View file @ 991a067c
...@@ -2285,7 +2285,253 @@ msg|String|消息|- ...@@ -2285,7 +2285,253 @@ msg|String|消息|-
} }
``` ```
## 部门信息
### 查询部门信息列表
**请求URL:** dept/list
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 查询部门信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
**请求样例:**
```
{
"page":1,
"size":10
}
```
**响应参数:**
参数名称|参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
&emsp;per_page|Integer|每页条数
&emsp;total|Integer|总条数
&emsp;last_page|Integer|总页数
&emsp;current_page|Integer|当前页
&emsp;data|array|结果集列表|数组
&emsp;&emsp;id|Long|主键ID，主键，自增长
&emsp;&emsp;parentId|Long|父id
&emsp;&emsp;ancestors|String|祖级列表
&emsp;&emsp;deptName|String|部门名称
&emsp;&emsp;deptCode|String|部门编码
&emsp;&emsp;deptStatus|Integer|部门状态(0.停用,1.启用)
&emsp;&emsp;orderNum|Integer|顺序
&emsp;&emsp;personNum|Integer|部门人数
&emsp;&emsp;workId|Long|负责人id
&emsp;&emsp;workName|String|负责人名称
&emsp;&emsp;remark|String|备注
&emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createTime|Date|创建时间
&emsp;&emsp;updateUserId|Long|更新用户
&emsp;&emsp;updateTime|Date|更新时间
dict|object|字典对象
&emsp;deptStatus|object|字典属性对象，详见附录
**响应消息样例:**
```
{
"code":1,
"data":{
}
}
```
### 查看部门信息
**请求URL:** dept/info
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 查看部门信息，返回实例详细信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|Long|是|ID
**请求样例:**
```
http://localhost/dept/info?id=549
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:-------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
&emsp;id|Long|主键ID，主键，自增长
&emsp;parentId|Long|父id
&emsp;ancestors|String|祖级列表
&emsp;deptName|String|部门名称
&emsp;deptCode|String|部门编码
&emsp;deptStatus|Integer|部门状态(0.停用,1.启用)
&emsp;orderNum|Integer|顺序
&emsp;personNum|Integer|部门人数
&emsp;workId|Long|负责人id
&emsp;workName|String|负责人名称
&emsp;remark|String|备注
&emsp;createUserId|Long|创建用户
&emsp;createTime|Date|创建时间
&emsp;updateUserId|Long|更新用户
&emsp;updateTime|Date|更新时间
dict|object|字典对象
&emsp;deptStatus|object|字典属性对象，详见附录
**响应消息样例:**
```
{
"code": 1,
"data": {
"id":7651,
"parentId":8553,
"ancestors":"cdj8nb",
"deptName":"5c0hz6",
"deptCode":"cvve65",
"deptStatus":3802,
"orderNum":3996,
"personNum":4781,
"workId":4739,
"workName":"vzwyu5",
"remark":"ematnx",
"createUserId":6954,
"createTime":"2023-04-11",
"updateUserId":7898,
"updateTime":"2023-04-11"
}
}
```
### 保存更新部门信息
**请求URL:** dept/save
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 保存或更新部门信息：id为空时为新增保存，否则为更新提交
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
parentId|Long|否|父id
ancestors|String|是|祖级列表
deptName|String|是|部门名称
deptCode|String|是|部门编码
deptStatus|Integer|是|部门状态(0.停用,1.启用)
orderNum|Integer|是|顺序
personNum|Integer|是|部门人数
workId|Long|否|负责人id
workName|String|否|负责人名称
remark|String|否|备注
**请求样例:**
```
{
"parentId":9851,
"ancestors":"4s6v2r",
"deptName":"78noyn",
"deptCode":"urn8b2",
"deptStatus":7892,
"orderNum":1915,
"personNum":4399,
"workId":4758,
"workName":"5c27ex",
"remark":"mop40m",
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
&emsp;id|Long|保存后主键id
&emsp;entity|object|保存更新实体
&emsp;&emsp;id|Long|主键ID，主键，自增长
&emsp;&emsp;parentId|Long|父id
&emsp;&emsp;ancestors|String|祖级列表
&emsp;&emsp;deptName|String|部门名称
&emsp;&emsp;deptCode|String|部门编码
&emsp;&emsp;deptStatus|Integer|部门状态(0.停用,1.启用)
&emsp;&emsp;orderNum|Integer|顺序
&emsp;&emsp;personNum|Integer|部门人数
&emsp;&emsp;workId|Long|负责人id
&emsp;&emsp;workName|String|负责人名称
&emsp;&emsp;remark|String|备注
&emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createTime|Date|创建时间
&emsp;&emsp;updateUserId|Long|更新用户
&emsp;&emsp;updateTime|Date|更新时间
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{}
}
}
```
### 删除部门信息
**请求URL:** dept/delete
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 删除部门信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|String|是|数组
**请求样例:**
```
http://localhost:8080/dept/delete?id=1&id=2'
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
```
## 员工基本信息 ## 员工基本信息
...@@ -3098,9 +3344,9 @@ jobName|String|否|职位名称,字段前后添加%%模糊查询 ...@@ -3098,9 +3344,9 @@ jobName|String|否|职位名称,字段前后添加%%模糊查询
**请求样例:** **请求样例:**
``` ```
{ {
"groupName":"221sgc", "groupName":"w4y1au",
"jobCode":"buzhdj", "jobCode":"p48hfz",
"jobName":"vduagu", "jobName":"tvhi3v",
"page":1, "page":1,
"size":10 "size":10
} }
...@@ -3128,7 +3374,9 @@ data|object|数据对象 ...@@ -3128,7 +3374,9 @@ data|object|数据对象
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;updateUserId|Long|更新用户 &emsp;&emsp;updateUserId|Long|更新用户
&emsp;&emsp;updateTime|Date|修改时间 &emsp;&emsp;updateTime|Date|修改时间
&emsp;&emsp;type|Integer|节点类型(1.分组,2.职位)
dict|object|字典对象 dict|object|字典对象
&emsp;type|object|字典属性对象，详见附录
**响应消息样例:** **响应消息样例:**
``` ```
...@@ -3176,23 +3424,26 @@ data|object|数据对象 ...@@ -3176,23 +3424,26 @@ data|object|数据对象
&emsp;createUserId|Long|创建用户 &emsp;createUserId|Long|创建用户
&emsp;updateUserId|Long|更新用户 &emsp;updateUserId|Long|更新用户
&emsp;updateTime|Date|修改时间 &emsp;updateTime|Date|修改时间
&emsp;type|Integer|节点类型(1.分组,2.职位)
dict|object|字典对象 dict|object|字典对象
&emsp;type|object|字典属性对象，详见附录
**响应消息样例:** **响应消息样例:**
``` ```
{ {
"code": 1, "code": 1,
"data": { "data": {
"id":3224, "id":6214,
"groupId":5192, "groupId":6910,
"groupName":"y8zckh", "groupName":"h3qmbp",
"jobCode":"djdvg1", "jobCode":"ybsxab",
"jobName":"k2657g", "jobName":"mwfwda",
"remark":"ajxdd3", "remark":"j454du",
"createTime":"2023-04-07", "createTime":"2023-04-11",
"createUserId":4686, "createUserId":3094,
"updateUserId":8121, "updateUserId":1149,
"updateTime":"2023-04-07" "updateTime":"2023-04-11",
"type":4950
} }
} }
``` ```
...@@ -3216,15 +3467,17 @@ groupName|String|否|分组名称 ...@@ -3216,15 +3467,17 @@ groupName|String|否|分组名称
jobCode|String|否|职位编码 jobCode|String|否|职位编码
jobName|String|否|职位名称 jobName|String|否|职位名称
remark|String|否|备注 remark|String|否|备注
type|Integer|否|节点类型(1.分组,2.职位)
**请求样例:** **请求样例:**
``` ```
{ {
"groupId":3140, "groupId":4323,
"groupName":"q8jukx", "groupName":"0rvnhk",
"jobCode":"38mrsx", "jobCode":"qlhfq6",
"jobName":"fxtzka", "jobName":"aw1orv",
"remark":"owe9bs", "remark":"b3g5ig",
"type":5729
} }
``` ```
...@@ -3247,6 +3500,7 @@ data|object|数据对象 ...@@ -3247,6 +3500,7 @@ data|object|数据对象
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;updateUserId|Long|更新用户 &emsp;&emsp;updateUserId|Long|更新用户
&emsp;&emsp;updateTime|Date|修改时间 &emsp;&emsp;updateTime|Date|修改时间
&emsp;&emsp;type|Integer|节点类型(1.分组,2.职位)
**响应消息样例:** **响应消息样例:**
``` ```
...@@ -7606,30 +7860,10 @@ msg|String|消息|- ...@@ -7606,30 +7860,10 @@ msg|String|消息|-
:---|:---|:---|:------ :---|:---|:---|:------
page|Integer|否|当前页 page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录 size|Integer|否|每页条数，值为-1，查询所有记录
staffId|Long|否|员工id
staffName|String|否|员工姓名,字段前后添加%%模糊查询
deptId|Long|否|部门id
deptName|String|否|部门名称,字段前后添加%%模糊查询
entryTime|Date|否|入职时间
personalLeaveDays|BigDecimal|否|事假（天）
compensatedLeaveDays|BigDecimal|否|调休（天）
sickLeaveDays|BigDecimal|否|病假（天）
annualLeaveDays|BigDecimal|否|年假（天）
marriageLeaveDays|BigDecimal|否|婚假（天）
**请求样例:** **请求样例:**
``` ```
{ {
"staffId":9144,
"staffName":"th922m",
"deptId":2036,
"deptName":"pntg03",
"entryTime":"2023-04-07",
"personalLeaveDays":0.95,
"compensatedLeaveDays":0.42,
"sickLeaveDays":0.18,
"annualLeaveDays":0.05,
"marriageLeaveDays":0.19,
"page":1, "page":1,
"size":10 "size":10
} }
...@@ -7657,7 +7891,12 @@ data|object|数据对象 ...@@ -7657,7 +7891,12 @@ data|object|数据对象
&emsp;&emsp;compensatedLeaveDays|BigDecimal|调休（天） &emsp;&emsp;compensatedLeaveDays|BigDecimal|调休（天）
&emsp;&emsp;sickLeaveDays|BigDecimal|病假（天） &emsp;&emsp;sickLeaveDays|BigDecimal|病假（天）
&emsp;&emsp;annualLeaveDays|BigDecimal|年假（天） &emsp;&emsp;annualLeaveDays|BigDecimal|年假（天）
&emsp;&emsp;maternityLeaveDays|BigDecimal|产假（天）
&emsp;&emsp;paternityLeaveDays|BigDecimal|陪产假（天）
&emsp;&emsp;marriageLeaveDays|BigDecimal|婚假（天） &emsp;&emsp;marriageLeaveDays|BigDecimal|婚假（天）
&emsp;&emsp;menstrualLeaveDays|BigDecimal|例假（天）
&emsp;&emsp;breastfeedingLeaveDays|BigDecimal|哺乳假（天）
&emsp;&emsp;bereavementLeaveDays|BigDecimal|丧假（天）
&emsp;&emsp;remark|String|备注 &emsp;&emsp;remark|String|备注
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createTime|Date|创建时间 &emsp;&emsp;createTime|Date|创建时间
...@@ -7711,7 +7950,12 @@ data|object|数据对象 ...@@ -7711,7 +7950,12 @@ data|object|数据对象
&emsp;compensatedLeaveDays|BigDecimal|调休（天） &emsp;compensatedLeaveDays|BigDecimal|调休（天）
&emsp;sickLeaveDays|BigDecimal|病假（天） &emsp;sickLeaveDays|BigDecimal|病假（天）
&emsp;annualLeaveDays|BigDecimal|年假（天） &emsp;annualLeaveDays|BigDecimal|年假（天）
&emsp;maternityLeaveDays|BigDecimal|产假（天）
&emsp;paternityLeaveDays|BigDecimal|陪产假（天）
&emsp;marriageLeaveDays|BigDecimal|婚假（天） &emsp;marriageLeaveDays|BigDecimal|婚假（天）
&emsp;menstrualLeaveDays|BigDecimal|例假（天）
&emsp;breastfeedingLeaveDays|BigDecimal|哺乳假（天）
&emsp;bereavementLeaveDays|BigDecimal|丧假（天）
&emsp;remark|String|备注 &emsp;remark|String|备注
&emsp;createUserId|Long|创建用户 &emsp;createUserId|Long|创建用户
&emsp;createTime|Date|创建时间 &emsp;createTime|Date|创建时间
...@@ -7724,22 +7968,27 @@ dict|object|字典对象 ...@@ -7724,22 +7968,27 @@ dict|object|字典对象
{ {
"code": 1, "code": 1,
"data": { "data": {
"id":4062, "id":9420,
"staffId":3961, "staffId":9986,
"staffName":"39vtrt", "staffName":"r84j8j",
"deptId":3250, "deptId":8490,
"deptName":"cmn42l", "deptName":"9h1my7",
"entryTime":"2023-04-07", "entryTime":"2023-04-11",
"personalLeaveDays":0.21, "personalLeaveDays":0.14,
"compensatedLeaveDays":0.24, "compensatedLeaveDays":0.2,
"sickLeaveDays":0.33, "sickLeaveDays":0.07,
"annualLeaveDays":0.09, "annualLeaveDays":0.76,
"marriageLeaveDays":0.68, "maternityLeaveDays":0.83,
"remark":"iltzm1", "paternityLeaveDays":0.65,
"createUserId":3323, "marriageLeaveDays":0.61,
"createTime":"2023-04-07", "menstrualLeaveDays":0.43,
"updateUserId":8630, "breastfeedingLeaveDays":0.26,
"updateTime":"2023-04-07" "bereavementLeaveDays":0.58,
"remark":"88xnhv",
"createUserId":7178,
"createTime":"2023-04-11",
"updateUserId":3567,
"updateTime":"2023-04-11"
} }
} }
``` ```
...@@ -7767,23 +8016,33 @@ personalLeaveDays|BigDecimal|否|事假（天） ...@@ -7767,23 +8016,33 @@ personalLeaveDays|BigDecimal|否|事假（天）
compensatedLeaveDays|BigDecimal|否|调休（天） compensatedLeaveDays|BigDecimal|否|调休（天）
sickLeaveDays|BigDecimal|否|病假（天） sickLeaveDays|BigDecimal|否|病假（天）
annualLeaveDays|BigDecimal|否|年假（天） annualLeaveDays|BigDecimal|否|年假（天）
maternityLeaveDays|BigDecimal|否|产假（天）
paternityLeaveDays|BigDecimal|否|陪产假（天）
marriageLeaveDays|BigDecimal|否|婚假（天） marriageLeaveDays|BigDecimal|否|婚假（天）
menstrualLeaveDays|BigDecimal|否|例假（天）
breastfeedingLeaveDays|BigDecimal|否|哺乳假（天）
bereavementLeaveDays|BigDecimal|否|丧假（天）
remark|String|否|备注 remark|String|否|备注
**请求样例:** **请求样例:**
``` ```
{ {
"staffId":5626, "staffId":9529,
"staffName":"e2rs4j", "staffName":"3c197f",
"deptId":9498, "deptId":8317,
"deptName":"o2fvb6", "deptName":"dwos3l",
"entryTime":"2023-04-07", "entryTime":"2023-04-11",
"personalLeaveDays":0.8, "personalLeaveDays":0.0,
"compensatedLeaveDays":0.17, "compensatedLeaveDays":0.36,
"sickLeaveDays":0.24, "sickLeaveDays":0.1,
"annualLeaveDays":0.64, "annualLeaveDays":0.68,
"marriageLeaveDays":0.11, "maternityLeaveDays":0.35,
"remark":"ylqz26", "paternityLeaveDays":0.38,
"marriageLeaveDays":0.53,
"menstrualLeaveDays":0.17,
"breastfeedingLeaveDays":0.53,
"bereavementLeaveDays":0.12,
"remark":"wo79df",
} }
``` ```
...@@ -7806,7 +8065,12 @@ data|object|数据对象 ...@@ -7806,7 +8065,12 @@ data|object|数据对象
&emsp;&emsp;compensatedLeaveDays|BigDecimal|调休（天） &emsp;&emsp;compensatedLeaveDays|BigDecimal|调休（天）
&emsp;&emsp;sickLeaveDays|BigDecimal|病假（天） &emsp;&emsp;sickLeaveDays|BigDecimal|病假（天）
&emsp;&emsp;annualLeaveDays|BigDecimal|年假（天） &emsp;&emsp;annualLeaveDays|BigDecimal|年假（天）
&emsp;&emsp;maternityLeaveDays|BigDecimal|产假（天）
&emsp;&emsp;paternityLeaveDays|BigDecimal|陪产假（天）
&emsp;&emsp;marriageLeaveDays|BigDecimal|婚假（天） &emsp;&emsp;marriageLeaveDays|BigDecimal|婚假（天）
&emsp;&emsp;menstrualLeaveDays|BigDecimal|例假（天）
&emsp;&emsp;breastfeedingLeaveDays|BigDecimal|哺乳假（天）
&emsp;&emsp;bereavementLeaveDays|BigDecimal|丧假（天）
&emsp;&emsp;remark|String|备注 &emsp;&emsp;remark|String|备注
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createTime|Date|创建时间 &emsp;&emsp;createTime|Date|创建时间
......
pom.xml
View file @ 991a067c
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<common-lib.version>0.0.1-SNAPSHOT</common-lib.version> <common-lib.version>0.0.1-SNAPSHOT</common-lib.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
......
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