diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java index 4f70730a..587e345d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java @@ -542,10 +542,10 @@ public class LabourApiController extends BaseController { throw new ServiceException("人员部门类型信息不完整",HttpStatusEnum.DARA_EXCEPTION.getCode()); } //进出门逻辑判断 - if(Objects.equals("L",surProjectAttendanceData.getAttendanceType())){ - surProjectAttendanceData.setAttendanceOutTime(labourDataVo.getAttendanceTime()); - surProjectAttendanceData.setAttendanceTime(null); - } + //if(Objects.equals("L",surProjectAttendanceData.getAttendanceType())){ + //surProjectAttendanceData.setAttendanceOutTime(labourDataVo.getAttendanceTime()); + surProjectAttendanceData.setAttendanceTime(labourDataVo.getAttendanceTime()); + //} surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId()); surProjectAttendanceData.setAppId(sysApplyConfig.getAppId()); surProjectAttendanceData.setProjectId(sysApplyConfig.getProjectId()); @@ -693,10 +693,10 @@ public class LabourApiController extends BaseController { throw new ServiceException("人员部门类型信息不完整",HttpStatusEnum.DARA_EXCEPTION.getCode()); } //进出门逻辑判断 - if(Objects.equals("L",surProjectAttendanceData.getAttendanceType())){ - surProjectAttendanceData.setAttendanceOutTime(surProjectAttendanceData.getAttendanceTime()); - surProjectAttendanceData.setAttendanceTime(null); - } + //if(Objects.equals("L",surProjectAttendanceData.getAttendanceType())){ + //surProjectAttendanceData.setAttendanceOutTime(surProjectAttendanceData.getAttendanceTime()); + surProjectAttendanceData.setAttendanceTime(surProjectAttendanceData.getAttendanceTime()); + //} surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId()); surProjectAttendanceData.setAppId(sysApplyConfig.getAppId()); surProjectAttendanceData.setProjectId(sysApplyConfig.getProjectId()); diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAttendanceController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAttendanceController.java new file mode 100644 index 00000000..6f8b7875 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAttendanceController.java @@ -0,0 +1,176 @@ +package com.ruoyi.web.project.controller; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.project.domain.SurProjectAttendanceData; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUser; +import com.yanzhu.jh.project.service.ISurProjectAttendanceDataService; +import com.yanzhu.jh.project.service.ISurProjectAttendanceUserService; +import com.yanzhu.jh.project.service.ISurProjectDeptWroksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; +import java.util.concurrent.TimeUnit; + +/** + * @version : V1.0 + * @ClassName: ProjectDeptWroksController + * @Description: 在岗人员 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/attendance") +public class ProjectAttendanceController extends BaseController { + + @Autowired + private RedisCache redisCache; + + @Autowired + private ISurProjectDeptWroksService surProjectDeptWroksService; + + @Autowired + private ISurProjectAttendanceDataService attendanceDataService; + + @Autowired + private ISurProjectAttendanceUserService attendanceUserService; + + /** + * 根据项目分组查询统计 + * @param projectId + * @return + */ + @GetMapping("/findSumByProjectId") + public AjaxResult findSumByProjectId(Long projectId){ + return success(surProjectDeptWroksService.findSumByProjectId(projectId)); + } + + /** + * 统计劳务人员信息 + * @param where + * @return + */ + @PostMapping("/v1/groupAllByParams") + public AjaxResult groupAllByParams(@RequestBody SurProjectAttendanceData where){ + String key="WECHAT_ATTENDANCE-groupAllByParams-"+where.getProjectId(); + Object obj = redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List> list = attendanceDataService.groupAllByParams(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE*2, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + + /** + * 统计劳务人员信息 + * @param where + * @return + */ + @PostMapping("/v1/findGroupAllByDays") + public AjaxResult findGroupAllByDays(@RequestBody SurProjectAttendanceData where){ + String key="WECHAT_ATTENDANCE-findGroupAllByDays-"+where.getProjectId(); + Object obj = redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List> users = attendanceUserService.findUserAllByDays(where.getProjectId()); + Calendar calendar = Calendar.getInstance(); + where.setAttendanceOutTime(DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD)); + calendar.add(Calendar.DAY_OF_MONTH, -7); + where.setAttendanceTime(DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD)); + List> list = attendanceDataService.findGroupAllByDays(where); + Map data = new HashMap<>(); + data.put("list",list); + data.put("user",users.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum()); + redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE*2, TimeUnit.MINUTES); + return AjaxResult.success(data); + } + + /** + * 统计劳务人员信息 + * @param where + * @return + */ + @PostMapping("/v1/groupUserByParams") + public AjaxResult groupUserByParams(@RequestBody SurProjectAttendanceUser where){ + String key="WECHAT_ATTENDANCE-groupDataByParams-"+where.getProjectId()+"-"+where.getName(); + Object obj = redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List> list = attendanceUserService.groupUserByParams(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE*2, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + + /** + * 劳务人员详情 + * @param id + * @return + */ + @GetMapping("/v1/attendanceUser/{id}") + public AjaxResult attendanceUserList(@PathVariable("id") Long id){ + SurProjectAttendanceUser where = new SurProjectAttendanceUser(); + where.setId(id); + List list=attendanceUserService.attendanceUserList(where); + if(StringUtils.isNotEmpty(list)){ + return success(list.get(0)); + }else{ + return error(); + } + } + + /** + * 劳务人员列表 + * @param where + * @return + */ + @GetMapping("/v1/attendanceUserList") + public TableDataInfo attendanceUserList(SurProjectAttendanceUser where){ + startPage(); + List list=attendanceUserService.attendanceUserList(where); + return getDataTable(list); + } + + /** + * 统计劳务人员信息 + * @param where + * @return + */ + @PostMapping("/v1/groupDataByParams") + public AjaxResult groupDataByParams(@RequestBody SurProjectAttendanceData where){ + if(StringUtils.isEmpty(where.getWorkerId()) && StringUtils.isEmpty(where.getWorkerName()) && StringUtils.isEmpty(where.getAttendanceTime())){ + where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); + } + String key="WECHAT_ATTENDANCE-groupDataByParams-"+where.getProjectId()+"-"+where.getWorkerName()+"-"+where.getAttendanceTime(); + Object obj = redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List> list = attendanceDataService.groupDataByParams(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE*2, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + + /** + * 出勤数据列表 + */ + @GetMapping("/v1/attendanceDataList") + public TableDataInfo attendanceDataList(SurProjectAttendanceData where){ + startPage(); + if(StringUtils.isEmpty(where.getWorkerId()) && StringUtils.isEmpty(where.getWorkerName()) && StringUtils.isEmpty(where.getAttendanceTime())){ + where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); + } + List list = attendanceDataService.attendanceDataList(where); + return getDataTable(list); + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDeptWroksController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDeptWroksController.java deleted file mode 100644 index fa102450..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDeptWroksController.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.ruoyi.web.project.controller; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.yanzhu.jh.project.domain.SurProjectDeptWroks; -import com.yanzhu.jh.project.service.ISurProjectDeptWroksService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @version : V1.0 - * @ClassName: ProjectDeptWroksController - * @Description: 在岗人员 - * @Auther: JiangYuQi - * @Date: 2020/7/7 18:03 - */ -@RestController -@RequestMapping("/wechat/projectDeptWroks") -public class ProjectDeptWroksController extends BaseController { - - @Autowired - private ISurProjectDeptWroksService surProjectDeptWroksService; - - /** - * 查询项目在岗人员列表 - * @param surProjectDeptWroks - * @return - */ - @GetMapping("/list") - public AjaxResult list(SurProjectDeptWroks surProjectDeptWroks){ - if(surProjectDeptWroks.getDeptId()==0){ - surProjectDeptWroks.setDeptId(null); - } - return success(surProjectDeptWroksService.selectSurProjectDeptWroksList(surProjectDeptWroks)); - } - - /** - * 查询在岗人员详情 - * @param id - * @return - */ - @GetMapping("/info") - public AjaxResult info(Long id){ - return success(surProjectDeptWroksService.selectSurProjectDeptWroksById(id)); - } - - /** - * 新增在岗人员 - * @param surProjectDeptWroks - * @return - */ - @PostMapping("/add") - @Log(title = "在岗人员", businessType = BusinessType.INSERT) - public AjaxResult add(@RequestBody SurProjectDeptWroks surProjectDeptWroks){ - return success(surProjectDeptWroksService.deleteInsertProjectDeptWroks(surProjectDeptWroks)); - } - - /** - * 删除在岗人员 - */ - @Log(title = "在岗人员", businessType = BusinessType.DELETE) - @GetMapping("/remove") - public AjaxResult remove(@RequestParam Long id) - { - return toAjax(surProjectDeptWroksService.deleteSurProjectDeptWroksById(id)); - } - - /** - * 根据项目分组查询统计 - * @param projectId - * @return - */ - @GetMapping("/findSumByProjectId") - public AjaxResult findSumByProjectId(Long projectId){ - return success(surProjectDeptWroksService.findSumByProjectId(projectId)); - } - -} diff --git a/ruoyi-wechat/src/main/resources/application-druid.yml b/ruoyi-wechat/src/main/resources/application-druid.yml index 982a407b..a6bd9ab4 100644 --- a/ruoyi-wechat/src/main/resources/application-druid.yml +++ b/ruoyi-wechat/src/main/resources/application-druid.yml @@ -51,7 +51,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root password: Sxyanzhu@cf # 从库数据源 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java index d892fb92..f95c98ab 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java @@ -48,7 +48,6 @@ public class SurProjectController extends BaseController @GetMapping("/list") public TableDataInfo list(SurProject surProject) { - surProject.setNowRole(Convert.toStr(getUserFirstRole())); if(SysRoleEnum.ZGS.getCode().equals(surProject.getNowRole())){ surProject.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java index aed53fc2..94aad3cd 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java @@ -1,11 +1,11 @@ package com.yanzhu.jh.project.mapper; -import java.util.List; -import java.util.Map; - import com.yanzhu.jh.project.domain.SurProjectAttendanceData; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + /** * 劳务实名制管理Mapper接口 * @@ -103,5 +103,33 @@ public interface SurProjectAttendanceDataMapper public List todayAttendance(SurProjectAttendanceData where); + /** + * 统计人员数据 + * @param where + * @return + */ + public List> findGroupAllByDays(SurProjectAttendanceData where); + + /** + * 统计所有数据 + * @param where + * @return + */ + public List> findGroupAllByParams(SurProjectAttendanceData where); + + /** + * 统计考勤数据 + * @param where + * @return + */ + public List> groupDataByParams(SurProjectAttendanceData where); + + /** + * 考勤数据列表 + * @param where + * @return + */ + public List attendanceDataList(SurProjectAttendanceData where); + public List groupTodayCompanyTypeId(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java index fe31950c..7e00f957 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java @@ -126,6 +126,27 @@ public interface SurProjectAttendanceUserMapper */ List queryWorkerOnDuty(SurProjectAttendanceUser where); + /** + * 统计人员数据 + * @param where + * @return + */ + public List> groupUserByParams(SurProjectAttendanceUser where); + + /** + * 在岗工人查询 + * @param where + * @return + */ + public List attendanceUserList(SurProjectAttendanceUser where); + + /** + * 统计人员数据 + * @param projectId + * @return + */ + public List> findUserAllByDays(Long projectId); + /** * 按部门汇总在岗人数 * @param where diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java index 572e4eb9..7cd7393a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java @@ -1,11 +1,10 @@ package com.yanzhu.jh.project.service; +import com.yanzhu.jh.project.domain.SurProjectAttendanceData; + import java.util.List; import java.util.Map; -import com.yanzhu.jh.project.domain.SurProjectAttendanceData; -import com.yanzhu.jh.project.domain.SurProjectAttendanceUser; - /** * 劳务实名制管理Service接口 * @@ -104,6 +103,34 @@ public interface ISurProjectAttendanceDataService List todayAttendance(SurProjectAttendanceData where); + /** + * 统计所有数据 + * @param where + * @return + */ + public List> groupAllByParams(SurProjectAttendanceData where); + + /** + * 统计人员数据 + * @param where + * @return + */ + public List> findGroupAllByDays(SurProjectAttendanceData where); + + /** + * 考勤数据列表 + * @param where + * @return + */ + public List attendanceDataList(SurProjectAttendanceData where); + + /** + * 统计考勤数据 + * @param where + * @return + */ + public List> groupDataByParams(SurProjectAttendanceData where); + List groupTodayCompanyTypeId(SurProjectAttendanceData where); /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java index 2cf44efb..0a649c24 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java @@ -1,12 +1,11 @@ package com.yanzhu.jh.project.service; +import com.yanzhu.jh.project.domain.SurProjectAttendanceData; +import com.yanzhu.jh.project.domain.SurProjectAttendanceUser; + import java.util.List; import java.util.Map; -import com.yanzhu.jh.project.domain.SurProjectAttendanceCfg; -import com.yanzhu.jh.project.domain.SurProjectAttendanceData; -import com.yanzhu.jh.project.domain.SurProjectAttendanceUser; - /** * 考勤人员基本属性Service接口 * @@ -119,6 +118,27 @@ public interface ISurProjectAttendanceUserService */ public List queryWorkerOnDuty(SurProjectAttendanceUser where); + /** + * 统计人员数据 + * @param where + * @return + */ + public List> groupUserByParams(SurProjectAttendanceUser where); + + /** + * 在岗工人查询 + * @param where + * @return + */ + public List attendanceUserList(SurProjectAttendanceUser where); + + /** + * 统计人员数据 + * @param projectId + * @return + */ + public List> findUserAllByDays(Long projectId); + /** * 按部门汇总在岗人数 * @param where diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index 7880031d..f52bd972 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -350,6 +350,46 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc return surProjectAttendanceDataMapper.todayAttendance(where); } + /** + * 统计所有数据 + * @param where + * @return + */ + @Override + public List> groupAllByParams(SurProjectAttendanceData where) { + return surProjectAttendanceDataMapper.findGroupAllByParams(where); + } + + /** + * 统计人员数据 + * @param where + * @return + */ + @Override + public List> findGroupAllByDays(SurProjectAttendanceData where){ + return surProjectAttendanceDataMapper.findGroupAllByDays(where); + } + + /** + * 统计考勤数据 + * @param where + * @return + */ + @Override + public List> groupDataByParams(SurProjectAttendanceData where){ + return surProjectAttendanceDataMapper.groupDataByParams(where); + } + + /** + * 考勤数据列表 + * @param where + * @return + */ + @Override + public List attendanceDataList(SurProjectAttendanceData where) { + return surProjectAttendanceDataMapper.attendanceDataList(where); + } + @Override public List groupTodayCompanyTypeId(SurProjectAttendanceData where) { return surProjectAttendanceDataMapper.groupTodayCompanyTypeId(where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java index 8f5cde9c..823526e5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java @@ -237,6 +237,35 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc return surProjectAttendanceUserMapper.queryWorkerOnDuty(where); } + /** + * 统计人员数据 + * @param where + * @return + */ + public List> groupUserByParams(SurProjectAttendanceUser where){ + return surProjectAttendanceUserMapper.groupUserByParams(where); + } + + /** + * 在岗工人查询 + * @param where + * @return + */ + @Override + public List attendanceUserList(SurProjectAttendanceUser where){ + return surProjectAttendanceUserMapper.attendanceUserList(where); + } + + /** + * 统计人员数据 + * @param projectId + * @return + */ + @Override + public List> findUserAllByDays(Long projectId){ + return surProjectAttendanceUserMapper.findUserAllByDays(projectId); + } + /** * 按部门汇总在岗人数 * @param where diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index f4872092..6910ddfd 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -368,7 +368,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sp.projectType = #{proType} and c.project_id in - #{item} @@ -436,11 +435,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date(ady.attendance_time) =date(#{attendanceTime}) + + + + + + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml index b07e30b9..76a32eaf 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml @@ -651,7 +651,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName, b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp - WHERE u.cfgid=b.id and u.state=0 and u.companyId=g.companyId and sp.isDel=0 and sp.progressVisible=0 and b.project_id = sp.id + WHERE u.cfgid=b.id and u.state=0 and u.companyId=g.companyId and sp.isDel=0 and b.project_id = sp.id and g.companyTypeId in (1,6) @@ -674,14 +674,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + + + + + + \ No newline at end of file