ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 权限申请流程结束后自动赋予临时权限

Browse Source
This commit is contained in:
mzaxd
2024-04-15 10:15:29 +08:00
parent d0e0ccd1b3
commit 1fe776134a
2 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+15 -10
View File
@@ -21,9 +21,13 @@ import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermi
import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService; import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService;
import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO; import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO;
import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngine;
import org.activiti.engine.ProcessEngines; import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
@@ -74,6 +78,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
@Resource @Resource
private TaskService taskService; private TaskService taskService;
@Resource
private EnterpriseStandardAuthUserService enterpriseStandardAuthUserService;
@Override @Override
public void flowStart(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { public void flowStart(EsPermissionApplyFlowVO esPermissionApplyFlowVO) {
// 流程信息 // 流程信息
@@ -267,16 +274,14 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
if (isLastNode(processAll.getProcessInstanceId()) if (isLastNode(processAll.getProcessInstanceId())
&& map.containsKey("pass") && (boolean) map.get("pass")) { && map.containsKey("pass") && (boolean) map.get("pass")) {
// 临时权限设置 // 临时权限设置
/** ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId());
* ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId()); List<LawsEnterpriseStandard> lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList();
* List<LawsEnterpriseStandard> lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList(); List<String> idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList());
* List<String> idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission();
* LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission(); lawsStandardTempPermission.setStandardIds(String.join(",", idList));
* lawsStandardTempPermission.setStandardIds(String.join(",", idList)); lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId());
* lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId()); lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate());
* lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate()); enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission);
* enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission);
*/
} }
} }
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+1 -9
View File
@@ -142,15 +142,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser(); EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser();
enterpriseStandardAuthUser.setAuthUser(userId); enterpriseStandardAuthUser.setAuthUser(userId);
enterpriseStandardAuthUser.setStandardId(standardId); enterpriseStandardAuthUser.setStandardId(standardId);
if (lawsStandardTempPermission.getAuthDate() != null) { enterpriseStandardAuthUser.setAuthExpireDate(lawsStandardTempPermission.getAuthDate());
Date authDate = lawsStandardTempPermission.getAuthDate();
// 对authDate加一天
Calendar c = Calendar.getInstance();
c.setTime(authDate);
c.add(Calendar.DATE, 1);
authDate = c.getTime();
enterpriseStandardAuthUser.setAuthExpireDate(authDate);
}
esAuthUsers.add(enterpriseStandardAuthUser); esAuthUsers.add(enterpriseStandardAuthUser);
} }
} }