From c281a11886ace1d43cd88d21dea9e9250cca9bc5 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 27 Sep 2023 00:37:24 +0800 Subject: [PATCH] update code --- .../ProjectAttendanceController.java | 17 +++++++++-- .../domain/SurProjectAttendanceData.java | 28 +++++++++++++++++++ .../SurProjectAttendanceDataMapper.java | 2 ++ .../ISurProjectAttendanceDataService.java | 2 ++ .../SurProjectAttendanceDataServiceImpl.java | 5 ++++ .../SurProjectAttendanceDataMapper.xml | 23 ++++++++++++++- 6 files changed, 73 insertions(+), 4 deletions(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java index f3128588..77c6940a 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java @@ -1,20 +1,22 @@ package com.yanzhu.jh.bigscreen.web.controller; 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.text.Convert; 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.SurProjectDeptWroks; import com.yanzhu.jh.project.domain.SurProjectWorkAttendance; +import com.yanzhu.jh.project.service.ISurProjectAttendanceDataService; import com.yanzhu.jh.project.service.ISurProjectDeptWroksService; import com.yanzhu.jh.project.service.ISurProjectWorkAttendanceService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * 在岗出勤Conller @@ -29,6 +31,9 @@ public class ProjectAttendanceController extends BaseController { @Autowired ISurProjectDeptWroksService surProjectDeptWroksService; + @Autowired + ISurProjectAttendanceDataService attendanceDataService; + /** * 查询在岗人数 * @param deptId @@ -70,4 +75,10 @@ public class ProjectAttendanceController extends BaseController { } return getDataTable(surProjectWorkAttendanceService.selectBgscreenWorkAttendanceList(surProjectWorkAttendance)); } + + @PostMapping("/groupByComany") + public AjaxResult groupByComany(@RequestBody SurProjectAttendanceData where){ + List list=attendanceDataService.groupByComany(where); + return AjaxResult.success(list); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java index 8dd33ad3..c8a0cd33 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java @@ -91,6 +91,34 @@ public class SurProjectAttendanceData extends BaseEntity @Excel(name = "") private Long isDel; + private Long projectId; + private Long subDeptId; + private String companyTypeId; + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getSubDeptId() { + return subDeptId; + } + + public void setSubDeptId(Long subDeptId) { + this.subDeptId = subDeptId; + } + + public String getCompanyTypeId() { + return companyTypeId; + } + + public void setCompanyTypeId(String companyTypeId) { + this.companyTypeId = companyTypeId; + } + public static SurProjectAttendanceData create(JSONObject json) { SurProjectAttendanceData d=new SurProjectAttendanceData(); d.attendanceTime=json.getString("time"); 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 fd6f9e22..76e1e7ca 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 @@ -60,4 +60,6 @@ public interface SurProjectAttendanceDataMapper public int deleteSurProjectAttendanceDataByIds(Long[] ids); public long getLastServerId(SurProjectAttendanceData where); + + List groupByComany(SurProjectAttendanceData 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 d9a66567..02cf286e 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 @@ -62,4 +62,6 @@ public interface ISurProjectAttendanceDataService public void add(SurProjectAttendanceData sdata); public long getLastServerId(SurProjectAttendanceData where); + + public List groupByComany(SurProjectAttendanceData 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 396b6038..6f4d2fb0 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 @@ -116,4 +116,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc public long getLastServerId(SurProjectAttendanceData where) { return surProjectAttendanceDataMapper.getLastServerId(where); } + + @Override + public List groupByComany(SurProjectAttendanceData where) { + return surProjectAttendanceDataMapper.groupByComany(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 698bb333..682f6cfa 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -29,10 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select id, cfgid, vendors_code, serverid, workerId, attendance_type, attendance_time, identification, teamId, workTypeCode, companyId, vendorId, projectType, device_code, work_point_id, scanPhoto, other, state, remark, is_del, create_by, create_time, update_by, update_time from sur_project_attendance_data + select * FROM + ( + select a.*,b.project_id,b.sub_dept_id,c.companyTypeId + from sur_project_attendance_data a,sur_project_attendance_cfg b,sur_project_attendance_group c + where a.cfgid=b.id and a.companyId=c.companyId + ) + sur_project_attendance_data SELECT IF(MAX(serverid),MAX(serverid),0) serverid FROM sur_project_attendance_data WHERE cfgid=#{cfgid} + \ No newline at end of file