From 1c6c5435233464b07fe22cff1d4e46848851227b 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: Thu, 13 Feb 2025 00:20:07 +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

---
 .../mapper/manage/AttendanceUbiDataMapper.xml |  2 +-
 .../impl/AttendanceUbiDataServiceImpl.java    | 33 ++++-------
 ...roProjectInfoSubdeptsUsersServiceImpl.java | 31 +++++-----
 .../manage/utils/pdf/PdfImageSignetUtil.java  |  4 +-
 .../src/main/resources/bootstrap.yml          |  2 +-
 .../components/safety-bar-chart/index.js      |  3 +-
 .../miniprogram/pages/login/login.wxml        |  4 +-
 .../project_flowable/approveTask/index.js     |  8 ++-
 .../project_flowable/approveTask/index.wxml   |  4 +-
 .../project_flowable/detailTask/index.js      | 13 ++++-
 .../project_flowable/detailTask/index.wxml    |  8 +--
 .../miniprogram/pages/project_info/index.js   |  8 +--
 .../miniprogram/pages/project_qr/index.js     | 33 ++---------
 .../miniprogram/pages/project_qr/index.wxml   |  2 +-
 .../api/manage/proProjectInfoSubdeptsUsers.js |  8 +++
 .../proProjectInfoSubdeptsUsers/index.vue     | 56 +++++++++++--------
 16 files changed, 112 insertions(+), 107 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
index 8bc034bf..8f69e728 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
@@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="statsAttendanceDays" parameterType="AttendanceUbiData" resultType="Map">
         select u.craft_type as craftType, count(1) as total from attendance_ubi_data d
         left join pro_project_info_subdepts_users u on u.user_id = d.userId
-        where u.id is not null and u.use_status = '1'
+        where u.id is not null and u.use_status = '0'
         <if test="comId != null "> and d.comId = #{comId}</if>
         <if test="projectId != null "> and d.projectId = #{projectId}</if>
         <if test="subDeptId != null "> and d.sub_dept_id = #{subDeptId}</if>
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
index 7b63d260..69a13f03 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
@@ -11,6 +11,7 @@ import com.yanzhu.common.core.utils.StringUtils;
 import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.manage.domain.AttendanceUbiData;
 import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers;
+import com.yanzhu.manage.enums.SubDeptsEnums;
 import com.yanzhu.manage.enums.UserPostEnums;
 import com.yanzhu.manage.mapper.AttendanceUbiDataMapper;
 import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper;
@@ -213,19 +214,13 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
      */
     @Override
     public List<Map<String,Object>> statsAttendanceDaysByProId(Long proId){
+        ProProjectInfoSubdeptsUsers myInfos = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersByParamId(proId,SecurityUtils.getLoginUser().getUserid());
         AttendanceUbiData attendanceQuery = new AttendanceUbiData();
         attendanceQuery.setProjectId(proId);
-        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-        if(!Objects.equals(sysUser.getUserType(), UserTypeEnums.ZSRY.getCode()) && !Objects.equals(sysUser.getUserType(),UserTypeEnums.LSRY.getCode())){
-            ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers();
-            query.setProjectId(proId);
-            query.setUserId(sysUser.getUserId());
-            List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query);
-            if(StringUtils.isNotEmpty(users)){
-                attendanceQuery.setSubDeptId(users.get(0).getSubDeptId());
-                if(Objects.equals(users.get(0).getUserPost(), UserPostEnums.BZZ.getCode())){
-                    attendanceQuery.setSubDeptGroup(users.get(0).getSubDeptGroup());
-                }
+        if(Objects.equals(myInfos.getSubDeptType(), SubDeptsEnums.LWFB.getCode()) || Objects.equals(myInfos.getSubDeptType(),SubDeptsEnums.ZYFB.getCode())){
+            attendanceQuery.setSubDeptId(myInfos.getSubDeptId());
+            if(Objects.equals(myInfos.getUserPost(),UserPostEnums.BZZ.getCode())){
+                attendanceQuery.setSubDeptGroup(myInfos.getSubDeptGroup());
             }
         }
         return attendanceUbiDataMapper.statsAttendanceDays(attendanceQuery);
@@ -237,19 +232,13 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
      */
     @Override
     public List<Map<String,Object>> statsAttendanceViewByProId(Long proId){
+        ProProjectInfoSubdeptsUsers myInfos = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersByParamId(proId,SecurityUtils.getLoginUser().getUserid());
         AttendanceUbiData attendanceQuery = new AttendanceUbiData();
         attendanceQuery.setProjectId(proId);
-        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-        if(!Objects.equals(sysUser.getUserType(), UserTypeEnums.ZSRY.getCode()) && !Objects.equals(sysUser.getUserType(),UserTypeEnums.LSRY.getCode())){
-            ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers();
-            query.setProjectId(proId);
-            query.setUserId(sysUser.getUserId());
-            List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query);
-            if(StringUtils.isNotEmpty(users)){
-                attendanceQuery.setSubDeptId(users.get(0).getSubDeptId());
-                if(Objects.equals(users.get(0).getUserPost(), UserPostEnums.BZZ.getCode())){
-                    attendanceQuery.setSubDeptGroup(users.get(0).getSubDeptGroup());
-                }
+        if(Objects.equals(myInfos.getSubDeptType(), SubDeptsEnums.LWFB.getCode()) || Objects.equals(myInfos.getSubDeptType(),SubDeptsEnums.ZYFB.getCode())){
+            attendanceQuery.setSubDeptId(myInfos.getSubDeptId());
+            if(Objects.equals(myInfos.getUserPost(),UserPostEnums.BZZ.getCode())){
+                attendanceQuery.setSubDeptGroup(myInfos.getSubDeptGroup());
             }
         }
         Map<String, Object> params = new HashMap<>();
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 3a501fc4..92a50537 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
@@ -805,11 +805,13 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         String saveWordFilePath = rootSavePath + "/" +filePath + "/" + fileName;
         String saveEdusFilePath = ProfileConfig.profile + "/" + filePath + "/" + fileName;
         // 生成文件夹
-        File dirFile = FileUtils.getFile(rootSavePath + filePath);
+        File dirFile = FileUtils.getFile(rootSavePath + "/" +filePath);
         if (!dirFile.exists()) {
             dirFile.mkdirs();
         }
         proSubdeptsUser.setSubStep(100L);
+        proSubdeptsUser.setEduStatus("1");
+        proSubdeptsUser.setEduDate(DateUtils.getNowDate());
         proSubdeptsUser.setEduFilePath(saveEdusFilePath);
         // word文件转PDF文件
         Map<String, Object> dataMap = getUserDataMap(proSubdeptsUser, signetFileVo.getImgPath());
@@ -1179,18 +1181,13 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
      */
     @Override
     public List<Map<String,Object>> statsSubDeptsUsersByProId(Long proId){
+        ProProjectInfoSubdeptsUsers myInfos = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersByParamId(proId,SecurityUtils.getLoginUser().getUserid());
         ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers();
         query.setProjectId(proId);
-        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-        if(!Objects.equals(sysUser.getUserType(),UserTypeEnums.ZSRY.getCode()) && !Objects.equals(sysUser.getUserType(),UserTypeEnums.LSRY.getCode())){
-            query.setUserId(sysUser.getUserId());
-            List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query);
-            query.setUserId(null);
-            if(StringUtils.isNotEmpty(users)){
-                query.setSubDeptId(users.get(0).getSubDeptId());
-                if(Objects.equals(users.get(0).getUserPost(),UserPostEnums.BZZ.getCode())){
-                    query.setSubDeptGroup(users.get(0).getSubDeptGroup());
-                }
+        if(Objects.equals(myInfos.getSubDeptType(),SubDeptsEnums.LWFB.getCode()) || Objects.equals(myInfos.getSubDeptType(),SubDeptsEnums.ZYFB.getCode())){
+            query.setSubDeptId(myInfos.getSubDeptId());
+            if(Objects.equals(myInfos.getUserPost(),UserPostEnums.BZZ.getCode())){
+                query.setSubDeptGroup(myInfos.getSubDeptGroup());
             }
         }
         return proProjectInfoSubdeptsUsersMapper.statsSubDeptsUsersByProId(query);
@@ -1264,8 +1261,10 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
                         if(StringUtils.isNotEmpty(signets)){
                             String newFilePath = filePath.replace(".pdf","-g.pdf");
                             String signPath = signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath);
-                            PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath, SignetKeyEnums.GROUP_SIGN.getCode());
-                            filePath = newFilePath;
+                            boolean flag = PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath, SignetKeyEnums.GROUP_SIGN.getCode());
+                            if(flag){
+                                filePath = newFilePath;
+                            }
                         }else{
                             throw new ServiceException("未查询到班组长签名信息...");
                         }
@@ -1292,8 +1291,10 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
             if(StringUtils.isNotEmpty(signets)){
                 String newFilePath = filePath.replace(".pdf","-p.pdf");
                 String signPath = signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath);
-                PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath,SignetKeyEnums.PROJECT_SIGN.getCode());
-                filePath = newFilePath;
+                boolean flag = PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath,SignetKeyEnums.PROJECT_SIGN.getCode());
+                if(flag){
+                    filePath = newFilePath;
+                }
             }else{
                 throw new ServiceException("未查询安质部部长签名信息...");
             }
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java
index 4097cda7..73636bbc 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/pdf/PdfImageSignetUtil.java
@@ -31,7 +31,7 @@ public class PdfImageSignetUtil {
      * @param imagePath	图片文件路径
      * @param keyWord	签名关键字
      */
-    public static void imageWaterMark(String templatePath,String targetPath,String imagePath,String keyWord){
+    public static boolean imageWaterMark(String templatePath,String targetPath,String imagePath,String keyWord){
         log.error("imageWaterMark...PDF...PATH{}：" + templatePath);
         log.error("imageWaterMark...NEWPDF...PATH{}：" + targetPath);
         try {
@@ -59,6 +59,7 @@ public class PdfImageSignetUtil {
                 log.info("最后一次出现关键字的位置信息：页码=" + (int)positions.get(positions.size()-1)[0] +
                         "，X轴=" + positions.get(positions.size()-1)[1] + "，Y轴=" + positions.get(positions.size()-1)[2]);
                 PdfImage(targetPath,input,imagePath,positions);
+                return true;
             }else {
                 log.info("未发现关键字信息");
             }
@@ -67,6 +68,7 @@ public class PdfImageSignetUtil {
             log.error("PDF插入图片发生意外异常：" + e);
             throw new RuntimeException();
         }
+        return false;
     }
 
     /**
diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
index efe975fc..6ee499db 100644
--- a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml
+++ b/yanzhu-modules/yanzhu-system/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-ui-app/miniprogram/components/safety-bar-chart/index.js b/yanzhu-ui-app/miniprogram/components/safety-bar-chart/index.js
index ba168145..741237d8 100644
--- a/yanzhu-ui-app/miniprogram/components/safety-bar-chart/index.js
+++ b/yanzhu-ui-app/miniprogram/components/safety-bar-chart/index.js
@@ -205,7 +205,8 @@ Component({
                                 formatter: function (data) {
                                     //富文本固定格式{colorName|这里填你想要写的内容}
                                     //return '{arrow|}'
-                                    return '{index|No.' + (nameData.length - data.dataIndex) + '}{name|' + nameData[data.dataIndex] + '}{prop|' + totalData[data.dataIndex] + '}{unit| ' + unitData[data.dataIndex] + '}{prop|（} {yes|' + yesMonitor[data.dataIndex] + '}{unit| ' + unitData[data.dataIndex] + '/}{not|' + notMonitor[data.dataIndex] + '}{unit| ' + unitData[data.dataIndex] + '}{prop|）} ';
+                                    return '{index|No.' + (nameData.length - data.dataIndex) + '}{name|' + nameData[data.dataIndex] + '}{prop|' + totalData[data.dataIndex] + '}{unit| ' + unitData[data.dataIndex] + '}';
+                                    //{prop|（} {yes|' + yesMonitor[data.dataIndex] + '}{unit| ' + unitData[data.dataIndex] + '/}{not|' + notMonitor[data.dataIndex] + '}{unit| ' + unitData[data.dataIndex] + '}{prop|）} 
                                 },
                             }
                         },
diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxml b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
index 18bda77e..b32c2538 100644
--- a/yanzhu-ui-app/miniprogram/pages/login/login.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
@@ -1,6 +1,6 @@
 <!--pages/login/login.wxml-->
 <view class="login_logo">
-  <image wx:if="false" src="https://xiangguan.sxyanzhu.com/profile/xmgl/static/sys_logo.png"></image>
+  <image wx:if="{{false}}" src="https://xiangguan.sxyanzhu.com/profile/xmgl/static/sys_logo.png"></image>
 </view>
 <view class="login_title">
   <text>数字工程项目管理系统</text>
@@ -11,7 +11,7 @@
 <view class="login_bg">
   <view class="login_ex">请使用手机号登录</view>
   <view class="login_input">
-    <input placeholder="输入登录手机" placeholder-style="color:#5e6ea2" bindinput="name" class="name" maxlength="11"/>
+    <input placeholder="输入登录手机" placeholder-style="color:#5e6ea2" bindinput="name" class="name" maxlength="21"/>
   </view>
   <view class="login_input">
     <input placeholder="输入登录密码" placeholder-style="color:#5e6ea2" password="true" bindinput="psw" class="pass" maxlength="20" />
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 a6798827..1f34cb0a 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js
@@ -11,6 +11,9 @@ import {
     findProSubDeptsInfoById,
     findProSubDeptsUserInfoById
 } from '../../../api/project'
+import {
+	getToken
+} from '../../../utils/auth'
 const app = getApp()
 Page({
     /**
@@ -60,7 +63,7 @@ Page({
                     index = idx + 1;
                 }
                 list.push({
-                    text: item.name,
+                    text: item.name.substr(0,6),
                     desc: ''
                 });
             });
@@ -362,6 +365,9 @@ Page({
         wx.downloadFile({
             // 示例 url，并非真实存在
             url: config.baseUrl + '/file/download?fileName=' + path,
+            header: {
+                'Authorization': 'Bearer ' + getToken()
+            },
             success: function (res) {
                 const filePath = res.tempFilePath
                 let fpt = filePath.split(".");
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 1fd7ea9c..bc74ea06 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml
@@ -71,12 +71,12 @@
             <view>{{subDeptData.projectName}}</view>
         </view>
         <view class="inspect_info" wx:if="{{options.category=='1' || options.category=='2' || options.category=='3' || options.category=='4' || options.category=='5' || options.category=='6' || options.category=='8'}}">
-            <view class="inspect_overview_list">
+            <!-- <view class="inspect_overview_list">
                 <van-row>
                     <van-col span="8"><text class="color_purple">项目单位</text></van-col>
                     <van-col span="16" class="color_orange">{{ subDeptData.projectName}}</van-col>
                 </van-row>
-            </view>
+            </view> -->
             <view class="inspect_overview_list">
                 <van-row>
                     <van-col span="8"><text class="color_purple">单位类型</text></van-col>
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 90b002da..d787f36c 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js
@@ -7,6 +7,9 @@ import {
     findProSubDeptsInfoById,
     findProSubDeptsUserInfoById
 } from '../../../api/project'
+import {
+	getToken
+} from '../../../utils/auth'
 const app = getApp()
 Page({
     /**
@@ -32,7 +35,8 @@ Page({
         minImageList: [],
         imgTypes: ["png", "jpg", "jpeg"],
         stopBtnShow: false,
-        comment: ""
+        comment: "",
+        imgBaseUrl: config.baseImgUrl
     },
 
     /**
@@ -55,11 +59,13 @@ Page({
             }];
             let index = this.data.active;
             res.data.forEach((item,idx) => {
+                console.log("this.data.options.taskName",this.data.options.taskName)
+                console.log("item.name",item.name)
                 if(this.data.options.taskName==item.name){
                     index = idx+1;
                 }
                 list.push({
-                    text: item.name,
+                    text: item.name.substr(0,6),
                     desc: ''
                 });
             });
@@ -282,6 +288,9 @@ Page({
         wx.downloadFile({
             // 示例 url，并非真实存在
             url: config.baseUrl + '/file/download?fileName=' + path,
+            header: {
+                'Authorization': 'Bearer ' + getToken()
+            },
             success: function (res) {
                 const filePath = res.tempFilePath
                 let fpt = filePath.split(".");
diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml
index 5c50e6b9..10c447b8 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml
@@ -71,12 +71,12 @@
             <view>{{subDeptData.projectName}}</view>
         </view>
         <view class="inspect_info" wx:if="{{options.category=='1' || options.category=='2' || options.category=='3' || options.category=='4' || options.category=='5' || options.category=='6' || options.category=='8'}}">
-            <view class="inspect_overview_list">
+            <!-- <view class="inspect_overview_list">
                 <van-row>
                     <van-col span="8"><text class="color_purple">项目单位</text></van-col>
                     <van-col span="16" class="color_orange">{{ subDeptData.projectName}}</van-col>
                 </van-row>
-            </view>
+            </view> -->
             <view class="inspect_overview_list">
                 <van-row>
                     <van-col span="8"><text class="color_purple">单位类型</text></van-col>
@@ -211,8 +211,8 @@
                     <van-col span="16">
                         <view class="problem_list_info_con in-img-max">
                             <view class="in-img-div" wx:key="index">
-                                <image bindtap='showImg' data-set="{{subDeptUserData.cardImgPos}}" src="{{imgBaseUrl+subDeptUserData.cardImgPos+'.min.jpg'}}"></image>
-                                <image bindtap='showImg' data-set="{{subDeptUserData.cardImgInv}}" src="{{imgBaseUrl+subDeptUserData.cardImgInv+'.min.jpg'}}"></image>
+                                <image bindtap='showImg' data-set="{{subDeptUserData.userInfos.cardImgPos}}" src="{{imgBaseUrl+subDeptUserData.userInfos.cardImgPos+'.min.jpg'}}"></image>
+                                <image bindtap='showImg' data-set="{{subDeptUserData.userInfos.cardImgInv}}" src="{{imgBaseUrl+subDeptUserData.userInfos.cardImgInv+'.min.jpg'}}"></image>
                             </view>
                         </view>
                     </van-col>
diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.js b/yanzhu-ui-app/miniprogram/pages/project_info/index.js
index 2631e2f5..724e0c0c 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_info/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.js
@@ -166,7 +166,7 @@ Page({
                 let zg = 0;
                 let lg = 0;
                 res.data.forEach(item => {
-                    if (item.useStatus == '1') {
+                    if (item.useStatus == '0') {
                         zg += item.total;
                     } else {
                         lg += item.total;
@@ -217,7 +217,7 @@ Page({
             let lw = 0;
             labourDataList.forEach(item => {
                 if (this.data.nactive == 0) {
-                    if (item.useStatus == '1') {
+                    if (item.useStatus == '0') {
                         if (item.craftType == '2') {
                             ts += item.total;
                         } else if (item.craftType == '3') {
@@ -227,7 +227,7 @@ Page({
                         }
                     }
                 } else {
-                    if (item.useStatus != '1') {
+                    if (item.useStatus != '0') {
                         if (item.craftType == '2') {
                             ts += item.total;
                         } else if (item.craftType == '3') {
@@ -351,7 +351,7 @@ Page({
      */
     getProSubDeptsUserInfo(proId) {
         findProSubDeptsUserByParams(proId).then(res => {
-            app.globalData.subDeptUserData = res.data;
+            app.globalData.subDeptUserData = res.data[0];
             this.setData({
                 subDeptUserInfo: res.data[0]
             });
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
index 364ab430..173a2e12 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
@@ -674,38 +674,17 @@ if (this.data.userPost == "1") {
     });
   },
 
-  /**
-   * 签名..
-   */
-  startSignFile_0(){
-    this.initData(this.data.userPhoneNumber);
-  },
-
   /**
    * 开始签署文件
    * @param {*} skip 
    */
   startSignFile(skip) {
     let _fileForm = {};
-    let currDate = new Date().toLocaleString().substring(0, 10).split("/");
-    currDate[2] = currDate[2].replace("上","").replace("下","").replace("午","");
-    if (this.data.form.userPost == 1) {
-      _fileForm.fName = this.data.form.subDeptLeaderName;
-      _fileForm.fCardId = this.data.form.subDeptLeaderCode;
-      _fileForm.fSex = this.getGenderFromIdCard(this.data.form.subDeptLeaderCode);
-      _fileForm.fPost = "委托人";
-      _fileForm.fDate = currDate[0] + "年" + currDate[1] + "月" + currDate[2] + "日";
-    } else {
-      _fileForm.fName = this.data.form.userName;
-      _fileForm.fCardId = this.data.form.cardCode;
-      _fileForm.fSex = this.getGenderFromIdCard(this.data.form.cardCode);
-      this.data.craftPostAllOrginList.forEach(item => {
-        if (this.data.form.craftPost == item.dictValue) {
-          _fileForm.fPost = item.dictLabel;
-        }
-      });
-      _fileForm.fDate = currDate[0] + "年" + currDate[1] + "月" + currDate[2] + "日";
-    }
+    _fileForm.fName = "";
+    _fileForm.fCardId = "";
+    _fileForm.fSex = "";
+    _fileForm.fPost = "";
+    _fileForm.fDate = "";
     this.setData({
       active: skip ? (this.data.active + 1) : this.data.active,
       fileForm: _fileForm,
@@ -1221,7 +1200,7 @@ if (this.data.userPost == "1") {
           this.setData({
             "form.userName": res.data.name,
             "form.cardCode": res.data.cardId,
-            "form.nativePlace": res.data.native,
+            "form.nativePlace": res.data.nation,
             "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 f76e5991..bdffb60b 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
@@ -688,7 +688,7 @@
             <project-select init="{{initProject}}"></project-select>
             <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
             <view class="kaoshimianban">
-                <jyq-result wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜！考试通过" description="本次考试已顺利完成，您可以去签署安全承诺文件了。" actionText="立 即 签 署" bind:action="startSignFile_0" />
+                <jyq-result wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜！考试通过" description="本次考试已顺利完成，您可以去签署安全承诺文件了。" actionText="立 即 签 署" bind:action="startSignFile" />
                 <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/sb.png" title="很遗憾！考试未通过" description="本次考试未通过，重新考试通过后您才可以签署安全承诺文件，请返回学习或继续考试。" actionText="继 续 考 试" bind:action="anewBusEduQuestion" descActionText="返 回 学 习" bind:descAction="onClickPreviousNode" />
                 <!-- <view class="time-unit">
                     <text class="timeline_for_state_2 timeline_for_state_6" wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}">很 遗 憾 ！ 考 试 不 通 过</text><text class="timeline_for_state_1 timeline_for_state_6" wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}">恭 喜 ！ 考 试 通 过</text>
diff --git a/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js b/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js
index cd8a6695..352e8801 100644
--- a/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js
+++ b/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js
@@ -67,4 +67,12 @@ export function changeDefaultProject(id) {
     url: '/manage/proProjectInfoSubdeptsUsers/changeDefaultProject/' + id,
     method: 'get'
   })
+}
+
+// 文件签署
+export function fileSign(id) {
+  return request({
+    url: '/manage/proProjectInfoSubdeptsUsers/fileSign/' + id,
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
index 4953fc19..f2df8671 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
@@ -124,7 +124,7 @@
           <el-button link type="primary" icon="Delete" @click="handleEnter(scope.row)" v-if="scope.row.useStatus == 0"
             v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">离场</el-button>
           <el-button link type="primary" icon="Delete" @click="handleEnter(scope.row)" v-else
-            v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">进场</el-button><el-icon>< /></el-icon>
+            v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">进场</el-button>
           <el-button v-if="isSign(scope.row)" link type="primary" icon="StarFilled" @click="handleFileSign(scope.row)"
           v-hasPermi="['manage:proProjectInfoSubdeptsUsers:edit']">签名</el-button>
         </template>
@@ -297,7 +297,7 @@
 </template>
 
 <script setup name="ProProjectInfoSubdeptsUsers">
-import { listProProjectInfoSubdeptsUsers, getProProjectInfoSubdeptsUsers, updateEnterState, delProProjectInfoSubdeptsUsers, addProProjectInfoSubdeptsUsers, updateProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers";
+import { listProProjectInfoSubdeptsUsers, getProProjectInfoSubdeptsUsers, updateEnterState, delProProjectInfoSubdeptsUsers, addProProjectInfoSubdeptsUsers, updateProProjectInfoSubdeptsUsers, fileSign } from "@/api/manage/proProjectInfoSubdeptsUsers";
 import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
 import { listProProjectInfoSubdeptsGroup } from "@/api/manage/proProjectInfoSubdeptsGroup";
 import { listUser } from "@/api/system/user";
@@ -512,27 +512,7 @@ function getList() {
   });
 }
 
-function isSign(row){
-  if(row.approveStatus==100){
-    if(row.userPost=='1' || row.userPost=='2' || row.userPost=='3' || row.userPost=='6' || row.userPost=='8'){
-      if(row.eduFilePath.indexOf("-p")>-1 && row.eduFilePath.indexOf("-c")>-1){
-        return false;
-      }else{
-        return true;
-      }
-    }else if(row.userPost=='4' || row.userPost=='5'){
-      if(row.eduFilePath.indexOf("-g")>-1 && row.eduFilePath.indexOf("-p")>-1 && row.eduFilePath.indexOf("-c")>-1){
-        return false;
-      }else{
-        return true;
-      }
-    }else{
-      return false;
-    }
-  }else{
-    return false;
-  }
-}
+
 
 // 取消按钮
 function cancel() {
@@ -774,6 +754,36 @@ function handleUpdate(row) {
   });
 }
 
+function isSign(row){
+  if(row.approveStatus==100){
+    if(row.userPost=='1' || row.userPost=='2' || row.userPost=='3' || row.userPost=='6' || row.userPost=='8'){
+      if(row.eduFilePath.indexOf("-p")>-1 && row.eduFilePath.indexOf("-c")>-1){
+        return false;
+      }else{
+        return true;
+      }
+    }else if(row.userPost=='4' || row.userPost=='5'){
+      if(row.eduFilePath.indexOf("-g")>-1 && row.eduFilePath.indexOf("-p")>-1 && row.eduFilePath.indexOf("-c")>-1){
+        return false;
+      }else{
+        return true;
+      }
+    }else{
+      return false;
+    }
+  }else{
+    return false;
+  }
+}
+
+function handleFileSign(row){
+  fileSign(row.id).then(res =>{
+    if(res.code==200){
+      getList();
+    }
+  });
+}
+
 function getWorkType(wt) {
   if (wt) {
     let tmps = user_work_type.value.filter(d => d.value == wt);