jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-02-21 00:44:42 +08:00
parent cfca6bb5c1
commit 6703fc0bd1
7 changed files with 81 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_ext ex on u.user_id=ex.user_id
where u.del_flag = '0'
where u.del_flag = '0' and u.remark is null
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java
View File

@ -69,7 +69,7 @@ public class BusExamUserController extends BaseController
* @RequiresPermissions("manage:busExamUser:query")
*/
@GetMapping(value = "/last/{proId}")
public AjaxResult findBusExamUserList(@PathVariable("userId") Long proId,Long userId)
public AjaxResult findBusExamUserList(@PathVariable("proId") Long proId,Long userId)
{
BusExamUser query = new BusExamUser();
query.setUserId(userId);

4
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java
View File

@ -107,7 +107,7 @@ public class WxController extends BaseController {
public AjaxResult findProSubDeptsUserInfo(@PathVariable("proId") Long proId)
{
LoginUser loginUser = SecurityUtils.getLoginUser();
if(SysUser.isAdmin(loginUser.getUserid()) ||SecurityUtils.isGSAdmin()){
if(SecurityUtils.isAdmin(loginUser.getUserid()) || SecurityUtils.isGSAdmin()){
ProProjectInfo projectInfo = proProjectInfoService.selectProProjectInfoById(proId);
ProProjectInfoSubdeptsUsers adminUser = new ProProjectInfoSubdeptsUsers();
adminUser.setId(0L);
@ -122,7 +122,7 @@ public class WxController extends BaseController {
adminUser.setUserName(loginUser.getSysUser().getNickName());
return success(adminUser);
}else{
return success(proProjectInfoSubdeptsUsersService.findProSubDeptsUserInfo(proId, SecurityUtils.getUserId()));
return success(proProjectInfoSubdeptsUsersService.findProSubDeptsUserInfo(proId, loginUser.getUserid()));
}
}

1
yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
View File

@ -79,7 +79,6 @@
</view>
<view class="echarts_max" wx:if="{{(subDeptUserInfo.subDeptType=='1' || subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4' && subDeptUserInfo.userPost!='6' && subDeptUserInfo.userPost!='8'}}">
<video id="myVideo" src="https://xiangguan.sxyanzhu.com/statics/2025/2-建筑施工安全生产标准化系列视频—附着式升降脚手架.wmv" autoplay="{{true}}" bindended="onClickAfterVideo" show-bottom-progress="{{false}}" vslide-gesture="{{true}}" enable-progress-gesture="{{false}}" style="width: 100%;height: 280px;" />
<view class="echarts_min">
<view class="eharts_title module_title_flex">
劳务人员

53
yanzhu-ui-app/miniprogram/pages/project_qr/index.js
View File

@ -346,13 +346,18 @@ if (this.data.userPost == "1") {
}
if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos){
let userInfosJSON = JSON.parse(deptRes.data.proProjectInfoSubdeptsUsers.userInfos);
if(userInfosJSON.cardImgPos){
deptRes.data.leaderCardImgPos = (this.data.imgBase + userInfosJSON.cardImgPos).split(',');
}
if(userInfosJSON.cardImgInv){
deptRes.data.leaderCardImgInv = (this.data.imgBase + userInfosJSON.cardImgInv).split(',');
}
deptRes.data.proProjectInfoSubdeptsUsers.userInfos = userInfosJSON;
if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgPos){
deptRes.data.leaderCardImgPos = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgPos).split(',');
}
if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgInv){
deptRes.data.leaderCardImgInv = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgInv).split(',');
}
deptRes.data.nativePlace = userInfosJSON.nativePlace;
deptRes.data.nation = userInfosJSON.nation;
deptRes.data.address = userInfosJSON.address;
deptRes.data.emergencyContact = userInfosJSON.emergencyContact;
deptRes.data.contactPhone = userInfosJSON.contactPhone;
}
if(deptRes.data.proProjectInfoSubdeptsUsers.userPicture){
deptRes.data.leaderUserPicture = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userPicture).split(',');
@ -1030,7 +1035,10 @@ if (this.data.userPost == "1") {
if(res.code==200){
this.setData({
"form.subDeptLeaderName": res.data.name,
"form.subDeptLeaderCode": res.data.cardId
"form.subDeptLeaderCode": res.data.cardId,
"form.nation": res.data.nation,
"form.nativePlace": res.data.native,
"form.address": res.data.address
})
if(!res.data.name || !res.data.cardId){
this.setData({
@ -1463,6 +1471,32 @@ if (this.data.userPost == "1") {
app.toast("请填写委托人联系电话！");
return false;
}
if (!form.nativePlace) {
app.toast("请填写籍贯！");
return false;
}
if (!form.nation) {
app.toast("请填写民族！");
return false;
}
if (!form.address) {
app.toast("请填写地址！");
return false;
}
if (!form.emergencyContact) {
app.toast("请填写紧急联系人！");
return false;
}
if (!form.contactPhone) {
app.toast("请填写紧急联系人电话！");
return false;
}else{
const phonePattern = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
if(!phonePattern.test(form.contactPhone)){
app.toast("紧急联系人电话不正确！");
return false;
}
}
if (!form.leaderDegreeGrade) {
app.toast("请选择委托人学历信息！");
return false;
@ -1575,6 +1609,11 @@ if (this.data.userPost == "1") {
if (uploads.length == uploadFiles.length) {
_form.subDeptInfos = JSON.stringify(subDeptInfos);
let leaderUserInfos = {};
leaderUserInfos.nation = _form.nation;
leaderUserInfos.nativePlace = _form.nativePlace;
leaderUserInfos.address = _form.address;
leaderUserInfos.emergencyContact = _form.emergencyContact;
leaderUserInfos.contactPhone = _form.contactPhone;
leaderUserInfos.cardImgPos = _form.leaderCardImgPos;
leaderUserInfos.cardImgInv = _form.leaderCardImgInv;
_form.leaderUserInfos = JSON.stringify(leaderUserInfos);

30
yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
View File

@ -160,6 +160,36 @@
<input placeholder="请填写委托代理人联系电话" placeholder-style="color:#6777aa;" bindinput="subDeptLeaderPhone" model:value="{{form.subDeptLeaderPhone}}" disabled class="inspect_input_fill_in" maxlength="30" />
</view>
</view>
<view class="inspect_info_list">
<view class="markers inspect_info_title">民族</view>
<view class="inspect_info_content">
<input placeholder="请填写民族" placeholder-style="color:#6777aa;" bindinput="inputOriginNation" class="inspect_input_fill_in" disabled maxlength="30" model:value="{{form.nation}}" />
</view>
</view>
<view class="inspect_info_list">
<view class="markers inspect_info_title">籍贯</view>
<view class="inspect_info_content">
<input placeholder="请填写籍贯" placeholder-style="color:#6777aa;" bindinput="inputOriginNative" class="inspect_input_fill_in" disabled maxlength="30" model:value="{{form.nativePlace}}" />
</view>
</view>
<view class="inspect_info_list">
<view class="markers inspect_info_title">地址</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写地址" placeholder-style="color:#6777aa;" maxlength="64" disabled bindblur="inputOriginAddress" model:value="{{form.address}}" />
</view>
</view>
<view class="inspect_info_list">
<view class="markers inspect_info_title">紧急联系人</view>
<view class="inspect_info_content">
<input placeholder="请填写紧急联系人" placeholder-style="color:#6777aa;" bindinput="inputUrgentUser" class="inspect_input_fill_in" model:value="{{form.emergencyContact}}" maxlength="30" />
</view>
</view>
<view class="inspect_info_list">
<view class="markers inspect_info_title">紧急联系人电话</view>
<view class="inspect_info_content">
<input placeholder="请填写紧急联系人电话" placeholder-style="color:#6777aa;" bindinput="inputUrgentUserPhone" class="inspect_input_fill_in" model:value="{{form.contactPhone}}" maxlength="30" />
</view>
</view>
<view class="inspect_info_list">
<view class="markers inspect_info_title">代理人文化程度</view>
<view class="inspect_info_content">

2
yanzhu-ui-app/miniprogram/project.private.config.json
View File

@ -11,7 +11,7 @@
{
"name": "pages/project_qr/index",
"pathName": "pages/project_qr/index",
"query": "QRPID=133&SIGID=4",
"query": "QRPID=133&SIGID=1",
"launchMode": "default",
"scene": null
},