Skip to content

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

添加员工钉钉同步userId

parent 4e9d5846
Hide whitespace changes
Inline Side-by-side
Showing with 955 additions and 817 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/QiongLaiProcessInstanceEnum.java 0 → 100644
View file @ 548b31d2
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @author: finegirl
* @date: 2021/7/16 11:50
* @description: 组件枚举类
**/
public enum QiongLaiProcessInstanceEnum {
邛崃大厅人员请假("PROC-E1A4A56A-0EA7-43FE-A073-52E2B9C53E58", "邛崃大厅人员请假"),
邛崃大厅人员因公外出("PROC-034CE8B1-ED6D-492F-AC2C-61BAC5C0B4B9", "邛崃大厅人员因公外出"),
邛崃大厅人员补卡申请("PROC-16D29417-3049-4EB8-9710-9D39F9EDD1BD", "邛崃大厅人员补卡申请"),
/*
邛崃机关人员补卡申请("PROC-DDBEBB18-4FFC-486A-8E97-BAD7911BB9F2", "邛崃机关人员补卡申请"),
邛崃机关人员请假("PROC-7C84DFC5-579E-4500-9159-F38642E7238C", "邛崃机关人员请假"),
邛崃机关人员因公外出("PROC-6B46D143-4A05-4E9B-9C99-E0BD75A29003", "机关人员因公外出"),*/;
private String value;
private String desc;
QiongLaiProcessInstanceEnum(String value, String desc) {
this.value = value;
this.desc = desc;
}
public String getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static QiongLaiProcessInstanceEnum getByValue(String value) {
for (QiongLaiProcessInstanceEnum componentEnum : QiongLaiProcessInstanceEnum.values()) {
if (componentEnum.getValue() == value) {
return componentEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(String... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (QiongLaiProcessInstanceEnum item : QiongLaiProcessInstanceEnum.values()) {
try {
boolean hasE = false;
for (String 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 @ 548b31d2
...@@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -86,7 +87,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -86,7 +87,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
//同步钉钉人员 //同步钉钉人员
staffService.syncPersonsByDingTalk(null); staffService.syncPersonsByDingTalk(null);
log.info("同步钉钉usreId"); log.info("同步钉钉usreId");
syncDingDingLocalUserIds(); //syncDingDingLocalUserIds();
log.info("钉钉直连同步人员信息"); log.info("钉钉直连同步人员信息");
//同步最近10天请假信息 //同步最近10天请假信息
...@@ -116,47 +117,33 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -116,47 +117,33 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
} }
private void syncDingDingUserIds() { private void syncDingDingUserIds() {
try {
List<UserEntity> userList = userService.getCacheList().stream()
.filter(f -> !ObjectUtils.isEmpty(f.getCustomerId()))
.filter(f -> ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList());
List<UserEntity> updateUserList = userList.stream().map(item -> {
UserEntity userEntity = new UserEntity();
userEntity.setId(item.getId());
String mobile = "";
StaffEntity staffCache = staffService.getCache(item.getCustomerId().toString());
if (!ObjectUtils.isEmpty(staffCache) && !ObjectUtils.isEmpty(staffCache.getPhoneNumber())) {
mobile = staffCache.getPhoneNumber();
if (ObjectUtils.isEmpty(item.getMobile())) {
userEntity.setMobile(mobile);
}
}
if (!ObjectUtils.isEmpty(mobile)) { List<StaffEntity> staffList = staffService.getCacheList();
Rest<String> personByMobile = dingPersonService.getPersonByMobile(mobile); List<StaffEntity> updateList = new ArrayList<>();
for (StaffEntity staffCache : staffList) {
if (!ObjectUtils.isEmpty(staffCache) && !ObjectUtils.isEmpty(staffCache.getPhoneNumber())) {
String phoneNumber = staffCache.getPhoneNumber();
if (!ObjectUtils.isEmpty(phoneNumber)) {
Rest<String> personByMobile = dingPersonService.getPersonByMobile(phoneNumber);
if (!ObjectUtils.isEmpty(personByMobile) && if (!ObjectUtils.isEmpty(personByMobile) &&
YesNoEnum.YES.getValue() == personByMobile.getCode() YesNoEnum.YES.getValue() == personByMobile.getCode()
&& !ObjectUtils.isEmpty(personByMobile.getData())) { && !ObjectUtils.isEmpty(personByMobile.getData())) {
userEntity.setDingUserId(personByMobile.getData());
StaffEntity updateStaff = new StaffEntity();
updateStaff.setId(staffCache.getId());
updateStaff.setDingUserId(personByMobile.getData());
updateList.add(updateStaff);
} }
} }
userEntity.setUpdateTime(new Date());
userEntity.setUpdateUserId(1L);
return userEntity;
}).filter(f -> !ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(updateUserList)) {
log.info("更新用户钉钉id信息数量：{}", updateUserList.size());
userService.getUserDao().updateBatch(updateUserList);
} }
} catch (Exception e) { if (!ObjectUtils.isEmpty(updateList)) {
log.error("同步钉钉usreId失败"); log.info("更新用户钉钉id信息数量：{}", updateList.size());
staffService.update(updateList);
}
} }
} }
private void syncDingDingLocalUserIds() { private void syncDingDingLocalUserIds() {
try { try {
List<UserEntity> userList = userService.getCacheList().stream() List<UserEntity> userList = userService.getCacheList().stream()
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
View file @ 548b31d2
...@@ -93,8 +93,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -93,8 +93,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
this.updateBefore(entity, context); this.updateBefore(entity, context);
boolean doPerformAttend = true; boolean doPerformAttend = true;
AttendanceLeaveRecordEntity temp = this.get(entity.getId()); AttendanceLeaveRecordEntity temp = this.get(entity.getId());
if(temp!=null){ if (temp != null) {
if(AppealResultEnum.通过.getValue() == temp.getAuditResult() && LeaveTypeEnum.事假.getValue() == temp.getLeaveType()){ if (AppealResultEnum.通过.getValue() == temp.getAuditResult() && LeaveTypeEnum.事假.getValue() == temp.getLeaveType()) {
doPerformAttend = false; doPerformAttend = false;
} }
} }
...@@ -103,7 +103,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -103,7 +103,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
throw new AppException(-1002, "更新失败！"); throw new AppException(-1002, "更新失败！");
} else { } else {
super.updateAfter(entity, context); super.updateAfter(entity, context);
if(doPerformAttend) { if (doPerformAttend) {
creatPerformAttend(entity, context); creatPerformAttend(entity, context);
} }
doUpdateRecordAndSummary(entity, context); doUpdateRecordAndSummary(entity, context);
...@@ -186,7 +186,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -186,7 +186,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
} }
} }
log.info("请假通过后汇总考勤，请假人员："+entity.getLeavePerson()); log.info("请假通过后汇总考勤，请假人员：" + entity.getLeavePerson());
AttendanceSummaryQuery query = new AttendanceSummaryQuery(); AttendanceSummaryQuery query = new AttendanceSummaryQuery();
query.setSummaryTimeEnd(DateUtils.getStrDate(entity.getEndTime())); query.setSummaryTimeEnd(DateUtils.getStrDate(entity.getEndTime()));
query.setSummaryTimeStart(DateUtils.getStrDate(entity.getStartTime())); query.setSummaryTimeStart(DateUtils.getStrDate(entity.getStartTime()));
...@@ -202,24 +202,21 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -202,24 +202,21 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
public Rest<String> syncLeaveRecord(AttendanceLeaveRecordQuery query, Context context) { public Rest<String> syncLeaveRecord(AttendanceLeaveRecordQuery query, Context context) {
List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords = new ArrayList<>(); List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords = new ArrayList<>();
Long staffId = query.getStaffId(); Long staffId = query.getStaffId();
List<UserEntity> userCacheList = userService.getCacheList(); List<StaffEntity> staffCacheList = staffService.getCacheList();
// List<UserEntity> userCacheList = userService.getCacheList();
if (ObjectUtils.isEmpty(staffId)) { if (ObjectUtils.isEmpty(staffId)) {
//同步所有用户 //同步所有用户
List<UserEntity> userEntityList = userCacheList.stream() List<StaffEntity> userEntityList = staffCacheList.stream()
.filter(f -> !ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList()); .filter(f -> !ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList());
getLeaveRecordByUserList(query, userEntityList, waitSyncLeaveRecords); getLeaveRecordByUserList(query, userEntityList, waitSyncLeaveRecords);
} else { } else {
//同步指定用户 //同步指定用户
List<UserEntity> userEntityList = userCacheList.stream() List<StaffEntity> userEntityList = staffCacheList.stream()
.filter(f -> !ObjectUtils.isEmpty(f.getDingUserId())) .filter(f -> !ObjectUtils.isEmpty(f.getDingUserId()))
.filter(f -> staffId.equals(f.getCustomerId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
getLeaveRecordByUserList(query, userEntityList, waitSyncLeaveRecords); getLeaveRecordByUserList(query, userEntityList, waitSyncLeaveRecords);
} }
log.info("待同步请假记录：{}", JSON.toJSONString(waitSyncLeaveRecords)); log.info("待同步请假记录：{}", JSON.toJSONString(waitSyncLeaveRecords));
if (!ObjectUtils.isEmpty(waitSyncLeaveRecords)) { if (!ObjectUtils.isEmpty(waitSyncLeaveRecords)) {
for (AttendanceLeaveRecordEntity waitSyncLeaveRecord : waitSyncLeaveRecords) { for (AttendanceLeaveRecordEntity waitSyncLeaveRecord : waitSyncLeaveRecords) {
dingPersonService.handleByProcessInstanceId(waitSyncLeaveRecord.getRemark()); dingPersonService.handleByProcessInstanceId(waitSyncLeaveRecord.getRemark());
...@@ -228,11 +225,11 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -228,11 +225,11 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
return Rest.ok(); return Rest.ok();
} }
private void getLeaveRecordByUserList(AttendanceLeaveRecordQuery query, List<UserEntity> userEntityList, List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords) { private void getLeaveRecordByUserList(AttendanceLeaveRecordQuery query, List<StaffEntity> staffCacheList, List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords) {
List<List<UserEntity>> partition = Lists.partition(userEntityList, 10); List<List<StaffEntity>> partition = Lists.partition(staffCacheList, 10);
for (List<UserEntity> userList : partition) { for (List<StaffEntity> staffList : partition) {
//String dingUserId = item.getDingUserId(); //String dingUserId = item.getDingUserId();
List<String> dingUserIds = userList.stream().map(m -> m.getDingUserId()).collect(Collectors.toList()); List<String> dingUserIds = staffList.stream().map(m -> m.getDingUserId()).collect(Collectors.toList());
long startTime = DateUtil.parseDateTime(query.getStartTimeStart() + " 00:00:00").getTime(); long startTime = DateUtil.parseDateTime(query.getStartTimeStart() + " 00:00:00").getTime();
long endTime = DateUtil.parseDateTime(query.getEndTimeEnd() + " 23:59:59").getTime(); long endTime = DateUtil.parseDateTime(query.getEndTimeEnd() + " 23:59:59").getTime();
Long nextToken = 0L; Long nextToken = 0L;
...@@ -245,21 +242,6 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -245,21 +242,6 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
} }
} }
} }
/* for (UserEntity item : userEntityList) {
String dingUserId = item.getDingUserId();
long startTime = DateUtil.parseDateTime(query.getStartTimeStart() + " 00:00:00").getTime();
long endTime = DateUtil.parseDateTime(query.getEndTimeEnd() + " 23:59:59").getTime();
Long nextToken = 0L;
long maxResults = 20L;
for (ProcessInstanceEnum processInstanceEnum : ProcessInstanceEnum.values()) {
try {
getRecords(waitSyncLeaveRecords, item, processInstanceEnum, startTime, endTime, nextToken, maxResults, dingUserId);
} catch (Exception e) {
log.error("同步请假记录异常", e);
}
}
}*/
} }
private void getRecords(List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords, ProcessInstanceEnum processInstanceEnum, long startTime, long endTime, Long nextToken, long maxResults, List<String> dingUserIds) throws Exception { private void getRecords(List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords, ProcessInstanceEnum processInstanceEnum, long startTime, long endTime, Long nextToken, long maxResults, List<String> dingUserIds) throws Exception {
...@@ -270,7 +252,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -270,7 +252,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
for (String process : processInstanceList) { for (String process : processInstanceList) {
AttendanceLeaveRecordEntity leaveRecord = new AttendanceLeaveRecordEntity(); AttendanceLeaveRecordEntity leaveRecord = new AttendanceLeaveRecordEntity();
leaveRecord.setRemark(process); leaveRecord.setRemark(process);
// leaveRecord.setStaffId(item.getCustomerId()); // leaveRecord.setStaffId(item.getCustomerId());
waitSyncLeaveRecords.add(leaveRecord); waitSyncLeaveRecords.add(leaveRecord);
log.info("更新记录成功==>" + process); log.info("更新记录成功==>" + process);
} }
...@@ -291,7 +273,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -291,7 +273,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
String leaveKey = cacheService.get(LEAVE_REIDS_KEY + redisKey); String leaveKey = cacheService.get(LEAVE_REIDS_KEY + redisKey);
if (StringUtils.isEmpty(leaveKey)) { if (StringUtils.isEmpty(leaveKey)) {
cacheService.set(LEAVE_REIDS_KEY + redisKey, redisKey, 300); //五分钟内不会重复 cacheService.set(LEAVE_REIDS_KEY + redisKey, redisKey, 300); //五分钟内不会重复
PerformAttendRecordEntity recordEntity = conversionLeaveRecord(entity,multiple); PerformAttendRecordEntity recordEntity = conversionLeaveRecord(entity, multiple);
recordEntity.setCreateTime(new Date()); recordEntity.setCreateTime(new Date());
recordEntity.setCreateUserId(1l); recordEntity.setCreateUserId(1l);
recordEntity.setErrorTime(entity.getStartTime()); recordEntity.setErrorTime(entity.getStartTime());
...@@ -314,7 +296,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -314,7 +296,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
} }
private PerformAttendRecordEntity conversionLeaveRecord(AttendanceLeaveRecordEntity entity,int multiple) { private PerformAttendRecordEntity conversionLeaveRecord(AttendanceLeaveRecordEntity entity, int multiple) {
PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity(); PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
recordEntity.initAttrValue(); recordEntity.initAttrValue();
StaffEntity staffEntity = staffService.get(entity.getLeavePersonId()); StaffEntity staffEntity = staffService.get(entity.getLeavePersonId());
...@@ -333,10 +315,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -333,10 +315,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
recordEntity.setAttendanceGroupName(groupStaffEntity.getGroupName()); recordEntity.setAttendanceGroupName(groupStaffEntity.getGroupName());
} }
String ruleCode = "ATTEND1009"; String ruleCode = "ATTEND1009";
if(multiple%2>0){ //奇数，半天 if (multiple % 2 > 0) { //奇数，半天
ruleCode = "ATTEND1010"; ruleCode = "ATTEND1010";
} }
if(multiple%2==0){ //偶数，全天 if (multiple % 2 == 0) { //偶数，全天
ruleCode = "ATTEND1011"; ruleCode = "ATTEND1011";
} }
PerformRulesEntity performRulesEntity = performRulesService.selectOne(new PerformRulesQuery().ruleCode(ruleCode)); PerformRulesEntity performRulesEntity = performRulesService.selectOne(new PerformRulesQuery().ruleCode(ruleCode));
...@@ -346,15 +328,15 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -346,15 +328,15 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
recordEntity.setCategoryId(performRulesEntity.getCategoryId()); recordEntity.setCategoryId(performRulesEntity.getCategoryId());
recordEntity.setCategoryName(performRulesEntity.getCategoryName()); recordEntity.setCategoryName(performRulesEntity.getCategoryName());
recordEntity.setSubAddType(performRulesEntity.getSubAddType()); recordEntity.setSubAddType(performRulesEntity.getSubAddType());
if(ruleCode.equals("ATTEND1011")){ if (ruleCode.equals("ATTEND1011")) {
int m = multiple/2; int m = multiple / 2;
recordEntity.setScore(performRulesEntity.getScore().multiply(new BigDecimal(m))); recordEntity.setScore(performRulesEntity.getScore().multiply(new BigDecimal(m)));
}else { } else {
recordEntity.setScore(performRulesEntity.getScore().multiply(new BigDecimal(multiple))); recordEntity.setScore(performRulesEntity.getScore().multiply(new BigDecimal(multiple)));
} }
recordEntity.setRemark(performRulesEntity.getContent()); recordEntity.setRemark(performRulesEntity.getContent());
} else { } else {
throw new AppException("没有查询到请假扣分规则:"+ruleCode); throw new AppException("没有查询到请假扣分规则:" + ruleCode);
} }
recordEntity.setSubMethod(SubMethodEnum.系统自动.getValue()); recordEntity.setSubMethod(SubMethodEnum.系统自动.getValue());
recordEntity.setDeductPerson("系统管理员"); recordEntity.setDeductPerson("系统管理员");
...@@ -362,10 +344,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -362,10 +344,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
} }
@Override @Override
public void doCreatPerformAttend(Long id, Context context){ public void doCreatPerformAttend(Long id, Context context) {
AttendanceLeaveRecordEntity temp = this.get(id); AttendanceLeaveRecordEntity temp = this.get(id);
if(temp!=null){ if (temp != null) {
if(AppealResultEnum.通过.getValue() == temp.getAuditResult() && LeaveTypeEnum.事假.getValue() == temp.getLeaveType()){ if (AppealResultEnum.通过.getValue() == temp.getAuditResult() && LeaveTypeEnum.事假.getValue() == temp.getLeaveType()) {
creatPerformAttend(temp, context); creatPerformAttend(temp, context);
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
View file @ 548b31d2
...@@ -8,8 +8,6 @@ import cn.hutool.core.date.DateUtil; ...@@ -8,8 +8,6 @@ import cn.hutool.core.date.DateUtil;
import java.util.Date; 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.annotation.desensitization.IdCardDesensitize;
import com.mortals.framework.annotation.desensitization.MobileDesensitize;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffVo; import com.mortals.xhx.module.staff.model.vo.StaffVo;
import lombok.Data; import lombok.Data;
...@@ -17,7 +15,7 @@ import lombok.Data; ...@@ -17,7 +15,7 @@ import lombok.Data;
* 员工基本信息实体对象 * 员工基本信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-01-11 * @date 2025-04-02
*/ */
@Data @Data
public class StaffEntity extends StaffVo { public class StaffEntity extends StaffVo {
...@@ -26,12 +24,10 @@ public class StaffEntity extends StaffVo { ...@@ -26,12 +24,10 @@ public class StaffEntity extends StaffVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String name; private String name;
/** /**
* 性别(1.男,2.女) * 性别(1.男,2.女)
*/ */
@Excel(name = "性别", readConverterExp = "1=男,2=女")
private Integer gender; private Integer gender;
/** /**
* 出生日期 * 出生日期
...@@ -44,19 +40,14 @@ public class StaffEntity extends StaffVo { ...@@ -44,19 +40,14 @@ public class StaffEntity extends StaffVo {
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
@MobileDesensitize
private String phoneNumber; private String phoneNumber;
/** /**
* 身份证号码 * 身份证号码
*/ */
@Excel(name = "身份证号码")
@IdCardDesensitize
private String idCard; private String idCard;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 政治面貌 (1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它) * 政治面貌 (1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
...@@ -69,7 +60,6 @@ public class StaffEntity extends StaffVo { ...@@ -69,7 +60,6 @@ public class StaffEntity extends StaffVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 职位ID * 职位ID
...@@ -78,22 +68,15 @@ public class StaffEntity extends StaffVo { ...@@ -78,22 +68,15 @@ public class StaffEntity extends StaffVo {
/** /**
* 职位名称 * 职位名称
*/ */
@Excel(name = "职位名称")
private String positionName; private String positionName;
/** /**
* 员工类型（1.全职,2.兼职,3.实习) * 员工类型（1.全职,2.兼职,3.实习)
*/ */
@Excel(name = "员工类型", readConverterExp = "1=全职,2=兼职,3=实习")
private Integer staffType; private Integer staffType;
/** /**
* 员工状态(1.正式,2.试用,3.离职) * 员工状态(1.正式,2.试用,3.离职)
*/ */
@Excel(name = "员工状态", readConverterExp = "1=正式,2=试用,3=离职")
private Integer status; private Integer status;
/**
* 员工来源(1.外部,2.内部)
*/
private Integer source;
/** /**
* 入职登记表 * 入职登记表
*/ */
...@@ -101,7 +84,6 @@ public class StaffEntity extends StaffVo { ...@@ -101,7 +84,6 @@ public class StaffEntity extends StaffVo {
/** /**
* 入职时间 * 入职时间
*/ */
@Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate; private Date entryDate;
/** /**
* 转正时间 * 转正时间
...@@ -119,6 +101,10 @@ public class StaffEntity extends StaffVo { ...@@ -119,6 +101,10 @@ public class StaffEntity extends StaffVo {
* 备注 * 备注
*/ */
private String remarkId; private String remarkId;
/**
* 员工来源(1.外部,2.内部)
*/
private Integer source;
/** /**
* 相对图片pic * 相对图片pic
*/ */
...@@ -127,22 +113,6 @@ public class StaffEntity extends StaffVo { ...@@ -127,22 +113,6 @@ public class StaffEntity extends StaffVo {
* 图片资源唯一标识 * 图片资源唯一标识
*/ */
private String serverIndexCode; private String serverIndexCode;
/**
* 绩效分数
*/
private BigDecimal score;
/**
* 员工登录名
*/
private String loginName;
/**
* 员工登录密码
*/
private String loginPwd;
/**
* 最后登录时间
*/
private Date lastLoginTime;
/** /**
* 考勤授权(0.不启用,1.启用) * 考勤授权(0.不启用,1.启用)
*/ */
...@@ -175,6 +145,26 @@ public class StaffEntity extends StaffVo { ...@@ -175,6 +145,26 @@ public class StaffEntity extends StaffVo {
* 所属大厅名称 * 所属大厅名称
*/ */
private String salaName; private String salaName;
/**
* 绩效分数
*/
private BigDecimal score;
/**
* 员工登录名
*/
private String loginName;
/**
* 员工登录密码
*/
private String loginPwd;
/**
* 最后登录时间
*/
private Date lastLoginTime;
/**
* 钉钉userId
*/
private String dingUserId;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -206,19 +196,15 @@ public class StaffEntity extends StaffVo { ...@@ -206,19 +196,15 @@ public class StaffEntity extends StaffVo {
this.positionName = ""; this.positionName = "";
this.staffType = 1; this.staffType = 1;
this.status = 1; this.status = 1;
this.source = 1;
this.registerPath = ""; this.registerPath = "";
this.entryDate = null; this.entryDate = null;
this.regularDate = null; this.regularDate = null;
this.leaveDate = null; this.leaveDate = null;
this.remark = ""; this.remark = "";
this.remarkId = ""; this.remarkId = "";
this.source = 1;
this.picUri = ""; this.picUri = "";
this.serverIndexCode = ""; this.serverIndexCode = "";
this.score = BigDecimal.ZERO;
this.loginName = "";
this.loginPwd = "";
this.lastLoginTime = null;
this.attendCheck = 1; this.attendCheck = 1;
this.complainCheck = 1; this.complainCheck = 1;
this.reviewCheck = 1; this.reviewCheck = 1;
...@@ -227,5 +213,10 @@ public class StaffEntity extends StaffVo { ...@@ -227,5 +213,10 @@ public class StaffEntity extends StaffVo {
this.otherCheck = 1; this.otherCheck = 1;
this.salaId = null; this.salaId = null;
this.salaName = ""; this.salaName = "";
this.score = BigDecimal.ZERO;
this.loginName = "";
this.loginPwd = "";
this.lastLoginTime = null;
this.dingUserId = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
View file @ 548b31d2
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
* 员工基本信息查询对象 * 员工基本信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-01-11 * @date 2025-04-02
*/ */
public class StaffQuery extends StaffEntity { public class StaffQuery extends StaffEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -157,21 +157,6 @@ public class StaffQuery extends StaffEntity { ...@@ -157,21 +157,6 @@ public class StaffQuery extends StaffEntity {
/** 员工状态(1.正式,2.试用,3.离职)排除列表 */ /** 员工状态(1.正式,2.试用,3.离职)排除列表 */
private List <Integer> statusNotList; private List <Integer> statusNotList;
/** 开始 员工来源(1.外部,2.内部) */
private Integer sourceStart;
/** 结束 员工来源(1.外部,2.内部) */
private Integer sourceEnd;
/** 增加 员工来源(1.外部,2.内部) */
private Integer sourceIncrement;
/** 员工来源(1.外部,2.内部)列表 */
private List <Integer> sourceList;
/** 员工来源(1.外部,2.内部)排除列表 */
private List <Integer> sourceNotList;
/** 入职登记表 */ /** 入职登记表 */
private List<String> registerPathList; private List<String> registerPathList;
...@@ -247,6 +232,21 @@ public class StaffQuery extends StaffEntity { ...@@ -247,6 +232,21 @@ public class StaffQuery extends StaffEntity {
/** 备注排除列表 */ /** 备注排除列表 */
private List <String> remarkIdNotList; private List <String> remarkIdNotList;
/** 开始 员工来源(1.外部,2.内部) */
private Integer sourceStart;
/** 结束 员工来源(1.外部,2.内部) */
private Integer sourceEnd;
/** 增加 员工来源(1.外部,2.内部) */
private Integer sourceIncrement;
/** 员工来源(1.外部,2.内部)列表 */
private List <Integer> sourceList;
/** 员工来源(1.外部,2.内部)排除列表 */
private List <Integer> sourceNotList;
/** 相对图片pic */ /** 相对图片pic */
private List<String> picUriList; private List<String> picUriList;
...@@ -257,37 +257,6 @@ public class StaffQuery extends StaffEntity { ...@@ -257,37 +257,6 @@ public class StaffQuery extends StaffEntity {
/** 图片资源唯一标识排除列表 */ /** 图片资源唯一标识排除列表 */
private List <String> serverIndexCodeNotList; private List <String> serverIndexCodeNotList;
/** 开始 绩效分数 */
private BigDecimal scoreStart;
/** 结束 绩效分数 */
private BigDecimal scoreEnd;
/** 增加 绩效分数 */
private BigDecimal scoreIncrement;
/** 绩效分数列表 */
private List <BigDecimal> scoreList;
/** 绩效分数排除列表 */
private List <BigDecimal> scoreNotList;
/** 员工登录名 */
private List<String> loginNameList;
/** 员工登录名排除列表 */
private List <String> loginNameNotList;
/** 员工登录密码 */
private List<String> loginPwdList;
/** 员工登录密码排除列表 */
private List <String> loginPwdNotList;
/** 开始 最后登录时间 */
private String lastLoginTimeStart;
/** 结束 最后登录时间 */
private String lastLoginTimeEnd;
/** 开始 考勤授权(0.不启用,1.启用) */ /** 开始 考勤授权(0.不启用,1.启用) */
private Integer attendCheckStart; private Integer attendCheckStart;
...@@ -398,6 +367,42 @@ public class StaffQuery extends StaffEntity { ...@@ -398,6 +367,42 @@ public class StaffQuery extends StaffEntity {
/** 所属大厅名称排除列表 */ /** 所属大厅名称排除列表 */
private List <String> salaNameNotList; private List <String> salaNameNotList;
/** 开始 绩效分数 */
private BigDecimal scoreStart;
/** 结束 绩效分数 */
private BigDecimal scoreEnd;
/** 增加 绩效分数 */
private BigDecimal scoreIncrement;
/** 绩效分数列表 */
private List <BigDecimal> scoreList;
/** 绩效分数排除列表 */
private List <BigDecimal> scoreNotList;
/** 员工登录名 */
private List<String> loginNameList;
/** 员工登录名排除列表 */
private List <String> loginNameNotList;
/** 员工登录密码 */
private List<String> loginPwdList;
/** 员工登录密码排除列表 */
private List <String> loginPwdNotList;
/** 开始 最后登录时间 */
private String lastLoginTimeStart;
/** 结束 最后登录时间 */
private String lastLoginTimeEnd;
/** 钉钉userId */
private List<String> dingUserIdList;
/** 钉钉userId排除列表 */
private List <String> dingUserIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<StaffQuery> orConditionList; private List<StaffQuery> orConditionList;
...@@ -1229,87 +1234,6 @@ public class StaffQuery extends StaffEntity { ...@@ -1229,87 +1234,6 @@ public class StaffQuery extends StaffEntity {
} }
/**
* 获取 开始 员工来源(1.外部,2.内部)
* @return sourceStart
*/
public Integer getSourceStart(){
return this.sourceStart;
}
/**
* 设置 开始 员工来源(1.外部,2.内部)
* @param sourceStart
*/
public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
}
/**
* 获取 结束 员工来源(1.外部,2.内部)
* @return $sourceEnd
*/
public Integer getSourceEnd(){
return this.sourceEnd;
}
/**
* 设置 结束 员工来源(1.外部,2.内部)
* @param sourceEnd
*/
public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
}
/**
* 获取 增加 员工来源(1.外部,2.内部)
* @return sourceIncrement
*/
public Integer getSourceIncrement(){
return this.sourceIncrement;
}
/**
* 设置 增加 员工来源(1.外部,2.内部)
* @param sourceIncrement
*/
public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
}
/**
* 获取 员工来源(1.外部,2.内部)
* @return sourceList
*/
public List<Integer> getSourceList(){
return this.sourceList;
}
/**
* 设置 员工来源(1.外部,2.内部)
* @param sourceList
*/
public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList;
}
/**
* 获取 员工来源(1.外部,2.内部)
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 员工来源(1.外部,2.内部)
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/** /**
* 获取 入职登记表 * 获取 入职登记表
* @return registerPathList * @return registerPathList
...@@ -1728,6 +1652,87 @@ public class StaffQuery extends StaffEntity { ...@@ -1728,6 +1652,87 @@ public class StaffQuery extends StaffEntity {
this.remarkIdNotList = remarkIdNotList; this.remarkIdNotList = remarkIdNotList;
} }
/**
* 获取 开始 员工来源(1.外部,2.内部)
* @return sourceStart
*/
public Integer getSourceStart(){
return this.sourceStart;
}
/**
* 设置 开始 员工来源(1.外部,2.内部)
* @param sourceStart
*/
public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
}
/**
* 获取 结束 员工来源(1.外部,2.内部)
* @return $sourceEnd
*/
public Integer getSourceEnd(){
return this.sourceEnd;
}
/**
* 设置 结束 员工来源(1.外部,2.内部)
* @param sourceEnd
*/
public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
}
/**
* 获取 增加 员工来源(1.外部,2.内部)
* @return sourceIncrement
*/
public Integer getSourceIncrement(){
return this.sourceIncrement;
}
/**
* 设置 增加 员工来源(1.外部,2.内部)
* @param sourceIncrement
*/
public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
}
/**
* 获取 员工来源(1.外部,2.内部)
* @return sourceList
*/
public List<Integer> getSourceList(){
return this.sourceList;
}
/**
* 设置 员工来源(1.外部,2.内部)
* @param sourceList
*/
public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList;
}
/**
* 获取 员工来源(1.外部,2.内部)
* @return sourceNotList
*/
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 员工来源(1.外部,2.内部)
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/** /**
* 获取 相对图片pic * 获取 相对图片pic
* @return picUriList * @return picUriList
...@@ -1792,183 +1797,6 @@ public class StaffQuery extends StaffEntity { ...@@ -1792,183 +1797,6 @@ public class StaffQuery extends StaffEntity {
this.serverIndexCodeNotList = serverIndexCodeNotList; this.serverIndexCodeNotList = serverIndexCodeNotList;
} }
/**
* 获取 开始 绩效分数
* @return scoreStart
*/
public BigDecimal getScoreStart(){
return this.scoreStart;
}
/**
* 设置 开始 绩效分数
* @param scoreStart
*/
public void setScoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart;
}
/**
* 获取 结束 绩效分数
* @return $scoreEnd
*/
public BigDecimal getScoreEnd(){
return this.scoreEnd;
}
/**
* 设置 结束 绩效分数
* @param scoreEnd
*/
public void setScoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd;
}
/**
* 获取 增加 绩效分数
* @return scoreIncrement
*/
public BigDecimal getScoreIncrement(){
return this.scoreIncrement;
}
/**
* 设置 增加 绩效分数
* @param scoreIncrement
*/
public void setScoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement;
}
/**
* 获取 绩效分数
* @return scoreList
*/
public List<BigDecimal> getScoreList(){
return this.scoreList;
}
/**
* 设置 绩效分数
* @param scoreList
*/
public void setScoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
}
/**
* 获取 绩效分数
* @return scoreNotList
*/
public List<BigDecimal> getScoreNotList(){
return this.scoreNotList;
}
/**
* 设置 绩效分数
* @param scoreNotList
*/
public void setScoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
}
/**
* 获取 员工登录名
* @return loginNameList
*/
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 员工登录名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 员工登录名
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 员工登录名
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/**
* 获取 员工登录密码
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 员工登录密码
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 员工登录密码
* @return loginPwdNotList
*/
public List<String> getLoginPwdNotList(){
return this.loginPwdNotList;
}
/**
* 设置 员工登录密码
* @param loginPwdNotList
*/
public void setLoginPwdNotList(List<String> loginPwdNotList){
this.loginPwdNotList = loginPwdNotList;
}
/**
* 获取 开始 最后登录时间
* @return lastLoginTimeStart
*/
public String getLastLoginTimeStart(){
return this.lastLoginTimeStart;
}
/**
* 设置 开始 最后登录时间
* @param lastLoginTimeStart
*/
public void setLastLoginTimeStart(String lastLoginTimeStart){
this.lastLoginTimeStart = lastLoginTimeStart;
}
/**
* 获取 结束 最后登录时间
* @return lastLoginTimeEnd
*/
public String getLastLoginTimeEnd(){
return this.lastLoginTimeEnd;
}
/**
* 设置 结束 最后登录时间
* @param lastLoginTimeEnd
*/
public void setLastLoginTimeEnd(String lastLoginTimeEnd){
this.lastLoginTimeEnd = lastLoginTimeEnd;
}
/** /**
* 获取 开始 考勤授权(0.不启用,1.启用) * 获取 开始 考勤授权(0.不启用,1.启用)
* @return attendCheckStart * @return attendCheckStart
...@@ -2568,6 +2396,215 @@ public class StaffQuery extends StaffEntity { ...@@ -2568,6 +2396,215 @@ public class StaffQuery extends StaffEntity {
this.salaNameNotList = salaNameNotList; this.salaNameNotList = salaNameNotList;
} }
/**
* 获取 开始 绩效分数
* @return scoreStart
*/
public BigDecimal getScoreStart(){
return this.scoreStart;
}
/**
* 设置 开始 绩效分数
* @param scoreStart
*/
public void setScoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart;
}
/**
* 获取 结束 绩效分数
* @return $scoreEnd
*/
public BigDecimal getScoreEnd(){
return this.scoreEnd;
}
/**
* 设置 结束 绩效分数
* @param scoreEnd
*/
public void setScoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd;
}
/**
* 获取 增加 绩效分数
* @return scoreIncrement
*/
public BigDecimal getScoreIncrement(){
return this.scoreIncrement;
}
/**
* 设置 增加 绩效分数
* @param scoreIncrement
*/
public void setScoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement;
}
/**
* 获取 绩效分数
* @return scoreList
*/
public List<BigDecimal> getScoreList(){
return this.scoreList;
}
/**
* 设置 绩效分数
* @param scoreList
*/
public void setScoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
}
/**
* 获取 绩效分数
* @return scoreNotList
*/
public List<BigDecimal> getScoreNotList(){
return this.scoreNotList;
}
/**
* 设置 绩效分数
* @param scoreNotList
*/
public void setScoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
}
/**
* 获取 员工登录名
* @return loginNameList
*/
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 员工登录名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 员工登录名
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 员工登录名
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/**
* 获取 员工登录密码
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 员工登录密码
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 员工登录密码
* @return loginPwdNotList
*/
public List<String> getLoginPwdNotList(){
return this.loginPwdNotList;
}
/**
* 设置 员工登录密码
* @param loginPwdNotList
*/
public void setLoginPwdNotList(List<String> loginPwdNotList){
this.loginPwdNotList = loginPwdNotList;
}
/**
* 获取 开始 最后登录时间
* @return lastLoginTimeStart
*/
public String getLastLoginTimeStart(){
return this.lastLoginTimeStart;
}
/**
* 设置 开始 最后登录时间
* @param lastLoginTimeStart
*/
public void setLastLoginTimeStart(String lastLoginTimeStart){
this.lastLoginTimeStart = lastLoginTimeStart;
}
/**
* 获取 结束 最后登录时间
* @return lastLoginTimeEnd
*/
public String getLastLoginTimeEnd(){
return this.lastLoginTimeEnd;
}
/**
* 设置 结束 最后登录时间
* @param lastLoginTimeEnd
*/
public void setLastLoginTimeEnd(String lastLoginTimeEnd){
this.lastLoginTimeEnd = lastLoginTimeEnd;
}
/**
* 获取 钉钉userId
* @return dingUserIdList
*/
public List<String> getDingUserIdList(){
return this.dingUserIdList;
}
/**
* 设置 钉钉userId
* @param dingUserIdList
*/
public void setDingUserIdList(List<String> dingUserIdList){
this.dingUserIdList = dingUserIdList;
}
/**
* 获取 钉钉userId
* @return dingUserIdNotList
*/
public List<String> getDingUserIdNotList(){
return this.dingUserIdNotList;
}
/**
* 设置 钉钉userId
* @param dingUserIdNotList
*/
public void setDingUserIdNotList(List<String> dingUserIdNotList){
this.dingUserIdNotList = dingUserIdNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -3040,97 +3077,43 @@ public class StaffQuery extends StaffEntity { ...@@ -3040,97 +3077,43 @@ public class StaffQuery extends StaffEntity {
* @param statusStart * @param statusStart
*/ */
public StaffQuery statusStart(Integer statusStart){ public StaffQuery statusStart(Integer statusStart){
this.statusStart = statusStart; this.statusStart = statusStart;
return this;
}
/**
* 设置 结束 员工状态(1.正式,2.试用,3.离职)
* @param statusEnd
*/
public StaffQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 增加 员工状态(1.正式,2.试用,3.离职)
* @param statusIncrement
*/
public StaffQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 员工状态(1.正式,2.试用,3.离职)
* @param statusList
*/
public StaffQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 员工状态(1.正式,2.试用,3.离职)
* @param statusNotList
*/
public StaffQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/**
* 设置 员工来源(1.外部,2.内部)
* @param source
*/
public StaffQuery source(Integer source){
setSource(source);
return this;
}
/**
* 设置 开始 员工来源(1.外部,2.内部)
* @param sourceStart
*/
public StaffQuery sourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
return this; return this;
} }
/** /**
* 设置 结束 员工来源(1.外部,2.内部) * 设置 结束 员工状态(1.正式,2.试用,3.离职)
* @param sourceEnd * @param statusEnd
*/ */
public StaffQuery sourceEnd(Integer sourceEnd){ public StaffQuery statusEnd(Integer statusEnd){
this.sourceEnd = sourceEnd; this.statusEnd = statusEnd;
return this; return this;
} }
/** /**
* 设置 增加 员工来源(1.外部,2.内部) * 设置 增加 员工状态(1.正式,2.试用,3.离职)
* @param sourceIncrement * @param statusIncrement
*/ */
public StaffQuery sourceIncrement(Integer sourceIncrement){ public StaffQuery statusIncrement(Integer statusIncrement){
this.sourceIncrement = sourceIncrement; this.statusIncrement = statusIncrement;
return this; return this;
} }
/** /**
* 设置 员工来源(1.外部,2.内部) * 设置 员工状态(1.正式,2.试用,3.离职)
* @param sourceList * @param statusList
*/ */
public StaffQuery sourceList(List<Integer> sourceList){ public StaffQuery statusList(List<Integer> statusList){
this.sourceList = sourceList; this.statusList = statusList;
return this; return this;
} }
/** /**
* 设置 员工来源(1.外部,2.内部) * 设置 员工状态(1.正式,2.试用,3.离职)
* @param sourceNotList * @param statusNotList
*/ */
public StaffQuery sourceNotList(List<Integer> sourceNotList){ public StaffQuery statusNotList(List<Integer> statusNotList){
this.sourceNotList = sourceNotList; this.statusNotList = statusNotList;
return this; return this;
} }
...@@ -3304,137 +3287,98 @@ public class StaffQuery extends StaffEntity { ...@@ -3304,137 +3287,98 @@ public class StaffQuery extends StaffEntity {
return this; return this;
} }
/**
* 设置 相对图片pic
* @param picUri
*/
public StaffQuery picUri(String picUri){
setPicUri(picUri);
return this;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public StaffQuery picUriList(List<String> picUriList){
this.picUriList = picUriList;
return this;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public StaffQuery serverIndexCode(String serverIndexCode){
setServerIndexCode(serverIndexCode);
return this;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public StaffQuery serverIndexCodeList(List<String> serverIndexCodeList){
this.serverIndexCodeList = serverIndexCodeList;
return this;
}
/** /**
* 设置 绩效分数 * 设置 员工来源(1.外部,2.内部)
* @param score * @param source
*/ */
public StaffQuery score(BigDecimal score){ public StaffQuery source(Integer source){
setScore(score); setSource(source);
return this; return this;
} }
/** /**
* 设置 开始 绩效分数 * 设置 开始 员工来源(1.外部,2.内部)
* @param scoreStart * @param sourceStart
*/ */
public StaffQuery scoreStart(BigDecimal scoreStart){ public StaffQuery sourceStart(Integer sourceStart){
this.scoreStart = scoreStart; this.sourceStart = sourceStart;
return this; return this;
} }
/** /**
* 设置 结束 绩效分数 * 设置 结束 员工来源(1.外部,2.内部)
* @param scoreEnd * @param sourceEnd
*/ */
public StaffQuery scoreEnd(BigDecimal scoreEnd){ public StaffQuery sourceEnd(Integer sourceEnd){
this.scoreEnd = scoreEnd; this.sourceEnd = sourceEnd;
return this; return this;
} }
/** /**
* 设置 增加 绩效分数 * 设置 增加 员工来源(1.外部,2.内部)
* @param scoreIncrement * @param sourceIncrement
*/ */
public StaffQuery scoreIncrement(BigDecimal scoreIncrement){ public StaffQuery sourceIncrement(Integer sourceIncrement){
this.scoreIncrement = scoreIncrement; this.sourceIncrement = sourceIncrement;
return this; return this;
} }
/** /**
* 设置 绩效分数 * 设置 员工来源(1.外部,2.内部)
* @param scoreList * @param sourceList
*/ */
public StaffQuery scoreList(List<BigDecimal> scoreList){ public StaffQuery sourceList(List<Integer> sourceList){
this.scoreList = scoreList; this.sourceList = sourceList;
return this; return this;
} }
/** /**
* 设置 绩效分数 * 设置 员工来源(1.外部,2.内部)
* @param scoreNotList * @param sourceNotList
*/ */
public StaffQuery scoreNotList(List<BigDecimal> scoreNotList){ public StaffQuery sourceNotList(List<Integer> sourceNotList){
this.scoreNotList = scoreNotList; this.sourceNotList = sourceNotList;
return this; return this;
} }
/** /**
* 设置 员工登录名 * 设置 相对图片pic
* @param loginName * @param picUri
*/ */
public StaffQuery loginName(String loginName){ public StaffQuery picUri(String picUri){
setLoginName(loginName); setPicUri(picUri);
return this; return this;
} }
/** /**
* 设置 员工登录名 * 设置 相对图片pic
* @param loginNameList * @param picUriList
*/ */
public StaffQuery loginNameList(List<String> loginNameList){ public StaffQuery picUriList(List<String> picUriList){
this.loginNameList = loginNameList; this.picUriList = picUriList;
return this; return this;
} }
/** /**
* 设置 员工登录密码 * 设置 图片资源唯一标识
* @param loginPwd * @param serverIndexCode
*/ */
public StaffQuery loginPwd(String loginPwd){ public StaffQuery serverIndexCode(String serverIndexCode){
setLoginPwd(loginPwd); setServerIndexCode(serverIndexCode);
return this; return this;
} }
/** /**
* 设置 员工登录密码 * 设置 图片资源唯一标识
* @param loginPwdList * @param serverIndexCodeList
*/ */
public StaffQuery loginPwdList(List<String> loginPwdList){ public StaffQuery serverIndexCodeList(List<String> serverIndexCodeList){
this.loginPwdList = loginPwdList; this.serverIndexCodeList = serverIndexCodeList;
return this; return this;
} }
/** /**
* 设置 考勤授权(0.不启用,1.启用) * 设置 考勤授权(0.不启用,1.启用)
* @param attendCheck * @param attendCheck
...@@ -3832,6 +3776,118 @@ public class StaffQuery extends StaffEntity { ...@@ -3832,6 +3776,118 @@ public class StaffQuery extends StaffEntity {
return this; return this;
} }
/**
* 设置 绩效分数
* @param score
*/
public StaffQuery score(BigDecimal score){
setScore(score);
return this;
}
/**
* 设置 开始 绩效分数
* @param scoreStart
*/
public StaffQuery scoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart;
return this;
}
/**
* 设置 结束 绩效分数
* @param scoreEnd
*/
public StaffQuery scoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd;
return this;
}
/**
* 设置 增加 绩效分数
* @param scoreIncrement
*/
public StaffQuery scoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement;
return this;
}
/**
* 设置 绩效分数
* @param scoreList
*/
public StaffQuery scoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
return this;
}
/**
* 设置 绩效分数
* @param scoreNotList
*/
public StaffQuery scoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
return this;
}
/**
* 设置 员工登录名
* @param loginName
*/
public StaffQuery loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 员工登录名
* @param loginNameList
*/
public StaffQuery loginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
return this;
}
/**
* 设置 员工登录密码
* @param loginPwd
*/
public StaffQuery loginPwd(String loginPwd){
setLoginPwd(loginPwd);
return this;
}
/**
* 设置 员工登录密码
* @param loginPwdList
*/
public StaffQuery loginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
return this;
}
/**
* 设置 钉钉userId
* @param dingUserId
*/
public StaffQuery dingUserId(String dingUserId){
setDingUserId(dingUserId);
return this;
}
/**
* 设置 钉钉userId
* @param dingUserIdList
*/
public StaffQuery dingUserIdList(List<String> dingUserIdList){
this.dingUserIdList = dingUserIdList;
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/resources/sqlmap/module/staff/StaffMapper.xml
View file @ 548b31d2
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
<result property="positionName" column="positionName" /> <result property="positionName" column="positionName" />
<result property="staffType" column="staffType" /> <result property="staffType" column="staffType" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="source" column="source" />
<result property="registerPath" column="registerPath" /> <result property="registerPath" column="registerPath" />
<result property="entryDate" column="entryDate" /> <result property="entryDate" column="entryDate" />
<result property="regularDate" column="regularDate" /> <result property="regularDate" column="regularDate" />
...@@ -31,12 +30,9 @@ ...@@ -31,12 +30,9 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="remarkId" column="remarkId" /> <result property="remarkId" column="remarkId" />
<result property="source" column="source" />
<result property="picUri" column="picUri" /> <result property="picUri" column="picUri" />
<result property="serverIndexCode" column="serverIndexCode" /> <result property="serverIndexCode" column="serverIndexCode" />
<result property="score" column="score" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="lastLoginTime" column="lastLoginTime" />
<result property="attendCheck" column="attendCheck" /> <result property="attendCheck" column="attendCheck" />
<result property="complainCheck" column="complainCheck" /> <result property="complainCheck" column="complainCheck" />
<result property="reviewCheck" column="reviewCheck" /> <result property="reviewCheck" column="reviewCheck" />
...@@ -45,10 +41,13 @@ ...@@ -45,10 +41,13 @@
<result property="otherCheck" column="otherCheck" /> <result property="otherCheck" column="otherCheck" />
<result property="salaId" column="salaId" /> <result property="salaId" column="salaId" />
<result property="salaName" column="salaName" /> <result property="salaName" column="salaName" />
<result property="score" column="score" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="lastLoginTime" column="lastLoginTime" />
<result property="dingUserId" column="dingUserId" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
...@@ -97,9 +96,6 @@ ...@@ -97,9 +96,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status, a.status,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('registerPath') or colPickMode == 1 and data.containsKey('registerPath')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('registerPath') or colPickMode == 1 and data.containsKey('registerPath')))">
a.registerPath, a.registerPath,
</if> </if>
...@@ -130,24 +126,15 @@ ...@@ -130,24 +126,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remarkId') or colPickMode == 1 and data.containsKey('remarkId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remarkId') or colPickMode == 1 and data.containsKey('remarkId')))">
a.remarkId, a.remarkId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picUri') or colPickMode == 1 and data.containsKey('picUri')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picUri') or colPickMode == 1 and data.containsKey('picUri')))">
a.picUri, a.picUri,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serverIndexCode') or colPickMode == 1 and data.containsKey('serverIndexCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serverIndexCode') or colPickMode == 1 and data.containsKey('serverIndexCode')))">
a.serverIndexCode, a.serverIndexCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
a.score,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginTime') or colPickMode == 1 and data.containsKey('lastLoginTime')))">
a.lastLoginTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendCheck') or colPickMode == 1 and data.containsKey('attendCheck')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendCheck') or colPickMode == 1 and data.containsKey('attendCheck')))">
a.attendCheck, a.attendCheck,
</if> </if>
...@@ -172,23 +159,38 @@ ...@@ -172,23 +159,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
a.salaName, a.salaName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
a.score,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginTime') or colPickMode == 1 and data.containsKey('lastLoginTime')))">
a.lastLoginTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dingUserId') or colPickMode == 1 and data.containsKey('dingUserId')))">
a.dingUserId,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_staff insert into mortals_xhx_staff
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck,salaId,salaName) (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source,picUri,serverIndexCode,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck,salaId,salaName,score,loginName,loginPwd,lastLoginTime,dingUserId)
VALUES VALUES
(#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{picUri},#{serverIndexCode},#{score},#{loginName},#{loginPwd},#{lastLoginTime},#{attendCheck},#{complainCheck},#{reviewCheck},#{goworkCheck},#{effectCheck},#{otherCheck},#{salaId},#{salaName}) (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{source},#{picUri},#{serverIndexCode},#{attendCheck},#{complainCheck},#{reviewCheck},#{goworkCheck},#{effectCheck},#{otherCheck},#{salaId},#{salaName},#{score},#{loginName},#{loginPwd},#{lastLoginTime},#{dingUserId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_staff insert into mortals_xhx_staff
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck,salaId,salaName) (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source,picUri,serverIndexCode,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck,salaId,salaName,score,loginName,loginPwd,lastLoginTime,dingUserId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.picUri},#{item.serverIndexCode},#{item.score},#{item.loginName},#{item.loginPwd},#{item.lastLoginTime},#{item.attendCheck},#{item.complainCheck},#{item.reviewCheck},#{item.goworkCheck},#{item.effectCheck},#{item.otherCheck},#{item.salaId},#{item.salaName}) (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.source},#{item.picUri},#{item.serverIndexCode},#{item.attendCheck},#{item.complainCheck},#{item.reviewCheck},#{item.goworkCheck},#{item.effectCheck},#{item.otherCheck},#{item.salaId},#{item.salaName},#{item.score},#{item.loginName},#{item.loginPwd},#{item.lastLoginTime},#{item.dingUserId})
</foreach> </foreach>
</insert> </insert>
...@@ -258,12 +260,6 @@ ...@@ -258,12 +260,6 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('registerPath')) or (colPickMode==1 and !data.containsKey('registerPath'))"> <if test="(colPickMode==0 and data.containsKey('registerPath')) or (colPickMode==1 and !data.containsKey('registerPath'))">
a.registerPath=#{data.registerPath}, a.registerPath=#{data.registerPath},
</if> </if>
...@@ -300,27 +296,18 @@ ...@@ -300,27 +296,18 @@
<if test="(colPickMode==0 and data.containsKey('remarkId')) or (colPickMode==1 and !data.containsKey('remarkId'))"> <if test="(colPickMode==0 and data.containsKey('remarkId')) or (colPickMode==1 and !data.containsKey('remarkId'))">
a.remarkId=#{data.remarkId}, a.remarkId=#{data.remarkId},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('picUri')) or (colPickMode==1 and !data.containsKey('picUri'))"> <if test="(colPickMode==0 and data.containsKey('picUri')) or (colPickMode==1 and !data.containsKey('picUri'))">
a.picUri=#{data.picUri}, a.picUri=#{data.picUri},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('serverIndexCode')) or (colPickMode==1 and !data.containsKey('serverIndexCode'))"> <if test="(colPickMode==0 and data.containsKey('serverIndexCode')) or (colPickMode==1 and !data.containsKey('serverIndexCode'))">
a.serverIndexCode=#{data.serverIndexCode}, a.serverIndexCode=#{data.serverIndexCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('score')) or (colPickMode==1 and !data.containsKey('score'))">
a.score=#{data.score},
</if>
<if test="(colPickMode==0 and data.containsKey('scoreIncrement')) or (colPickMode==1 and !data.containsKey('scoreIncrement'))">
a.score=ifnull(a.score,0) + #{data.scoreIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
<if test="(colPickMode==0 and data.containsKey('lastLoginTime')) or (colPickMode==1 and !data.containsKey('lastLoginTime'))">
a.lastLoginTime=#{data.lastLoginTime},
</if>
<if test="(colPickMode==0 and data.containsKey('attendCheck')) or (colPickMode==1 and !data.containsKey('attendCheck'))"> <if test="(colPickMode==0 and data.containsKey('attendCheck')) or (colPickMode==1 and !data.containsKey('attendCheck'))">
a.attendCheck=#{data.attendCheck}, a.attendCheck=#{data.attendCheck},
</if> </if>
...@@ -366,6 +353,24 @@ ...@@ -366,6 +353,24 @@
<if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))"> <if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
a.salaName=#{data.salaName}, a.salaName=#{data.salaName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('score')) or (colPickMode==1 and !data.containsKey('score'))">
a.score=#{data.score},
</if>
<if test="(colPickMode==0 and data.containsKey('scoreIncrement')) or (colPickMode==1 and !data.containsKey('scoreIncrement'))">
a.score=ifnull(a.score,0) + #{data.scoreIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
<if test="(colPickMode==0 and data.containsKey('lastLoginTime')) or (colPickMode==1 and !data.containsKey('lastLoginTime'))">
a.lastLoginTime=#{data.lastLoginTime},
</if>
<if test="(colPickMode==0 and data.containsKey('dingUserId')) or (colPickMode==1 and !data.containsKey('dingUserId'))">
a.dingUserId=#{data.dingUserId},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -506,18 +511,6 @@ ...@@ -506,18 +511,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.source}
</when>
<when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="registerPath=(case" suffix="ELSE registerPath end),"> <trim prefix="registerPath=(case" suffix="ELSE registerPath 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('registerPath')) or (colPickMode==1 and !item.containsKey('registerPath'))"> <if test="(colPickMode==0 and item.containsKey('registerPath')) or (colPickMode==1 and !item.containsKey('registerPath'))">
...@@ -598,50 +591,29 @@ ...@@ -598,50 +591,29 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="picUri=(case" suffix="ELSE picUri end),"> <trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('picUri')) or (colPickMode==1 and !item.containsKey('picUri'))">
when a.id=#{item.id} then #{item.picUri}
</if>
</foreach>
</trim>
<trim prefix="serverIndexCode=(case" suffix="ELSE serverIndexCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serverIndexCode')) or (colPickMode==1 and !item.containsKey('serverIndexCode'))">
when a.id=#{item.id} then #{item.serverIndexCode}
</if>
</foreach>
</trim>
<trim prefix="score=(case" suffix="ELSE score end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('score')) or (colPickMode==1 and !item.containsKey('score'))"> <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.score} when a.id=#{item.id} then #{item.source}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('scoreIncrement')) or (colPickMode==1 and !item.containsKey('scoreIncrement'))"> <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.score,0) + #{item.scoreIncrement} when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),"> <trim prefix="picUri=(case" suffix="ELSE picUri end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
when a.id=#{item.id} then #{item.loginName}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd 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('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))"> <if test="(colPickMode==0 and item.containsKey('picUri')) or (colPickMode==1 and !item.containsKey('picUri'))">
when a.id=#{item.id} then #{item.loginPwd} when a.id=#{item.id} then #{item.picUri}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="lastLoginTime=(case" suffix="ELSE lastLoginTime end),"> <trim prefix="serverIndexCode=(case" suffix="ELSE serverIndexCode 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('lastLoginTime')) or (colPickMode==1 and !item.containsKey('lastLoginTime'))"> <if test="(colPickMode==0 and item.containsKey('serverIndexCode')) or (colPickMode==1 and !item.containsKey('serverIndexCode'))">
when a.id=#{item.id} then #{item.lastLoginTime} when a.id=#{item.id} then #{item.serverIndexCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -736,6 +708,46 @@ ...@@ -736,6 +708,46 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="score=(case" suffix="ELSE score end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('score')) or (colPickMode==1 and !item.containsKey('score'))">
when a.id=#{item.id} then #{item.score}
</when>
<when test="(colPickMode==0 and item.containsKey('scoreIncrement')) or (colPickMode==1 and !item.containsKey('scoreIncrement'))">
when a.id=#{item.id} then ifnull(a.score,0) + #{item.scoreIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
when a.id=#{item.id} then #{item.loginName}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))">
when a.id=#{item.id} then #{item.loginPwd}
</if>
</foreach>
</trim>
<trim prefix="lastLoginTime=(case" suffix="ELSE lastLoginTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('lastLoginTime')) or (colPickMode==1 and !item.containsKey('lastLoginTime'))">
when a.id=#{item.id} then #{item.lastLoginTime}
</if>
</foreach>
</trim>
<trim prefix="dingUserId=(case" suffix="ELSE dingUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dingUserId')) or (colPickMode==1 and !item.containsKey('dingUserId'))">
when a.id=#{item.id} then #{item.dingUserId}
</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=")">
...@@ -847,6 +859,10 @@ ...@@ -847,6 +859,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}
...@@ -1203,33 +1219,6 @@ ...@@ -1203,33 +1219,6 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if>
<if test="conditionParamRef.containsKey('registerPath')"> <if test="conditionParamRef.containsKey('registerPath')">
<if test="conditionParamRef.registerPath != null and conditionParamRef.registerPath != ''"> <if test="conditionParamRef.registerPath != null and conditionParamRef.registerPath != ''">
...@@ -1422,6 +1411,33 @@ ...@@ -1422,6 +1411,33 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if>
<if test="conditionParamRef.containsKey('picUri')"> <if test="conditionParamRef.containsKey('picUri')">
<if test="conditionParamRef.picUri != null and conditionParamRef.picUri != ''"> <if test="conditionParamRef.picUri != null and conditionParamRef.picUri != ''">
...@@ -1464,90 +1480,6 @@ ...@@ -1464,90 +1480,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('score')">
<if test="conditionParamRef.score != null ">
${_conditionType_} a.score = #{${_conditionParam_}.score}
</if>
<if test="conditionParamRef.score == null">
${_conditionType_} a.score is null
</if>
</if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
${_conditionType_} a.score in
<foreach collection="conditionParamRef.scoreList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('scoreNotList') and conditionParamRef.scoreNotList.size() > 0">
${_conditionType_} a.score not in
<foreach collection="conditionParamRef.scoreNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('scoreStart') and conditionParamRef.scoreStart != null">
${_conditionType_} a.score <![CDATA[ >= ]]> #{${_conditionParam_}.scoreStart}
</if>
<if test="conditionParamRef.containsKey('scoreEnd') and conditionParamRef.scoreEnd != null">
${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
</if>
<if test="conditionParamRef.containsKey('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
${_conditionType_} a.loginPwd not in
<foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('lastLoginTime')">
<if test="conditionParamRef.lastLoginTime != null ">
${_conditionType_} a.lastLoginTime = #{${_conditionParam_}.lastLoginTime}
</if>
<if test="conditionParamRef.lastLoginTime == null">
${_conditionType_} a.lastLoginTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('lastLoginTimeStart') and conditionParamRef.lastLoginTimeStart != null and conditionParamRef.lastLoginTimeStart!=''">
${_conditionType_} a.lastLoginTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('lastLoginTimeEnd') and conditionParamRef.lastLoginTimeEnd != null and conditionParamRef.lastLoginTimeEnd!=''">
${_conditionType_} a.lastLoginTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('attendCheck')"> <if test="conditionParamRef.containsKey('attendCheck')">
<if test="conditionParamRef.attendCheck != null "> <if test="conditionParamRef.attendCheck != null ">
${_conditionType_} a.attendCheck = #{${_conditionParam_}.attendCheck} ${_conditionType_} a.attendCheck = #{${_conditionParam_}.attendCheck}
...@@ -1758,6 +1690,111 @@ ...@@ -1758,6 +1690,111 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('score')">
<if test="conditionParamRef.score != null ">
${_conditionType_} a.score = #{${_conditionParam_}.score}
</if>
<if test="conditionParamRef.score == null">
${_conditionType_} a.score is null
</if>
</if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
${_conditionType_} a.score in
<foreach collection="conditionParamRef.scoreList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('scoreNotList') and conditionParamRef.scoreNotList.size() > 0">
${_conditionType_} a.score not in
<foreach collection="conditionParamRef.scoreNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('scoreStart') and conditionParamRef.scoreStart != null">
${_conditionType_} a.score <![CDATA[ >= ]]> #{${_conditionParam_}.scoreStart}
</if>
<if test="conditionParamRef.containsKey('scoreEnd') and conditionParamRef.scoreEnd != null">
${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
</if>
<if test="conditionParamRef.containsKey('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
${_conditionType_} a.loginPwd not in
<foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('lastLoginTime')">
<if test="conditionParamRef.lastLoginTime != null ">
${_conditionType_} a.lastLoginTime = #{${_conditionParam_}.lastLoginTime}
</if>
<if test="conditionParamRef.lastLoginTime == null">
${_conditionType_} a.lastLoginTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('lastLoginTimeStart') and conditionParamRef.lastLoginTimeStart != null and conditionParamRef.lastLoginTimeStart!=''">
${_conditionType_} a.lastLoginTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('lastLoginTimeEnd') and conditionParamRef.lastLoginTimeEnd != null and conditionParamRef.lastLoginTimeEnd!=''">
${_conditionType_} a.lastLoginTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('dingUserId')">
<if test="conditionParamRef.dingUserId != null and conditionParamRef.dingUserId != ''">
${_conditionType_} a.dingUserId like #{${_conditionParam_}.dingUserId}
</if>
<if test="conditionParamRef.dingUserId == null">
${_conditionType_} a.dingUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('dingUserIdList') and conditionParamRef.dingUserIdList.size() > 0">
${_conditionType_} a.dingUserId in
<foreach collection="conditionParamRef.dingUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dingUserIdNotList') and conditionParamRef.dingUserIdNotList.size() > 0">
${_conditionType_} a.dingUserId not in
<foreach collection="conditionParamRef.dingUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1811,13 +1848,6 @@ ...@@ -1811,13 +1848,6 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId, field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
...@@ -1832,9 +1862,9 @@ ...@@ -1832,9 +1862,9 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0"> <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.score, field(a.source,
<foreach collection="conditionParamRef.scoreList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
, ,
...@@ -1888,6 +1918,13 @@ ...@@ -1888,6 +1918,13 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
field(a.score,
<foreach collection="conditionParamRef.scoreList" 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=",">
a.${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
...@@ -1945,13 +1982,6 @@ ...@@ -1945,13 +1982,6 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId, field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
...@@ -1966,9 +1996,9 @@ ...@@ -1966,9 +1996,9 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0"> <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.score, field(a.source,
<foreach collection="conditionParamRef.scoreList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
, ,
...@@ -2022,6 +2052,13 @@ ...@@ -2022,6 +2052,13 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
field(a.score,
<foreach collection="conditionParamRef.scoreList" 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
...@@ -2098,11 +2135,6 @@ ...@@ -2098,11 +2135,6 @@
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('registerPath')"> <if test="orderCol.containsKey('registerPath')">
a.registerPath a.registerPath
<if test='orderCol.registerPath != null and "DESC".equalsIgnoreCase(orderCol.registerPath)'>DESC</if> <if test='orderCol.registerPath != null and "DESC".equalsIgnoreCase(orderCol.registerPath)'>DESC</if>
...@@ -2153,6 +2185,11 @@ ...@@ -2153,6 +2185,11 @@
<if test='orderCol.remarkId != null and "DESC".equalsIgnoreCase(orderCol.remarkId)'>DESC</if> <if test='orderCol.remarkId != null and "DESC".equalsIgnoreCase(orderCol.remarkId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('picUri')"> <if test="orderCol.containsKey('picUri')">
a.picUri a.picUri
<if test='orderCol.picUri != null and "DESC".equalsIgnoreCase(orderCol.picUri)'>DESC</if> <if test='orderCol.picUri != null and "DESC".equalsIgnoreCase(orderCol.picUri)'>DESC</if>
...@@ -2163,26 +2200,6 @@ ...@@ -2163,26 +2200,6 @@
<if test='orderCol.serverIndexCode != null and "DESC".equalsIgnoreCase(orderCol.serverIndexCode)'>DESC</if> <if test='orderCol.serverIndexCode != null and "DESC".equalsIgnoreCase(orderCol.serverIndexCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('score')">
a.score
<if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('lastLoginTime')">
a.lastLoginTime
<if test='orderCol.lastLoginTime != null and "DESC".equalsIgnoreCase(orderCol.lastLoginTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('attendCheck')"> <if test="orderCol.containsKey('attendCheck')">
a.attendCheck a.attendCheck
<if test='orderCol.attendCheck != null and "DESC".equalsIgnoreCase(orderCol.attendCheck)'>DESC</if> <if test='orderCol.attendCheck != null and "DESC".equalsIgnoreCase(orderCol.attendCheck)'>DESC</if>
...@@ -2223,6 +2240,31 @@ ...@@ -2223,6 +2240,31 @@
<if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if> <if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('score')">
a.score
<if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('lastLoginTime')">
a.lastLoginTime
<if test='orderCol.lastLoginTime != null and "DESC".equalsIgnoreCase(orderCol.lastLoginTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dingUserId')">
a.dingUserId
<if test='orderCol.dingUserId != null and "DESC".equalsIgnoreCase(orderCol.dingUserId)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @ 548b31d2
...@@ -143,7 +143,7 @@ Authorization: {{authToken}} ...@@ -143,7 +143,7 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"staffId": 816, "staffId": 349,
"startTimeStart": "2025-02-01", "startTimeStart": "2025-02-01",
"endTimeEnd": "2025-03-31" "endTimeEnd": "2025-03-31"
} }
......
db/add.sql
View file @ 548b31d2
...@@ -1375,4 +1375,10 @@ CREATE TABLE mortals_xhx_window_perform_summary( ...@@ -1375,4 +1375,10 @@ CREATE TABLE mortals_xhx_window_perform_summary(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
,KEY `year` (`year`) USING BTREE ,KEY `year` (`year`) USING BTREE
,KEY `deptName` (`deptName`) USING BTREE ,KEY `deptName` (`deptName`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口绩效汇总登记'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口绩效汇总登记';
\ No newline at end of file
-- ----------------------------
-- 2025-04-02
-- ----------------------------
ALTER TABLE mortals_xhx_staff ADD COLUMN `dingUserId` varchar(128) COMMENT '钉钉userId';
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