From 849401501ae72e0d363a70f7d329d3b42c2ac38e 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: Sat, 15 Feb 2025 14:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProProjectInfoSubdeptsGroupMapper.xml | 1 + .../manage/ProProjectInfoSubdeptsMapper.xml | 1 + .../impl/ProProjectInfoServiceImpl.java | 1 + ...roProjectInfoSubdeptsUsersServiceImpl.java | 6 ++-- .../project_flowable/approveTask/index.js | 2 +- .../project_flowable/approveTask/index.wxml | 2 +- .../project_flowable/detailTask/index.js | 2 +- .../miniprogram/pages/project_qr/index.js | 10 +++++-- .../miniprogram/pages/project_qr/index.wxml | 18 ++++++++---- .../proProjectInfoSubdeptsGroup/index.vue | 1 + .../proProjectInfoSubdeptsUsers/index.vue | 28 +++++++++++++++---- 11 files changed, 50 insertions(+), 22 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml index cde6408b..7b661617 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml @@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psg.craft_type = #{craftType} and psg.craft_post = #{craftPost} and psg.use_status = #{useStatus} + and ps.approve_status = ]]> 100 and psg.is_del != 2 order by psg.id desc diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml index d08579ae..4e809c4a 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml @@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ps.use_status = #{useStatus} and ps.approve_status = #{approveStatus} and ps.sub_dept_leader_phone = #{subDeptLeaderPhone} + and ps.approve_status = ]]> 100 and ps.is_del = 0 order by ps.id desc diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index f334af4a..27f1472c 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -197,6 +197,7 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService this.insertProRole(UserTypeEnums.SJDWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.SJDWRY.getInfo(),proProjectInfo.getId(),null); this.insertProRole(UserTypeEnums.OTHERS.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.OTHERS.getInfo(),proProjectInfo.getId(),null); loadingProjectsCache(); + return res; }else{ throw new ServiceException("项目信息保存失败！！！"); 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 92a50537..fc6480d5 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 @@ -340,7 +340,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu GroupQuery.setGroupCode(DeptGroupEnums.SPECIAL.getCode()); List specialGroups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query); - if(Objects.nonNull(specialGroups) && specialGroups.size()>0){ + if(StringUtils.isNotEmpty(specialGroups)){ ProProjectInfoSubdeptsGroup specialGroup = specialGroups.get(0); specialGroup.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); specialGroup.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); @@ -504,8 +504,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu if(Objects.isNull(parUsers)){ throw new ServiceException("用户信息异常...请重新扫码"); } - - proProjectInfoSubdeptsUsers.setComId(parUsers.getComId()); proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId()); proProjectInfoSubdeptsUsers.setSubDeptId(parUsers.getSubDeptId()); @@ -548,7 +546,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu GroupQuery.setGroupCode(DeptGroupEnums.SPECIAL.getCode()); List specialGroups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query); - if(Objects.nonNull(specialGroups) && specialGroups.size()>0){ + if(StringUtils.isNotEmpty(specialGroups)){ ProProjectInfoSubdeptsGroup specialGroup = specialGroups.get(0); specialGroup.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); specialGroup.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js index 1f34cb0a..a3f1ecce 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js @@ -370,7 +370,7 @@ Page({ }, success: function (res) { const filePath = res.tempFilePath - let fpt = filePath.split("."); + let fpt = path.split("."); wx.openDocument({ filePath: filePath, fileType: fpt[fpt.length - 1], diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml index bc74ea06..f65f849b 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml @@ -299,7 +299,7 @@ 安全承诺书 - 点击下载安全承诺书 + 点击查看安全承诺书 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js index d787f36c..ce3272b2 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js @@ -293,7 +293,7 @@ Page({ }, success: function (res) { const filePath = res.tempFilePath - let fpt = filePath.split("."); + let fpt = path.split("."); wx.openDocument({ filePath: filePath, fileType: fpt[fpt.length - 1], diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js index 645d7ef8..ee468ece 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js @@ -826,8 +826,8 @@ if (this.data.userPost == "1") { // 示例 url，并非真实存在 url: _baseUrl + '/file/NoSecurity/download?fileName=' + _eduFilePath, success: function (res) { - const filePath = res.tempFilePath - const fileTypes = filePath.split("."); + const filePath = res.tempFilePath; + const fileTypes = _eduFilePath.split("."); wx.openDocument({ filePath: filePath, fileType: fileTypes[fileTypes.length - 1], @@ -1203,10 +1203,14 @@ if (this.data.userPost == "1") { let obj = await this.syncUploadImage(item); findCardOcrFront(obj.data.data.url).then(res =>{ if(res.code==200){ + if(res.data.nation.indexOf("族")<0){ + res.data.nation = res.data.nation+"族"; + } this.setData({ "form.userName": res.data.name, "form.cardCode": res.data.cardId, - "form.nativePlace": res.data.nation, + "form.nation": res.data.nation, + "form.nativePlace": res.data.native, "form.address": res.data.address }) if(!res.data.name || !res.data.cardId){ diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml index 1c1b6749..a1480b01 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml @@ -262,7 +262,7 @@ 地址 -