Compare commits
2 Commits
f7996664c0
...
57d80dd7cd
| Author | SHA1 | Date |
|---|---|---|
姜玉琦
|
57d80dd7cd | |
|
姜玉琦
|
a574e37bbe |
|
|
@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectProProjectInfoSubdeptsUsersVo">
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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<String, Object> 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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@
|
|||
</view>
|
||||
</van-collapse-item>
|
||||
<van-collapse-item wx:if="{{subDeptUserInfo.subDeptType=='1'}}" title="建设及管理单位信息" name="dept">
|
||||
<view class="construction_unit" wx:for="{{projectDeptsList}}" wx:key="unique">
|
||||
<view class="construction_unit" wx:for="{{projectDeptsList}}" wx:key="index">
|
||||
<view class="construction_unit_image">
|
||||
<image src="{{item.iconSrc}}"></image>
|
||||
<image src="https://xiangguan.sxyanzhu.com/profile/static/icon/web_zbdw.png"></image>
|
||||
</view>
|
||||
<view class="construction_unit_list">
|
||||
<view class="construction_unit_title">{{item.deptType}}</view>
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 统计代办
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
<view class="module_min">
|
||||
<view class="module_title module_title_flex">
|
||||
<view>质量隐患统计</view>
|
||||
<view class="module_see_info" bindtap="goAQYH">查看详情
|
||||
<view wx:if="{{showZlyhpcDetail}}" class="module_see_info" bindtap="goZLYH">查看详情
|
||||
<van-icon name="arrow" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 统计代办
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
<view class="module_min">
|
||||
<view class="module_title module_title_flex">
|
||||
<view>安全隐患统计</view>
|
||||
<view class="module_see_info" bindtap="goAQYH">查看详情
|
||||
<view wx:if="{{showAqyhpcDetail}}" class="module_see_info" bindtap="goAQYH">查看详情
|
||||
<van-icon name="arrow" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
Loading…
Reference in New Issue