From b29e602186955d3c9cd78b7225a92c839638a79b Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 29 Apr 2025 00:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=B3=BB=E7=BB=9F=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/manage/domain/AttendanceCfg.java | 21 ++++++++++++++++++- .../mapper/manage/AttendanceCfgMapper.xml | 8 ++++++- .../domain/QuartzProjectAttendanceCfg.java | 20 ++++++++++++++++++ ...uartzProjectAttendanceDataServiceImpl.java | 6 +++--- ...uartzProjectAttendanceUserServiceImpl.java | 2 +- .../job/QuartzProjectAttendanceCfgMapper.xml | 5 ++++- .../job/QuartzProjectAttendanceUserMapper.xml | 2 +- 7 files changed, 56 insertions(+), 8 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java index 1528e8a3..8a0b018c 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceCfg.java @@ -50,7 +50,26 @@ public class AttendanceCfg extends BaseEntity this.id = id; } - public Long getId() + private Long deptId; + private String deptName; + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public Long getId() { return id; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml index 3fbb41d8..2a6f6b28 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceCfgMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -19,16 +20,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + SELECT ac.id, ac.com_id, ac.project_id, ac.vendors_code, ac.vendors_parameter, ac.enabled, ac.state, ac.remark, ac.is_del, ac.create_by, ac.create_time, ac.update_by - , ac.update_time,dp.`dept_name` comp_name,pp.`project_name`,dic.`dict_label` vendors_name + , ac.update_time,dp.`dept_name` comp_name,pp.`project_name`,dic.`dict_label` vendors_name,sd.sub_dept_name dept_name,ac.dept_id FROM attendance_cfg ac LEFT JOIN sys_dept dp ON ac.`com_id`=dp.`dept_id` LEFT JOIN pro_project_info pp ON ac.`project_id`=pp.`id` + left join pro_project_info_subdepts sd on ac.dept_id=sd.id LEFT JOIN sys_dict_data dic ON ac.`vendors_code`=dic.`dict_value` AND dic.`dict_type`='attendance_vendors' @@ -54,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into attendance_cfg com_id, + dept_id, project_id, vendors_code, vendors_parameter, @@ -68,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{comId}, + #{deptId}, #{projectId}, #{vendorsCode}, #{vendorsParameter}, @@ -86,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update attendance_cfg com_id = #{comId}, + dept_id = #{deptId}, project_id = #{projectId}, vendors_code = #{vendorsCode}, vendors_parameter = #{vendorsParameter}, diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProjectAttendanceCfg.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProjectAttendanceCfg.java index 14d02752..9e6da397 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProjectAttendanceCfg.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/QuartzProjectAttendanceCfg.java @@ -43,6 +43,26 @@ public class QuartzProjectAttendanceCfg extends BaseEntity @Excel(name = "状态") private Long state; + private Long deptId; + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + private String deptName; + /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long isDel; diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java index e4bde27c..e5703e5e 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceDataServiceImpl.java @@ -234,9 +234,9 @@ public class QuartzProjectAttendanceDataServiceImpl implements IQuartzProjectAtt } QuartzProjectAttendanceCfg cfg=cfgList.get(0); sdata.setProjectId(cfg.getProjectId()); - sdata.setDeptId(cfg.getComId()); + sdata.setDeptId(cfg.getDeptId()); sdata.setProjectName(cfg.getProjectName()); - sdata.setDeptName(cfg.getCompName()); + sdata.setDeptName(cfg.getDeptName()); if(sdata.getCompanyTypeId()==null){ sdata.setCompanyTypeId("0"); } @@ -471,7 +471,7 @@ public class QuartzProjectAttendanceDataServiceImpl implements IQuartzProjectAtt } QuartzProjectAttendanceCfg cfg=cfgList.get(0); sdata.setProjectId(cfg.getProjectId()); - sdata.setDeptId(cfg.getSubDeptId()); + sdata.setDeptId(cfg.getDeptId()); sdata.setProjectName(cfg.getProjectName()); sdata.setDeptName(cfg.getDeptName()); if(sdata.getCompanyTypeId()==null){ diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceUserServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceUserServiceImpl.java index ca3081ef..ef5d564a 100644 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/QuartzProjectAttendanceUserServiceImpl.java @@ -217,7 +217,7 @@ public class QuartzProjectAttendanceUserServiceImpl implements IQuartzProjectAtt public long countAttendance(QuartzProjectAttendanceUser user) { QuartzProjectAttendanceCfg where=new QuartzProjectAttendanceCfg(); where.setCreateBy(user.getCreateBy()); - where.setSubDeptId(user.getSubDeptId()); + where.setDeptId(user.getSubDeptId()); where.setProjectId(user.getProjectId()); return quartzProjectAttendanceUserMapper.countAttendance(where); } diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml index fed3545f..6ad1f743 100644 --- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceCfgMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -19,16 +20,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + SELECT ac.id, ac.com_id, ac.project_id, ac.vendors_code, ac.vendors_parameter, ac.enabled, ac.state, ac.remark, ac.is_del, ac.create_by, ac.create_time, ac.update_by - , ac.update_time,dp.`dept_name` comp_name,pp.`project_name`,dic.`dict_label` vendors_name + , ac.update_time,dp.`dept_name` comp_name,pp.`project_name`,dic.`dict_label` vendors_name,sd.sub_dept_name dept_name,ac.dept_id FROM attendance_cfg ac LEFT JOIN sys_dept dp ON ac.`com_id`=dp.`dept_id` LEFT JOIN pro_project_info pp ON ac.`project_id`=pp.`id` + left join pro_project_info_subdepts sd on ac.dept_id=sd.id LEFT JOIN sys_dict_data dic ON ac.`vendors_code`=dic.`dict_value` AND dic.`dict_type`='attendance_vendors' diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml index c07e9996..602be580 100644 --- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml +++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml @@ -499,7 +499,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId and u.workerid in( SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN ( - SELECT id FROM sur_project_attendance_cfg WHERE project_id=#{projectId} AND sub_dept_id=#{subDeptId} + SELECT id FROM sur_project_attendance_cfg WHERE project_id=#{projectId} AND sub_dept_id=#{deptId} ) group by workerid )