jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-06-27 00:32:10 +08:00
parent e589f4c11b
commit 6a0fa6d652
21 changed files with 210 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java
View File

@ -1,4 +1,4 @@
package com.yanzhu.system.api.domain;
package com.yanzhu.api.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

14
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceDataMapper.java
View File

@ -154,4 +154,18 @@ public interface SurProjectAttendanceDataMapper
* @return
*/
List<SurProjectAttendanceData> getRealAttendance(@Param("prjId") Long prjId,@Param("year") int year);
/**
* 根据项目统计今日考勤
* @param where
* @return
*/
public List<Map<String, Object>> statsAttendanceDaysByProId(SurProjectAttendanceData where);
/**
* 统计人员出勤信息
* @param where
* @return
*/
public List<Map<String, Object>> statsAttendanceViewByProId(SurProjectAttendanceData where);
}

7
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceUserMapper.java
View File

@ -190,4 +190,11 @@ public interface SurProjectAttendanceUserMapper
* @return
*/
List<SurProjectAttendanceUser> getAttendanceAlert(@Param("projectId")Long prjId, @Param("year")int year);
/**
* 统计劳务人员信息
* @param proId
* @return
*/
public List<Map<String, Object>> statsSubDeptsUsersByProId(Long proId);
}

2
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java
View File

@ -5,11 +5,11 @@ import java.util.List;
import java.util.Objects;
import com.alibaba.fastjson2.JSONArray;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.common.core.constant.CacheConstants;
import com.yanzhu.common.core.utils.SpringUtils;
import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.redis.service.RedisService;
import com.yanzhu.system.api.domain.SysDictData;
/**
* 字典工具类

3
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java
View File

@ -1,8 +1,9 @@
package com.yanzhu.system.mapper;
import java.util.List;
import com.yanzhu.api.domain.SysDictData;
import org.apache.ibatis.annotations.Param;
import com.yanzhu.system.api.domain.SysDictData;
/**
* 字典表 数据层

16
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
View File

@ -226,26 +226,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="statsAttendanceDays" parameterType="AttendanceUbiData" resultType="Map">
select u.craft_type as craftType, count(1) as total from attendance_ubi_data d
left join pro_project_info_subdepts_users u on u.user_id = d.userId
where u.id is not null and u.use_status = '0'
<if test="comId != null "> and d.comId = #{comId}</if>
<where>
<if test="projectId != null "> and d.projectId = #{projectId}</if>
<if test="subDeptId != null "> and d.sub_dept_id = #{subDeptId}</if>
<if test="subDeptGroup != null "> and d.sub_dept_group = #{subDeptGroup}</if>
<if test="params.createTime != null and params.createTime != ''"> and date(d.create_time) = #{params.createTime}</if>
and u.use_status = '0' and date(d.create_time) = CURDATE()
</where>
group by u.craft_type
</select>
<select id="statsAttendanceView" parameterType="AttendanceUbiData" resultType="Map">
select DATE_FORMAT(days.attendanceTime, '%m-%d') as attendanceTime,days.total from(
select date(d.inTime) as attendanceTime, count(1) as total from attendance_ubi_data d
where 1=0
<if test="comId != null "> and d.comId = #{comId}</if>
select date(d.create_time) as attendanceTime, count(1) as total from attendance_ubi_data d
<where>
<if test="projectId != null "> and d.projectId = #{projectId}</if>
<if test="subDeptId != null "> and d.sub_dept_id = #{subDeptId}</if>
<if test="subDeptGroup != null "> and d.sub_dept_group = #{subDeptGroup}</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(d.create_time) between #{params.beginTime} and #{params.endTime}</if>
group by date(d.inTime)
order by date(d.inTime)
</where>
group by attendanceTime
order by attendanceTime
)days
</select>

26
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml
View File

@ -664,7 +664,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getRealAttendance" resultMap="SurProjectAttendanceDataResult">
select * from sur_project_attendance_data_${year}
where date(attendance_time)=date(now()) or date(attendance_out_time)=date(now())
and is_del!=1
@ -672,4 +671,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by ifnull(attendance_time,attendance_out_time) DESC
LIMIT 4
</select>
<select id="statsAttendanceDaysByProId" parameterType="SurProjectAttendanceData" resultType="Map">
select '1' as craftType,count(1) as total from sur_project_attendance_data_${year}
where projectId=#{projectId} and specWorkType = 1 and companyTypeId != 1
UNION ALL
select '2' as craftType,count(1) as total from sur_project_attendance_data_${year}
where projectId=#{projectId} and specWorkType = 0 and companyTypeId != 1
UNION ALL
select '3' as craftType,count(1) as total from sur_project_attendance_data_${year}
where projectId=#{projectId} and companyTypeId = 1
</select>
<select id="statsAttendanceViewByProId" parameterType="SurProjectAttendanceData" resultType="Map">
select DATE_FORMAT(days.attendanceTime, '%m-%d') as attendanceTime,days.total from(
select date(d.create_time) as attendanceTime, count(1) as total from sur_project_attendance_data_${year} d
<where>
<if test="projectId != null "> and d.projectId = #{projectId}</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(d.create_time) between #{params.beginTime} and #{params.endTime}</if>
</where>
group by attendanceTime
order by attendanceTime
)days
</select>
</mapper>

20
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml
View File

@ -829,8 +829,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getAttendanceAlert" resultMap="SurProjectAttendanceUserResult">
select u.*,TIMESTAMPDIFF(Day, att.dt,now()) id
from (
select su.workerId,su.name,pi.project_name companyName, pdept.sub_dept_name teamName
@ -842,15 +840,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.is_del!=1 and su.state=0
and cfg.project_id=#{projectId} ) u
join
(
select workerId,max(ifnull(attendance_time,attendance_out_time)) dt
from sur_project_attendance_data_${year}
where projectid=#{projectId} and is_del!=1
GROUP BY workerId
order by max(ifnull(attendance_time,attendance_out_time))
) att on u.workerId=att.workerId
</select>
<select id="statsSubDeptsUsersByProId" resultType="Map">
select '1' as craftType, u.state as useStatus, count(1) as total from sur_project_attendance_user u
left join sur_project_attendance_group g on g.serverid = u.groupId
where u.cfgid=#{proId} and u.specWorkType = 1 and g.companyTypeId != 1
group by u.state
UNION ALL
select '2' as craftType, u.state as useStatus, count(1) as total from sur_project_attendance_user u
left join sur_project_attendance_group g on g.serverid = u.groupId
where u.cfgid=#{proId} and u.specWorkType = 0 and g.companyTypeId != 1
group by u.state
UNION ALL
select '3' as craftType, u.state as useStatus, count(1) as total from sur_project_attendance_user u
left join sur_project_attendance_group g on g.serverid = u.groupId
where u.cfgid=#{proId} and g.companyTypeId = 1
group by u.state
</select>
</mapper>

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
View File

@ -1,6 +1,7 @@
package com.yanzhu.manage.controller;
import com.alibaba.fastjson2.JSONObject;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.common.core.domain.R;
import com.yanzhu.common.core.enums.UseStateEnums;
import com.yanzhu.common.core.text.Convert;
@ -22,7 +23,6 @@ import com.yanzhu.common.core.enums.UserPostEnums;
import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService;
import com.yanzhu.manage.service.IUniService;
import com.yanzhu.security.utils.DictUtils;
import com.yanzhu.system.api.domain.SysDictData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

42
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java
View File

@ -1,17 +1,20 @@
package com.yanzhu.manage.controller.wechat;
import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.core.web.controller.BaseController;
import com.yanzhu.common.core.web.domain.AjaxResult;
import com.yanzhu.common.redis.service.RedisService;
import com.yanzhu.manage.domain.AttendanceCfg;
import com.yanzhu.manage.domain.AttendanceUbiData;
import com.yanzhu.manage.service.IAttendanceUbiDataService;
import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService;
import com.yanzhu.manage.domain.SurProjectAttendanceData;
import com.yanzhu.manage.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -30,9 +33,18 @@ public class WXAttendanceController extends BaseController {
@Autowired
private RedisService redisService;
@Autowired
private IAttendanceCfgService attendanceCfgService;
@Autowired
private IAttendanceUbiDataService attendanceUbiDataService;
@Autowired
private ISurProjectAttendanceUserService surProjectAttendanceUserService;
@Autowired
private ISurProjectAttendanceDataService surProjectAttendanceDataService;
@Autowired
private IProProjectInfoSubdeptsUsersService proProjectInfoSubdeptsUsersService;
@ -43,8 +55,16 @@ public class WXAttendanceController extends BaseController {
*/
@GetMapping("/v1/findSubDeptsUsers/{proId}")
public AjaxResult findSubDeptsUsers(@PathVariable("proId") Long proId){
AttendanceCfg attendanceCfgQuery = new AttendanceCfg();
attendanceCfgQuery.setProjectId(proId);
List<AttendanceCfg> cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery);
if(cfgList.size()>0 && (StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"uni") || StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"jgw"))){
List<Map<String, Object>> list = proProjectInfoSubdeptsUsersService.statsSubDeptsUsersByProId(proId);
return AjaxResult.success(list);
}else{
List<Map<String, Object>> list = surProjectAttendanceUserService.statsSubDeptsUsersByProId(cfgList.size()>0?cfgList.get(0).getId():0);
return AjaxResult.success(list);
}
}
/**
@ -54,8 +74,16 @@ public class WXAttendanceController extends BaseController {
*/
@GetMapping("/v1/findDaysAttendanceView/{proId}")
public AjaxResult findDaysAttendanceView(@PathVariable("proId") Long proId){
AttendanceCfg attendanceCfgQuery = new AttendanceCfg();
attendanceCfgQuery.setProjectId(proId);
List<AttendanceCfg> cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery);
if(cfgList.size()>0 && (StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"uni") || StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"jgw"))){
List<Map<String, Object>> list = attendanceUbiDataService.statsAttendanceDaysByProId(proId);
return AjaxResult.success(list);
}else{
List<Map<String, Object>> list = surProjectAttendanceDataService.statsAttendanceDaysByProId(proId);
return AjaxResult.success(list);
}
}
/**
@ -65,7 +93,15 @@ public class WXAttendanceController extends BaseController {
*/
@GetMapping("/v1/findSubDeptsAttendanceView/{proId}")
public AjaxResult findSubDeptsAttendanceView(@PathVariable("proId") Long proId){
List<Map<String, Object>> list = attendanceUbiDataService.statsAttendanceViewByProId(proId);
List<Map<String, Object>> list = new ArrayList<>();
AttendanceCfg attendanceCfgQuery = new AttendanceCfg();
attendanceCfgQuery.setProjectId(proId);
List<AttendanceCfg> cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery);
if(cfgList.size()>0 && (StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"uni") || StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"jgw"))){
list = attendanceUbiDataService.statsAttendanceViewByProId(proId);
}else{
list = surProjectAttendanceDataService.statsAttendanceViewByProId(proId);
}
Map<String, Object> data = new HashMap<>();
data.put("list",list);
data.put("user",list.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum());

14
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceDataService.java
View File

@ -157,4 +157,18 @@ public interface ISurProjectAttendanceDataService
* @return
*/
List<SurProjectAttendanceData> getRealAttendance(Long prjId, int year);
/**
* 统计今日出勤信息
* @param proId
* @return
*/
public List<Map<String, Object>> statsAttendanceDaysByProId(Long proId);
/**
* 统计人员出勤信息
* @param proId
* @return
*/
public List<Map<String, Object>> statsAttendanceViewByProId(Long proId);
}

7
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceUserService.java
View File

@ -183,4 +183,11 @@ public interface ISurProjectAttendanceUserService
* @return
*/
List<SurProjectAttendanceUser> getAttendanceAlert(Long prjId, int year);
/**
* 统计劳务人员信息
* @param proId
* @return
*/
public List<Map<String, Object>> statsSubDeptsUsersByProId(Long proId);
}

12
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
View File

@ -1,28 +1,28 @@
package com.yanzhu.manage.service.impl;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.common.core.context.SecurityContextHolder;
import com.yanzhu.common.core.enums.ShiFouEnums;
import com.yanzhu.common.core.enums.SubDeptsEnums;
import com.yanzhu.common.core.enums.UserPostEnums;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.manage.domain.AttendanceUbiData;
import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers;
import com.yanzhu.common.core.enums.SubDeptsEnums;
import com.yanzhu.common.core.enums.UserPostEnums;
import com.yanzhu.manage.mapper.AttendanceUbiDataMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper;
import com.yanzhu.manage.service.IAttendanceUbiDataService;
import com.yanzhu.system.api.domain.SysDictData;
import com.yanzhu.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* 考勤管理Service业务层处理
*

30
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java
View File

@ -331,6 +331,36 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
return surProjectAttendanceDataMapper.getRealAttendance(prjId,year);
}
/**
* 统计今日出勤信息
* @param proId
* @return
*/
@Override
public List<Map<String, Object>> statsAttendanceDaysByProId(Long proId){
SurProjectAttendanceData query = new SurProjectAttendanceData();
query.setProjectId(proId);
return surProjectAttendanceDataMapper.statsAttendanceDaysByProId(query);
}
/**
* 统计人员出勤信息
* @param proId
* @return
*/
public List<Map<String, Object>> statsAttendanceViewByProId(Long proId){
SurProjectAttendanceData query = new SurProjectAttendanceData();
query.setProjectId(proId);
Map<String, Object> params = new HashMap<>();
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -1);
params.put("beginTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD));
calendar.add(Calendar.DAY_OF_MONTH, -6);
params.put("endTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD));
query.setParams(params);
return surProjectAttendanceDataMapper.statsAttendanceViewByProId(query);
}
public static void main(String[] args) {
Date dateEnd=new DateTime();
Date dateStart=DateUtil.offsetDay(dateEnd,-7);

9
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceUserServiceImpl.java
View File

@ -381,6 +381,15 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc
return surProjectAttendanceUserMapper.getAttendanceAlert(prjId,year);
}
/**
* 统计劳务人员信息
* @param proId
* @return
*/
public List<Map<String, Object>> statsSubDeptsUsersByProId(Long proId){
return surProjectAttendanceUserMapper.statsSubDeptsUsersByProId(proId);
}
private Date findDate(List<SurProjectAttendanceUser> datas, SurProjectAttendanceUser u, String type) {
for (SurProjectAttendanceUser user:datas) {
if(user.getWorkerId().equals(u.getWorkerId()) && user.getName().equals(type)){

3
yanzhu-modules/yanzhu-manage/src/main/java/net/hasor/dataway/service/InterfaceUiFilter.java
View File

@ -14,9 +14,8 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.yanzhu.system.api.domain.SysDictData;
import com.yanzhu.api.domain.SysDictData;
import net.hasor.dataway.config.DatawayUtils;
import net.hasor.utils.ResourcesUtils;
import net.hasor.utils.StringUtils;
import net.hasor.utils.io.FilenameUtils;
import net.hasor.utils.io.IOUtils;

22
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDictDataController.java
View File

@ -1,18 +1,6 @@
package com.yanzhu.system.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.core.utils.poi.ExcelUtil;
import com.yanzhu.common.core.web.controller.BaseController;
@ -22,9 +10,15 @@ import com.yanzhu.common.log.annotation.Log;
import com.yanzhu.common.log.enums.BusinessType;
import com.yanzhu.common.security.annotation.RequiresPermissions;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.system.api.domain.SysDictData;
import com.yanzhu.system.service.ISysDictDataService;
import com.yanzhu.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
* 数据字典信息

3
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictDataService.java
View File

@ -1,7 +1,8 @@
package com.yanzhu.system.service;
import com.yanzhu.api.domain.SysDictData;
import java.util.List;
import com.yanzhu.system.api.domain.SysDictData;
/**
* 字典 业务层

5
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictTypeService.java
View File

@ -1,9 +1,10 @@
package com.yanzhu.system.service;
import java.util.List;
import com.yanzhu.system.api.domain.SysDictData;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.system.api.domain.SysDictType;
import java.util.List;
/**
* 字典 业务层
*

8
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java
View File

@ -1,13 +1,13 @@
package com.yanzhu.system.service.impl;
import java.util.List;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.security.utils.DictUtils;
import com.yanzhu.system.mapper.SysDictDataMapper;
import com.yanzhu.system.service.ISysDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yanzhu.system.api.domain.SysDictData;
import com.yanzhu.system.service.ISysDictDataService;
import java.util.List;
/**
* 字典 业务层处理

2
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -1,10 +1,10 @@
package com.yanzhu.system.service.impl;
import com.yanzhu.api.domain.SysDictData;
import com.yanzhu.common.core.constant.UserConstants;
import com.yanzhu.common.core.exception.ServiceException;
import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.security.utils.DictUtils;
import com.yanzhu.system.api.domain.SysDictData;
import com.yanzhu.system.api.domain.SysDictType;
import com.yanzhu.system.mapper.SysDictDataMapper;
import com.yanzhu.system.mapper.SysDictTypeMapper;