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

提交代码

dev_xd
姜玉琦 2025-02-11 23:11:34 +08:00
parent 44d498c2dc
commit dc560902e3
4 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,10 +120,20 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(task.getProcessInstanceId())
.singleResult();
if(task.getName().indexOf("安全教育")>-1 || task.getName().indexOf("预算员审批")>-1){
/**if(task.getName().indexOf("预算员审批")>-1 || task.getName().indexOf("预算员审批")>-1 || task.getName().indexOf("预算员审批")>-1){
R<Boolean> data = remoteProService.findUserComSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER);
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("未查询到三级安全教育主管签名信息...");
@ -131,7 +141,6 @@ 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("未查询到安质部部长签名信息...");
@ -139,12 +148,11 @@ 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());

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

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

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

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

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

@ -78,9 +78,8 @@
<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">
@ -119,7 +118,9 @@
<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>
v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">进场</el-button><el-icon>< /></el-icon>
<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>
@ -504,6 +505,28 @@ 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;