diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java
index 77edd9c7..8e59301b 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java
@@ -57,6 +57,25 @@ public class ProMobileAttendanceConfig extends BaseEntity
this.startDate = startDate;
}
+ private Long groupId;
+ private Long userId;
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Long groupId) {
+ this.groupId = groupId;
+ }
+
public Integer getIsDel() {
return isDel;
}
@@ -91,7 +110,11 @@ public class ProMobileAttendanceConfig extends BaseEntity
/** 考勤范围 */
@Excel(name = "考勤范围")
- private BigDecimal rang;
+ private BigDecimal range;
+
+ /** 是否全部班组 1-是 0-否 */
+ @Excel(name = "是否全部班组", readConverterExp = "1=是,0=否")
+ private Integer isAll;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -179,14 +202,24 @@ public class ProMobileAttendanceConfig extends BaseEntity
{
return valid;
}
- public void setRang(BigDecimal rang)
+ public void setRange(BigDecimal range)
{
- this.rang = rang;
+ this.range = range;
}
- public BigDecimal getRang()
+ public BigDecimal getRange()
{
- return rang;
+ return range;
+ }
+
+ public void setIsAll(Integer isAll)
+ {
+ this.isAll = isAll;
+ }
+
+ public Integer getIsAll()
+ {
+ return isAll;
}
public void setState(Long state)
{
@@ -211,7 +244,8 @@ public class ProMobileAttendanceConfig extends BaseEntity
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("valid", getValid())
- .append("rang", getRang())
+ .append("range", getRange())
+ .append("isAll", getIsAll())
.append("state", getState())
.append("remark", getRemark())
.append("createBy", getCreateBy())
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml
index fab1e7f7..325cfb62 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml
@@ -15,7 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select c.id, c.com_id, c.project_id, c.title, c.start_date, c.end_date, c.address, c.longitude, c.latitude, c.valid, c.rang, c.state, c.is_del, c.remark, c.create_by, c.create_time, c.update_by, c.update_time, g.id as group_id, g.cfg_id, g.group_id as group_id, pg.group_name, pg.sub_dept_name as dept_name
+ select c.id, c.com_id, c.project_id, c.title, c.start_date, c.end_date, c.address, c.longitude, c.latitude, c.valid, c.range, c.is_all, c.state, c.is_del, c.remark, c.create_by, c.create_time, c.update_by, c.update_time, g.cfg_id, pg.id as group_id, pg.group_name, pg.sub_dept_name as dept_name
from pro_mobile_attendance_config c
left join pro_mobile_attendance_config_group g on c.id=g.cfg_id
left join pro_project_info_subdepts_group pg on g.group_id=pg.id
@@ -55,8 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and c.valid=0 and date(c.end_date) >=CURRENT_DATE()
and ( c.valid!=0 or date(c.end_date) < CURRENT_DATE() )
- and c.rang = #{rang}
+ and c.range = #{range}
+ and c.is_all = #{isAll}
and c.state = #{state}
+
+ and ( (c.is_all=1 and c.valid=0 ) or g.group_id= #{groupId})
+
+
+ and ( (c.is_all=1 and c.valid=0 ) or g.group_id in (SELECT sub_dept_group from pro_project_info_subdepts_users where user_id=#{userId}) )
+