diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 92236f1d..34354b93 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, pdept.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group, + select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, ifNull(pdept.sub_dept_name,'项目单位'), psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group, psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status, psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark, psu.source, psu.face_guid,sd.dept_name com_name,psu.work_type diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java index ee4e0046..e1f2176e 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java @@ -6,7 +6,6 @@ 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.domain.SurProjectAttendanceData; import com.yanzhu.manage.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -14,7 +13,6 @@ 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; @@ -104,7 +102,7 @@ public class WXAttendanceController extends BaseController { } Map data = new HashMap<>(); data.put("list",list); - data.put("user",list.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum()); + data.put("user",Math.floorDiv(list.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum(),list.size())); return AjaxResult.success(data); } diff --git a/yanzhu-ui-app/miniprogram/pageage/project_info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_info/index.js index dcdce438..47c98d89 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_info/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_info/index.js @@ -444,12 +444,14 @@ Page({ } else { res.data.plannedCompletionTime = " - "; } - res.data.projectDeptsList.forEach(item => { - let typeItem = this.data.deptTypes.filter((v) => v.name == item.deptType); - if(typeItem.length>0){ - item.iconSrc = typeItem[0].iconSrc; - } - }); + // let list = []; + // res.data.projectDeptsList.forEach(item => { + // let typeItem = this.data.deptTypes.filter((v) => v.name == item.deptType); + // if(typeItem.length>0){ + // item.iconSrc = typeItem[0].iconSrc; + // } + // list.push(item); + // }); this.setData({ projectInfo: res.data, projectDeptsList: res.data.projectDeptsList diff --git a/yanzhu-ui-app/miniprogram/pageage/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_info/index.wxml index 72e158dd..8f92d127 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_info/index.wxml @@ -64,9 +64,9 @@ - + - + {{item.deptType}} diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js index c989f0f9..c04686a9 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js @@ -53,6 +53,7 @@ Page({ total: 0, //问题总数 number: 0, //检查次数 }], + showZlyhpcDetail:false }, @@ -97,6 +98,13 @@ Page({ getUserMenuList: function (proId) { findUserMenuList(proId, 'zlgl').then(res => { if (res.code == 200) { + res.data.forEach(item =>{ + if(item.menuIdenti=='ZLYHPC'){ + this.setData({ + showZlyhpcDetail: true + }) + } + }); this.setData({ menuList: res.data }) @@ -177,6 +185,14 @@ Page({ }) }, + //质量隐患详情跳转 + goZLYH: function () { + wx.setStorageSync('nav-menu', "zlgl"); + wx.redirectTo({ + url: '../project_problemmodify/list/index?type=1' + }) + }, + /** * 统计代办 */ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml index 75e15715..8e4c1937 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml @@ -37,7 +37,7 @@ 质量隐患统计 - 查看详情 + 查看详情 diff --git a/yanzhu-ui-app/miniprogram/pageage/project_safety/index.js b/yanzhu-ui-app/miniprogram/pageage/project_safety/index.js index a3d7e2ed..978968b0 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_safety/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_safety/index.js @@ -53,6 +53,7 @@ Page({ total: 0, //问题总数 number: 0, //检查次数 }], + showAqyhpcDetail:false, }, //项目切换 返回值 @@ -96,6 +97,13 @@ Page({ getUserMenuList: function (proId) { findUserMenuList(proId, 'aqgl').then(res => { if (res.code == 200) { + res.data.forEach(item =>{ + if(item.menuIdenti=='AQYHPC'){ + this.setData({ + showAqyhpcDetail: true + }) + } + }); this.setData({ menuList: res.data }) @@ -176,6 +184,14 @@ Page({ }) }, + //安全隐患详情跳转 + goAQYH: function () { + wx.setStorageSync('nav-menu', "aqgl"); + wx.redirectTo({ + url: '../project_problemmodify/list/index?type=0' + }) + }, + /** * 统计代办 */ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxml index a87d860e..fef3abf9 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxml @@ -37,7 +37,7 @@ 安全隐患统计 - 查看详情 + 查看详情