平台测 上下班记录查询 新增 登录人 机构过滤条件

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/dto/WorkDayDto.java

@@ -22,4 +22,10 @@ public class WorkDayDto {
 
     @ApiModelProperty(value = "组织id")
     private Long orgId;
+
+    @ApiModelProperty(value = "组织路径")
+    private String orgPath;
+
+    @ApiModelProperty(value = "是否关联下级机构")
+    private  Boolean checkSub;
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotDayWorkOperationMapper.java

@@ -17,5 +17,6 @@ import java.util.List;
  */
 public interface IotDayWorkOperationMapper extends BaseMapper<IotDayWorkOperation> {
 
-    List<String> selectWorkDayList(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<String> selectWorkDayList(@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("orgId") Long orgId, @Param("orgPath") String orgPath);
+
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/IotDayWorkOperationService.java

@@ -19,5 +19,5 @@ public interface IotDayWorkOperationService extends IService<IotDayWorkOperation
 
     List<IotDayWorkOperation> getIotDayWorkOperationList(Long orgId);
 
-    List<String> selectWorkDayList(Date startTime, Date endTime);
+    List<String> selectWorkDayList(Date startTime, Date endTime, Long orgId, String orgPath);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDayWorkOperationServiceImpl.java

@@ -34,7 +34,7 @@ public class IotDayWorkOperationServiceImpl extends ServiceImpl<IotDayWorkOperat
     }
 
     @Override
-    public List<String> selectWorkDayList(Date startTime, Date endTime) {
-        return baseMapper.selectWorkDayList(startTime, endTime);
+    public List<String> selectWorkDayList(Date startTime, Date endTime, Long orgId, String orgPath) {
+        return baseMapper.selectWorkDayList(startTime, endTime,orgId,orgPath);
     }
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDayWorkServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
 import com.xunmei.common.core.domain.work.domain.IotDayWork;
 import com.xunmei.common.core.domain.work.domain.IotDayWorkOperation;
@@ -27,6 +28,8 @@ import com.xunmei.iot.service.IotDayWorkOperationService;
 import com.xunmei.iot.service.IotDayWorkService;
 import com.xunmei.iot.service.IotServerInfoService;
 import com.xunmei.system.api.RemoteHostService;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +63,9 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
     @Resource
     IotServerInfoService iotServerInfoService;
 
+    @Resource
+    private RemoteOrgService orgService;
+
     @Override
     public WorkVo getRealWorkData(WorkDayDto workDayDto) {
         final SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -161,6 +167,11 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
 
     @Override
     public WorkHistoryVo getHistoryList(WorkDayDto workDayDto) {
+        final SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+        // 页面端目前没有加机构树，先默认查询登录机构以及下级机构的 记录
+        SysOrg sysOrg= orgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
+        workDayDto.setOrgPath(sysOrg.getPath());
+
         String workDate = workDayDto.getWorkDate();
         if (StringUtils.isEmpty(workDate)) {
             throw new RuntimeException("请选择日期");
@@ -171,11 +182,12 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
         Date endTime =  DateUtil.endOfMonth(parse);
 
         //获取有记录的天数
-        List<String> dates = operationService.selectWorkDayList(startTime, endTime);
+        List<String> dates = operationService.selectWorkDayList(startTime, endTime,workDayDto.getOrgId(),workDayDto.getOrgPath());
 
         //获取当天的工作记录
         QueryWrapper<IotDayWork> qw = new QueryWrapper<>();
         qw.lambda().eq(IotDayWork::getWorkDate, workDate)
+                .likeRight(IotDayWork::getOrgPath,workDayDto.getOrgPath())
                 .orderByDesc(IotDayWork::getCreateTime);
         List<IotDayWork> list = baseMapper.selectList(qw);
 

soc-modules/soc-modules-iot/src/main/resources/mapper/IotDayWorkOperationMapper.xml

@@ -4,5 +4,11 @@
 
     <select id="selectWorkDayList" resultType="java.lang.String">
         select distinct work_date from iot_day_work where create_time &gt;=#{startTime} and create_time &lt; #{endTime}
+        <if test="orgId!= null">
+            and org_id=#{request.orgId}
+        </if>
+        <if test="orgPath!= null">
+            and org_path like CONCAT(#{orgPath}, '%')
+        </if>
     </select>
 </mapper>