diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/PageUtils.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/PageUtils.java index 32a63cd5..3f7503f4 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/PageUtils.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/PageUtils.java @@ -25,6 +25,17 @@ public class PageUtils extends PageHelper PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); } + /** + * 设置请求分页数据 + */ + public static void startPage(Integer pageNum, Integer pageSize) + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + Boolean reasonable = pageDomain.getReasonable(); + PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); + } + /** * 清理分页的线程变量 */ diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/controller/BaseController.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/controller/BaseController.java index 070a8903..3f96c67f 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/controller/BaseController.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/controller/BaseController.java @@ -49,6 +49,14 @@ public class BaseController PageUtils.startPage(); } + /** + * 设置请求分页数据 + */ + protected void startPage(Integer pageNum, Integer pageSize) + { + PageUtils.startPage(pageNum,pageSize); + } + /** * 清理分页的线程变量 */ diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SmzSspProblemmodify.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SmzSspProblemmodify.java index 50944af6..54ec4ea5 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SmzSspProblemmodify.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SmzSspProblemmodify.java @@ -145,6 +145,10 @@ public class SmzSspProblemmodify extends BaseEntity @Excel(name = "问题类型", readConverterExp = "1=常规问题，2专项问题") private String problemType; + private String problemTypeName; + private String dangerTypeName; + private String createUserName; + public void setId(Long id) { this.id = id; @@ -434,6 +438,30 @@ public class SmzSspProblemmodify extends BaseEntity return problemType; } + public String getProblemTypeName() { + return problemTypeName; + } + + public void setProblemTypeName(String problemTypeName) { + this.problemTypeName = problemTypeName; + } + + public String getDangerTypeName() { + return dangerTypeName; + } + + public void setDangerTypeName(String dangerTypeName) { + this.dangerTypeName = dangerTypeName; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index c45409bf..be7e37a2 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -153,7 +153,7 @@ \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index cac05038..e2c3fb57 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -405,7 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pi.com_id = #{comId} and pi.dis_dept_id = #{disDeptId} and pi.com_id = #{activeComId} - and psu.user_id = #{currentUserId} and psu.approve_status = ]]> 100 and psu.user_id = #{currentUserId} and psu.use_status='0' and psu.is_del=0 + and psu.user_id = #{currentUserId} and psu.approve_status = ]]> 100 and psu.use_status='0' and psu.is_del=0 and pi.project_name like concat('%', #{projectName}, '%') and pi.project_code = #{projectCode} and pi.simple_name like concat('%', #{simpleName}, '%') 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 faae1302..1bcdb541 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 @@ -96,7 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psu.user_phone = #{userPhone} and psu.approve_status = ]]> 100 and psu.is_del = #{isDel} - and psu.user_post != '66' + and psu.user_post != '66' + and psu.sub_dept_type in ('1','4','5') and psu.user_post not in ('4','5') and date(psu.use_date) between #{params.beginTime} and #{params.endTime} and psu.is_del != 2 diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml index 40668692..e54fdbe5 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml @@ -92,18 +92,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and comId = #{comId} - and projectId = #{projectId} - and infoType = #{infoType} - and marks_picture = #{marksPicture} - and marks_video = #{marksVideo} - and correction_picture = #{correctionPicture} - and problemArea = #{problemArea} - and workParts = #{workParts} - and changeInfo = #{changeInfo} - and lordSent = #{lordSent} - and lordSentUser = #{lordSentUser} - and copySend = #{copySend} - and copySendUser = #{copySendUser} - and checkState = #{checkState} - and nickedArea = #{nickedArea} - and nickedTime = #{nickedTime} - and projectType = #{projectType} - and processName like concat('%', #{processName}, '%') - and projectName like concat('%', #{projectName}, '%') - and nickedInfo = #{nickedInfo} - and checkUser = #{checkUser} - and checkUserPhone = #{checkUserPhone} - and smark_url = #{smarkUrl} - and isDel = #{isDel} - and createUser = #{createUser} - and createTime = #{createTime} - and updateUser = #{updateUser} - and updateTime = #{updateTime} - and danger_type = #{dangerType} - and recheckSend = #{recheckSend} - and recheckSendUser = #{recheckSendUser} - and roleType = #{roleType} - and problemType = #{problemType} + and ssp.comId = #{comId} + and ssp.projectId = #{projectId} + and ssp.infoType = #{infoType} + and ssp.lordSent = #{lordSent} + and ssp.lordSentUser = #{lordSentUser} + and find_in_set(#{copySend},ssp.copySend) + and find_in_set(#{copySendUser},ssp.copySendUser) + and ssp.checkState = #{checkState} + and ssp.checkUser = #{checkUser} + and ssp.checkUserPhone = #{checkUserPhone} + and ssp.createUser = #{createUser} + and ssp.danger_type = #{dangerType} + and ssp.recheckSend = #{recheckSend} + and ssp.recheckSendUser = #{recheckSendUser} + and ssp.problemType = #{problemType} + + and + ( + ssp.createUser=#{currentUserId} or ssp.lordSent=#{currentUserId} or find_in_set(#{currentUserId},ssp.copySend) or ssp.recheckSend=#{currentUserId} + ) + + and isDel = 0 + order by ssp.id desc diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/enums/UserPostEnums.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/enums/UserPostEnums.java new file mode 100644 index 00000000..0ed6ddb8 --- /dev/null +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/enums/UserPostEnums.java @@ -0,0 +1,43 @@ +package com.yanzhu.flowable.enums; + +/** + * 用户岗位 + */ +public enum UserPostEnums { + + WTDL("1", "委托代理"), + XMJL("2", "项目经理"), + BZZ("3", "班组长"), + LWGR("4", "劳务工人"), + TSGZ("5", "特殊工种"), + CLRY("6", "材料员"), + AQRY("8", "安全员"), + JSDWGL("66", "建设单位管理"), + JLDWGL("71", "监理单位管理"), + SGDWGL("72", "施工单位管理"), + CLFBGL("73", "材料分包管理"), + HQFBGL("74", "后勤分包管理"), + TSSBGL("75", "特殊设备管理"), + KTDWGL("76", "勘探单位管理"), + SJDWGL("77", "设计单位管理"), + QTDWGL("78", "其它单位管理"); + + private final String code; + private final String info; + + UserPostEnums(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } +} diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java index ac124068..310f8df7 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java @@ -4,8 +4,10 @@ import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.flowable.domain.my.FlowTaskEntity; +import com.yanzhu.flowable.enums.UserPostEnums; import com.yanzhu.flowable.mapper.FlowBusinessKeyMapper; import com.yanzhu.flowable.service.IFlowBusinessKeyService; +import liquibase.pro.packaged.S; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -99,10 +101,24 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService { public List> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity){ // 查询用户是否是班组长... if(Objects.nonNull(flowTaskEntity.getAssigneeId())){ - List> groups = flowBusinessKeyMapper.selectMySubdeptsGroups(Convert.toLong(flowTaskEntity.getStartProId()),SecurityUtils.getUserId()); - if(StringUtils.isNotEmpty(groups)){ - List groupIds = groups.stream().map(group -> Convert.toLong(group.get("sub_dept_group"))).collect(Collectors.toList()); - flowTaskEntity.setGroupIds(groupIds); + List> users = flowBusinessKeyMapper.selectMySubdeptsGroups(Convert.toLong(flowTaskEntity.getStartProId()),SecurityUtils.getUserId()); + if(StringUtils.isNotEmpty(users)){ + List groupIds = new ArrayList<>(); + for(Map userMap:users){ + String userPost = Convert.toStr(userMap.get("user_post")); + if(Objects.equals(userPost, UserPostEnums.JSDWGL.getCode())){ + //总包审批时忽略分包单位 + }else if(Objects.equals(userPost, UserPostEnums.BZZ.getCode())){ + groupIds.add(Convert.toLong(userMap.get("sub_dept_group"))); + flowTaskEntity.setStartDeptName(Convert.toStr(userMap.get("sub_dept_name"))); + }else{ + flowTaskEntity.setStartDeptName(Convert.toStr(userMap.get("sub_dept_name"))); + } + } + //班组长信息... + if(groupIds.size()>0){ + flowTaskEntity.setGroupIds(groupIds); + } } } return flowBusinessKeyMapper.selectMyAwaitFlowTask(flowTaskEntity); diff --git a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml index 15150440..568de19f 100644 --- a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml +++ b/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # 服务注册地址 server-addr: @discovery.server-addr@ # 服务分组 - group: lijun + group: JiangYuQi config: # 配置中心地址 server-addr: @discovery.server-addr@ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java index 01fcc578..632177bd 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java @@ -142,7 +142,6 @@ public class ProProjectInfoController extends BaseController { startPage(); LoginUser loginUser = SecurityUtils.getLoginUser(); - proProjectInfo.setComId(loginUser.getSysUser().getComId()); if(!SecurityUtils.isAdmin(loginUser.getUserid())){ if(SecurityUtils.isGSAdmin()){ proProjectInfo.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index aecb73eb..6a8c5903 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -2,6 +2,7 @@ package com.yanzhu.manage.controller; import com.alibaba.fastjson2.JSONObject; import com.yanzhu.common.core.domain.R; +import com.yanzhu.common.core.enums.UseStateEnums; import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.poi.ExcelUtil; @@ -305,4 +306,17 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController return success(); } + /** + * 查询分包单位工人列表 + */ + @GetMapping("/findAll") + public AjaxResult findAll(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) + { + proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode()); + proProjectInfoSubdeptsUsers.setActiveTags("finished"); + proProjectInfoSubdeptsUsers.setSearchValue("sedUsers"); + List list = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersList(proProjectInfoSubdeptsUsers); + return success(list); + } + } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java index b3bb92a7..1f814e30 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; +import com.yanzhu.common.core.text.Convert; +import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.domain.SmzSspProblemmodify; import com.yanzhu.manage.service.ISmzSspProblemmodifyService; @@ -143,4 +145,20 @@ public class SmzSspProblemmodifyController extends BaseController { return toAjax(smzSspProblemmodifyService.deleteSmzSspProblemmodifyByIds(ids)); } + + /** + * 查询我上次提交的隐患信息 + * 自动填充整改人，复检人，抄送人 + */ + @GetMapping(value = "/findMyLastProblemmodify/{proId}") + public AjaxResult findMyLastProblemmodify(@PathVariable("proId") Long proId,Long infoType) + { + startPage(1,1); + SmzSspProblemmodify query = new SmzSspProblemmodify(); + query.setProjectId(proId); + query.setInfoType(infoType); + query.setCreateUser(Convert.toStr(SecurityUtils.getUserId())); + List data = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(query); + return success(data); + } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index a6b2a2fb..7d68c54d 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -2,7 +2,6 @@ package com.yanzhu.manage.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import com.yanzhu.common.core.constant.SecurityConstants; -import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.enums.*; import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.text.Convert; @@ -473,7 +472,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu sysUser.setUpdateBy(SecurityUtils.getUsername()); sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); + log.info("insertProProjectInfoSubdeptsUsersWX==>{}",sysUser.getUserName()); Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); + log.info("insertProProjectInfoSubdeptsUsersWX==>{}",userId); proProjectInfoSubdeptsUsers.setUserId(userId); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); return proProjectInfoSubdeptsUsers; @@ -627,6 +628,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu @Transactional public ProProjectInfoSubdeptsUsers updateProProjectInfoSubdeptsUsersWX(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) { + log.info("updateProProjectInfoSubdeptsUsersWX==>"); ProProjectInfoSubdeptsUsers parUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proProjectInfoSubdeptsUsers.getParId()); if(Objects.isNull(parUsers)){ throw new ServiceException("用户信息异常...请重新扫码"); @@ -1378,14 +1380,16 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu @Override @Transactional public int editDefaultProjectById(Long id){ - int res = proProjectInfoSubdeptsUsersMapper.editDefaultProjectById(SecurityUtils.getUserId()); + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long userId = loginUser.getUserid(); + int res = proProjectInfoSubdeptsUsersMapper.editDefaultProjectById(userId); if(res>0){ - ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersByParamId(id,SecurityUtils.getUserId()); + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersByParamId(id,userId); proProjectInfoSubdeptsUsers.setSortBy(0L); res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } - boolean isAdmin= (SecurityUtils.isAdmin(SecurityUtils.getUserId()) || SecurityUtils.isGSAdmin()); - LoginUser loginUser = SecurityUtils.getLoginUser(); + boolean isAdmin= (SecurityUtils.isAdmin(userId) || SecurityUtils.isGSAdmin()); + if(isAdmin){ SysUserExt userExt = new SysUserExt(); userExt.setUserId(loginUser.getUserid()); diff --git a/yanzhu-ui-app/miniprogram/api/problemmodify.js b/yanzhu-ui-app/miniprogram/api/problemmodify.js index 0194414f..51cea0d2 100644 --- a/yanzhu-ui-app/miniprogram/api/problemmodify.js +++ b/yanzhu-ui-app/miniprogram/api/problemmodify.js @@ -11,11 +11,10 @@ export function list(query) { }) } -// 查询隐患列表 -export function list1(query) { +// 查询我上次提交的隐患信息 +export function findMyLastProblemmodify(proId,type) { return request({ - url: '/manage/problemmodify/list', - method: 'get', - params: query + url: '/manage/problemmodify/findMyLastProblemmodify/'+proId+'?infoType='+type, + method: 'get' }) } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/api/project.js b/yanzhu-ui-app/miniprogram/api/project.js index 39ef7545..74df64c2 100644 --- a/yanzhu-ui-app/miniprogram/api/project.js +++ b/yanzhu-ui-app/miniprogram/api/project.js @@ -98,4 +98,13 @@ export function findProjectDepts(proId) { url: '/manage/proProjectInfoDepts/findAllDepts/' + proId, method: 'get' }) +} + +// 查询项目参建单位 +export function findProjectDeptUsers(query) { + return request({ + url: '/manage/proProjectInfoDepts/findAllDepts/' + proId, + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/app.wxss b/yanzhu-ui-app/miniprogram/app.wxss index a44f3e4b..a8ec9552 100644 --- a/yanzhu-ui-app/miniprogram/app.wxss +++ b/yanzhu-ui-app/miniprogram/app.wxss @@ -2028,3 +2028,14 @@ swiper-item video { height: 180rpx; padding-right: 15rpx; } + +.markers{ + background: url("https://xiangguan.sxyanzhu.com/profile/icon/req.png") no-repeat left/40rpx; + height: 20px; + line-height: 20px; + padding-left: 42rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; +} diff --git a/yanzhu-ui-app/miniprogram/config.js b/yanzhu-ui-app/miniprogram/config.js index bc78aeeb..7e94b0e0 100644 --- a/yanzhu-ui-app/miniprogram/config.js +++ b/yanzhu-ui-app/miniprogram/config.js @@ -2,10 +2,10 @@ module.exports = { timeout: 60000, appId: "wx46466c7828eede2b", - baseUrl: 'https://xiangguan.sxyanzhu.com', - //baseUrl: 'http://127.0.0.1:8080', - baseImgUrl: 'https://xiangguan.sxyanzhu.com', + //baseUrl: 'https://xiangguan.sxyanzhu.com', + baseUrl: 'http://127.0.0.1:8080', + //baseImgUrl: 'https://xiangguan.sxyanzhu.com', //baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', - //baseImgUrl: 'http://127.0.0.1:9300', + baseImgUrl: 'http://127.0.0.1:9300', noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin'] }; \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml index ce4830e9..64d884ac 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml @@ -25,7 +25,7 @@ - {{index < 9 ?'0'+(index+1):(index+1)}} + {{index < 10 ?'0'+(index+1):(index+1)}} 申请时间 {{item.createTime}} 办结时间 {{item.endTime}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml index 860d6724..0b754e42 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml @@ -25,7 +25,7 @@ - {{index < 9 ?'0'+(index+1):(index+1)}} + {{index < 10 ?'0'+(index+1):(index+1)}} 申请时间 {{item.createTime}} 办结时间 {{item.endTime}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml index 70205925..86f77671 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml @@ -194,7 +194,7 @@ - {{index < 9 ?'0'+(index+1):(index+1)}} + {{index < 10 ?'0'+(index+1):(index+1)}} 考勤时间：{{format.dateStrEv(item.inTime,item.outTime)}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.js b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.js index 9cb7d862..365c796a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.js @@ -1,3 +1,17 @@ +import config from '../../../config' +import { + getToken, + getUserInfo + } from '../../../utils/auth' + import { + findDictCache + } from '../../../api/publics' + import { + findProjectDeptUsers + } from '../../../api/project' +import { + findMyLastProblemmodify +} from '../../../api/problemmodify' const app = getApp() Page({ @@ -6,15 +20,26 @@ Page({ */ data: { maxDate: new Date(2088, 1, 1).getTime(), - minDate: new Date().getTime() + (3600 * 48 * 1000), - projectId: "", - projectName: "", + type:"", + typeName:"", + projectId:"", + projectName:"", + problemTypeList: [], + problemSubTypeList: [], + imageInfoData: [], + form:{ + infoType:"", + problemType:"1", + dangerType:null, + nickedTime:"", + }, + active: 0, + flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}], loginName: "", userName: "", rectifierData: [], rectifierData2: [], rectifierData3: [], - imageInfoData: [], //验收时间 nickedTime: '', loadShow: false, @@ -32,53 +57,85 @@ Page({ selectIndex: "", problemType: "1", showHis: false, - problemTypeList: [{ - id: "1", - text: "常规检查" - }, { - id: "2", - text: "专项检查" - }], - flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}], - active: 0 + + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - let { - ts - } = options - this.setData({ - projectId: app.globalData.projectId, - projectName: app.globalData.projectName, - loginName: res.data.loginName, - userName: res.data.nickName, - recheckSend: res.data.nickName, - recheckSendUser: res.data.loginName - }); - //获取缓存数据 - wx.getStorage({ - key: 'YanZhu-XD-App-UserInfoKey', - success: res => { - this.setData({ - projectId: app.globalData.projectId, - projectName: app.globalData.projectName, - loginName: res.data.loginName, - userName: res.data.nickName, - recheckSend: res.data.nickName, - recheckSendUser: res.data.loginName - }); - this.getAllProjectUserData(); - this.getDangerTypeList(); - this.getHisInfo(); - } - }) + if(!getToken()){ + wx.redirectTo({ + url: '../../login/login', + }) + } + const proUserInfo = getUserInfo(); + this.setData({ + type:options.type, + typeName:options.type==1?"质量":"安全", + projectId:app.globalData.useProjectId, + projectName:app.globalData.useProjectName, + "form.infoType":options.type, + "form.recheckSend": proUserInfo.nickName, + "form.recheckSendUser": proUserInfo.userId + }); + this.getDictCache(); + this.getHisInfo(options.type); + this.getProjectUsers(); }, - //查询项目人员数据 - getAllProjectUserData() { + /** + * 获取字典缓存数据 + */ + getDictCache(signId) { + // 初始化检查类型 + findDictCache("ssp_proble_type").then(res => { + if (res.code == 200) { + let list = []; + res.data.forEach(item => { + list.push({ + "id": item.dictValue, + "text": item.dictLabel + }); + }); + this.setData({ + problemTypeList: list + }); + } + }); + + //初始化隐患类型 + findDictCache("ssp_proble_sub_type").then(res => { + if (res.code == 200) { + let list = []; + res.data.forEach(item => { + list.push({ + "id": item.dictValue, + "text": item.dictLabel + }); + }); + this.setData({ + problemSubTypeList: list + }); + } + }); + }, + + /** + * 查询项目人员数据 + * 获取项目所有人员，在页面组装数据... + */ + getProjectUsers() { + let params = "projectId="+app.globalData.useProjectId; + findProjectDeptUsers(params).then(res =>{ + let _lordSentList = []; + let _copySendList = []; + let _checkUserList = []; + res.data.forEach(item =>{ + //if(item.subDeptType!='1' && _lordSentList) + }); + }); let that = this wx.request({ url: app.globalData.reqUrl + '/wechat/projectuserinfo/queryAllProjectUserByParams', @@ -136,96 +193,52 @@ Page({ }) }, - getHisInfo() { - //这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人 - let that = this - wx.request({ - url: app.globalData.reqUrl + '/wechat/projectProblemmodify/findLastDataByParams', - method: "get", - data: { - projectId: that.data.projectId, - createUser: that.data.loginName, - infoType: 1 - }, - header: { - 'content-type': 'application/x-www-form-urlencoded' - }, - success(res) { - res = res.data - if (res.code == 200 && res.data) { - that.setData({ - showHis: true, - lordSent: res.data.lordSent, - lordSentUser: res.data.lordSentUser, - recheckSend: res.data.recheckSend, - recheckSendUser: res.data.recheckSendUser, - copySend: res.data.copySend, - copySendUser: res.data.copySendUser - }) - } + /** + * 这里查询当前登录人上次提交隐患 + * 自动填充整改人，复检人，抄送人 + * @param {*} type + */ + getHisInfo(type) { + findMyLastProblemmodify(app.globalData.useProjectId,type).then(res => { + if(res.code==200 && res.data && res.data.length>0){ + this.setData({ + showHis: true, + "form.lordSent": res.data[0].lordSent, + "form.lordSentUser": res.data[0].lordSentUser, + "form.recheckSend": res.data[0].recheckSend, + "form.recheckSendUser": res.data[0].recheckSendUser, + "form.copySend": res.data[0].copySend, + "form.copySendUser": res.data[0].copySendUser + }) } - }) - }, - - getDangerTypeList() { - let that = this - wx.request({ - url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryDangerType', - method: "get", - data: { - type: 'ssp_zlyhlx' - }, - header: { - 'content-type': 'application/x-www-form-urlencoded' - }, - success(res) { - res = res.data - if (res.code == 200) { - let list = []; - res.data.forEach(it => { - list.push({ - "id": it.dictValue, - "text": it.dictLabel - }); - }) - that.setData({ - dangerTypeList: list - }) - } - } - }) + }); }, //隐患描述 onInputWorkParts(e) { - let workParts = e.detail.value this.setData({ - workParts + "form.workParts":e.detail.value }) }, //整改要求 onInputChangeInfoValue(e) { - let changeInfo = e.detail.value this.setData({ - changeInfo + "form.changeInfo":e.detail.value }) }, //验收时间 onInputTime(e) { - let nickedTime = e.detail this.setData({ - nickedTime + "form.nickedTime":e.detail }) }, - // list 上传图片 + // 上传图片 onImagesArr(e) { - var data = this.data.imageInfoData - data = e.detail this.setData({ - imageInfoData: data + imageInfoData: e.detail }) }, @@ -435,53 +448,17 @@ Page({ }) }, - /** - * 这里考虑上传图片异步问题，封装为同步 - */ - syncUploadImage(url, uploadFile, name) { - return new Promise((resolve, reject) => { - wx.uploadFile({ - url, // 上传的服务器接口地址 - filePath: uploadFile, - header: { - "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8" - }, - name, //上传的所需字段，后端提供 - formData: { - user: 'test' - }, - success: (res) => { - // 上传完成操作 - const data = JSON.parse(res.data) - resolve({ - data: data - }) - }, - fail: (err) => { - //上传失败：修改pedding为reject - console.log("访问接口失败", err); - wx.showToast({ - title: "网络出错,上传失败", - icon: 'none', - duration: 1000 - }); - reject(err) - } - }); - }) - }, - //选择检查类型 onSelectProblemType(e) { this.setData({ - problemType: e.detail.id + "form.problemType": e.detail.id }) }, //选择隐患类型 onSelectDangerType(e) { this.setData({ - dangerType: e.detail.id + "form.dangerType": e.detail.id }) }, diff --git a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml index 4e0fbe4f..7b814a28 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml @@ -12,64 +12,64 @@ - - + + {{projectName}} - 隐患图片 + 隐患图片 - + - 检查类型 + 检查类型 - 隐患类型 + 隐患类型 - + - 隐患描述 + 隐患描述