Skip to content

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

添加用户反馈问答表 用户id,文件路径等

parent a89a87a6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5225 additions and 2756 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @ a89d6076
...@@ -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() {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/FeedbackReq.java 0 → 100644
View file @ a89d6076
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;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java
View file @ a89d6076
...@@ -55,5 +55,10 @@ public class PerformInfo { ...@@ -55,5 +55,10 @@ public class PerformInfo {
*/ */
private BigDecimal score; private BigDecimal score;
/**
* 类型
*/
private String performType;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java 0 → 100644
View file @ a89d6076
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/")
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) {
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
View file @ a89d6076
...@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,11 +9,11 @@ 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;
...@@ -113,6 +113,21 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -113,6 +113,21 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
* 扣分方式(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();
...@@ -176,5 +191,11 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -176,5 +191,11 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.checkStatus = 1; this.checkStatus = 1;
this.subMethod = 1; this.subMethod = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
View file @ a89d6076
...@@ -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;
...@@ -1769,6 +1784,102 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -1769,6 +1784,102 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
} }
/**
* 获取 说明
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 说明
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 说明
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 说明
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/**
* 获取 附件名称，多个逗号分割
* @return 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
...@@ -2613,6 +2724,63 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -2613,6 +2724,63 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
return this; return this;
} }
/**
* 设置 说明
* @param remark
*/
public CheckAttendRecordQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 说明
* @param remarkList
*/
public CheckAttendRecordQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordQuery.java
View file @ a89d6076
...@@ -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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
View file @ a89d6076
...@@ -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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
View file @ a89d6076
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
attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
View file @ a89d6076
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.base.system.user.dao.ibatis.UserDaoImpl"> <mapper namespace="com.mortals.xhx.module.user.dao.ibatis.UserDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="UserEntity" id="UserEntity-Map"> <resultMap type="UserEntity" id="UserEntity-Map">
...@@ -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>
......
attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformEffectRecordMapper.xml
View file @ a89d6076
...@@ -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>
......
db/add.sql
View file @ a89d6076
This diff is collapsed.
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