Skip to content

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

绩效相关表增加人员大厅字段

parent 93fd9953
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32246 additions and 23620 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/MockDataController.java
View file @ 74714cae
......@@ -199,6 +199,8 @@ public class MockDataController {
statEntity.setWorkNum(item.getWorkNum());
statEntity.setDeptId(item.getDeptId());
statEntity.setDeptName(item.getDeptName());
statEntity.setSalaId(item.getSalaId());
statEntity.setSalaName(item.getSalaName());
BigDecimal attendScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(15)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal reviewScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(15)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal complainScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(15)).setScale(1, BigDecimal.ROUND_CEILING);
......@@ -251,6 +253,10 @@ public class MockDataController {
statEntity.initAttrValue();
statEntity.setStaffId(item.getId());
statEntity.setStaffName(item.getName());
statEntity.setDeptId(item.getDeptId());
statEntity.setDeptName(item.getDeptName());
statEntity.setSalaId(item.getSalaId());
statEntity.setSalaName(item.getSalaName());
BigDecimal attendScoreAdd = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("5")).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal reviewScoreAdd = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("5")).setScale(1, BigDecimal.ROUND_CEILING);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
View file @ 74714cae
......@@ -245,9 +245,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -281,8 +283,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -336,8 +341,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -368,8 +376,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -401,8 +412,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -463,8 +477,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java
View file @ 74714cae
......@@ -306,10 +306,11 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setDeductTime(new Date());
StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
recordEntity.setDeductPerson(custStaff==null?"系统管理员":custStaff.getName());
......@@ -433,6 +434,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -461,6 +464,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setDeductTime(new Date());
StaffEntity custStaff = getStaff(context.getUser().getCustomerId().toString());
......@@ -499,6 +504,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -533,6 +540,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......@@ -566,6 +575,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/StaffPerformInitDataTaskImpl.java
View file @ 74714cae
......@@ -86,6 +86,10 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
statEntity.initAttrValue();
statEntity.setStaffId(item.getId());
statEntity.setStaffName(item.getName());
statEntity.setDeptId(item.getDeptId());
statEntity.setDeptName(item.getDeptName());
statEntity.setSalaId(item.getSalaId());
statEntity.setSalaName(item.getSalaName());
statEntity.setYear(year);
statEntity.setMonth(month);
statEntity.setDay(dayOfMonth);
......@@ -129,6 +133,8 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
staffPerformSummaryEntity.setStaffName(item.getName());
staffPerformSummaryEntity.setDeptId(item.getDeptId());
staffPerformSummaryEntity.setDeptName(item.getDeptName());
staffPerformSummaryEntity.setSalaId(item.getSalaId());
staffPerformSummaryEntity.setSalaName(item.getSalaName());
staffPerformSummaryEntity.setYear(year);
staffPerformSummaryEntity.setMonth(month);
staffPerformSummaryEntity.setTotalScore(totalScore);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
View file @ 74714cae
......@@ -39,6 +39,15 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/
@Excel(name = "工号")
private String workNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -219,5 +228,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.deductTime = new Date();
this.windowNum = "";
this.auditStatus = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
View file @ 74714cae
......@@ -44,6 +44,15 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -214,5 +223,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
View file @ 74714cae
......@@ -44,6 +44,15 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -200,5 +209,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
View file @ 74714cae
......@@ -44,6 +44,15 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -201,5 +210,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
View file @ 74714cae
......@@ -39,6 +39,15 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
*/
@Excel(name = "工号")
private String workNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -198,5 +207,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
View file @ 74714cae
......@@ -44,6 +44,15 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -200,5 +209,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendAppealEntity.java
View file @ 74714cae
......@@ -36,6 +36,14 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
* 工号
*/
private String workNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
/**
* 所属部门
*/
......@@ -381,5 +389,9 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
this.deductPerson = "";
this.deductTime = null;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java
View file @ 74714cae
......@@ -30,8 +30,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
/**
* 工号
*/
private String workNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -201,5 +209,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
this.ruleName = "";
this.windowNum = "";
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java
View file @ 74714cae
......@@ -37,6 +37,15 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -202,5 +211,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java
View file @ 74714cae
......@@ -37,6 +37,15 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -189,5 +198,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformErrorRecordEntity.java
View file @ 74714cae
......@@ -40,6 +40,15 @@ public class PerformErrorRecordEntity extends PerformErrorRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -168,5 +177,7 @@ public class PerformErrorRecordEntity extends PerformErrorRecordVo {
this.fileNames = "";
this.filePaths = "";
this.remark = "";
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java
View file @ 74714cae
......@@ -36,6 +36,15 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -186,5 +195,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java
View file @ 74714cae
......@@ -34,6 +34,14 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
* 窗口编号
*/
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
/**
* 所属部门
*/
......@@ -175,5 +183,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java
View file @ 74714cae
......@@ -37,6 +37,15 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
......@@ -182,5 +191,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
this.categoryName = "";
this.subAddType = 1;
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
View file @ 74714cae
......@@ -219,9 +219,11 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeptId(staffEntity.getDeptId());
recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSalaId(staffEntity.getSalaId());
recordEntity.setSalaName(staffEntity.getSalaName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java
View file @ 74714cae
......@@ -18,13 +18,32 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
private static final long serialVersionUID = 1L;
/**
* 部门id号
* 员工d号
*/
private Long staffId;
/**
* 部门名称
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 员工绩效总分数
*/
......@@ -163,5 +182,13 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
this.month = -1;
this.day = -1;
this.salaId = null;
this.salaName = "";
this.deptId = null;
this.deptName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java
View file @ 74714cae
......@@ -39,6 +39,15 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
*/
@Excel(name = "人员名称")
private String staffName;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "大厅名称")
private String salaName;
/**
* 部门id号
*/
......@@ -153,5 +162,9 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
this.month = DateUtil.month(new Date())+1;
this.belongCenter = "宜宾市民中心";
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryQuery.java
View file @ 74714cae
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
* 员工绩效统计查询对象
*
* @author zxfei
* @date 2023-07-18
* @date 2024-03-12
*/
public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
/** 开始 主键ID，主键，自增长 */
......@@ -50,6 +50,11 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
/** 人员名称排除列表 */
private List <String> staffNameNotList;
/** 所属中心 */
private List<String> belongCenterList;
/** 所属中心排除列表 */
private List <String> belongCenterNotList;
/** 开始 部门id号 */
private Long deptIdStart;
......@@ -267,11 +272,26 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
/** 更新人id排除列表 */
private List <Long> updateUserIdNotList;
/** 所属中心 */
private List<String> belongCenterList;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 所属中心排除列表 */
private List <String> belongCenterNotList;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<StaffPerformSummaryQuery> orConditionList;
......@@ -506,6 +526,38 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
this.staffNameNotList = staffNameNotList;
}
/**
* 获取 所属中心
* @return belongCenterList
*/
public List<String> getBelongCenterList(){
return this.belongCenterList;
}
/**
* 设置 所属中心
* @param belongCenterList
*/
public void setBelongCenterList(List<String> belongCenterList){
this.belongCenterList = belongCenterList;
}
/**
* 获取 所属中心
* @return belongCenterNotList
*/
public List<String> getBelongCenterNotList(){
return this.belongCenterNotList;
}
/**
* 设置 所属中心
* @param belongCenterNotList
*/
public void setBelongCenterNotList(List<String> belongCenterNotList){
this.belongCenterNotList = belongCenterNotList;
}
/**
* 获取 开始 部门id号
* @return deptIdStart
......@@ -1688,35 +1740,116 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
/**
* 获取 所属中心
* @return belongCenterList
* 获取 开始 所属大厅
* @return salaIdStart
*/
public List<String> getBelongCenterList(){
return this.belongCenterList;
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 所属中心
* @param belongCenterList
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setBelongCenterList(List<String> belongCenterList){
this.belongCenterList = belongCenterList;
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 所属中心
* @return belongCenterNotList
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public List<String> getBelongCenterNotList(){
return this.belongCenterNotList;
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 所属中心
* @param belongCenterNotList
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setBelongCenterNotList(List<String> belongCenterNotList){
this.belongCenterNotList = belongCenterNotList;
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/**
......@@ -1865,6 +1998,25 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
return this;
}
/**
* 设置 所属中心
* @param belongCenter
*/
public StaffPerformSummaryQuery belongCenter(String belongCenter){
setBelongCenter(belongCenter);
return this;
}
/**
* 设置 所属中心
* @param belongCenterList
*/
public StaffPerformSummaryQuery belongCenterList(List<String> belongCenterList){
this.belongCenterList = belongCenterList;
return this;
}
/**
* 设置 部门id号
* @param deptId
......@@ -2607,22 +2759,76 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
return this;
}
/**
* 设置 所属大厅
* @param salaId
*/
public StaffPerformSummaryQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 所属中心
* @param belongCenter
* 设置 开始 所属大厅
* @param salaIdStart
*/
public StaffPerformSummaryQuery belongCenter(String belongCenter){
setBelongCenter(belongCenter);
public StaffPerformSummaryQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 所属中心
* @param belongCenterList
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public StaffPerformSummaryQuery belongCenterList(List<String> belongCenterList){
this.belongCenterList = belongCenterList;
public StaffPerformSummaryQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public StaffPerformSummaryQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public StaffPerformSummaryQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public StaffPerformSummaryQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public StaffPerformSummaryQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public StaffPerformSummaryQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
return this;
}
......
db/add.sql
View file @ 74714cae
......@@ -1196,4 +1196,78 @@ CREATE TABLE mortals_xhx_door(
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
,KEY `deviceCode` (`deviceCode`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='门禁设备';
\ No newline at end of file
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='门禁设备';
-- ------------------
-- 2024-03-12
-- 绩效表增加人员大厅字段
-- ------------------
ALTER TABLE `mortals_xhx_attendance_vacation_balance`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_check_attend_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_check_complain_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_check_effect_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_check_gowork_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_check_other_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_check_review_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_attend_appeal`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_attend_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_complain_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_effect_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_error_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_gowork_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_other_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_perform_review_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_staff_perform_stat`
ADD COLUMN `deptId` bigint(20) COMMENT '所属部门id' AFTER `staffName`,
ADD COLUMN `deptName` varchar(256) COMMENT '所属部门名称' AFTER `deptId`,
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
ALTER TABLE `mortals_xhx_staff_perform_summary`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅' AFTER `deptName`,
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称' AFTER `salaId`;
\ No newline at end of file
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