From 6703fc0bd16298f946ea8c99bdd236657487a7be 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: Fri, 21 Feb 2025 00:44:42 +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
---
.../resources/mapper/system/SysUserMapper.xml | 2 +-
.../controller/BusExamUserController.java | 2 +-
.../controller/wechat/WxController.java | 4 +-
.../miniprogram/pages/project_info/index.wxml | 1 -
.../miniprogram/pages/project_qr/index.js | 53 ++++++++++++++++---
.../miniprogram/pages/project_qr/index.wxml | 30 +++++++++++
.../miniprogram/project.private.config.json | 2 +-
7 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
index 1bd7537f..fac8142c 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
@@ -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
AND u.user_id = #{userId}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java
index ac0f2bdf..1a929457 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java
@@ -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);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java
index a5f29782..e4f0d0bd 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java
@@ -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()));
}
}
diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
index d9a5d457..70205925 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
@@ -79,7 +79,6 @@
-
劳务人员
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
index 465aa433..f426b768 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
@@ -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);
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
index 99d9d1c6..c58a7f64 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
@@ -160,6 +160,36 @@
+
+ 民族
+
+
+
+
+
+ 籍贯
+
+
+
+
+
+ 地址
+
+
+
+
+
+ 紧急联系人
+
+
+
+
+
+ 紧急联系人电话
+
+
+
+
代理人文化程度
diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json
index 18a1a246..e029e664 100644
--- a/yanzhu-ui-app/miniprogram/project.private.config.json
+++ b/yanzhu-ui-app/miniprogram/project.private.config.json
@@ -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
},