Commit c1be6f2f authored by 王启林's avatar 王启林
parents 38fba130 e79fb360
...@@ -86,6 +86,11 @@ public class UserEntity extends UserVo implements IUser { ...@@ -86,6 +86,11 @@ public class UserEntity extends UserVo implements IUser {
*/ */
private String lastLoginAddress; private String lastLoginAddress;
/**
* 员工id
*/
private Long customerId;
public UserEntity(){} public UserEntity(){}
...@@ -253,7 +258,7 @@ public class UserEntity extends UserVo implements IUser { ...@@ -253,7 +258,7 @@ public class UserEntity extends UserVo implements IUser {
@Override @Override
public Long getCustomerId() { public Long getCustomerId() {
return null; return this.customerId;
} }
@Override @Override
...@@ -358,7 +363,9 @@ public class UserEntity extends UserVo implements IUser { ...@@ -358,7 +363,9 @@ public class UserEntity extends UserVo implements IUser {
} }
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
@Override @Override
public int hashCode() { public int hashCode() {
......
package com.mortals.xhx.busiz.req;
import com.mortals.xhx.busiz.BaseReq;
import lombok.Data;
@Data
public class FeedbackReq extends BaseReq {
//反馈开始时间
private String feedBackStartDate;
//反馈结束时间
private String feedBackEndDate;
//反馈状态(1.未反馈,2.已反馈)
private Integer feedbackStatus;
//详细
private Long Id;
}
...@@ -55,5 +55,10 @@ public class PerformInfo { ...@@ -55,5 +55,10 @@ public class PerformInfo {
*/ */
private BigDecimal score; private BigDecimal score;
/**
* 类型
*/
private String performType;
} }
...@@ -40,7 +40,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT; ...@@ -40,7 +40,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/v1/") @RequestMapping("/api/v1/login")
public class ApiLoginController extends BaseJsonBodyController { public class ApiLoginController extends BaseJsonBodyController {
@Autowired @Autowired
......
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/v1/") @RequestMapping("/api/v1/appeal")
public class AppealApiController extends BaseJsonBodyController { public class AppealApiController extends BaseJsonBodyController {
@Autowired @Autowired
......
package com.mortals.xhx.busiz.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.busiz.req.AppealReq;
import com.mortals.xhx.busiz.req.FeedbackReq;
import com.mortals.xhx.busiz.rsp.AppealStatInfo;
import com.mortals.xhx.module.check.service.*;
import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
/**
* h5 申诉
*
* @author: zxfei
* @date: 2023/7/7 15:08
*/
@RestController
@Slf4j
@RequestMapping("/api/v1/feedback")
public class FeedbackApiController extends BaseJsonBodyController {
@Autowired
private CheckAttendRecordService checkAttendRecordService;
@Autowired
private CheckReviewRecordService checkReviewRecordService;
@Autowired
private CheckComplainRecordService checkComplainRecordService;
@Autowired
private CheckEffectRecordService checkEffectRecordService;
@Autowired
private CheckGoworkRecordService checkGoworkRecordService;
@Autowired
private CheckOtherRecordService checkOtherRecordService;
/**
* 反馈列表
*/
@PostMapping(value = "feedback/list")
public Rest<List<PerformAttendAppealEntity>> feedbackList(@RequestBody FeedbackReq feedbackReq) {
String busiDesc = "个人反馈列表";
Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
try {
if (ObjectUtils.isEmpty(feedbackReq.getFeedbackStatus())) {
//未设置时间的情况,默认为当月
feedbackReq.setFeedBackStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
feedbackReq.setFeedBackEndDate(DateUtil.today());
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 反馈详细
*/
@PostMapping(value = "feedback/question")
public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
String busiDesc = "个人申诉详细";
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
try {
if (ObjectUtils.isEmpty(appealReq.getId())) {
throw new AppException("详细查询id不能为空!");
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 申诉新增
*/
@PostMapping(value = "appeal/save")
public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
String busiDesc = "个人申诉新增";
Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
try {
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
public static void main(String[] args) {
}
}
...@@ -27,7 +27,7 @@ import java.util.List; ...@@ -27,7 +27,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("/api/v1/") @RequestMapping("/api/v1/perform")
public class PerformApiController extends BaseJsonBodyController { public class PerformApiController extends BaseJsonBodyController {
@Autowired @Autowired
......
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/***
* 核查类型枚举(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
*/
public enum CheckTypeEnum {
考勤绩效(1, "考勤绩效"),
效能绩效(2, "效能绩效"),
评价绩效(3, "评价绩效"),
办件绩效(4, "办件绩效"),
差评绩效(5, "差评绩效"),
其它绩效(6, "其它绩效"),
;
private Integer value;
private String desc;
CheckTypeEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static CheckTypeEnum getByValue(Integer value) {
for (CheckTypeEnum checkTypeEnum : CheckTypeEnum.values()) {
if (checkTypeEnum.getValue() == value) {
return checkTypeEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (CheckTypeEnum item : CheckTypeEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
package com.mortals.xhx.module.check.dao;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import java.util.List;
/**
* 全部类型核查信息Dao
*/
public interface CheckAllRecordDao {
List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
}
package com.mortals.xhx.module.check.dao.ibatis;
import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.support.SqlSessionDaoSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 全部类型核查信息Dao
*/
@Repository("checkAllRecordDao")
public class CheckAllRecordDaoImpl extends SqlSessionDaoSupport implements CheckAllRecordDao {
protected String namespace = this.getClass().getName();
@Autowired
public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
super.setSqlSessionFactory(sqlSessionFactory);
}
protected String getSqlId(String id) {
return this.namespace + "." + id;
}
@Override
public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
return this.getSqlSession().selectList(this.getSqlId("getList"), query);
}
}
package com.mortals.xhx.module.check.model;
import lombok.Data;
@Data
public class CheckAllRecordQuery {
/**
* 员工ID
*/
private Long staffId;
/**
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
private String createTimeStart;
private String createTimeEnd;
private Long createUserId;
}
...@@ -9,113 +9,128 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,113 +9,128 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo; import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 考勤绩效记录核查信息实体对象 * 考勤绩效记录核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-07 * @date 2023-07-08
*/ */
@Data @Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo { public class CheckAttendRecordEntity extends CheckAttendRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 记录ID * 记录ID
*/ */
private Long recordId; private Long recordId;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
private String workNum; private String workNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
private String deptName; private String deptName;
/** /**
* 所属考勤组ID * 所属考勤组ID
*/ */
private Long attendanceGroupId; private Long attendanceGroupId;
/** /**
* 所属考勤组名称 * 所属考勤组名称
*/ */
private String attendanceGroupName; private String attendanceGroupName;
/** /**
* 考勤时间 * 考勤时间
*/ */
private Date attendanceDate; private Date attendanceDate;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
private String ruleName; private String ruleName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
private Integer subAddType; private Integer subAddType;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
private BigDecimal score; private BigDecimal score;
/** /**
* 上下班时间 * 上下班时间
*/ */
private String goOffTimeStr; private String goOffTimeStr;
/** /**
* 异常时间 * 异常时间
*/ */
private Date errorTime; private Date errorTime;
/** /**
* 实际打卡时间 * 实际打卡时间
*/ */
private Date actualAttendTime; private Date actualAttendTime;
/** /**
* 异常处理结果 * 异常处理结果
*/ */
private String errorResult; private String errorResult;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员") @Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
*/ */
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明") @Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果") @Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
private Integer checkStatus; private Integer checkStatus;
/** /**
* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
*/ */
private Integer subMethod; private Integer subMethod;
/**
* 说明
*/
@Excel(name = "说明")
private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -123,7 +138,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -123,7 +138,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
if (obj instanceof CheckAttendRecordEntity) { if (obj instanceof CheckAttendRecordEntity) {
CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj; CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -131,50 +146,56 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -131,50 +146,56 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
public void initAttrValue(){ public void initAttrValue(){
this.recordId = -1L; this.recordId = -1L;
this.staffId = -1L;
this.staffName = "";
this.workNum = "";
this.staffId = -1L; this.deptId = -1L;
this.staffName = ""; this.deptName = "";
this.workNum = ""; this.attendanceGroupId = -1L;
this.deptId = -1L; this.attendanceGroupName = "";
this.deptName = ""; this.attendanceDate = null;
this.attendanceGroupId = -1L; this.ruleId = -1L;
this.attendanceGroupName = ""; this.ruleName = "";
this.attendanceDate = null; this.subAddType = 1;
this.ruleId = -1L; this.score = BigDecimal.valueOf(0.00);
this.ruleName = ""; this.goOffTimeStr = "";
this.subAddType = 1; this.errorTime = null;
this.score = BigDecimal.valueOf(0.00); this.actualAttendTime = null;
this.goOffTimeStr = ""; this.errorResult = "";
this.errorTime = null; this.checkPerson = "";
this.actualAttendTime = null; this.checkTime = null;
this.errorResult = ""; this.checkDesc = "";
this.checkPerson = ""; this.checkResult = "";
this.checkTime = null; this.checkStatus = 1;
this.checkDesc = ""; this.subMethod = 1;
this.checkResult = ""; this.remark = "";
this.checkStatus = 1; this.fileNames = "";
this.subMethod = 1; this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -5,11 +5,11 @@ import java.util.Date; ...@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
/** /**
* 考勤绩效记录核查信息查询对象 * 考勤绩效记录核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-07 * @date 2023-07-08
*/ */
public class CheckAttendRecordQuery extends CheckAttendRecordEntity { public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
private Long idStart; private Long idStart;
...@@ -277,6 +277,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -277,6 +277,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */ /** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */
private List <Integer> subMethodNotList; private List <Integer> subMethodNotList;
/** 说明 */
private List<String> remarkList;
/** 说明排除列表 */
private List <String> remarkNotList;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<CheckAttendRecordQuery> orConditionList; private List<CheckAttendRecordQuery> orConditionList;
...@@ -286,2361 +301,2514 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -286,2361 +301,2514 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
public CheckAttendRecordQuery(){} public CheckAttendRecordQuery(){}
/** /**
* 获取 开始 序号,主键,自增长 * 获取 开始 序号,主键,自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号,主键,自增长 * 设置 开始 序号,主键,自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号,主键,自增长 * 获取 结束 序号,主键,自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号,主键,自增长 * 设置 结束 序号,主键,自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号,主键,自增长 * 获取 增加 序号,主键,自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号,主键,自增长 * 设置 增加 序号,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号,主键,自增长 * 获取 序号,主键,自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 序号,主键,自增长 * 获取 序号,主键,自增长
* @return idNotList * @return idNotList
*/ */
public List<Long> getIdNotList(){ public List<Long> getIdNotList(){
return this.idNotList; return this.idNotList;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idNotList * @param idNotList
*/ */
public void setIdNotList(List<Long> idNotList){ public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
} }
/** /**
* 获取 开始 记录ID * 获取 开始 记录ID
* @return recordIdStart * @return recordIdStart
*/ */
public Long getRecordIdStart(){ public Long getRecordIdStart(){
return this.recordIdStart; return this.recordIdStart;
} }
/** /**
* 设置 开始 记录ID * 设置 开始 记录ID
* @param recordIdStart * @param recordIdStart
*/ */
public void setRecordIdStart(Long recordIdStart){ public void setRecordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart; this.recordIdStart = recordIdStart;
} }
/** /**
* 获取 结束 记录ID * 获取 结束 记录ID
* @return $recordIdEnd * @return $recordIdEnd
*/ */
public Long getRecordIdEnd(){ public Long getRecordIdEnd(){
return this.recordIdEnd; return this.recordIdEnd;
} }
/** /**
* 设置 结束 记录ID * 设置 结束 记录ID
* @param recordIdEnd * @param recordIdEnd
*/ */
public void setRecordIdEnd(Long recordIdEnd){ public void setRecordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd; this.recordIdEnd = recordIdEnd;
} }
/** /**
* 获取 增加 记录ID * 获取 增加 记录ID
* @return recordIdIncrement * @return recordIdIncrement
*/ */
public Long getRecordIdIncrement(){ public Long getRecordIdIncrement(){
return this.recordIdIncrement; return this.recordIdIncrement;
} }
/** /**
* 设置 增加 记录ID * 设置 增加 记录ID
* @param recordIdIncrement * @param recordIdIncrement
*/ */
public void setRecordIdIncrement(Long recordIdIncrement){ public void setRecordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement; this.recordIdIncrement = recordIdIncrement;
} }
/** /**
* 获取 记录ID * 获取 记录ID
* @return recordIdList * @return recordIdList
*/ */
public List<Long> getRecordIdList(){ public List<Long> getRecordIdList(){
return this.recordIdList; return this.recordIdList;
} }
/** /**
* 设置 记录ID * 设置 记录ID
* @param recordIdList * @param recordIdList
*/ */
public void setRecordIdList(List<Long> recordIdList){ public void setRecordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList; this.recordIdList = recordIdList;
} }
/** /**
* 获取 记录ID * 获取 记录ID
* @return recordIdNotList * @return recordIdNotList
*/ */
public List<Long> getRecordIdNotList(){ public List<Long> getRecordIdNotList(){
return this.recordIdNotList; return this.recordIdNotList;
} }
/** /**
* 设置 记录ID * 设置 记录ID
* @param recordIdNotList * @param recordIdNotList
*/ */
public void setRecordIdNotList(List<Long> recordIdNotList){ public void setRecordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList; this.recordIdNotList = recordIdNotList;
} }
/** /**
* 获取 开始 员工ID * 获取 开始 员工ID
* @return staffIdStart * @return staffIdStart
*/ */
public Long getStaffIdStart(){ public Long getStaffIdStart(){
return this.staffIdStart; return this.staffIdStart;
} }
/** /**
* 设置 开始 员工ID * 设置 开始 员工ID
* @param staffIdStart * @param staffIdStart
*/ */
public void setStaffIdStart(Long staffIdStart){ public void setStaffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart; this.staffIdStart = staffIdStart;
} }
/** /**
* 获取 结束 员工ID * 获取 结束 员工ID
* @return $staffIdEnd * @return $staffIdEnd
*/ */
public Long getStaffIdEnd(){ public Long getStaffIdEnd(){
return this.staffIdEnd; return this.staffIdEnd;
} }
/** /**
* 设置 结束 员工ID * 设置 结束 员工ID
* @param staffIdEnd * @param staffIdEnd
*/ */
public void setStaffIdEnd(Long staffIdEnd){ public void setStaffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd; this.staffIdEnd = staffIdEnd;
} }
/** /**
* 获取 增加 员工ID * 获取 增加 员工ID
* @return staffIdIncrement * @return staffIdIncrement
*/ */
public Long getStaffIdIncrement(){ public Long getStaffIdIncrement(){
return this.staffIdIncrement; return this.staffIdIncrement;
} }
/** /**
* 设置 增加 员工ID * 设置 增加 员工ID
* @param staffIdIncrement * @param staffIdIncrement
*/ */
public void setStaffIdIncrement(Long staffIdIncrement){ public void setStaffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement; this.staffIdIncrement = staffIdIncrement;
} }
/** /**
* 获取 员工ID * 获取 员工ID
* @return staffIdList * @return staffIdList
*/ */
public List<Long> getStaffIdList(){ public List<Long> getStaffIdList(){
return this.staffIdList; return this.staffIdList;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdList * @param staffIdList
*/ */
public void setStaffIdList(List<Long> staffIdList){ public void setStaffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList; this.staffIdList = staffIdList;
} }
/** /**
* 获取 员工ID * 获取 员工ID
* @return staffIdNotList * @return staffIdNotList
*/ */
public List<Long> getStaffIdNotList(){ public List<Long> getStaffIdNotList(){
return this.staffIdNotList; return this.staffIdNotList;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdNotList * @param staffIdNotList
*/ */
public void setStaffIdNotList(List<Long> staffIdNotList){ public void setStaffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList; this.staffIdNotList = staffIdNotList;
} }
/** /**
* 获取 员工姓名 * 获取 员工姓名
* @return staffNameList * @return staffNameList
*/ */
public List<String> getStaffNameList(){ public List<String> getStaffNameList(){
return this.staffNameList; return this.staffNameList;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffNameList * @param staffNameList
*/ */
public void setStaffNameList(List<String> staffNameList){ public void setStaffNameList(List<String> staffNameList){
this.staffNameList = staffNameList; this.staffNameList = staffNameList;
} }
/** /**
* 获取 员工姓名 * 获取 员工姓名
* @return staffNameNotList * @return staffNameNotList
*/ */
public List<String> getStaffNameNotList(){ public List<String> getStaffNameNotList(){
return this.staffNameNotList; return this.staffNameNotList;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffNameNotList * @param staffNameNotList
*/ */
public void setStaffNameNotList(List<String> staffNameNotList){ public void setStaffNameNotList(List<String> staffNameNotList){
this.staffNameNotList = staffNameNotList; this.staffNameNotList = staffNameNotList;
} }
/** /**
* 获取 工号 * 获取 工号
* @return workNumList * @return workNumList
*/ */
public List<String> getWorkNumList(){ public List<String> getWorkNumList(){
return this.workNumList; return this.workNumList;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNumList * @param workNumList
*/ */
public void setWorkNumList(List<String> workNumList){ public void setWorkNumList(List<String> workNumList){
this.workNumList = workNumList; this.workNumList = workNumList;
} }
/** /**
* 获取 工号 * 获取 工号
* @return workNumNotList * @return workNumNotList
*/ */
public List<String> getWorkNumNotList(){ public List<String> getWorkNumNotList(){
return this.workNumNotList; return this.workNumNotList;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNumNotList * @param workNumNotList
*/ */
public void setWorkNumNotList(List<String> workNumNotList){ public void setWorkNumNotList(List<String> workNumNotList){
this.workNumNotList = workNumNotList; this.workNumNotList = workNumNotList;
} }
/** /**
* 获取 开始 所属部门 * 获取 开始 所属部门
* @return deptIdStart * @return deptIdStart
*/ */
public Long getDeptIdStart(){ public Long getDeptIdStart(){
return this.deptIdStart; return this.deptIdStart;
} }
/** /**
* 设置 开始 所属部门 * 设置 开始 所属部门
* @param deptIdStart * @param deptIdStart
*/ */
public void setDeptIdStart(Long deptIdStart){ public void setDeptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart; this.deptIdStart = deptIdStart;
} }
/** /**
* 获取 结束 所属部门 * 获取 结束 所属部门
* @return $deptIdEnd * @return $deptIdEnd
*/ */
public Long getDeptIdEnd(){ public Long getDeptIdEnd(){
return this.deptIdEnd; return this.deptIdEnd;
} }
/** /**
* 设置 结束 所属部门 * 设置 结束 所属部门
* @param deptIdEnd * @param deptIdEnd
*/ */
public void setDeptIdEnd(Long deptIdEnd){ public void setDeptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd; this.deptIdEnd = deptIdEnd;
} }
/** /**
* 获取 增加 所属部门 * 获取 增加 所属部门
* @return deptIdIncrement * @return deptIdIncrement
*/ */
public Long getDeptIdIncrement(){ public Long getDeptIdIncrement(){
return this.deptIdIncrement; return this.deptIdIncrement;
} }
/** /**
* 设置 增加 所属部门 * 设置 增加 所属部门
* @param deptIdIncrement * @param deptIdIncrement
*/ */
public void setDeptIdIncrement(Long deptIdIncrement){ public void setDeptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement; this.deptIdIncrement = deptIdIncrement;
} }
/** /**
* 获取 所属部门 * 获取 所属部门
* @return deptIdList * @return deptIdList
*/ */
public List<Long> getDeptIdList(){ public List<Long> getDeptIdList(){
return this.deptIdList; return this.deptIdList;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdList * @param deptIdList
*/ */
public void setDeptIdList(List<Long> deptIdList){ public void setDeptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList; this.deptIdList = deptIdList;
} }
/** /**
* 获取 所属部门 * 获取 所属部门
* @return deptIdNotList * @return deptIdNotList
*/ */
public List<Long> getDeptIdNotList(){ public List<Long> getDeptIdNotList(){
return this.deptIdNotList; return this.deptIdNotList;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdNotList * @param deptIdNotList
*/ */
public void setDeptIdNotList(List<Long> deptIdNotList){ public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList; this.deptIdNotList = deptIdNotList;
} }
/** /**
* 获取 所属部门名称 * 获取 所属部门名称
* @return deptNameList * @return deptNameList
*/ */
public List<String> getDeptNameList(){ public List<String> getDeptNameList(){
return this.deptNameList; return this.deptNameList;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptNameList * @param deptNameList
*/ */
public void setDeptNameList(List<String> deptNameList){ public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList; this.deptNameList = deptNameList;
} }
/** /**
* 获取 所属部门名称 * 获取 所属部门名称
* @return deptNameNotList * @return deptNameNotList
*/ */
public List<String> getDeptNameNotList(){ public List<String> getDeptNameNotList(){
return this.deptNameNotList; return this.deptNameNotList;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptNameNotList * @param deptNameNotList
*/ */
public void setDeptNameNotList(List<String> deptNameNotList){ public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList; this.deptNameNotList = deptNameNotList;
} }
/** /**
* 获取 开始 所属考勤组ID * 获取 开始 所属考勤组ID
* @return attendanceGroupIdStart * @return attendanceGroupIdStart
*/ */
public Long getAttendanceGroupIdStart(){ public Long getAttendanceGroupIdStart(){
return this.attendanceGroupIdStart; return this.attendanceGroupIdStart;
} }
/** /**
* 设置 开始 所属考勤组ID * 设置 开始 所属考勤组ID
* @param attendanceGroupIdStart * @param attendanceGroupIdStart
*/ */
public void setAttendanceGroupIdStart(Long attendanceGroupIdStart){ public void setAttendanceGroupIdStart(Long attendanceGroupIdStart){
this.attendanceGroupIdStart = attendanceGroupIdStart; this.attendanceGroupIdStart = attendanceGroupIdStart;
} }
/** /**
* 获取 结束 所属考勤组ID * 获取 结束 所属考勤组ID
* @return $attendanceGroupIdEnd * @return $attendanceGroupIdEnd
*/ */
public Long getAttendanceGroupIdEnd(){ public Long getAttendanceGroupIdEnd(){
return this.attendanceGroupIdEnd; return this.attendanceGroupIdEnd;
} }
/** /**
* 设置 结束 所属考勤组ID * 设置 结束 所属考勤组ID
* @param attendanceGroupIdEnd * @param attendanceGroupIdEnd
*/ */
public void setAttendanceGroupIdEnd(Long attendanceGroupIdEnd){ public void setAttendanceGroupIdEnd(Long attendanceGroupIdEnd){
this.attendanceGroupIdEnd = attendanceGroupIdEnd; this.attendanceGroupIdEnd = attendanceGroupIdEnd;
} }
/** /**
* 获取 增加 所属考勤组ID * 获取 增加 所属考勤组ID
* @return attendanceGroupIdIncrement * @return attendanceGroupIdIncrement
*/ */
public Long getAttendanceGroupIdIncrement(){ public Long getAttendanceGroupIdIncrement(){
return this.attendanceGroupIdIncrement; return this.attendanceGroupIdIncrement;
} }
/** /**
* 设置 增加 所属考勤组ID * 设置 增加 所属考勤组ID
* @param attendanceGroupIdIncrement * @param attendanceGroupIdIncrement
*/ */
public void setAttendanceGroupIdIncrement(Long attendanceGroupIdIncrement){ public void setAttendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
this.attendanceGroupIdIncrement = attendanceGroupIdIncrement; this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
} }
/** /**
* 获取 所属考勤组ID * 获取 所属考勤组ID
* @return attendanceGroupIdList * @return attendanceGroupIdList
*/ */
public List<Long> getAttendanceGroupIdList(){ public List<Long> getAttendanceGroupIdList(){
return this.attendanceGroupIdList; return this.attendanceGroupIdList;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdList * @param attendanceGroupIdList
*/ */
public void setAttendanceGroupIdList(List<Long> attendanceGroupIdList){ public void setAttendanceGroupIdList(List<Long> attendanceGroupIdList){
this.attendanceGroupIdList = attendanceGroupIdList; this.attendanceGroupIdList = attendanceGroupIdList;
} }
/** /**
* 获取 所属考勤组ID * 获取 所属考勤组ID
* @return attendanceGroupIdNotList * @return attendanceGroupIdNotList
*/ */
public List<Long> getAttendanceGroupIdNotList(){ public List<Long> getAttendanceGroupIdNotList(){
return this.attendanceGroupIdNotList; return this.attendanceGroupIdNotList;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdNotList * @param attendanceGroupIdNotList
*/ */
public void setAttendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){ public void setAttendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
this.attendanceGroupIdNotList = attendanceGroupIdNotList; this.attendanceGroupIdNotList = attendanceGroupIdNotList;
} }
/** /**
* 获取 所属考勤组名称 * 获取 所属考勤组名称
* @return attendanceGroupNameList * @return attendanceGroupNameList
*/ */
public List<String> getAttendanceGroupNameList(){ public List<String> getAttendanceGroupNameList(){
return this.attendanceGroupNameList; return this.attendanceGroupNameList;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupNameList * @param attendanceGroupNameList
*/ */
public void setAttendanceGroupNameList(List<String> attendanceGroupNameList){ public void setAttendanceGroupNameList(List<String> attendanceGroupNameList){
this.attendanceGroupNameList = attendanceGroupNameList; this.attendanceGroupNameList = attendanceGroupNameList;
} }
/** /**
* 获取 所属考勤组名称 * 获取 所属考勤组名称
* @return attendanceGroupNameNotList * @return attendanceGroupNameNotList
*/ */
public List<String> getAttendanceGroupNameNotList(){ public List<String> getAttendanceGroupNameNotList(){
return this.attendanceGroupNameNotList; return this.attendanceGroupNameNotList;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupNameNotList * @param attendanceGroupNameNotList
*/ */
public void setAttendanceGroupNameNotList(List<String> attendanceGroupNameNotList){ public void setAttendanceGroupNameNotList(List<String> attendanceGroupNameNotList){
this.attendanceGroupNameNotList = attendanceGroupNameNotList; this.attendanceGroupNameNotList = attendanceGroupNameNotList;
} }
/** /**
* 获取 开始 考勤时间 * 获取 开始 考勤时间
* @return attendanceDateStart * @return attendanceDateStart
*/ */
public String getAttendanceDateStart(){ public String getAttendanceDateStart(){
return this.attendanceDateStart; return this.attendanceDateStart;
} }
/** /**
* 设置 开始 考勤时间 * 设置 开始 考勤时间
* @param attendanceDateStart * @param attendanceDateStart
*/ */
public void setAttendanceDateStart(String attendanceDateStart){ public void setAttendanceDateStart(String attendanceDateStart){
this.attendanceDateStart = attendanceDateStart; this.attendanceDateStart = attendanceDateStart;
} }
/** /**
* 获取 结束 考勤时间 * 获取 结束 考勤时间
* @return attendanceDateEnd * @return attendanceDateEnd
*/ */
public String getAttendanceDateEnd(){ public String getAttendanceDateEnd(){
return this.attendanceDateEnd; return this.attendanceDateEnd;
} }
/** /**
* 设置 结束 考勤时间 * 设置 结束 考勤时间
* @param attendanceDateEnd * @param attendanceDateEnd
*/ */
public void setAttendanceDateEnd(String attendanceDateEnd){ public void setAttendanceDateEnd(String attendanceDateEnd){
this.attendanceDateEnd = attendanceDateEnd; this.attendanceDateEnd = attendanceDateEnd;
} }
/** /**
* 获取 开始 绩效规则id * 获取 开始 绩效规则id
* @return ruleIdStart * @return ruleIdStart
*/ */
public Long getRuleIdStart(){ public Long getRuleIdStart(){
return this.ruleIdStart; return this.ruleIdStart;
} }
/** /**
* 设置 开始 绩效规则id * 设置 开始 绩效规则id
* @param ruleIdStart * @param ruleIdStart
*/ */
public void setRuleIdStart(Long ruleIdStart){ public void setRuleIdStart(Long ruleIdStart){
this.ruleIdStart = ruleIdStart; this.ruleIdStart = ruleIdStart;
} }
/** /**
* 获取 结束 绩效规则id * 获取 结束 绩效规则id
* @return $ruleIdEnd * @return $ruleIdEnd
*/ */
public Long getRuleIdEnd(){ public Long getRuleIdEnd(){
return this.ruleIdEnd; return this.ruleIdEnd;
} }
/** /**
* 设置 结束 绩效规则id * 设置 结束 绩效规则id
* @param ruleIdEnd * @param ruleIdEnd
*/ */
public void setRuleIdEnd(Long ruleIdEnd){ public void setRuleIdEnd(Long ruleIdEnd){
this.ruleIdEnd = ruleIdEnd; this.ruleIdEnd = ruleIdEnd;
} }
/** /**
* 获取 增加 绩效规则id * 获取 增加 绩效规则id
* @return ruleIdIncrement * @return ruleIdIncrement
*/ */
public Long getRuleIdIncrement(){ public Long getRuleIdIncrement(){
return this.ruleIdIncrement; return this.ruleIdIncrement;
} }
/** /**
* 设置 增加 绩效规则id * 设置 增加 绩效规则id
* @param ruleIdIncrement * @param ruleIdIncrement
*/ */
public void setRuleIdIncrement(Long ruleIdIncrement){ public void setRuleIdIncrement(Long ruleIdIncrement){
this.ruleIdIncrement = ruleIdIncrement; this.ruleIdIncrement = ruleIdIncrement;
} }
/** /**
* 获取 绩效规则id * 获取 绩效规则id
* @return ruleIdList * @return ruleIdList
*/ */
public List<Long> getRuleIdList(){ public List<Long> getRuleIdList(){
return this.ruleIdList; return this.ruleIdList;
} }
/** /**
* 设置 绩效规则id * 设置 绩效规则id
* @param ruleIdList * @param ruleIdList
*/ */
public void setRuleIdList(List<Long> ruleIdList){ public void setRuleIdList(List<Long> ruleIdList){
this.ruleIdList = ruleIdList; this.ruleIdList = ruleIdList;
} }
/** /**
* 获取 绩效规则id * 获取 绩效规则id
* @return ruleIdNotList * @return ruleIdNotList
*/ */
public List<Long> getRuleIdNotList(){ public List<Long> getRuleIdNotList(){
return this.ruleIdNotList; return this.ruleIdNotList;
} }
/** /**
* 设置 绩效规则id * 设置 绩效规则id
* @param ruleIdNotList * @param ruleIdNotList
*/ */
public void setRuleIdNotList(List<Long> ruleIdNotList){ public void setRuleIdNotList(List<Long> ruleIdNotList){
this.ruleIdNotList = ruleIdNotList; this.ruleIdNotList = ruleIdNotList;
} }
/** /**
* 获取 规则名称 * 获取 规则名称
* @return ruleNameList * @return ruleNameList
*/ */
public List<String> getRuleNameList(){ public List<String> getRuleNameList(){
return this.ruleNameList; return this.ruleNameList;
} }
/** /**
* 设置 规则名称 * 设置 规则名称
* @param ruleNameList * @param ruleNameList
*/ */
public void setRuleNameList(List<String> ruleNameList){ public void setRuleNameList(List<String> ruleNameList){
this.ruleNameList = ruleNameList; this.ruleNameList = ruleNameList;
} }
/** /**
* 获取 规则名称 * 获取 规则名称
* @return ruleNameNotList * @return ruleNameNotList
*/ */
public List<String> getRuleNameNotList(){ public List<String> getRuleNameNotList(){
return this.ruleNameNotList; return this.ruleNameNotList;
} }
/** /**
* 设置 规则名称 * 设置 规则名称
* @param ruleNameNotList * @param ruleNameNotList
*/ */
public void setRuleNameNotList(List<String> ruleNameNotList){ public void setRuleNameNotList(List<String> ruleNameNotList){
this.ruleNameNotList = ruleNameNotList; this.ruleNameNotList = ruleNameNotList;
} }
/** /**
* 获取 开始 增减类型(1.增加,2.扣除) * 获取 开始 增减类型(1.增加,2.扣除)
* @return subAddTypeStart * @return subAddTypeStart
*/ */
public Integer getSubAddTypeStart(){ public Integer getSubAddTypeStart(){
return this.subAddTypeStart; return this.subAddTypeStart;
} }
/** /**
* 设置 开始 增减类型(1.增加,2.扣除) * 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart * @param subAddTypeStart
*/ */
public void setSubAddTypeStart(Integer subAddTypeStart){ public void setSubAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart; this.subAddTypeStart = subAddTypeStart;
} }
/** /**
* 获取 结束 增减类型(1.增加,2.扣除) * 获取 结束 增减类型(1.增加,2.扣除)
* @return $subAddTypeEnd * @return $subAddTypeEnd
*/ */
public Integer getSubAddTypeEnd(){ public Integer getSubAddTypeEnd(){
return this.subAddTypeEnd; return this.subAddTypeEnd;
} }
/** /**
* 设置 结束 增减类型(1.增加,2.扣除) * 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd * @param subAddTypeEnd
*/ */
public void setSubAddTypeEnd(Integer subAddTypeEnd){ public void setSubAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd; this.subAddTypeEnd = subAddTypeEnd;
} }
/** /**
* 获取 增加 增减类型(1.增加,2.扣除) * 获取 增加 增减类型(1.增加,2.扣除)
* @return subAddTypeIncrement * @return subAddTypeIncrement
*/ */
public Integer getSubAddTypeIncrement(){ public Integer getSubAddTypeIncrement(){
return this.subAddTypeIncrement; return this.subAddTypeIncrement;
} }
/** /**
* 设置 增加 增减类型(1.增加,2.扣除) * 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement * @param subAddTypeIncrement
*/ */
public void setSubAddTypeIncrement(Integer subAddTypeIncrement){ public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement; this.subAddTypeIncrement = subAddTypeIncrement;
} }
/** /**
* 获取 增减类型(1.增加,2.扣除) * 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeList * @return subAddTypeList
*/ */
public List<Integer> getSubAddTypeList(){ public List<Integer> getSubAddTypeList(){
return this.subAddTypeList; return this.subAddTypeList;
} }
/** /**
* 设置 增减类型(1.增加,2.扣除) * 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList * @param subAddTypeList
*/ */
public void setSubAddTypeList(List<Integer> subAddTypeList){ public void setSubAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList; this.subAddTypeList = subAddTypeList;
} }
/** /**
* 获取 增减类型(1.增加,2.扣除) * 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeNotList * @return subAddTypeNotList
*/ */
public List<Integer> getSubAddTypeNotList(){ public List<Integer> getSubAddTypeNotList(){
return this.subAddTypeNotList; return this.subAddTypeNotList;
} }
/** /**
* 设置 增减类型(1.增加,2.扣除) * 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList * @param subAddTypeNotList
*/ */
public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){ public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList; this.subAddTypeNotList = subAddTypeNotList;
} }
/** /**
* 获取 开始 扣分或增加分值 * 获取 开始 扣分或增加分值
* @return scoreStart * @return scoreStart
*/ */
public BigDecimal getScoreStart(){ public BigDecimal getScoreStart(){
return this.scoreStart; return this.scoreStart;
} }
/** /**
* 设置 开始 扣分或增加分值 * 设置 开始 扣分或增加分值
* @param scoreStart * @param scoreStart
*/ */
public void setScoreStart(BigDecimal scoreStart){ public void setScoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart; this.scoreStart = scoreStart;
} }
/** /**
* 获取 结束 扣分或增加分值 * 获取 结束 扣分或增加分值
* @return $scoreEnd * @return $scoreEnd
*/ */
public BigDecimal getScoreEnd(){ public BigDecimal getScoreEnd(){
return this.scoreEnd; return this.scoreEnd;
} }
/** /**
* 设置 结束 扣分或增加分值 * 设置 结束 扣分或增加分值
* @param scoreEnd * @param scoreEnd
*/ */
public void setScoreEnd(BigDecimal scoreEnd){ public void setScoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd; this.scoreEnd = scoreEnd;
} }
/** /**
* 获取 增加 扣分或增加分值 * 获取 增加 扣分或增加分值
* @return scoreIncrement * @return scoreIncrement
*/ */
public BigDecimal getScoreIncrement(){ public BigDecimal getScoreIncrement(){
return this.scoreIncrement; return this.scoreIncrement;
} }
/** /**
* 设置 增加 扣分或增加分值 * 设置 增加 扣分或增加分值
* @param scoreIncrement * @param scoreIncrement
*/ */
public void setScoreIncrement(BigDecimal scoreIncrement){ public void setScoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement; this.scoreIncrement = scoreIncrement;
} }
/** /**
* 获取 扣分或增加分值 * 获取 扣分或增加分值
* @return scoreList * @return scoreList
*/ */
public List<BigDecimal> getScoreList(){ public List<BigDecimal> getScoreList(){
return this.scoreList; return this.scoreList;
} }
/** /**
* 设置 扣分或增加分值 * 设置 扣分或增加分值
* @param scoreList * @param scoreList
*/ */
public void setScoreList(List<BigDecimal> scoreList){ public void setScoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList; this.scoreList = scoreList;
} }
/** /**
* 获取 扣分或增加分值 * 获取 扣分或增加分值
* @return scoreNotList * @return scoreNotList
*/ */
public List<BigDecimal> getScoreNotList(){ public List<BigDecimal> getScoreNotList(){
return this.scoreNotList; return this.scoreNotList;
} }
/** /**
* 设置 扣分或增加分值 * 设置 扣分或增加分值
* @param scoreNotList * @param scoreNotList
*/ */
public void setScoreNotList(List<BigDecimal> scoreNotList){ public void setScoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList; this.scoreNotList = scoreNotList;
} }
/** /**
* 获取 上下班时间 * 获取 上下班时间
* @return goOffTimeStrList * @return goOffTimeStrList
*/ */
public List<String> getGoOffTimeStrList(){ public List<String> getGoOffTimeStrList(){
return this.goOffTimeStrList; return this.goOffTimeStrList;
} }
/** /**
* 设置 上下班时间 * 设置 上下班时间
* @param goOffTimeStrList * @param goOffTimeStrList
*/ */
public void setGoOffTimeStrList(List<String> goOffTimeStrList){ public void setGoOffTimeStrList(List<String> goOffTimeStrList){
this.goOffTimeStrList = goOffTimeStrList; this.goOffTimeStrList = goOffTimeStrList;
} }
/** /**
* 获取 上下班时间 * 获取 上下班时间
* @return goOffTimeStrNotList * @return goOffTimeStrNotList
*/ */
public List<String> getGoOffTimeStrNotList(){ public List<String> getGoOffTimeStrNotList(){
return this.goOffTimeStrNotList; return this.goOffTimeStrNotList;
} }
/** /**
* 设置 上下班时间 * 设置 上下班时间
* @param goOffTimeStrNotList * @param goOffTimeStrNotList
*/ */
public void setGoOffTimeStrNotList(List<String> goOffTimeStrNotList){ public void setGoOffTimeStrNotList(List<String> goOffTimeStrNotList){
this.goOffTimeStrNotList = goOffTimeStrNotList; this.goOffTimeStrNotList = goOffTimeStrNotList;
} }
/** /**
* 获取 开始 异常时间 * 获取 开始 异常时间
* @return errorTimeStart * @return errorTimeStart
*/ */
public String getErrorTimeStart(){ public String getErrorTimeStart(){
return this.errorTimeStart; return this.errorTimeStart;
} }
/** /**
* 设置 开始 异常时间 * 设置 开始 异常时间
* @param errorTimeStart * @param errorTimeStart
*/ */
public void setErrorTimeStart(String errorTimeStart){ public void setErrorTimeStart(String errorTimeStart){
this.errorTimeStart = errorTimeStart; this.errorTimeStart = errorTimeStart;
} }
/** /**
* 获取 结束 异常时间 * 获取 结束 异常时间
* @return errorTimeEnd * @return errorTimeEnd
*/ */
public String getErrorTimeEnd(){ public String getErrorTimeEnd(){
return this.errorTimeEnd; return this.errorTimeEnd;
} }
/** /**
* 设置 结束 异常时间 * 设置 结束 异常时间
* @param errorTimeEnd * @param errorTimeEnd
*/ */
public void setErrorTimeEnd(String errorTimeEnd){ public void setErrorTimeEnd(String errorTimeEnd){
this.errorTimeEnd = errorTimeEnd; this.errorTimeEnd = errorTimeEnd;
} }
/** /**
* 获取 开始 实际打卡时间 * 获取 开始 实际打卡时间
* @return actualAttendTimeStart * @return actualAttendTimeStart
*/ */
public String getActualAttendTimeStart(){ public String getActualAttendTimeStart(){
return this.actualAttendTimeStart; return this.actualAttendTimeStart;
} }
/** /**
* 设置 开始 实际打卡时间 * 设置 开始 实际打卡时间
* @param actualAttendTimeStart * @param actualAttendTimeStart
*/ */
public void setActualAttendTimeStart(String actualAttendTimeStart){ public void setActualAttendTimeStart(String actualAttendTimeStart){
this.actualAttendTimeStart = actualAttendTimeStart; this.actualAttendTimeStart = actualAttendTimeStart;
} }
/** /**
* 获取 结束 实际打卡时间 * 获取 结束 实际打卡时间
* @return actualAttendTimeEnd * @return actualAttendTimeEnd
*/ */
public String getActualAttendTimeEnd(){ public String getActualAttendTimeEnd(){
return this.actualAttendTimeEnd; return this.actualAttendTimeEnd;
} }
/** /**
* 设置 结束 实际打卡时间 * 设置 结束 实际打卡时间
* @param actualAttendTimeEnd * @param actualAttendTimeEnd
*/ */
public void setActualAttendTimeEnd(String actualAttendTimeEnd){ public void setActualAttendTimeEnd(String actualAttendTimeEnd){
this.actualAttendTimeEnd = actualAttendTimeEnd; this.actualAttendTimeEnd = actualAttendTimeEnd;
} }
/** /**
* 获取 异常处理结果 * 获取 异常处理结果
* @return errorResultList * @return errorResultList
*/ */
public List<String> getErrorResultList(){ public List<String> getErrorResultList(){
return this.errorResultList; return this.errorResultList;
} }
/** /**
* 设置 异常处理结果 * 设置 异常处理结果
* @param errorResultList * @param errorResultList
*/ */
public void setErrorResultList(List<String> errorResultList){ public void setErrorResultList(List<String> errorResultList){
this.errorResultList = errorResultList; this.errorResultList = errorResultList;
} }
/** /**
* 获取 异常处理结果 * 获取 异常处理结果
* @return errorResultNotList * @return errorResultNotList
*/ */
public List<String> getErrorResultNotList(){ public List<String> getErrorResultNotList(){
return this.errorResultNotList; return this.errorResultNotList;
} }
/** /**
* 设置 异常处理结果 * 设置 异常处理结果
* @param errorResultNotList * @param errorResultNotList
*/ */
public void setErrorResultNotList(List<String> errorResultNotList){ public void setErrorResultNotList(List<String> errorResultNotList){
this.errorResultNotList = errorResultNotList; this.errorResultNotList = errorResultNotList;
} }
/** /**
* 获取 核查人员 * 获取 核查人员
* @return checkPersonList * @return checkPersonList
*/ */
public List<String> getCheckPersonList(){ public List<String> getCheckPersonList(){
return this.checkPersonList; return this.checkPersonList;
} }
/** /**
* 设置 核查人员 * 设置 核查人员
* @param checkPersonList * @param checkPersonList
*/ */
public void setCheckPersonList(List<String> checkPersonList){ public void setCheckPersonList(List<String> checkPersonList){
this.checkPersonList = checkPersonList; this.checkPersonList = checkPersonList;
} }
/** /**
* 获取 核查人员 * 获取 核查人员
* @return checkPersonNotList * @return checkPersonNotList
*/ */
public List<String> getCheckPersonNotList(){ public List<String> getCheckPersonNotList(){
return this.checkPersonNotList; return this.checkPersonNotList;
} }
/** /**
* 设置 核查人员 * 设置 核查人员
* @param checkPersonNotList * @param checkPersonNotList
*/ */
public void setCheckPersonNotList(List<String> checkPersonNotList){ public void setCheckPersonNotList(List<String> checkPersonNotList){
this.checkPersonNotList = checkPersonNotList; this.checkPersonNotList = checkPersonNotList;
} }
/** /**
* 获取 开始 核查时间 * 获取 开始 核查时间
* @return checkTimeStart * @return checkTimeStart
*/ */
public String getCheckTimeStart(){ public String getCheckTimeStart(){
return this.checkTimeStart; return this.checkTimeStart;
} }
/** /**
* 设置 开始 核查时间 * 设置 开始 核查时间
* @param checkTimeStart * @param checkTimeStart
*/ */
public void setCheckTimeStart(String checkTimeStart){ public void setCheckTimeStart(String checkTimeStart){
this.checkTimeStart = checkTimeStart; this.checkTimeStart = checkTimeStart;
} }
/** /**
* 获取 结束 核查时间 * 获取 结束 核查时间
* @return checkTimeEnd * @return checkTimeEnd
*/ */
public String getCheckTimeEnd(){ public String getCheckTimeEnd(){
return this.checkTimeEnd; return this.checkTimeEnd;
} }
/** /**
* 设置 结束 核查时间 * 设置 结束 核查时间
* @param checkTimeEnd * @param checkTimeEnd
*/ */
public void setCheckTimeEnd(String checkTimeEnd){ public void setCheckTimeEnd(String checkTimeEnd){
this.checkTimeEnd = checkTimeEnd; this.checkTimeEnd = checkTimeEnd;
} }
/** /**
* 获取 核查说明 * 获取 核查说明
* @return checkDescList * @return checkDescList
*/ */
public List<String> getCheckDescList(){ public List<String> getCheckDescList(){
return this.checkDescList; return this.checkDescList;
} }
/** /**
* 设置 核查说明 * 设置 核查说明
* @param checkDescList * @param checkDescList
*/ */
public void setCheckDescList(List<String> checkDescList){ public void setCheckDescList(List<String> checkDescList){
this.checkDescList = checkDescList; this.checkDescList = checkDescList;
} }
/** /**
* 获取 核查说明 * 获取 核查说明
* @return checkDescNotList * @return checkDescNotList
*/ */
public List<String> getCheckDescNotList(){ public List<String> getCheckDescNotList(){
return this.checkDescNotList; return this.checkDescNotList;
} }
/** /**
* 设置 核查说明 * 设置 核查说明
* @param checkDescNotList * @param checkDescNotList
*/ */
public void setCheckDescNotList(List<String> checkDescNotList){ public void setCheckDescNotList(List<String> checkDescNotList){
this.checkDescNotList = checkDescNotList; this.checkDescNotList = checkDescNotList;
} }
/** /**
* 获取 核查结果 * 获取 核查结果
* @return checkResultList * @return checkResultList
*/ */
public List<String> getCheckResultList(){ public List<String> getCheckResultList(){
return this.checkResultList; return this.checkResultList;
} }
/** /**
* 设置 核查结果 * 设置 核查结果
* @param checkResultList * @param checkResultList
*/ */
public void setCheckResultList(List<String> checkResultList){ public void setCheckResultList(List<String> checkResultList){
this.checkResultList = checkResultList; this.checkResultList = checkResultList;
} }
/** /**
* 获取 核查结果 * 获取 核查结果
* @return checkResultNotList * @return checkResultNotList
*/ */
public List<String> getCheckResultNotList(){ public List<String> getCheckResultNotList(){
return this.checkResultNotList; return this.checkResultNotList;
} }
/** /**
* 设置 核查结果 * 设置 核查结果
* @param checkResultNotList * @param checkResultNotList
*/ */
public void setCheckResultNotList(List<String> checkResultNotList){ public void setCheckResultNotList(List<String> checkResultNotList){
this.checkResultNotList = checkResultNotList; this.checkResultNotList = checkResultNotList;
} }
/** /**
* 获取 开始 处理状态(1.未处理,2.已处理) * 获取 开始 处理状态(1.未处理,2.已处理)
* @return checkStatusStart * @return checkStatusStart
*/ */
public Integer getCheckStatusStart(){ public Integer getCheckStatusStart(){
return this.checkStatusStart; return this.checkStatusStart;
} }
/** /**
* 设置 开始 处理状态(1.未处理,2.已处理) * 设置 开始 处理状态(1.未处理,2.已处理)
* @param checkStatusStart * @param checkStatusStart
*/ */
public void setCheckStatusStart(Integer checkStatusStart){ public void setCheckStatusStart(Integer checkStatusStart){
this.checkStatusStart = checkStatusStart; this.checkStatusStart = checkStatusStart;
} }
/** /**
* 获取 结束 处理状态(1.未处理,2.已处理) * 获取 结束 处理状态(1.未处理,2.已处理)
* @return $checkStatusEnd * @return $checkStatusEnd
*/ */
public Integer getCheckStatusEnd(){ public Integer getCheckStatusEnd(){
return this.checkStatusEnd; return this.checkStatusEnd;
} }
/** /**
* 设置 结束 处理状态(1.未处理,2.已处理) * 设置 结束 处理状态(1.未处理,2.已处理)
* @param checkStatusEnd * @param checkStatusEnd
*/ */
public void setCheckStatusEnd(Integer checkStatusEnd){ public void setCheckStatusEnd(Integer checkStatusEnd){
this.checkStatusEnd = checkStatusEnd; this.checkStatusEnd = checkStatusEnd;
} }
/** /**
* 获取 增加 处理状态(1.未处理,2.已处理) * 获取 增加 处理状态(1.未处理,2.已处理)
* @return checkStatusIncrement * @return checkStatusIncrement
*/ */
public Integer getCheckStatusIncrement(){ public Integer getCheckStatusIncrement(){
return this.checkStatusIncrement; return this.checkStatusIncrement;
} }
/** /**
* 设置 增加 处理状态(1.未处理,2.已处理) * 设置 增加 处理状态(1.未处理,2.已处理)
* @param checkStatusIncrement * @param checkStatusIncrement
*/ */
public void setCheckStatusIncrement(Integer checkStatusIncrement){ public void setCheckStatusIncrement(Integer checkStatusIncrement){
this.checkStatusIncrement = checkStatusIncrement; this.checkStatusIncrement = checkStatusIncrement;
} }
/** /**
* 获取 处理状态(1.未处理,2.已处理) * 获取 处理状态(1.未处理,2.已处理)
* @return checkStatusList * @return checkStatusList
*/ */
public List<Integer> getCheckStatusList(){ public List<Integer> getCheckStatusList(){
return this.checkStatusList; return this.checkStatusList;
} }
/** /**
* 设置 处理状态(1.未处理,2.已处理) * 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusList * @param checkStatusList
*/ */
public void setCheckStatusList(List<Integer> checkStatusList){ public void setCheckStatusList(List<Integer> checkStatusList){
this.checkStatusList = checkStatusList; this.checkStatusList = checkStatusList;
} }
/** /**
* 获取 处理状态(1.未处理,2.已处理) * 获取 处理状态(1.未处理,2.已处理)
* @return checkStatusNotList * @return checkStatusNotList
*/ */
public List<Integer> getCheckStatusNotList(){ public List<Integer> getCheckStatusNotList(){
return this.checkStatusNotList; return this.checkStatusNotList;
} }
/** /**
* 设置 处理状态(1.未处理,2.已处理) * 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusNotList * @param checkStatusNotList
*/ */
public void setCheckStatusNotList(List<Integer> checkStatusNotList){ public void setCheckStatusNotList(List<Integer> checkStatusNotList){
this.checkStatusNotList = checkStatusNotList; this.checkStatusNotList = checkStatusNotList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdNotList * @return createUserIdNotList
*/ */
public List<Long> getCreateUserIdNotList(){ public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList; return this.createUserIdNotList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdNotList * @return updateUserIdNotList
*/ */
public List<Long> getUpdateUserIdNotList(){ public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList; return this.updateUserIdNotList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){ public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 获取 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 获取 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @return subMethodStart * @return subMethodStart
*/ */
public Integer getSubMethodStart(){ public Integer getSubMethodStart(){
return this.subMethodStart; return this.subMethodStart;
} }
/** /**
* 设置 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodStart * @param subMethodStart
*/ */
public void setSubMethodStart(Integer subMethodStart){ public void setSubMethodStart(Integer subMethodStart){
this.subMethodStart = subMethodStart; this.subMethodStart = subMethodStart;
} }
/** /**
* 获取 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 获取 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @return $subMethodEnd * @return $subMethodEnd
*/ */
public Integer getSubMethodEnd(){ public Integer getSubMethodEnd(){
return this.subMethodEnd; return this.subMethodEnd;
} }
/** /**
* 设置 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodEnd * @param subMethodEnd
*/ */
public void setSubMethodEnd(Integer subMethodEnd){ public void setSubMethodEnd(Integer subMethodEnd){
this.subMethodEnd = subMethodEnd; this.subMethodEnd = subMethodEnd;
} }
/** /**
* 获取 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 获取 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @return subMethodIncrement * @return subMethodIncrement
*/ */
public Integer getSubMethodIncrement(){ public Integer getSubMethodIncrement(){
return this.subMethodIncrement; return this.subMethodIncrement;
} }
/** /**
* 设置 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodIncrement * @param subMethodIncrement
*/ */
public void setSubMethodIncrement(Integer subMethodIncrement){ public void setSubMethodIncrement(Integer subMethodIncrement){
this.subMethodIncrement = subMethodIncrement; this.subMethodIncrement = subMethodIncrement;
} }
/** /**
* 获取 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 获取 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @return subMethodList * @return subMethodList
*/ */
public List<Integer> getSubMethodList(){ public List<Integer> getSubMethodList(){
return this.subMethodList; return this.subMethodList;
} }
/** /**
* 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodList * @param subMethodList
*/ */
public void setSubMethodList(List<Integer> subMethodList){ public void setSubMethodList(List<Integer> subMethodList){
this.subMethodList = subMethodList; this.subMethodList = subMethodList;
} }
/** /**
* 获取 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 获取 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @return subMethodNotList * @return subMethodNotList
*/ */
public List<Integer> getSubMethodNotList(){ public List<Integer> getSubMethodNotList(){
return this.subMethodNotList; return this.subMethodNotList;
} }
/** /**
* 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodNotList * @param subMethodNotList
*/ */
public void setSubMethodNotList(List<Integer> subMethodNotList){ public void setSubMethodNotList(List<Integer> subMethodNotList){
this.subMethodNotList = subMethodNotList; this.subMethodNotList = subMethodNotList;
} }
/** /**
* 设置 序号,主键,自增长 * 获取 说明
* @param id * @return remarkList
*/ */
public CheckAttendRecordQuery id(Long id){ public List<String> getRemarkList(){
setId(id); return this.remarkList;
return this; }
/**
* 设置 说明
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 说明
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 说明
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
} }
/** /**
* 设置 开始 序号,主键,自增长 * 设置 附件名称,多个逗号分割
* @param idStart * @param fileNamesList
*/ */
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
*/
public CheckAttendRecordQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号,主键,自增长
* @param idStart
*/
public CheckAttendRecordQuery idStart(Long idStart){ public CheckAttendRecordQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号,主键,自增长 * 设置 结束 序号,主键,自增长
* @param idEnd * @param idEnd
*/ */
public CheckAttendRecordQuery idEnd(Long idEnd){ public CheckAttendRecordQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号,主键,自增长 * 设置 增加 序号,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public CheckAttendRecordQuery idIncrement(Long idIncrement){ public CheckAttendRecordQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idList * @param idList
*/ */
public CheckAttendRecordQuery idList(List<Long> idList){ public CheckAttendRecordQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idNotList * @param idNotList
*/ */
public CheckAttendRecordQuery idNotList(List<Long> idNotList){ public CheckAttendRecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
return this; return this;
} }
/** /**
* 设置 记录ID * 设置 记录ID
* @param recordId * @param recordId
*/ */
public CheckAttendRecordQuery recordId(Long recordId){ public CheckAttendRecordQuery recordId(Long recordId){
setRecordId(recordId); setRecordId(recordId);
return this; return this;
} }
/** /**
* 设置 开始 记录ID * 设置 开始 记录ID
* @param recordIdStart * @param recordIdStart
*/ */
public CheckAttendRecordQuery recordIdStart(Long recordIdStart){ public CheckAttendRecordQuery recordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart; this.recordIdStart = recordIdStart;
return this; return this;
} }
/** /**
* 设置 结束 记录ID * 设置 结束 记录ID
* @param recordIdEnd * @param recordIdEnd
*/ */
public CheckAttendRecordQuery recordIdEnd(Long recordIdEnd){ public CheckAttendRecordQuery recordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd; this.recordIdEnd = recordIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 记录ID * 设置 增加 记录ID
* @param recordIdIncrement * @param recordIdIncrement
*/ */
public CheckAttendRecordQuery recordIdIncrement(Long recordIdIncrement){ public CheckAttendRecordQuery recordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement; this.recordIdIncrement = recordIdIncrement;
return this; return this;
} }
/** /**
* 设置 记录ID * 设置 记录ID
* @param recordIdList * @param recordIdList
*/ */
public CheckAttendRecordQuery recordIdList(List<Long> recordIdList){ public CheckAttendRecordQuery recordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList; this.recordIdList = recordIdList;
return this; return this;
} }
/** /**
* 设置 记录ID * 设置 记录ID
* @param recordIdNotList * @param recordIdNotList
*/ */
public CheckAttendRecordQuery recordIdNotList(List<Long> recordIdNotList){ public CheckAttendRecordQuery recordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList; this.recordIdNotList = recordIdNotList;
return this; return this;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffId * @param staffId
*/ */
public CheckAttendRecordQuery staffId(Long staffId){ public CheckAttendRecordQuery staffId(Long staffId){
setStaffId(staffId); setStaffId(staffId);
return this; return this;
} }
/** /**
* 设置 开始 员工ID * 设置 开始 员工ID
* @param staffIdStart * @param staffIdStart
*/ */
public CheckAttendRecordQuery staffIdStart(Long staffIdStart){ public CheckAttendRecordQuery staffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart; this.staffIdStart = staffIdStart;
return this; return this;
} }
/** /**
* 设置 结束 员工ID * 设置 结束 员工ID
* @param staffIdEnd * @param staffIdEnd
*/ */
public CheckAttendRecordQuery staffIdEnd(Long staffIdEnd){ public CheckAttendRecordQuery staffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd; this.staffIdEnd = staffIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 员工ID * 设置 增加 员工ID
* @param staffIdIncrement * @param staffIdIncrement
*/ */
public CheckAttendRecordQuery staffIdIncrement(Long staffIdIncrement){ public CheckAttendRecordQuery staffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement; this.staffIdIncrement = staffIdIncrement;
return this; return this;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdList * @param staffIdList
*/ */
public CheckAttendRecordQuery staffIdList(List<Long> staffIdList){ public CheckAttendRecordQuery staffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList; this.staffIdList = staffIdList;
return this; return this;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdNotList * @param staffIdNotList
*/ */
public CheckAttendRecordQuery staffIdNotList(List<Long> staffIdNotList){ public CheckAttendRecordQuery staffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList; this.staffIdNotList = staffIdNotList;
return this; return this;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffName * @param staffName
*/ */
public CheckAttendRecordQuery staffName(String staffName){ public CheckAttendRecordQuery staffName(String staffName){
setStaffName(staffName); setStaffName(staffName);
return this; return this;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffNameList * @param staffNameList
*/ */
public CheckAttendRecordQuery staffNameList(List<String> staffNameList){ public CheckAttendRecordQuery staffNameList(List<String> staffNameList){
this.staffNameList = staffNameList; this.staffNameList = staffNameList;
return this; return this;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNum * @param workNum
*/ */
public CheckAttendRecordQuery workNum(String workNum){ public CheckAttendRecordQuery workNum(String workNum){
setWorkNum(workNum); setWorkNum(workNum);
return this; return this;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNumList * @param workNumList
*/ */
public CheckAttendRecordQuery workNumList(List<String> workNumList){ public CheckAttendRecordQuery workNumList(List<String> workNumList){
this.workNumList = workNumList; this.workNumList = workNumList;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptId * @param deptId
*/ */
public CheckAttendRecordQuery deptId(Long deptId){ public CheckAttendRecordQuery deptId(Long deptId){
setDeptId(deptId); setDeptId(deptId);
return this; return this;
} }
/** /**
* 设置 开始 所属部门 * 设置 开始 所属部门
* @param deptIdStart * @param deptIdStart
*/ */
public CheckAttendRecordQuery deptIdStart(Long deptIdStart){ public CheckAttendRecordQuery deptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart; this.deptIdStart = deptIdStart;
return this; return this;
} }
/** /**
* 设置 结束 所属部门 * 设置 结束 所属部门
* @param deptIdEnd * @param deptIdEnd
*/ */
public CheckAttendRecordQuery deptIdEnd(Long deptIdEnd){ public CheckAttendRecordQuery deptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd; this.deptIdEnd = deptIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属部门 * 设置 增加 所属部门
* @param deptIdIncrement * @param deptIdIncrement
*/ */
public CheckAttendRecordQuery deptIdIncrement(Long deptIdIncrement){ public CheckAttendRecordQuery deptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement; this.deptIdIncrement = deptIdIncrement;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdList * @param deptIdList
*/ */
public CheckAttendRecordQuery deptIdList(List<Long> deptIdList){ public CheckAttendRecordQuery deptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList; this.deptIdList = deptIdList;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdNotList * @param deptIdNotList
*/ */
public CheckAttendRecordQuery deptIdNotList(List<Long> deptIdNotList){ public CheckAttendRecordQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList; this.deptIdNotList = deptIdNotList;
return this; return this;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptName * @param deptName
*/ */
public CheckAttendRecordQuery deptName(String deptName){ public CheckAttendRecordQuery deptName(String deptName){
setDeptName(deptName); setDeptName(deptName);
return this; return this;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptNameList * @param deptNameList
*/ */
public CheckAttendRecordQuery deptNameList(List<String> deptNameList){ public CheckAttendRecordQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList; this.deptNameList = deptNameList;
return this; return this;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupId * @param attendanceGroupId
*/ */
public CheckAttendRecordQuery attendanceGroupId(Long attendanceGroupId){ public CheckAttendRecordQuery attendanceGroupId(Long attendanceGroupId){
setAttendanceGroupId(attendanceGroupId); setAttendanceGroupId(attendanceGroupId);
return this; return this;
} }
/** /**
* 设置 开始 所属考勤组ID * 设置 开始 所属考勤组ID
* @param attendanceGroupIdStart * @param attendanceGroupIdStart
*/ */
public CheckAttendRecordQuery attendanceGroupIdStart(Long attendanceGroupIdStart){ public CheckAttendRecordQuery attendanceGroupIdStart(Long attendanceGroupIdStart){
this.attendanceGroupIdStart = attendanceGroupIdStart; this.attendanceGroupIdStart = attendanceGroupIdStart;
return this; return this;
} }
/** /**
* 设置 结束 所属考勤组ID * 设置 结束 所属考勤组ID
* @param attendanceGroupIdEnd * @param attendanceGroupIdEnd
*/ */
public CheckAttendRecordQuery attendanceGroupIdEnd(Long attendanceGroupIdEnd){ public CheckAttendRecordQuery attendanceGroupIdEnd(Long attendanceGroupIdEnd){
this.attendanceGroupIdEnd = attendanceGroupIdEnd; this.attendanceGroupIdEnd = attendanceGroupIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属考勤组ID * 设置 增加 所属考勤组ID
* @param attendanceGroupIdIncrement * @param attendanceGroupIdIncrement
*/ */
public CheckAttendRecordQuery attendanceGroupIdIncrement(Long attendanceGroupIdIncrement){ public CheckAttendRecordQuery attendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
this.attendanceGroupIdIncrement = attendanceGroupIdIncrement; this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
return this; return this;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdList * @param attendanceGroupIdList
*/ */
public CheckAttendRecordQuery attendanceGroupIdList(List<Long> attendanceGroupIdList){ public CheckAttendRecordQuery attendanceGroupIdList(List<Long> attendanceGroupIdList){
this.attendanceGroupIdList = attendanceGroupIdList; this.attendanceGroupIdList = attendanceGroupIdList;
return this; return this;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdNotList * @param attendanceGroupIdNotList
*/ */
public CheckAttendRecordQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){ public CheckAttendRecordQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
this.attendanceGroupIdNotList = attendanceGroupIdNotList; this.attendanceGroupIdNotList = attendanceGroupIdNotList;
return this; return this;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupName * @param attendanceGroupName
*/ */
public CheckAttendRecordQuery attendanceGroupName(String attendanceGroupName){ public CheckAttendRecordQuery attendanceGroupName(String attendanceGroupName){
setAttendanceGroupName(attendanceGroupName); setAttendanceGroupName(attendanceGroupName);
return this; return this;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupNameList * @param attendanceGroupNameList
*/ */
public CheckAttendRecordQuery attendanceGroupNameList(List<String> attendanceGroupNameList){ public CheckAttendRecordQuery attendanceGroupNameList(List<String> attendanceGroupNameList){
this.attendanceGroupNameList = attendanceGroupNameList; this.attendanceGroupNameList = attendanceGroupNameList;
return this; return this;
} }
/** /**
* 设置 绩效规则id * 设置 绩效规则id
* @param ruleId * @param ruleId
*/ */
public CheckAttendRecordQuery ruleId(Long ruleId){ public CheckAttendRecordQuery ruleId(Long ruleId){
setRuleId(ruleId); setRuleId(ruleId);
return this; return this;
} }
/** /**
* 设置 开始 绩效规则id * 设置 开始 绩效规则id
* @param ruleIdStart * @param ruleIdStart
*/ */
public CheckAttendRecordQuery ruleIdStart(Long ruleIdStart){ public CheckAttendRecordQuery ruleIdStart(Long ruleIdStart){
this.ruleIdStart = ruleIdStart; this.ruleIdStart = ruleIdStart;
return this; return this;
} }
/** /**
* 设置 结束 绩效规则id * 设置 结束 绩效规则id
* @param ruleIdEnd * @param ruleIdEnd
*/ */
public CheckAttendRecordQuery ruleIdEnd(Long ruleIdEnd){ public CheckAttendRecordQuery ruleIdEnd(Long ruleIdEnd){
this.ruleIdEnd = ruleIdEnd; this.ruleIdEnd = ruleIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 绩效规则id * 设置 增加 绩效规则id
* @param ruleIdIncrement * @param ruleIdIncrement
*/ */
public CheckAttendRecordQuery ruleIdIncrement(Long ruleIdIncrement){ public CheckAttendRecordQuery ruleIdIncrement(Long ruleIdIncrement){
this.ruleIdIncrement = ruleIdIncrement; this.ruleIdIncrement = ruleIdIncrement;
return this; return this;
} }
/** /**
* 设置 绩效规则id * 设置 绩效规则id
* @param ruleIdList * @param ruleIdList
*/ */
public CheckAttendRecordQuery ruleIdList(List<Long> ruleIdList){ public CheckAttendRecordQuery ruleIdList(List<Long> ruleIdList){
this.ruleIdList = ruleIdList; this.ruleIdList = ruleIdList;
return this; return this;
} }
/** /**
* 设置 绩效规则id * 设置 绩效规则id
* @param ruleIdNotList * @param ruleIdNotList
*/ */
public CheckAttendRecordQuery ruleIdNotList(List<Long> ruleIdNotList){ public CheckAttendRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
this.ruleIdNotList = ruleIdNotList; this.ruleIdNotList = ruleIdNotList;
return this; return this;
} }
/** /**
* 设置 规则名称 * 设置 规则名称
* @param ruleName * @param ruleName
*/ */
public CheckAttendRecordQuery ruleName(String ruleName){ public CheckAttendRecordQuery ruleName(String ruleName){
setRuleName(ruleName); setRuleName(ruleName);
return this; return this;
} }
/** /**
* 设置 规则名称 * 设置 规则名称
* @param ruleNameList * @param ruleNameList
*/ */
public CheckAttendRecordQuery ruleNameList(List<String> ruleNameList){ public CheckAttendRecordQuery ruleNameList(List<String> ruleNameList){
this.ruleNameList = ruleNameList; this.ruleNameList = ruleNameList;
return this; return this;
} }
/** /**
* 设置 增减类型(1.增加,2.扣除) * 设置 增减类型(1.增加,2.扣除)
* @param subAddType * @param subAddType
*/ */
public CheckAttendRecordQuery subAddType(Integer subAddType){ public CheckAttendRecordQuery subAddType(Integer subAddType){
setSubAddType(subAddType); setSubAddType(subAddType);
return this; return this;
} }
/** /**
* 设置 开始 增减类型(1.增加,2.扣除) * 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart * @param subAddTypeStart
*/ */
public CheckAttendRecordQuery subAddTypeStart(Integer subAddTypeStart){ public CheckAttendRecordQuery subAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart; this.subAddTypeStart = subAddTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 增减类型(1.增加,2.扣除) * 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd * @param subAddTypeEnd
*/ */
public CheckAttendRecordQuery subAddTypeEnd(Integer subAddTypeEnd){ public CheckAttendRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd; this.subAddTypeEnd = subAddTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 增减类型(1.增加,2.扣除) * 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement * @param subAddTypeIncrement
*/ */
public CheckAttendRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){ public CheckAttendRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement; this.subAddTypeIncrement = subAddTypeIncrement;
return this; return this;
} }
/** /**
* 设置 增减类型(1.增加,2.扣除) * 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList * @param subAddTypeList
*/ */
public CheckAttendRecordQuery subAddTypeList(List<Integer> subAddTypeList){ public CheckAttendRecordQuery subAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList; this.subAddTypeList = subAddTypeList;
return this; return this;
} }
/** /**
* 设置 增减类型(1.增加,2.扣除) * 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList * @param subAddTypeNotList
*/ */
public CheckAttendRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){ public CheckAttendRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList; this.subAddTypeNotList = subAddTypeNotList;
return this; return this;
} }
/** /**
* 设置 扣分或增加分值 * 设置 扣分或增加分值
* @param score * @param score
*/ */
public CheckAttendRecordQuery score(BigDecimal score){ public CheckAttendRecordQuery score(BigDecimal score){
setScore(score); setScore(score);
return this; return this;
} }
/** /**
* 设置 开始 扣分或增加分值 * 设置 开始 扣分或增加分值
* @param scoreStart * @param scoreStart
*/ */
public CheckAttendRecordQuery scoreStart(BigDecimal scoreStart){ public CheckAttendRecordQuery scoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart; this.scoreStart = scoreStart;
return this; return this;
} }
/** /**
* 设置 结束 扣分或增加分值 * 设置 结束 扣分或增加分值
* @param scoreEnd * @param scoreEnd
*/ */
public CheckAttendRecordQuery scoreEnd(BigDecimal scoreEnd){ public CheckAttendRecordQuery scoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd; this.scoreEnd = scoreEnd;
return this; return this;
} }
/** /**
* 设置 增加 扣分或增加分值 * 设置 增加 扣分或增加分值
* @param scoreIncrement * @param scoreIncrement
*/ */
public CheckAttendRecordQuery scoreIncrement(BigDecimal scoreIncrement){ public CheckAttendRecordQuery scoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement; this.scoreIncrement = scoreIncrement;
return this; return this;
} }
/** /**
* 设置 扣分或增加分值 * 设置 扣分或增加分值
* @param scoreList * @param scoreList
*/ */
public CheckAttendRecordQuery scoreList(List<BigDecimal> scoreList){ public CheckAttendRecordQuery scoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList; this.scoreList = scoreList;
return this; return this;
} }
/** /**
* 设置 扣分或增加分值 * 设置 扣分或增加分值
* @param scoreNotList * @param scoreNotList
*/ */
public CheckAttendRecordQuery scoreNotList(List<BigDecimal> scoreNotList){ public CheckAttendRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList; this.scoreNotList = scoreNotList;
return this; return this;
} }
/** /**
* 设置 上下班时间 * 设置 上下班时间
* @param goOffTimeStr * @param goOffTimeStr
*/ */
public CheckAttendRecordQuery goOffTimeStr(String goOffTimeStr){ public CheckAttendRecordQuery goOffTimeStr(String goOffTimeStr){
setGoOffTimeStr(goOffTimeStr); setGoOffTimeStr(goOffTimeStr);
return this; return this;
} }
/** /**
* 设置 上下班时间 * 设置 上下班时间
* @param goOffTimeStrList * @param goOffTimeStrList
*/ */
public CheckAttendRecordQuery goOffTimeStrList(List<String> goOffTimeStrList){ public CheckAttendRecordQuery goOffTimeStrList(List<String> goOffTimeStrList){
this.goOffTimeStrList = goOffTimeStrList; this.goOffTimeStrList = goOffTimeStrList;
return this; return this;
} }
/** /**
* 设置 异常处理结果 * 设置 异常处理结果
* @param errorResult * @param errorResult
*/ */
public CheckAttendRecordQuery errorResult(String errorResult){ public CheckAttendRecordQuery errorResult(String errorResult){
setErrorResult(errorResult); setErrorResult(errorResult);
return this; return this;
} }
/** /**
* 设置 异常处理结果 * 设置 异常处理结果
* @param errorResultList * @param errorResultList
*/ */
public CheckAttendRecordQuery errorResultList(List<String> errorResultList){ public CheckAttendRecordQuery errorResultList(List<String> errorResultList){
this.errorResultList = errorResultList; this.errorResultList = errorResultList;
return this; return this;
} }
/** /**
* 设置 核查人员 * 设置 核查人员
* @param checkPerson * @param checkPerson
*/ */
public CheckAttendRecordQuery checkPerson(String checkPerson){ public CheckAttendRecordQuery checkPerson(String checkPerson){
setCheckPerson(checkPerson); setCheckPerson(checkPerson);
return this; return this;
} }
/** /**
* 设置 核查人员 * 设置 核查人员
* @param checkPersonList * @param checkPersonList
*/ */
public CheckAttendRecordQuery checkPersonList(List<String> checkPersonList){ public CheckAttendRecordQuery checkPersonList(List<String> checkPersonList){
this.checkPersonList = checkPersonList; this.checkPersonList = checkPersonList;
return this; return this;
} }
/** /**
* 设置 核查说明 * 设置 核查说明
* @param checkDesc * @param checkDesc
*/ */
public CheckAttendRecordQuery checkDesc(String checkDesc){ public CheckAttendRecordQuery checkDesc(String checkDesc){
setCheckDesc(checkDesc); setCheckDesc(checkDesc);
return this; return this;
} }
/** /**
* 设置 核查说明 * 设置 核查说明
* @param checkDescList * @param checkDescList
*/ */
public CheckAttendRecordQuery checkDescList(List<String> checkDescList){ public CheckAttendRecordQuery checkDescList(List<String> checkDescList){
this.checkDescList = checkDescList; this.checkDescList = checkDescList;
return this; return this;
} }
/** /**
* 设置 核查结果 * 设置 核查结果
* @param checkResult * @param checkResult
*/ */
public CheckAttendRecordQuery checkResult(String checkResult){ public CheckAttendRecordQuery checkResult(String checkResult){
setCheckResult(checkResult); setCheckResult(checkResult);
return this; return this;
} }
/** /**
* 设置 核查结果 * 设置 核查结果
* @param checkResultList * @param checkResultList
*/ */
public CheckAttendRecordQuery checkResultList(List<String> checkResultList){ public CheckAttendRecordQuery checkResultList(List<String> checkResultList){
this.checkResultList = checkResultList; this.checkResultList = checkResultList;
return this; return this;
} }
/** /**
* 设置 处理状态(1.未处理,2.已处理) * 设置 处理状态(1.未处理,2.已处理)
* @param checkStatus * @param checkStatus
*/ */
public CheckAttendRecordQuery checkStatus(Integer checkStatus){ public CheckAttendRecordQuery checkStatus(Integer checkStatus){
setCheckStatus(checkStatus); setCheckStatus(checkStatus);
return this; return this;
} }
/** /**
* 设置 开始 处理状态(1.未处理,2.已处理) * 设置 开始 处理状态(1.未处理,2.已处理)
* @param checkStatusStart * @param checkStatusStart
*/ */
public CheckAttendRecordQuery checkStatusStart(Integer checkStatusStart){ public CheckAttendRecordQuery checkStatusStart(Integer checkStatusStart){
this.checkStatusStart = checkStatusStart; this.checkStatusStart = checkStatusStart;
return this; return this;
} }
/** /**
* 设置 结束 处理状态(1.未处理,2.已处理) * 设置 结束 处理状态(1.未处理,2.已处理)
* @param checkStatusEnd * @param checkStatusEnd
*/ */
public CheckAttendRecordQuery checkStatusEnd(Integer checkStatusEnd){ public CheckAttendRecordQuery checkStatusEnd(Integer checkStatusEnd){
this.checkStatusEnd = checkStatusEnd; this.checkStatusEnd = checkStatusEnd;
return this; return this;
} }
/** /**
* 设置 增加 处理状态(1.未处理,2.已处理) * 设置 增加 处理状态(1.未处理,2.已处理)
* @param checkStatusIncrement * @param checkStatusIncrement
*/ */
public CheckAttendRecordQuery checkStatusIncrement(Integer checkStatusIncrement){ public CheckAttendRecordQuery checkStatusIncrement(Integer checkStatusIncrement){
this.checkStatusIncrement = checkStatusIncrement; this.checkStatusIncrement = checkStatusIncrement;
return this; return this;
} }
/** /**
* 设置 处理状态(1.未处理,2.已处理) * 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusList * @param checkStatusList
*/ */
public CheckAttendRecordQuery checkStatusList(List<Integer> checkStatusList){ public CheckAttendRecordQuery checkStatusList(List<Integer> checkStatusList){
this.checkStatusList = checkStatusList; this.checkStatusList = checkStatusList;
return this; return this;
} }
/** /**
* 设置 处理状态(1.未处理,2.已处理) * 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusNotList * @param checkStatusNotList
*/ */
public CheckAttendRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){ public CheckAttendRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
this.checkStatusNotList = checkStatusNotList; this.checkStatusNotList = checkStatusNotList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public CheckAttendRecordQuery createUserId(Long createUserId){ public CheckAttendRecordQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public CheckAttendRecordQuery createUserIdStart(Long createUserIdStart){ public CheckAttendRecordQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public CheckAttendRecordQuery createUserIdEnd(Long createUserIdEnd){ public CheckAttendRecordQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public CheckAttendRecordQuery createUserIdIncrement(Long createUserIdIncrement){ public CheckAttendRecordQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public CheckAttendRecordQuery createUserIdList(List<Long> createUserIdList){ public CheckAttendRecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public CheckAttendRecordQuery createUserIdNotList(List<Long> createUserIdNotList){ public CheckAttendRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public CheckAttendRecordQuery updateUserId(Long updateUserId){ public CheckAttendRecordQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public CheckAttendRecordQuery updateUserIdStart(Long updateUserIdStart){ public CheckAttendRecordQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public CheckAttendRecordQuery updateUserIdEnd(Long updateUserIdEnd){ public CheckAttendRecordQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public CheckAttendRecordQuery updateUserIdIncrement(Long updateUserIdIncrement){ public CheckAttendRecordQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public CheckAttendRecordQuery updateUserIdList(List<Long> updateUserIdList){ public CheckAttendRecordQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public CheckAttendRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){ public CheckAttendRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
return this; return this;
} }
/** /**
* 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethod * @param subMethod
*/ */
public CheckAttendRecordQuery subMethod(Integer subMethod){ public CheckAttendRecordQuery subMethod(Integer subMethod){
setSubMethod(subMethod); setSubMethod(subMethod);
return this; return this;
} }
/** /**
* 设置 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 开始 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodStart * @param subMethodStart
*/ */
public CheckAttendRecordQuery subMethodStart(Integer subMethodStart){ public CheckAttendRecordQuery subMethodStart(Integer subMethodStart){
this.subMethodStart = subMethodStart; this.subMethodStart = subMethodStart;
return this; return this;
} }
/** /**
* 设置 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 结束 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodEnd * @param subMethodEnd
*/ */
public CheckAttendRecordQuery subMethodEnd(Integer subMethodEnd){ public CheckAttendRecordQuery subMethodEnd(Integer subMethodEnd){
this.subMethodEnd = subMethodEnd; this.subMethodEnd = subMethodEnd;
return this; return this;
} }
/** /**
* 设置 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 增加 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodIncrement * @param subMethodIncrement
*/ */
public CheckAttendRecordQuery subMethodIncrement(Integer subMethodIncrement){ public CheckAttendRecordQuery subMethodIncrement(Integer subMethodIncrement){
this.subMethodIncrement = subMethodIncrement; this.subMethodIncrement = subMethodIncrement;
return this; return this;
} }
/** /**
* 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodList * @param subMethodList
*/ */
public CheckAttendRecordQuery subMethodList(List<Integer> subMethodList){ public CheckAttendRecordQuery subMethodList(List<Integer> subMethodList){
this.subMethodList = subMethodList; this.subMethodList = subMethodList;
return this;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
* @param subMethodNotList
*/
public CheckAttendRecordQuery subMethodNotList(List<Integer> subMethodNotList){
this.subMethodNotList = subMethodNotList;
return this; return this;
}
/**
* 设置 说明
* @param remark
*/
public CheckAttendRecordQuery remark(String remark){
setRemark(remark);
return this;
} }
/** /**
* 设置 扣分方式(1.系统自动,2.人工添加,3.大厅巡查) * 设置 说明
* @param subMethodNotList * @param remarkList
*/ */
public CheckAttendRecordQuery subMethodNotList(List<Integer> subMethodNotList){ public CheckAttendRecordQuery remarkList(List<String> remarkList){
this.subMethodNotList = subMethodNotList; this.remarkList = remarkList;
return this; return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckAttendRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckAttendRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckAttendRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckAttendRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
*/ */
public List<CheckAttendRecordQuery> getOrConditionList(){ public List<CheckAttendRecordQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<CheckAttendRecordQuery> orConditionList){ public void setOrConditionList(List<CheckAttendRecordQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<CheckAttendRecordQuery> getAndConditionList(){ public List<CheckAttendRecordQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<CheckAttendRecordQuery> andConditionList){ public void setAndConditionList(List<CheckAttendRecordQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价绩效投诉核查信息实体对象 * 评价绩效投诉核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckComplainRecordEntity extends CheckComplainRecordVo { public class CheckComplainRecordEntity extends CheckComplainRecordVo {
...@@ -29,14 +29,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -29,14 +29,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -45,14 +48,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -45,14 +48,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 投诉标题 * 投诉标题
*/ */
@Excel(name = "投诉标题")
private String complainTitle; private String complainTitle;
/** /**
* 投诉内容 * 投诉内容
*/ */
@Excel(name = "投诉内容")
private String complainContent; private String complainContent;
/** /**
* 投诉人真实姓名 * 投诉人真实姓名
...@@ -61,6 +67,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -61,6 +67,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
private String contact; private String contact;
/** /**
* 投诉时间 * 投诉时间
...@@ -89,6 +96,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -89,6 +96,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -101,6 +109,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -101,6 +109,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -109,10 +118,12 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -109,10 +118,12 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -122,6 +133,16 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -122,6 +133,16 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -191,5 +212,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -191,5 +212,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
* 评价绩效投诉核查信息查询对象 * 评价绩效投诉核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckComplainRecordQuery extends CheckComplainRecordEntity { public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -271,6 +271,16 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity { ...@@ -271,6 +271,16 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<CheckComplainRecordQuery> orConditionList; private List<CheckComplainRecordQuery> orConditionList;
...@@ -1761,6 +1771,70 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity { ...@@ -1761,6 +1771,70 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2610,6 +2684,44 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity { ...@@ -2610,6 +2684,44 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckComplainRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckComplainRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckComplainRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckComplainRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 效能绩效核查信息实体对象 * 效能绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckEffectRecordEntity extends CheckEffectRecordVo { public class CheckEffectRecordEntity extends CheckEffectRecordVo {
...@@ -29,14 +29,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -29,14 +29,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -45,14 +48,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -45,14 +48,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType; private Integer irregularType;
/** /**
* 发生时间 * 发生时间
*/ */
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 持续时间,秒 * 持续时间,秒
...@@ -81,6 +87,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -81,6 +87,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -93,6 +100,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -93,6 +100,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -101,10 +109,12 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -101,10 +109,12 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -114,6 +124,16 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -114,6 +124,16 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -179,5 +199,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -179,5 +199,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
* 效能绩效核查信息查询对象 * 效能绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckEffectRecordQuery extends CheckEffectRecordEntity { public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -282,6 +282,16 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity { ...@@ -282,6 +282,16 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<CheckEffectRecordQuery> orConditionList; private List<CheckEffectRecordQuery> orConditionList;
...@@ -1806,6 +1816,70 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity { ...@@ -1806,6 +1816,70 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2669,6 +2743,44 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity { ...@@ -2669,6 +2743,44 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckEffectRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckEffectRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckEffectRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckEffectRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 办件绩效核查信息实体对象 * 办件绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
...@@ -29,6 +29,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -29,6 +29,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
...@@ -37,6 +38,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -37,6 +38,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -45,22 +47,27 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -45,22 +47,27 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 办件编码 * 办件编码
*/ */
@Excel(name = "办件编码")
private String goworkCode; private String goworkCode;
/** /**
* 办件所属部门 * 办件所属部门
*/ */
@Excel(name = "办件所属部门")
private String goworkDepts; private String goworkDepts;
/** /**
* 事项名称 * 事项名称
*/ */
@Excel(name = "事项名称")
private String matterlName; private String matterlName;
/** /**
* 办理时间 * 办理时间
*/ */
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime; private Date goworkTime;
/** /**
* 绩效规则id * 绩效规则id
...@@ -69,6 +76,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -69,6 +76,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -77,6 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -77,6 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -85,10 +94,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -85,10 +94,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -97,10 +108,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -97,10 +108,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -110,6 +123,16 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -110,6 +123,16 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -173,5 +196,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -173,5 +196,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
* 办件绩效核查信息查询对象 * 办件绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -256,6 +256,16 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { ...@@ -256,6 +256,16 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<CheckGoworkRecordQuery> orConditionList; private List<CheckGoworkRecordQuery> orConditionList;
...@@ -1650,6 +1660,70 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { ...@@ -1650,6 +1660,70 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2442,6 +2516,44 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity { ...@@ -2442,6 +2516,44 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckGoworkRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckGoworkRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckGoworkRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckGoworkRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 其它绩效核查信息实体对象 * 其它绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckOtherRecordEntity extends CheckOtherRecordVo { public class CheckOtherRecordEntity extends CheckOtherRecordVo {
...@@ -89,6 +89,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -89,6 +89,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -97,10 +98,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -97,10 +98,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -110,6 +113,16 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -110,6 +113,16 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -173,5 +186,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -173,5 +186,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
* 其它绩效核查信息查询对象 * 其它绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckOtherRecordQuery extends CheckOtherRecordEntity { public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -276,6 +276,16 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity { ...@@ -276,6 +276,16 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<CheckOtherRecordQuery> orConditionList; private List<CheckOtherRecordQuery> orConditionList;
...@@ -1768,6 +1778,70 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity { ...@@ -1768,6 +1778,70 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2630,6 +2704,44 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity { ...@@ -2630,6 +2704,44 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckOtherRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckOtherRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckOtherRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckOtherRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价差评绩效核查信息实体对象 * 评价差评绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckReviewRecordEntity extends CheckReviewRecordVo { public class CheckReviewRecordEntity extends CheckReviewRecordVo {
...@@ -29,14 +29,17 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -29,14 +29,17 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -57,6 +60,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -57,6 +60,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它) * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/ */
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource; private String reviewSource;
/** /**
* 评价设备 * 评价设备
...@@ -69,6 +73,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -69,6 +73,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -77,6 +82,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -77,6 +82,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -85,10 +91,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -85,10 +91,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
...@@ -97,10 +105,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -97,10 +105,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -110,6 +120,16 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -110,6 +120,16 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -173,5 +193,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -173,5 +193,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
* 评价差评绩效核查信息查询对象 * 评价差评绩效核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class CheckReviewRecordQuery extends CheckReviewRecordEntity { public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -266,6 +266,16 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity { ...@@ -266,6 +266,16 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<CheckReviewRecordQuery> orConditionList; private List<CheckReviewRecordQuery> orConditionList;
...@@ -1709,6 +1719,70 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity { ...@@ -1709,6 +1719,70 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2536,6 +2610,44 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity { ...@@ -2536,6 +2610,44 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckReviewRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckReviewRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckReviewRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckReviewRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 全部类型核查信息视图对象
*/
@Data
public class CheckAllRecordVo extends BaseEntityLong {
private static final long serialVersionUID = 1L;
/**
* 记录ID
*/
private Long recordId;
/**
* 员工ID
*/
private Long staffId;
/**
* 员工姓名
*/
private String staffName;
/**
* 工号
*/
private String workNum;
/**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 绩效规则id
*/
private Long ruleId;
/**
* 规则名称
*/
private String ruleName;
/**
* 增减类型(1.增加,2.扣除)
*/
private Integer subAddType;
/**
* 扣分或增加分值
*/
private BigDecimal score;
/**
* 核查时间
*/
private Date checkTime;
/**
* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
*/
private Integer subMethod;
/**
* 扣分时间
*/
private Date deductTime;
/**
* 核查类型(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
*/
private Integer checkType;
}
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 考勤绩效记录核查信息视图对象 * 考勤绩效记录核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckAttendRecordVo extends BaseEntityLong { public class CheckAttendRecordVo extends BaseEntityLong {
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckComplainRecordEntity; import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价绩效投诉核查信息视图对象 * 评价绩效投诉核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckComplainRecordVo extends BaseEntityLong { public class CheckComplainRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 投诉标题
*/
@Excel(name = "投诉标题")
private String complainTitle;
/**
* 投诉内容
*/
@Excel(name = "投诉内容")
private String complainContent;
/**
* 联系电话
*/
@Excel(name = "联系电话")
private String contact;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckEffectRecordEntity; import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 效能绩效核查信息视图对象 * 效能绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckEffectRecordVo extends BaseEntityLong { public class CheckEffectRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType;
/**
* 发生时间
*/
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity; import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 办件绩效核查信息视图对象 * 办件绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckGoworkRecordVo extends BaseEntityLong { public class CheckGoworkRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 办件编码
*/
@Excel(name = "办件编码")
private String goworkCode;
/**
* 办件所属部门
*/
@Excel(name = "办件所属部门")
private String goworkDepts;
/**
* 事项名称
*/
@Excel(name = "事项名称")
private String matterlName;
/**
* 办理时间
*/
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckOtherRecordEntity; import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 其它绩效核查信息视图对象 * 其它绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckOtherRecordVo extends BaseEntityLong { public class CheckOtherRecordVo extends BaseEntityLong {
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckReviewRecordEntity; import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价差评绩效核查信息视图对象 * 评价差评绩效核查信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class CheckReviewRecordVo extends BaseEntityLong { public class CheckReviewRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.service;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import java.util.List;
/**
* 全部类型核查信息Dao
*/
public interface CheckAllRecordService {
List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
}
package com.mortals.xhx.module.check.service.impl;
import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import com.mortals.xhx.module.check.service.CheckAllRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("checkAllRecordService")
@Slf4j
public class CheckAllRecordServiceImpl implements CheckAllRecordService {
@Autowired
private CheckAllRecordDao checkAllRecordDao;
@Override
public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
return checkAllRecordDao.getAllCheckRecord(query);
}
}
package com.mortals.xhx.module.check.web;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import com.mortals.xhx.module.check.service.CheckAllRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 全部类型核查信息Dao
*/
@RestController
@RequestMapping("check/all/record")
public class CheckAllRecordController extends BaseJsonBodyController {
@Autowired
private CheckAllRecordService checkAllRecordService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
}
@PostMapping({"list"})
@UnAuth
public Rest<Object> list(@RequestBody CheckAllRecordQuery query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询所以类型绩效核查信息";
int code=1;
try {
List<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query);
model.put("data", result);
model.put("message_info", busiDesc + "成功");
if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
this.recordSysLog(this.request, busiDesc + " 【成功】");
}
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
}
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 考勤绩效记录信息实体对象 * 考勤绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformAttendRecordEntity extends PerformAttendRecordVo { public class PerformAttendRecordEntity extends PerformAttendRecordVo {
...@@ -81,6 +81,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo { ...@@ -81,6 +81,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -102,6 +103,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo { ...@@ -102,6 +103,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -161,5 +172,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo { ...@@ -161,5 +172,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
* 考勤绩效记录信息查询对象 * 考勤绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformAttendRecordQuery extends PerformAttendRecordEntity { public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -257,6 +257,16 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity { ...@@ -257,6 +257,16 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<PerformAttendRecordQuery> orConditionList; private List<PerformAttendRecordQuery> orConditionList;
...@@ -1636,6 +1646,70 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity { ...@@ -1636,6 +1646,70 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2407,6 +2481,44 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity { ...@@ -2407,6 +2481,44 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public PerformAttendRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public PerformAttendRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public PerformAttendRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public PerformAttendRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价绩效投诉记录信息实体对象 * 评价绩效投诉记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformComplainRecordEntity extends PerformComplainRecordVo { public class PerformComplainRecordEntity extends PerformComplainRecordVo {
...@@ -25,14 +25,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -25,14 +25,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,14 +44,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -41,14 +44,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 投诉标题 * 投诉标题
*/ */
@Excel(name = "投诉标题")
private String complainTitle; private String complainTitle;
/** /**
* 投诉内容 * 投诉内容
*/ */
@Excel(name = "投诉内容")
private String complainContent; private String complainContent;
/** /**
* 投诉人真实姓名 * 投诉人真实姓名
...@@ -57,6 +63,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -57,6 +63,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
private String contact; private String contact;
/** /**
* 投诉时间 * 投诉时间
...@@ -85,6 +92,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -85,6 +92,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -97,11 +105,22 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -97,11 +105,22 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus; private Integer processStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -161,5 +180,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo { ...@@ -161,5 +180,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
* 评价绩效投诉记录信息查询对象 * 评价绩效投诉记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformComplainRecordQuery extends PerformComplainRecordEntity { public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -235,6 +235,16 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity { ...@@ -235,6 +235,16 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<PerformComplainRecordQuery> orConditionList; private List<PerformComplainRecordQuery> orConditionList;
...@@ -1516,6 +1526,70 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity { ...@@ -1516,6 +1526,70 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2253,6 +2327,44 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity { ...@@ -2253,6 +2327,44 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public PerformComplainRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public PerformComplainRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public PerformComplainRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public PerformComplainRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 效能绩效记录信息实体对象 * 效能绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformEffectRecordEntity extends PerformEffectRecordVo { public class PerformEffectRecordEntity extends PerformEffectRecordVo {
...@@ -25,14 +25,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -25,14 +25,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,14 +44,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -41,14 +44,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType; private Integer irregularType;
/** /**
* 发生时间 * 发生时间
*/ */
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 持续时间,秒 * 持续时间,秒
...@@ -77,6 +83,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -77,6 +83,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -89,11 +96,22 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -89,11 +96,22 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus; private Integer processStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -149,5 +167,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo { ...@@ -149,5 +167,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
* 效能绩效记录信息查询对象 * 效能绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformEffectRecordQuery extends PerformEffectRecordEntity { public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -246,6 +246,16 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity { ...@@ -246,6 +246,16 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<PerformEffectRecordQuery> orConditionList; private List<PerformEffectRecordQuery> orConditionList;
...@@ -1561,6 +1571,70 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity { ...@@ -1561,6 +1571,70 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2312,6 +2386,44 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity { ...@@ -2312,6 +2386,44 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public PerformEffectRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public PerformEffectRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public PerformEffectRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public PerformEffectRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 办件绩效记录信息实体对象 * 办件绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
...@@ -25,6 +25,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -25,6 +25,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
...@@ -33,6 +34,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -33,6 +34,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,22 +43,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -41,22 +43,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 办件编码 * 办件编码
*/ */
@Excel(name = "办件编码")
private String goworkCode; private String goworkCode;
/** /**
* 办件所属部门 * 办件所属部门
*/ */
@Excel(name = "办件所属部门")
private String goworkDepts; private String goworkDepts;
/** /**
* 事项名称 * 事项名称
*/ */
@Excel(name = "事项名称")
private String matterlName; private String matterlName;
/** /**
* 办理时间 * 办理时间
*/ */
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime; private Date goworkTime;
/** /**
* 绩效规则id * 绩效规则id
...@@ -65,6 +72,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -65,6 +72,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -73,6 +81,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -73,6 +81,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -81,15 +90,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -81,15 +90,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus; private Integer processStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,5 +164,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo { ...@@ -143,5 +164,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
* 办件绩效记录信息查询对象 * 办件绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -220,6 +220,16 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { ...@@ -220,6 +220,16 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<PerformGoworkRecordQuery> orConditionList; private List<PerformGoworkRecordQuery> orConditionList;
...@@ -1405,6 +1415,70 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { ...@@ -1405,6 +1415,70 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2085,6 +2159,44 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity { ...@@ -2085,6 +2159,44 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public PerformGoworkRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public PerformGoworkRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public PerformGoworkRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public PerformGoworkRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 其它绩效记录信息实体对象 * 其它绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformOtherRecordEntity extends PerformOtherRecordVo { public class PerformOtherRecordEntity extends PerformOtherRecordVo {
...@@ -90,6 +90,16 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo { ...@@ -90,6 +90,16 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,5 +153,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo { ...@@ -143,5 +153,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
* 其它绩效记录信息查询对象 * 其它绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformOtherRecordQuery extends PerformOtherRecordEntity { public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -240,6 +240,16 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity { ...@@ -240,6 +240,16 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<PerformOtherRecordQuery> orConditionList; private List<PerformOtherRecordQuery> orConditionList;
...@@ -1523,6 +1533,70 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity { ...@@ -1523,6 +1533,70 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2273,6 +2347,44 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity { ...@@ -2273,6 +2347,44 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public PerformOtherRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public PerformOtherRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public PerformOtherRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public PerformOtherRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 评价差评绩效记录信息实体对象 * 评价差评绩效记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformReviewRecordEntity extends PerformReviewRecordVo { public class PerformReviewRecordEntity extends PerformReviewRecordVo {
...@@ -25,14 +25,17 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -25,14 +25,17 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
...@@ -53,6 +56,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -53,6 +56,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它) * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/ */
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource; private String reviewSource;
/** /**
* 评价设备 * 评价设备
...@@ -65,6 +69,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -65,6 +69,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
...@@ -73,6 +78,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -73,6 +78,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
...@@ -81,6 +87,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -81,6 +87,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 处理状态(1.未核查,2.已核查) * 处理状态(1.未核查,2.已核查)
...@@ -90,6 +97,16 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -90,6 +97,16 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,5 +160,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo { ...@@ -143,5 +160,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
this.processStatus = 1; this.processStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
* 评价差评绩效记录信息查询对象 * 评价差评绩效记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
public class PerformReviewRecordQuery extends PerformReviewRecordEntity { public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -230,6 +230,16 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity { ...@@ -230,6 +230,16 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 附件名称,多个逗号分割 */
private List<String> fileNamesList;
/** 附件名称,多个逗号分割排除列表 */
private List <String> fileNamesNotList;
/** 附件下载地址,多个逗号分割 */
private List<String> filePathsList;
/** 附件下载地址,多个逗号分割排除列表 */
private List <String> filePathsNotList;
/** 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<PerformReviewRecordQuery> orConditionList; private List<PerformReviewRecordQuery> orConditionList;
...@@ -1464,6 +1474,70 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity { ...@@ -1464,6 +1474,70 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2179,6 +2253,44 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity { ...@@ -2179,6 +2253,44 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
} }
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public PerformReviewRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public PerformReviewRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public PerformReviewRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public PerformReviewRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
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
......
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity; import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 考勤绩效记录信息视图对象 * 考勤绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformAttendRecordVo extends BaseEntityLong { public class PerformAttendRecordVo extends BaseEntityLong {
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
} }
\ No newline at end of file
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity; import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价绩效投诉记录信息视图对象 * 评价绩效投诉记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformComplainRecordVo extends BaseEntityLong { public class PerformComplainRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 投诉标题
*/
@Excel(name = "投诉标题")
private String complainTitle;
/**
* 投诉内容
*/
@Excel(name = "投诉内容")
private String complainContent;
/**
* 联系电话
*/
@Excel(name = "联系电话")
private String contact;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 处理状态(1.未核查,2.已核查)
*/
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus;
} }
\ No newline at end of file
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity; import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 效能绩效记录信息视图对象 * 效能绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformEffectRecordVo extends BaseEntityLong { public class PerformEffectRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
private Integer irregularType;
/**
* 发生时间
*/
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 处理状态(1.未核查,2.已核查)
*/
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus;
} }
\ No newline at end of file
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity; import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 办件绩效记录信息视图对象 * 办件绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformGoworkRecordVo extends BaseEntityLong { public class PerformGoworkRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 办件编码
*/
@Excel(name = "办件编码")
private String goworkCode;
/**
* 办件所属部门
*/
@Excel(name = "办件所属部门")
private String goworkDepts;
/**
* 事项名称
*/
@Excel(name = "事项名称")
private String matterlName;
/**
* 办理时间
*/
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
/**
* 处理状态(1.未核查,2.已核查)
*/
@Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
private Integer processStatus;
} }
\ No newline at end of file
...@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity; ...@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 其它绩效记录信息视图对象 * 其它绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformOtherRecordVo extends BaseEntityLong { public class PerformOtherRecordVo extends BaseEntityLong {
} }
\ No newline at end of file
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity; import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 评价差评绩效记录信息视图对象 * 评价差评绩效记录信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-18 * @date 2023-07-08
*/ */
@Data @Data
public class PerformReviewRecordVo extends BaseEntityLong { public class PerformReviewRecordVo extends BaseEntityLong {
/**
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource;
/**
* 规则名称
*/
@Excel(name = "规则名称")
private String ruleName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分或增加分值
*/
@Excel(name = "扣分或增加分值")
private BigDecimal score;
} }
\ No newline at end of file
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<result property="siteIds" column="siteIds" /> <result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" /> <result property="areaCodes" column="areaCodes" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="customerId" column="customerId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" /> <result property="createUserName" column="createUserName" />
...@@ -77,6 +78,9 @@ ...@@ -77,6 +78,9 @@
<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('customerId') or colPickMode == 1 and data.containsKey('customerId')))">
a.customerId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -97,18 +101,18 @@ ...@@ -97,18 +101,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES VALUES
(#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress}) (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress}) (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach> </foreach>
</insert> </insert>
...@@ -169,6 +173,12 @@ ...@@ -169,6 +173,12 @@
<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('customerId')) or (colPickMode==1 and !data.containsKey('customerId'))">
a.customerId=#{data.customerId},
</if>
<if test="(colPickMode==0 and data.containsKey('customerIdIncrement')) or (colPickMode==1 and !data.containsKey('customerIdIncrement'))">
a.customerId=ifnull(a.customerId,0) + #{data.customerIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -312,6 +322,18 @@ ...@@ -312,6 +322,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="customerId=(case" suffix="ELSE customerId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('customerId')) or (colPickMode==1 and !item.containsKey('customerId'))">
when a.id=#{item.id} then #{item.customerId}
</when>
<when test="(colPickMode==0 and item.containsKey('customerIdIncrement')) or (colPickMode==1 and !item.containsKey('customerIdIncrement'))">
when a.id=#{item.id} then ifnull(a.customerId,0) + #{item.customerIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -807,6 +829,33 @@ ...@@ -807,6 +829,33 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('customerId')">
<if test="conditionParamRef.customerId != null ">
${_conditionType_} a.customerId = #{${_conditionParam_}.customerId}
</if>
<if test="conditionParamRef.customerId == null">
${_conditionType_} a.customerId is null
</if>
</if>
<if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
${_conditionType_} a.customerId not in
<foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if>
<if test="conditionParamRef.containsKey('customerIdEnd') and conditionParamRef.customerIdEnd != null">
${_conditionType_} a.customerId <![CDATA[ <= ]]> #{${_conditionParam_}.customerIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -994,6 +1043,11 @@ ...@@ -994,6 +1043,11 @@
<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('customerId')">
a.customerId
<if test='orderCol.customerId != null and "DESC".equalsIgnoreCase(orderCol.customerId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
<select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
</select>
</mapper>
\ No newline at end of file
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -136,23 +138,29 @@ ...@@ -136,23 +138,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckComplainRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CheckComplainRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_complain_record insert into mortals_xhx_check_complain_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_complain_record insert into mortals_xhx_check_complain_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -279,6 +287,12 @@ ...@@ -279,6 +287,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -546,6 +560,20 @@ ...@@ -546,6 +560,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1343,6 +1371,48 @@ ...@@ -1343,6 +1371,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1511,6 +1581,16 @@ ...@@ -1511,6 +1581,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -128,23 +130,29 @@ ...@@ -128,23 +130,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckEffectRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CheckEffectRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_effect_record insert into mortals_xhx_check_effect_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_effect_record insert into mortals_xhx_check_effect_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -271,6 +279,12 @@ ...@@ -271,6 +279,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -534,6 +548,20 @@ ...@@ -534,6 +548,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1295,6 +1323,48 @@ ...@@ -1295,6 +1323,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1453,6 +1523,16 @@ ...@@ -1453,6 +1523,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -124,23 +126,29 @@ ...@@ -124,23 +126,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckGoworkRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CheckGoworkRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_gowork_record insert into mortals_xhx_check_gowork_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_gowork_record insert into mortals_xhx_check_gowork_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -258,6 +266,12 @@ ...@@ -258,6 +266,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -504,6 +518,20 @@ ...@@ -504,6 +518,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1238,6 +1266,48 @@ ...@@ -1238,6 +1266,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1391,6 +1461,16 @@ ...@@ -1391,6 +1461,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -124,23 +126,29 @@ ...@@ -124,23 +126,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckOtherRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CheckOtherRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_other_record insert into mortals_xhx_check_other_record
(recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{windowNum},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{windowNum},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_other_record insert into mortals_xhx_check_other_record
(recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.windowNum},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.windowNum},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -264,6 +272,12 @@ ...@@ -264,6 +272,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -520,6 +534,20 @@ ...@@ -520,6 +534,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1266,6 +1294,48 @@ ...@@ -1266,6 +1294,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1419,6 +1489,16 @@ ...@@ -1419,6 +1489,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -124,23 +126,29 @@ ...@@ -124,23 +126,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckReviewRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CheckReviewRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_review_record insert into mortals_xhx_check_review_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_review_record insert into mortals_xhx_check_review_record
(recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime) (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -261,6 +269,12 @@ ...@@ -261,6 +269,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -512,6 +526,20 @@ ...@@ -512,6 +526,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1252,6 +1280,48 @@ ...@@ -1252,6 +1280,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1405,6 +1475,16 @@ ...@@ -1405,6 +1475,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -116,23 +118,29 @@ ...@@ -116,23 +118,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformAttendRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PerformAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_attend_record insert into mortals_xhx_perform_attend_record
(staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleNme},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleNme},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_attend_record insert into mortals_xhx_perform_attend_record
(staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleNme},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleNme},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -247,6 +255,12 @@ ...@@ -247,6 +255,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -484,6 +498,20 @@ ...@@ -484,6 +498,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1176,6 +1204,48 @@ ...@@ -1176,6 +1204,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1319,6 +1389,16 @@ ...@@ -1319,6 +1389,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -116,23 +118,29 @@ ...@@ -116,23 +118,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformComplainRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PerformComplainRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_complain_record insert into mortals_xhx_perform_complain_record
(staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_complain_record insert into mortals_xhx_perform_complain_record
(staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -241,6 +249,12 @@ ...@@ -241,6 +249,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -468,6 +482,20 @@ ...@@ -468,6 +482,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1160,6 +1188,48 @@ ...@@ -1160,6 +1188,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1303,6 +1373,16 @@ ...@@ -1303,6 +1373,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -108,23 +110,29 @@ ...@@ -108,23 +110,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformEffectRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PerformEffectRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_effect_record insert into mortals_xhx_perform_effect_record
(staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_effect_record insert into mortals_xhx_perform_effect_record
(staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -233,6 +241,12 @@ ...@@ -233,6 +241,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -456,6 +470,20 @@ ...@@ -456,6 +470,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1112,6 +1140,48 @@ ...@@ -1112,6 +1140,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1245,6 +1315,16 @@ ...@@ -1245,6 +1315,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -104,23 +106,29 @@ ...@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformGoworkRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PerformGoworkRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_gowork_record insert into mortals_xhx_perform_gowork_record
(staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_gowork_record insert into mortals_xhx_perform_gowork_record
(staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -220,6 +228,12 @@ ...@@ -220,6 +228,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -426,6 +440,20 @@ ...@@ -426,6 +440,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1055,6 +1083,48 @@ ...@@ -1055,6 +1083,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1183,6 +1253,16 @@ ...@@ -1183,6 +1253,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -104,23 +106,29 @@ ...@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformOtherRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PerformOtherRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_other_record insert into mortals_xhx_perform_other_record
(staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_other_record insert into mortals_xhx_perform_other_record
(staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -226,6 +234,12 @@ ...@@ -226,6 +234,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -442,6 +456,20 @@ ...@@ -442,6 +456,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1083,6 +1111,48 @@ ...@@ -1083,6 +1111,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1211,6 +1281,16 @@ ...@@ -1211,6 +1281,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="fileNames" column="fileNames" />
<result property="filePaths" column="filePaths" />
</resultMap> </resultMap>
...@@ -104,23 +106,29 @@ ...@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
a.fileNames,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
a.filePaths,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformReviewRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PerformReviewRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_review_record insert into mortals_xhx_perform_review_record
(staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_review_record insert into mortals_xhx_perform_review_record
(staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach> </foreach>
</insert> </insert>
...@@ -223,6 +231,12 @@ ...@@ -223,6 +231,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
a.fileNames=#{data.fileNames},
</if>
<if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
a.filePaths=#{data.filePaths},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -434,6 +448,20 @@ ...@@ -434,6 +448,20 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
when a.id=#{item.id} then #{item.fileNames}
</if>
</foreach>
</trim>
<trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
when a.id=#{item.id} then #{item.filePaths}
</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=")">
...@@ -1069,6 +1097,48 @@ ...@@ -1069,6 +1097,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('fileNames')">
<if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
</if>
<if test="conditionParamRef.fileNames == null">
${_conditionType_} a.fileNames is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
${_conditionType_} a.fileNames in
<foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
${_conditionType_} a.fileNames not in
<foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePaths')">
<if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
</if>
<if test="conditionParamRef.filePaths == null">
${_conditionType_} a.filePaths is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
${_conditionType_} a.filePaths in
<foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
${_conditionType_} a.filePaths not in
<foreach collection="conditionParamRef.filePathsNotList" 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()">
...@@ -1197,6 +1267,16 @@ ...@@ -1197,6 +1267,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fileNames')">
a.fileNames
<if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePaths')">
a.filePaths
<if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -278,3 +278,54 @@ PRIMARY KEY (`id`) ...@@ -278,3 +278,54 @@ PRIMARY KEY (`id`)
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-查看', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-查看', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-维护', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-维护', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
2023-7-08
-- ----------------------------
ALTER TABLE mortals_xhx_user ADD COLUMN `customerId` bigint(20) DEFAULT -1 COMMENT '员工id' AFTER status;
ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `remark` varchar(256) DEFAULT '' COMMENT '备注' AFTER checkStatus;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '附件名称,多个逗号分割' AFTER remark;
ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '附件下载地址,多个逗号分割' AFTER fileNames;
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