瀏覽代碼

查询报表修改参数

wangchao 4 年之前
父節點
當前提交
eb0f593fc9

+ 3 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceReportController.java

@ -50,7 +50,7 @@ public class AttendanceReportController {
50 50
51 51
		Map<String, Object> params = new HashMap<>();
52 52
		params.put("workDay",attendanceReport.getWorkDay());
53
		params.put("orgId",attendanceReport.getOrgId());
53
		params.put("orgId",attendanceReport.getOrgCode());
54 54
		params.put("id",attendanceReport.getId());
55 55
		params.put("nameAsLike",attendanceReport.getNameAsLike());
56 56
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
@ -81,7 +81,7 @@ public class AttendanceReportController {
81 81
82 82
		Map<String, Object> params = new HashMap<>();
83 83
		params.put("month",attendanceReport.getMonth());
84
		params.put("orgId",attendanceReport.getOrgId());
84
		params.put("orgId",attendanceReport.getOrgCode());
85 85
		params.put("id",attendanceReport.getId());
86 86
		params.put("nameAsLike",attendanceReport.getNameAsLike());
87 87
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
@ -105,7 +105,7 @@ public class AttendanceReportController {
105 105
106 106
		Map<String, Object> params = new HashMap<>();
107 107
		params.put("month",attendanceReport.getMonth());
108
		params.put("orgId",attendanceReport.getOrgId());
108
		params.put("orgId",attendanceReport.getOrgCode());
109 109
		params.put("id",attendanceReport.getId());
110 110
		params.put("nameAsLike",attendanceReport.getNameAsLike());
111 111
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());

+ 2 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/model/AttendanceReport.java

@ -13,6 +13,8 @@ public class AttendanceReport implements Serializable {
13 13
14 14
    private  String orgId; //组织id
15 15
16
    private  String orgCode; //组织编码
17
16 18
    private  String id; //人员id 个人编码 员工编码
17 19
18 20
    private  String mainJobPositionId;  //职位id