Skip to content

A
attendance-performance-platform
Commit 54fb9672 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

员工关怀增加执行时间

parent 328546cd
Show whitespace changes
Inline Side-by-side
Showing with 1495 additions and 1487 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffCareEntity.java
View file @ 54fb9672
package com.mortals.xhx.module.staff.model; package com.mortals.xhx.module.staff.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffCareVo; import com.mortals.xhx.module.staff.model.vo.StaffCareVo;
import lombok.Data;
/** /**
* 员工关怀信息实体对象 * 员工关怀信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2025-04-10
*/ */
@Data
public class StaffCareEntity extends StaffCareVo { public class StaffCareEntity extends StaffCareVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -61,168 +64,10 @@ public class StaffCareEntity extends StaffCareVo { ...@@ -61,168 +64,10 @@ public class StaffCareEntity extends StaffCareVo {
* 关怀内容 * 关怀内容
*/ */
private String content; private String content;
public StaffCareEntity(){}
/**
* 获取 员工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;
}
/**
* 获取 出生日期
* @return Date
*/
public Date getBirthday(){
return birthday;
}
/**
* 设置 出生日期
* @param birthday
*/
public void setBirthday(Date birthday){
this.birthday = birthday;
}
/**
* 获取 所属部门
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 所属部门
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 所属部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 职位ID
* @return Long
*/
public Long getJobId(){
return jobId;
}
/**
* 设置 职位ID
* @param jobId
*/
public void setJobId(Long jobId){
this.jobId = jobId;
}
/**
* 获取 职位名称
* @return String
*/
public String getJobName(){
return jobName;
}
/**
* 设置 职位名称
* @param jobName
*/
public void setJobName(String jobName){
this.jobName = jobName;
}
/**
* 获取 入职时间
* @return Date
*/
public Date getEntryDate(){
return entryDate;
}
/**
* 设置 入职时间
* @param entryDate
*/
public void setEntryDate(Date entryDate){
this.entryDate = entryDate;
}
/**
* 获取 关怀类型(1.生日关怀,2.入职周年关怀)
* @return Integer
*/
public Integer getCareType(){
return careType;
}
/**
* 设置 关怀类型(1.生日关怀,2.入职周年关怀)
* @param careType
*/
public void setCareType(Integer careType){
this.careType = careType;
}
/**
* 获取 发送状态(0.未发送,1.已发送)
* @return Integer
*/
public Integer getSendStatus(){
return sendStatus;
}
/**
* 设置 发送状态(0.未发送,1.已发送)
* @param sendStatus
*/
public void setSendStatus(Integer sendStatus){
this.sendStatus = sendStatus;
}
/**
* 获取 关怀内容
* @return String
*/
public String getContent(){
return content;
}
/** /**
* 设置 关怀内容 * 执行时间
* @param content
*/ */
public void setContent(String content){ private Date excuteTime;
this.content = content;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -239,44 +84,18 @@ public class StaffCareEntity extends StaffCareVo { ...@@ -239,44 +84,18 @@ public class StaffCareEntity extends StaffCareVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",staffName:").append(getStaffName());
sb.append(",birthday:").append(getBirthday());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",jobId:").append(getJobId());
sb.append(",jobName:").append(getJobName());
sb.append(",entryDate:").append(getEntryDate());
sb.append(",careType:").append(getCareType());
sb.append(",sendStatus:").append(getSendStatus());
sb.append(",content:").append(getContent());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.staffId = null; this.staffId = null;
this.staffName = ""; this.staffName = "";
this.birthday = null; this.birthday = null;
this.deptId = null; this.deptId = null;
this.deptName = ""; this.deptName = "";
this.jobId = null; this.jobId = null;
this.jobName = ""; this.jobName = "";
this.entryDate = null; this.entryDate = null;
this.careType = 1; this.careType = 1;
this.sendStatus = 0; this.sendStatus = 0;
this.content = ""; this.content = "";
this.excuteTime = null;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffCareQuery.java
View file @ 54fb9672
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.staff.model.StaffCareEntity; import com.mortals.xhx.module.staff.model.StaffCareEntity;
/** /**
* 员工关怀信息查询对象 * 员工关怀信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2025-04-10
*/ */
public class StaffCareQuery extends StaffCareEntity { public class StaffCareQuery extends StaffCareEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -174,6 +174,12 @@ public class StaffCareQuery extends StaffCareEntity { ...@@ -174,6 +174,12 @@ public class StaffCareQuery extends StaffCareEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 执行时间 */
private String excuteTimeStart;
/** 结束 执行时间 */
private String excuteTimeEnd;
/** 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<StaffCareQuery> orConditionList; private List<StaffCareQuery> orConditionList;
...@@ -1086,6 +1092,38 @@ public class StaffCareQuery extends StaffCareEntity { ...@@ -1086,6 +1092,38 @@ public class StaffCareQuery extends StaffCareEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 执行时间
* @return excuteTimeStart
*/
public String getExcuteTimeStart(){
return this.excuteTimeStart;
}
/**
* 设置 开始 执行时间
* @param excuteTimeStart
*/
public void setExcuteTimeStart(String excuteTimeStart){
this.excuteTimeStart = excuteTimeStart;
}
/**
* 获取 结束 执行时间
* @return excuteTimeEnd
*/
public String getExcuteTimeEnd(){
return this.excuteTimeEnd;
}
/**
* 设置 结束 执行时间
* @param excuteTimeEnd
*/
public void setExcuteTimeEnd(String excuteTimeEnd){
this.excuteTimeEnd = excuteTimeEnd;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1598,6 +1636,7 @@ public class StaffCareQuery extends StaffCareEntity { ...@@ -1598,6 +1636,7 @@ public class StaffCareQuery extends StaffCareEntity {
} }
/** /**
* 获取 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/resources/sqlmap/module/staff/StaffCareMapper.xml
View file @ 54fb9672
<?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.staff.dao.ibatis.StaffCareDaoImpl"> <mapper namespace="com.mortals.xhx.module.staff.dao.ibatis.StaffCareDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="excuteTime" column="excuteTime" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
...@@ -76,23 +75,26 @@ ...@@ -76,23 +75,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('excuteTime') or colPickMode == 1 and data.containsKey('excuteTime')))">
a.excuteTime,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="StaffCareEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="StaffCareEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_staff_care insert into mortals_xhx_staff_care
(staffId,staffName,birthday,deptId,deptName,jobId,jobName,entryDate,careType,sendStatus,content,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,birthday,deptId,deptName,jobId,jobName,entryDate,careType,sendStatus,content,createUserId,createTime,updateUserId,updateTime,excuteTime)
VALUES VALUES
(#{staffId},#{staffName},#{birthday},#{deptId},#{deptName},#{jobId},#{jobName},#{entryDate},#{careType},#{sendStatus},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{birthday},#{deptId},#{deptName},#{jobId},#{jobName},#{entryDate},#{careType},#{sendStatus},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{excuteTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_staff_care insert into mortals_xhx_staff_care
(staffId,staffName,birthday,deptId,deptName,jobId,jobName,entryDate,careType,sendStatus,content,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,birthday,deptId,deptName,jobId,jobName,entryDate,careType,sendStatus,content,createUserId,createTime,updateUserId,updateTime,excuteTime)
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.birthday},#{item.deptId},#{item.deptName},#{item.jobId},#{item.jobName},#{item.entryDate},#{item.careType},#{item.sendStatus},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.birthday},#{item.deptId},#{item.deptName},#{item.jobId},#{item.jobName},#{item.entryDate},#{item.careType},#{item.sendStatus},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.excuteTime})
</foreach> </foreach>
</insert> </insert>
...@@ -168,6 +170,9 @@ ...@@ -168,6 +170,9 @@
<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('excuteTime')) or (colPickMode==1 and !data.containsKey('excuteTime'))">
a.excuteTime=#{data.excuteTime},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -320,6 +325,13 @@ ...@@ -320,6 +325,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="excuteTime=(case" suffix="ELSE excuteTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('excuteTime')) or (colPickMode==1 and !item.containsKey('excuteTime'))">
when a.id=#{item.id} then #{item.excuteTime}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -334,7 +346,7 @@ ...@@ -334,7 +346,7 @@
</select> </select>
<!-- 根据主健删除 --> <!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto"> <delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_staff_care as a where a.id=#{condition.id} delete from mortals_xhx_staff_care as a where a.id=#{condition.id}
</delete> </delete>
<!-- 根据主健删除一批，针对单一主健有效 --> <!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys"> <delete id="deleteByKeys">
...@@ -431,6 +443,10 @@ ...@@ -431,6 +443,10 @@
<!-- 条件映射-代参数 --> <!-- 条件映射-代参数 -->
<sql id="_condition_param_"> <sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/> <bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null"> <if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
...@@ -444,13 +460,13 @@ ...@@ -444,13 +460,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}
...@@ -471,13 +487,13 @@ ...@@ -471,13 +487,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}
...@@ -499,13 +515,13 @@ ...@@ -499,13 +515,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}
...@@ -534,13 +550,13 @@ ...@@ -534,13 +550,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}
...@@ -562,13 +578,13 @@ ...@@ -562,13 +578,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}
...@@ -582,13 +598,13 @@ ...@@ -582,13 +598,13 @@
${_conditionType_} a.jobId is null ${_conditionType_} a.jobId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('jobIdList')"> <if test="conditionParamRef.containsKey('jobIdList') and conditionParamRef.jobIdList.size() > 0">
${_conditionType_} a.jobId in ${_conditionType_} a.jobId in
<foreach collection="conditionParamRef.jobIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('jobIdNotList')"> <if test="conditionParamRef.containsKey('jobIdNotList') and conditionParamRef.jobIdNotList.size() > 0">
${_conditionType_} a.jobId not in ${_conditionType_} a.jobId not in
<foreach collection="conditionParamRef.jobIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -610,13 +626,13 @@ ...@@ -610,13 +626,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}
...@@ -645,13 +661,13 @@ ...@@ -645,13 +661,13 @@
${_conditionType_} a.careType is null ${_conditionType_} a.careType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('careTypeList')"> <if test="conditionParamRef.containsKey('careTypeList') and conditionParamRef.careTypeList.size() > 0">
${_conditionType_} a.careType in ${_conditionType_} a.careType in
<foreach collection="conditionParamRef.careTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.careTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('careTypeNotList')"> <if test="conditionParamRef.containsKey('careTypeNotList') and conditionParamRef.careTypeNotList.size() > 0">
${_conditionType_} a.careType not in ${_conditionType_} a.careType not in
<foreach collection="conditionParamRef.careTypeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.careTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -672,13 +688,13 @@ ...@@ -672,13 +688,13 @@
${_conditionType_} a.sendStatus is null ${_conditionType_} a.sendStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sendStatusList')"> <if test="conditionParamRef.containsKey('sendStatusList') and conditionParamRef.sendStatusList.size() > 0">
${_conditionType_} a.sendStatus in ${_conditionType_} a.sendStatus in
<foreach collection="conditionParamRef.sendStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sendStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sendStatusNotList')"> <if test="conditionParamRef.containsKey('sendStatusNotList') and conditionParamRef.sendStatusNotList.size() > 0">
${_conditionType_} a.sendStatus not in ${_conditionType_} a.sendStatus not in
<foreach collection="conditionParamRef.sendStatusNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sendStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -700,13 +716,13 @@ ...@@ -700,13 +716,13 @@
${_conditionType_} a.content is null ${_conditionType_} a.content is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('contentList')"> <if test="conditionParamRef.containsKey('contentList') and conditionParamRef.contentList.size() > 0">
${_conditionType_} a.content in ${_conditionType_} a.content in
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('contentNotList')"> <if test="conditionParamRef.containsKey('contentNotList') and conditionParamRef.contentNotList.size() > 0">
${_conditionType_} a.content not in ${_conditionType_} a.content not in
<foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -720,13 +736,13 @@ ...@@ -720,13 +736,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}
...@@ -762,13 +778,13 @@ ...@@ -762,13 +778,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}
...@@ -796,18 +812,145 @@ ...@@ -796,18 +812,145 @@
<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('excuteTime')">
<if test="conditionParamRef.excuteTime != null ">
${_conditionType_} a.excuteTime = #{${_conditionParam_}.excuteTime}
</if>
<if test="conditionParamRef.excuteTime == null">
${_conditionType_} a.excuteTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('excuteTimeStart') and conditionParamRef.excuteTimeStart != null and conditionParamRef.excuteTimeStart!=''">
${_conditionType_} a.excuteTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.excuteTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('excuteTimeEnd') and conditionParamRef.excuteTimeEnd != null and conditionParamRef.excuteTimeEnd!=''">
${_conditionType_} a.excuteTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.excuteTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('jobIdList') and conditionParamRef.jobIdList.size() > 0">
field(a.jobId,
<foreach collection="conditionParamRef.jobIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('careTypeList') and conditionParamRef.careTypeList.size() > 0">
field(a.careType,
<foreach collection="conditionParamRef.careTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sendStatusList') and conditionParamRef.sendStatusList.size() > 0">
field(a.sendStatus,
<foreach collection="conditionParamRef.sendStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('jobIdList') and conditionParamRef.jobIdList.size() > 0">
field(a.jobId,
<foreach collection="conditionParamRef.jobIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('careTypeList') and conditionParamRef.careTypeList.size() > 0">
field(a.careType,
<foreach collection="conditionParamRef.careTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sendStatusList') and conditionParamRef.sendStatusList.size() > 0">
field(a.sendStatus,
<foreach collection="conditionParamRef.sendStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -889,8 +1032,15 @@ ...@@ -889,8 +1032,15 @@
<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('excuteTime')">
a.excuteTime
<if test='orderCol.excuteTime != null and "DESC".equalsIgnoreCase(orderCol.excuteTime)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
db/add.sql
View file @ 54fb9672
...@@ -1389,7 +1389,7 @@ ALTER TABLE mortals_xhx_staff ADD COLUMN `dingUserId` varchar(128) COMMENT ' ...@@ -1389,7 +1389,7 @@ ALTER TABLE mortals_xhx_staff ADD COLUMN `dingUserId` varchar(128) COMMENT '
-- ---------------------------- -- ----------------------------
ALTER TABLE `mortals_xhx_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2) DEFAULT '0' COMMENT '时间类型(0,按月,1按季度,2按年)'; ALTER TABLE `mortals_xhx_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2) DEFAULT '0' COMMENT '时间类型(0,按月,1按季度,2按年)';
ALTER TABLE `mortals_xhx_check_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2) DEFAULT '0' COMMENT '时间类型(0,按月,1按季度,2按年)'; ALTER TABLE `mortals_xhx_check_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2) DEFAULT '0' COMMENT '时间类型(0,按月,1按季度,2按年)';
ALTER TABLE `mortals_xhx_staff_care` ADD COLUMN `excuteTime` datetime DEFAULT NULL COMMENT '执行时间';
-- ---------------------------- -- ----------------------------
-- 考勤机管理表 -- 考勤机管理表
-- ---------------------------- -- ----------------------------
......
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