From 0703ac1fa3f23813bfe36c7e29930baed1ca22b7 Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 7 May 2024 22:38:42 +0800 Subject: [PATCH 1/5] update code --- .../ProjectAttendanceController.java | 47 +++++++++++++++- .../SurProjectAttendanceUserMapper.java | 15 +++++- .../ISurProjectAttendanceUserService.java | 14 ++++- .../SurProjectAttendanceUserServiceImpl.java | 20 ++++++- .../SurProjectAttendanceUserMapper.xml | 54 +++++++++++++++++++ 5 files changed, 146 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 0fa26b11..37addbbc 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 @@ -193,7 +193,7 @@ public class ProjectAttendanceController extends BaseController { * @return */ @GetMapping("/groupByWorkerOnDuty") - public AjaxResult groupByWorkerOnDuty(SurProjectAttendanceData where){ + public AjaxResult groupByWorkerOnDuty(SurProjectAttendanceUser where){ Long deptId= where.getDeptId(); if(deptId==null || deptId<=0){ if (SecurityUtils.isUserB()) { @@ -210,6 +210,51 @@ public class ProjectAttendanceController extends BaseController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + + + /** + * 在岗|离岗工人查询 + * @param where + * @return + */ + @GetMapping("/queryWorkerByState") + public TableDataInfo queryWorkerByState(SurProjectAttendanceUser where){ + Long deptId= where.getDeptId(); + if(deptId==null || deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + startPage(); + List list=attendanceUserService.queryWorkerByState(where); + return getDataTable(list); + } + /** + * 按部门汇总在岗|离岗人数 + * @param where + * @return + */ + @GetMapping("/groupByWorkerState") + public AjaxResult groupByWorkerState(SurProjectAttendanceUser where){ + Long deptId= where.getDeptId(); + if(deptId==null || deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + String key="bgscreen_attendance_groupByWorkerState-"+where.getDeptId()+where.getState()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + + List list=attendanceUserService.groupByWorkerByDept(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } /** * 今日出勤详情 */ 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..3629c6eb 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 @@ -131,5 +131,18 @@ public interface SurProjectAttendanceUserMapper * @param where * @return */ - List groupByWorkerOnDutyByDept(SurProjectAttendanceData where); + List groupByWorkerOnDutyByDept(SurProjectAttendanceUser where); + /** + * 按部门汇总在岗|离岗人数 + * @param where + * @return + */ + List groupByWorkerByDept(SurProjectAttendanceUser where); + /** + * 在岗|离岗工人查询 + * @param where + * @return + */ + List queryWorkerByState(SurProjectAttendanceUser 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..eb9653a0 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 @@ -124,7 +124,19 @@ public interface ISurProjectAttendanceUserService * @param where * @return */ - List groupByWorkerOnDutyByDept(SurProjectAttendanceData where); + List groupByWorkerOnDutyByDept(SurProjectAttendanceUser where); List querySurProjectAttendanceUserList(SurProjectAttendanceUser surProjectAttendanceUser); + /** + * 按部门汇总在岗|离岗人数 + * @param where + * @return + */ + List groupByWorkerByDept(SurProjectAttendanceUser where); + /** + * 在岗|离岗工人查询 + * @param where + * @return + */ + List queryWorkerByState(SurProjectAttendanceUser 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..d6cc7ac2 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 @@ -243,7 +243,7 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc * @return */ @Override - public List groupByWorkerOnDutyByDept(SurProjectAttendanceData where) { + public List groupByWorkerOnDutyByDept(SurProjectAttendanceUser where) { return surProjectAttendanceUserMapper.groupByWorkerOnDutyByDept(where); } @@ -251,6 +251,24 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc public List querySurProjectAttendanceUserList(SurProjectAttendanceUser surProjectAttendanceUser) { return surProjectAttendanceUserMapper.querySurProjectAttendanceUserList(surProjectAttendanceUser); } + /** + * 按部门汇总在岗|离岗人数 + * @param where + * @return + */ + @Override + public List groupByWorkerByDept(SurProjectAttendanceUser where) { + return surProjectAttendanceUserMapper.groupByWorkerByDept(where); + } + /** + * 在岗|离岗工人查询 + * @param where + * @return + */ + @Override + public List queryWorkerByState(SurProjectAttendanceUser where) { + return surProjectAttendanceUserMapper.queryWorkerByState(where); + } private Date findDate(List datas, SurProjectAttendanceUser u, String type) { for (SurProjectAttendanceUser user:datas) { diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml index b07e30b9..100d8301 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml @@ -697,4 +697,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by p.id + + + \ No newline at end of file From 71bca5dfedd9c214aa390d60997cc80f5f06ba01 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 8 May 2024 00:09:51 +0800 Subject: [PATCH 2/5] update code --- .../web/controller/ProblemmodifyController.java | 9 +++------ .../main/resources/mapper/flow/FlowLabourInfoMapper.xml | 4 ++-- .../mapper/trouble/SmzSspProblemmodifyMapper.xml | 9 +++++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java index b391a57c..1caa854e 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java @@ -220,11 +220,7 @@ public class ProblemmodifyController extends BaseController { where.setPrjIds(getProjectIds()); } } - String key="problemmodify_getMonitAndWarning-"+deptId+"_"+projectId+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); - Object obj=redisCache.getCacheObject(key); - if(obj!=null){ - return AjaxResult.success(obj); - } + where.setDeptId(deptId); where.setProjectId(projectId); @@ -239,8 +235,9 @@ public class ProblemmodifyController extends BaseController { //map.put("week",smzSspProblemmodifyService.countByDateRange(where)); map.put("week",smzSspProblemmodifyService.countByDateRangeNew(where)); //各类型整改、未整改数量统计 + where.setEndDate(new Date()); + where.setStartDate(DateUtils.addDays(new Date(),-30)); map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckStateNew(where)); - redisCache.setCacheObject(key, map, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(map); } diff --git a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml index daf86bde..87d6f697 100644 --- a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml @@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fl.is_del=0 - and fl.project_id = #{projectId} + and fl.project_id = #{projectId} and fl.project_name like concat('%', #{projectName}, '%') - and fl.dept_id = #{deptId} + and fl.dept_id = #{deptId} and fl.dept_name like concat('%', #{deptName}, '%') and fl.sub_dept_id = #{subDeptId} and fl.sub_dept_name like concat('%', #{subDeptName}, '%') diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index 03d5e467..ba233a7a 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -696,6 +696,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM smz_ssp_problemmodify p left join sur_project sp on p.projectId=sp.id WHERE p.isDel=0 and sp.isDel=0 + =Date(#{startDate}) and Date(p.createTime)<=Date(#{endDate}) + ]]> and p.projectId=#{projectId} AND sp.deptid = #{deptId} and sp.projectType = #{proType} @@ -710,6 +713,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select '96' as infotype,'4' as checkState,count(1) as total from dev_ai_project_data ad left join sur_project sp on ad.project_id=sp.id where sp.isDel=0 + =Date(#{startDate}) and Date(ad.create_time)<=Date(#{endDate}) + ]]> and ad.project_id=#{projectId} AND sp.deptid = #{deptId} and sp.projectType = #{proType} @@ -724,6 +730,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info fli1 left join sur_project sp on fli1.project_id=sp.id where fli1.is_del=0 + =Date(#{startDate}) and Date(fli1.create_time)<=Date(#{endDate}) + ]]> and fli1.project_id=#{projectId} AND sp.deptid = #{deptId} and sp.projectType = #{proType} From 547ddde5c5647f143d2bedac97af02400d95bf39 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 8 May 2024 23:29:47 +0800 Subject: [PATCH 3/5] update code --- .../ProjectMaterialSealController.java | 16 ++++++++++++++ .../mapper/SurProjectMaterialSealMapper.java | 2 ++ .../ISurProjectMaterialSealService.java | 2 ++ .../SurProjectMaterialSealServiceImpl.java | 5 +++++ .../project/SurProjectMaterialSealMapper.xml | 22 +++++++++++++++++++ 5 files changed, 47 insertions(+) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java index a3a13933..202b7f97 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java @@ -101,4 +101,20 @@ public class ProjectMaterialSealController extends BaseController { return getDataTable(list); } + @PostMapping("/selectByApprove") + public TableDataInfo selectByApprove(@RequestBody SurProjectMaterialSeal where){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + Long deptId=where.getDeptId(); + if(deptId==null || deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + startPage(); + List list=materialSealService.selectByApprove(where); + return getDataTable(list); + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java index 38012724..15ec6933 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java @@ -80,4 +80,6 @@ public interface SurProjectMaterialSealMapper * @return */ public List groupByApprove(SurProjectMaterialSeal where); + + public List selectByApprove(SurProjectMaterialSeal where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java index 63a1c820..441cd71b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java @@ -88,4 +88,6 @@ public interface ISurProjectMaterialSealService * @return */ public List groupByApprove(SurProjectMaterialSeal where); + + public List selectByApprove(SurProjectMaterialSeal where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java index 8713b61e..6bf94d0b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java @@ -222,4 +222,9 @@ public class SurProjectMaterialSealServiceImpl extends WeChatMessageServiceImpl public List groupByApprove(SurProjectMaterialSeal where) { return surProjectMaterialSealMapper.groupByApprove(where); } + + @Override + public List selectByApprove(SurProjectMaterialSeal where) { + return surProjectMaterialSealMapper.selectByApprove(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml index 4e40f6cb..4aa9bc73 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml @@ -259,4 +259,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by spme.seal_date desc ) spme + + \ No newline at end of file From 3c6ec3fb1df425985f0c22be99a5733f1fa15e9e Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 9 May 2024 00:26:18 +0800 Subject: [PATCH 4/5] update code --- .../resources/mapper/project/SurProjectCheckDetectionMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index ea1e1fb9..9eb72efd 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -318,6 +318,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - WHERE spcd.is_del=0 + WHERE spcd.is_del=0 and sp.isDel=0 and sp.progressVisible=0 and spcd.detection_result=1 and spcd.detection_result <> 1 and spcd.check_type= #{checkType} @@ -334,5 +334,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spcd.project_id=#{projectId} + ORDER BY detection_result + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml index a9b0ab0e..b6ed2a13 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml @@ -240,6 +240,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND spm.project_id=#{projectId} + order by spm.approve_status + + + \ No newline at end of file