yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java

@@ -120,20 +120,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
                 .processInstanceId(task.getProcessInstanceId())
                 .singleResult();
-        /**if(task.getName().indexOf("预算员审批")>-1 || task.getName().indexOf("预算员审批")>-1 || task.getName().indexOf("预算员审批")>-1){
+
-            R<Boolean> data = remoteProService.findUserComSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER);
+        if(task.getName().indexOf("安全教育")>-1 || task.getName().indexOf("预算员审批")>-1){
-            Boolean vis = data.getData();
-            if(!vis){
-                return AjaxResult.error("未查询到三级安全教育主管签名信息...");
-            }
-            R<Boolean> data = remoteProService.findUserProSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER);
-            Boolean vis = data.getData();
-            if(!vis){
-                return AjaxResult.error("未查询到安质部部长签名信息...");
-            }
-        }
-        if(task.getName().indexOf("安全教育")>-1){
             R<Boolean> data = remoteProService.findUserComSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER);
+            System.out.println("DDD1"+JSON.toJSONString(data));
             Boolean vis = data.getData();
             if(!vis){
                 return AjaxResult.error("未查询到三级安全教育主管签名信息...");
@@ -141,6 +131,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         if(task.getName().indexOf("安质部")>-1){
             R<Boolean> data = remoteProService.findUserProSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER);
+            System.out.println("DDD2"+JSON.toJSONString(data));
             Boolean vis = data.getData();
             if(!vis){
                 return AjaxResult.error("未查询到安质部部长签名信息...");
@@ -148,11 +139,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         if(task.getName().indexOf("班组")>-1){
             R<Boolean> data = remoteProService.findUserGroSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER);
+            System.out.println("DDD3"+JSON.toJSONString(data));
             Boolean vis = data.getData();
             if(!vis){
                 return AjaxResult.error("未查询到班组长签名信息...");
             }
-        }*/
+        }
         if (DelegationState.PENDING.equals(task.getDelegationState())) {
             taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
             taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java

@@ -284,14 +284,4 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
         return toAjax(proProjectInfoSubdeptsUsersService.editDefaultProjectById(id));
     }
 
-    /**
-     * 修改为默认项目
-     */
-    @GetMapping("/fileSign/{id}")
-    public AjaxResult fileSign(@PathVariable("id") Long id)
-    {
-        proProjectInfoSubdeptsUsersService.fileSign(id);
-        return success();
-    }
-
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java

@@ -171,6 +171,4 @@ public interface IProProjectInfoSubdeptsUsersService
     Boolean findUserProSign(Long id);
 
     Boolean findUserGroSign(Long id);
-
-    void fileSign(Long id);
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -1243,85 +1243,4 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         return res+1;
     }
 
-    @Override
-    public void fileSign(Long id){
-        ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
-        String filePath = proProjectInfoSubdeptsUsers.getEduFilePath().replace(ProfileConfig.profile, ProfileConfig.profilePath).replace("-g","").replace("-p","").replace("-c","");
-        if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.LWGR.getCode()) || Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.TSGZ.getCode())){
-            // 查询班组长签名
-            if(proProjectInfoSubdeptsUsers.getSubDeptGroup()!=null){
-                ProProjectInfoSubdeptsGroup group = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupById(proProjectInfoSubdeptsUsers.getSubDeptGroup());
-                if(group!=null && StringUtils.isNotEmpty(group.getGroupLeaderPhone())){
-                    ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers();
-                    userQuery.setUserPhone(group.getGroupLeaderPhone());
-                    userQuery.setProjectId(group.getProjectId());
-                    List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
-                    if(StringUtils.isNotEmpty(users)){
-                        BasSignet query = new BasSignet();
-                        query.setProjectId(users.get(0).getProjectId());
-                        query.setUserId(users.get(0).getUserId());
-                        List<BasSignet> signets = basSignetMapper.selectBasSignetList(query);
-                        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;
-                        }else{
-                            throw new ServiceException("未查询到班组长签名信息...");
-                        }
-                    }else{
-                        throw new ServiceException("未查询到班组长签名信息...");
-                    }
-                }else{
-                    throw new ServiceException("未查询到班组长签名信息...");
-                }
-            }else{
-                throw new ServiceException("未查询到班组长签名信息...");
-            }
-        }
-
-        ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers();
-        userQuery.setWorkType(18L);
-        userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
-        List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
-        if(StringUtils.isNotEmpty(users)){
-            BasSignet query = new BasSignet();
-            query.setProjectId(users.get(0).getProjectId());
-            query.setUserId(users.get(0).getUserId());
-            List<BasSignet> signets = basSignetMapper.selectBasSignetList(query);
-            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;
-            }else{
-                throw new ServiceException("未查询安质部部长签名信息...");
-            }
-        }else {
-            throw new ServiceException("未查询安质部部长签名信息...");
-        }
-
-        ProProjectInfoSubdeptsUsers comUserQuery = new ProProjectInfoSubdeptsUsers();
-        comUserQuery.setWorkType(101L);
-        comUserQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
-        List<ProProjectInfoSubdeptsUsers> comUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(comUserQuery);
-        if(StringUtils.isNotEmpty(comUsers)){
-            BasSignet query = new BasSignet();
-            query.setProjectId(comUsers.get(0).getProjectId());
-            query.setUserId(comUsers.get(0).getUserId());
-            List<BasSignet> signets = basSignetMapper.selectBasSignetList(query);
-            if(StringUtils.isNotEmpty(signets)){
-                String newFilePath = filePath.replace(".pdf","-c.pdf");
-                String signPath = signets.get(0).getSignetPath().replace(ProfileConfig.profile, ProfileConfig.profilePath);
-                PdfImageSignetUtil.imageWaterMark(filePath, newFilePath, signPath, SignetKeyEnums.COMPANY_SIGN.getCode());
-                proProjectInfoSubdeptsUsers.setEduFilePath(newFilePath.replace(ProfileConfig.profilePath,ProfileConfig.profile));
-                proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
-            }else{
-                throw new ServiceException("未查询三级安全教育主管签名信息...");
-            }
-        }else{
-            throw new ServiceException("未查询三级安全教育主管签名信息...");
-        }
-    }
-
 }

yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue

@@ -78,8 +78,9 @@
       <el-table-column label="性别" align="center" prop="userSex">
         <template #default="scope">{{ scope.row.userSex == '男' ? '男' : '女' }}</template>
       </el-table-column>
-      <!-- <el-table-column label="民族" align="center" prop="info.nation" width="80" /> -->
+      <el-table-column label="民族" align="center" prop="info.nation" width="80" />
       <el-table-column label="所属单位" align="center" prop="subDeptName" />
+
       <el-table-column label="联系电话" align="center" prop="user.phonenumber" v-if="false" />
       <el-table-column label="班组" align="center" prop="subDeptGroupName" />
       <el-table-column label="工种类型" align="center" prop="craftType">
@@ -124,9 +125,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>
       </el-table-column>
     </el-table>
@@ -512,28 +511,6 @@ 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() {
   open.value = false;