From a8494d1bd3ed8644ae770dc5f94edff4faca6028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Thu, 17 Aug 2023 23:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/trouble/sspProblemmodify.js | 10 ++++ .../views/trouble/pshProblemmodify/index.vue | 60 ++++++++++++++++--- .../views/trouble/sspProblemmodify/index.vue | 60 ++++++++++++++++--- .../SurProjectInsuranceController.java | 14 +++++ .../SurProjectWorkAttendanceController.java | 13 ++++ .../SmzSspProblemmodifyController.java | 17 ++++++ .../mapper/SmzSspProblemmodifyMapper.java | 16 +++++ .../service/ISmzSspProblemmodifyService.java | 9 +++ .../impl/SmzSspProblemmodifyServiceImpl.java | 21 +++++++ .../project/SurProjectInsuranceMapper.xml | 12 ++++ .../SurProjectWorkAttendanceMapper.xml | 12 ++++ .../trouble/SmzSspProblemmodifyMapper.xml | 50 ++++++++++++++++ 12 files changed, 278 insertions(+), 16 deletions(-) diff --git a/ruoyi-ui/src/api/trouble/sspProblemmodify.js b/ruoyi-ui/src/api/trouble/sspProblemmodify.js index 1500df87..6b578e63 100644 --- a/ruoyi-ui/src/api/trouble/sspProblemmodify.js +++ b/ruoyi-ui/src/api/trouble/sspProblemmodify.js @@ -9,6 +9,15 @@ export function listSspProblemmodify(query) { }) } +// 查询质量整改统计 +export function findGroupCount(query) { + return request({ + url: '/trouble/sspProblemmodify/findGroupCount', + method: 'get', + params: query + }) +} + // 查询质量整改详细 export function getSspProblemmodify(id) { return request({ @@ -42,6 +51,7 @@ export function delSspProblemmodify(id) { method: 'delete' }) } + //随手拍流程处理列表 export function auditinfoList(query) { return request({ diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue index 7b0242d0..e79443a2 100644 --- a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue @@ -126,11 +126,11 @@ --> - - - - - + + + + + {{ scope.row.copySendUser }} - - + + + + { this.depts = d?.data || []; @@ -494,12 +514,36 @@ export default { this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0]; this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1]; } + this.queryGroupCount(); listSspProblemmodify(this.queryParams).then((response) => { this.sspProblemmodifyList = response.rows; this.total = response.total; this.loading = false; }); }, + queryGroupCount() { + findGroupCount(this.queryParams).then((response) => { + if (response && response.data) { + let sum = 0; + if (response.data.check0) { + sum += response.data.check0; + this.tabs.dzg = "待整改（" + response.data.check0 + "）"; + } + if (response.data.check1) { + sum += response.data.check1; + this.tabs.dqr = "待复检（" + response.data.check1 + "）"; + } + if (response.data.check4) { + sum += response.data.check4; + this.tabs.ycl = "整改完成（" + response.data.check4 + "）"; + } + this.tabs.all = "全部数据（" + sum + "）"; + if (response.data.check99) { + this.tabs.zgcs = "整改超时（" + response.data.check99 + "）"; + } + } + }); + }, // 取消按钮 cancel() { this.open = false; diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue index 79810a4f..cc603e4d 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue @@ -126,11 +126,11 @@ --> - - - - - + + + + + {{ scope.row.copySendUser }} - - + + + + { this.depts = d?.data || []; @@ -488,12 +508,36 @@ export default { this.queryParams.params["beginMarksTime"] = this.daterangeMarksTime[0]; this.queryParams.params["endMarksTime"] = this.daterangeMarksTime[1]; } + this.queryGroupCount(); listSspProblemmodify(this.queryParams).then((response) => { this.sspProblemmodifyList = response.rows; this.total = response.total; this.loading = false; }); }, + queryGroupCount() { + findGroupCount(this.queryParams).then((response) => { + if (response && response.data) { + let sum = 0; + if (response.data.check0) { + sum += response.data.check0; + this.tabs.dzg = "待整改（" + response.data.check0 + "）"; + } + if (response.data.check1) { + sum += response.data.check1; + this.tabs.dqr = "待复检（" + response.data.check1 + "）"; + } + if (response.data.check4) { + sum += response.data.check4; + this.tabs.ycl = "整改完成（" + response.data.check4 + "）"; + } + this.tabs.all = "全部数据（" + sum + "）"; + if (response.data.check99) { + this.tabs.zgcs = "整改超时（" + response.data.check99 + "）"; + } + } + }); + }, // 取消按钮 cancel() { this.open = false; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectInsuranceController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectInsuranceController.java index 369bde73..7ce1cc05 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectInsuranceController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectInsuranceController.java @@ -2,6 +2,10 @@ package com.yanzhu.jh.project.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -34,6 +38,9 @@ public class SurProjectInsuranceController extends BaseController @Autowired private ISurProjectInsuranceService surProjectInsuranceService; + @Autowired + private ISysDeptService sysDeptService; + /** * 查询项目保险列表 */ @@ -42,6 +49,13 @@ public class SurProjectInsuranceController extends BaseController public TableDataInfo list(SurProjectInsurance surProjectInsurance) { startPage(); + surProjectInsurance.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProjectInsurance.getNowRole())){ + surProjectInsurance.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + surProjectInsurance.setNowDept(Convert.toStr(getDeptId())); + } + surProjectInsurance.setNowUser(Convert.toStr(getUserId())); List list = surProjectInsuranceService.selectSurProjectInsuranceList(surProjectInsurance); return getDataTable(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java index 84e7379b..9cb6d2d3 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java @@ -4,7 +4,10 @@ import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.common.utils.file.ImageUtils; +import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -37,6 +40,9 @@ public class SurProjectWorkAttendanceController extends BaseController @Autowired private ISurProjectWorkAttendanceService surProjectWorkAttendanceService; + @Autowired + private ISysDeptService sysDeptService; + /** * 查询项目出勤列表 */ @@ -45,6 +51,13 @@ public class SurProjectWorkAttendanceController extends BaseController public TableDataInfo list(SurProjectWorkAttendance surProjectWorkAttendance) { startPage(); + surProjectWorkAttendance.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProjectWorkAttendance.getNowRole())){ + surProjectWorkAttendance.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + surProjectWorkAttendance.setNowDept(Convert.toStr(getDeptId())); + } + surProjectWorkAttendance.setNowUser(Convert.toStr(getUserId())); List list = surProjectWorkAttendanceService.selectSurProjectWorkAttendanceList(surProjectWorkAttendance); return getDataTable(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java index bcd9eccf..4f2fb874 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java @@ -65,6 +65,23 @@ public class SmzSspProblemmodifyController extends BaseController return getDataTable(list); } + /** + * 统计随手拍数量 + */ + @PreAuthorize("@ss.hasPermi('trouble:sspProblemmodify:query')") + @GetMapping("/findGroupCount") + public AjaxResult findGroupCount(SmzSspProblemmodify smzSspProblemmodify) + { + smzSspProblemmodify.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodify.getNowRole())){ + smzSspProblemmodify.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + smzSspProblemmodify.setNowDept(Convert.toStr(getDeptId())); + } + smzSspProblemmodify.setNowUser(getLoginUser().getUsername()); + return success(smzSspProblemmodifyService.findProblemmodifyGroupByCheckState(smzSspProblemmodify)); + } + /** * 导出质量整改列表 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java index 4fbc26e8..de452646 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java @@ -4,6 +4,7 @@ import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; import java.util.List; +import java.util.Map; /** * 质量整改Mapper接口 @@ -29,6 +30,20 @@ public interface SmzSspProblemmodifyMapper */ public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + /** + * 根据状态分组统计数量 + * @param smzSspProblemmodify 查询条件 + * @return List> + */ + public List> findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify); + + /** + * 根据状态分组统计数量 + * @param smzSspProblemmodify 查询条件 + * @return Integer + */ + public Integer findProblemmodifyTimeoutCount(SmzSspProblemmodify smzSspProblemmodify); + /** * 新增质量整改 * @@ -92,4 +107,5 @@ public interface SmzSspProblemmodifyMapper public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where); public int countTimeout(SmzSspProblemmodifyWhere where); + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index 5bc0bd2d..1047c788 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.trouble.service; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; @@ -28,6 +30,13 @@ public interface ISmzSspProblemmodifyService */ public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + /** + * 根据状态分组统计数量 + * @param smzSspProblemmodify 查询条件 + * @return List> + */ + public Map findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify); + /** * 新增质量整改 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index eb618d55..6ae088c4 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -1,6 +1,9 @@ package com.yanzhu.jh.trouble.service.impl; +import java.util.HashMap; import java.util.List; +import java.util.Map; + import com.ruoyi.common.utils.DateUtils; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,24 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyList(smzSspProblemmodify); } + /** + * 根据状态分组统计数量 + * @param smzSspProblemmodify 查询条件 + * @return List> + */ + @Override + public Map findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify) { + List> dataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodify); + Map dataMap = new HashMap<>(); + if(dataList!=null && dataList.size()>0){ + for(Map map:dataList){ + dataMap.put("check"+map.get("checkState"),map.get("total")); + } + dataMap.put("check99",smzSspProblemmodifyMapper.findProblemmodifyTimeoutCount(smzSspProblemmodify)); + } + return dataMap; + } + /** * 新增质量整改 * diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml index e9b2ae4b..aa4d0dbd 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml @@ -58,6 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id AND spi.insurance_type = sdd.dict_value AND spi.is_del = 0 + + left join sur_project_unit_info spui on spui.projectId = sp.id + + left join sur_project_userinfo spu on spu.project_id = sp.id and sp.isDel=0 and spui.del_flag=0 @@ -70,6 +74,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spi.insurance_state IS NULL and spi.insurance_state IS NOT NULL and spi.insurance_type = #{insuranceType} + + and sp.deptId = #{projectDeptId} + + and sp.deptId = #{nowDept} + + and spui.unitId = #{nowDept} + + and spu.user_id = #{nowUser} and spu.is_del=0 ORDER BY sp.projectSort, diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml index bbb669da..3524018a 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkAttendanceMapper.xml @@ -47,6 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sur_project_work_attendance spwa left join sur_project sp on sp.id=spwa.project_id left join sys_dept d on d.dept_id=spwa.dept_id + + left join sur_project_unit_info spui on spui.projectId = sp.id + + left join sur_project_userinfo spu on spu.project_id = sp.id and spwa.is_del=0 and spwa.project_id = #{projectId} @@ -55,6 +59,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.dept_name like concat('%', #{deptName}, '%') and spwa.work_date between #{params.beginWorkDate} and #{params.endWorkDate} and DATE_FORMAT(spwa.work_date,'%Y-%m-%d')=DATE_FORMAT(#{workDate},'%Y-%m-%d') + + and sp.deptId = #{projectDeptId} + + and sp.deptId = #{nowDept} + + and spui.unitId = #{nowDept} + + and spu.user_id = #{nowUser} and spu.is_del=0 diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index 264fd264..5b8cf23a 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -52,6 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END AS v_del from vw_smz_ssp_problemmodify_audit ssp left join sur_project sp on ssp.projectId = sp.id + + left join sur_project_unit_info spui on spui.projectId = sp.id and ssp.isDel=0 and ssp.projectId = #{projectId} @@ -94,6 +96,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by createTime desc + + + + + +