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

提交代码

dev_xd
姜玉琦 2025-06-28 10:35:31 +08:00
parent 2c11fb72cb
commit 144d79083c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,10 +674,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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 and date(create_time) = CURDATE()
where projectId=#{projectId} and specWorkType = 1 and companyTypeId in (4,5) and date(create_time) = CURDATE()
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 and date(create_time) = CURDATE()
where projectId=#{projectId} and specWorkType = 0 and companyTypeId in (4,5) and date(create_time) = CURDATE()
UNION ALL
select '3' as craftType,count(1) as total from sur_project_attendance_data_${year}
where projectId=#{projectId} and companyTypeId = 1 and date(create_time) = CURDATE()

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

@ -852,12 +852,12 @@ and cfg.project_id=#{projectId} ) u
<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
where u.cfgid=#{proId} and u.specWorkType = 1 and g.companyTypeId in (4,5)
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
where u.cfgid=#{proId} and u.specWorkType = 0 and g.companyTypeId in (4,5)
group by u.state
UNION ALL
select '3' as craftType, u.state as useStatus, count(1) as total from sur_project_attendance_user u

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java
View File

@ -24,7 +24,7 @@ public class LabourGroupReqVo {
/** 分包商类型不能为空 */
@NotBlank(message = "分包商类型不能为空")
@Pattern(regexp = "1|2|3|4|5|6|7|8", message = "分包商类型错误，1总包|2劳务分包|8监理")
@Pattern(regexp = "0|1|2|4|5|6|7|8|9|10|11|99", message = "分包商类型错误，0:建设单位;1:施工单位;10:设计单位;11:设备分包;2:监理单位;4:劳务分包;5:专业分包;6:材料分包;7:后勤分包;8:特殊设备;9:勘探单位;99:其他单位")
private String companyTypeId;
private String bizLicense;