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

fix: 80457 企标制修订-部门联络人汇总：这个选人是从联络人管理中选择并且自动带出，现在是从全部人员里选择

Browse Source
This commit is contained in:
mzaxd
2024-01-29 14:18:52 +08:00
parent 7794f0f1dd
commit 20223f8316
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+11 -2
View File
@@ -40,6 +40,8 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.system.entity.LawsContactManage;
import com.jero.modules.laws.system.service.ILawsContactManageService;
import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.sys.utils.UserUtils;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserDepartService; import com.jero.modules.system.service.ISysUserDepartService;
@@ -101,6 +103,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
@Resource @Resource
private SendMessageAPI sendMessageAPI; private SendMessageAPI sendMessageAPI;
@Resource
private ILawsContactManageService contactManageService;
@Override @Override
public void startProcess(ESRevisionDataVO revisionData) { public void startProcess(ESRevisionDataVO revisionData) {
@@ -337,8 +341,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
data.setReviewUser(null); data.setReviewUser(null);
} }
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
String contactUserLeader = (String) runtimeService.getVariable(executionId, executionId + "-ContactUserLeader"); // 根据联络人找到部门联络人主管级领导
data.setContactUserLeader(contactUserLeader); LambdaQueryWrapper<LawsContactManage> contactWrapper = new LambdaQueryWrapper<>();
contactWrapper.eq(LawsContactManage::getContactId, userId);
List<LawsContactManage> list = contactManageService.list(contactWrapper);
if (list != null && !list.isEmpty()) {
data.setContactUserLeader(list.get(0).getLeaderId());
}
case CONTACT_USER_LEADER_APPROVAL: case CONTACT_USER_LEADER_APPROVAL:
advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId); advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
adviceList = adviceService.list(advicesWrapper); adviceList = adviceService.list(advicesWrapper);