|
@@ -1795,11 +1795,12 @@ public class ActTaskService extends BaseService {
|
|
|
String flag = act.getFlag();
|
|
|
if ("yes".equals(flag)) {
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
- vars.put("operators", user.getRunUnitRole());
|
|
|
+ vars.put("operators", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
|
|
|
+
|
|
|
} else {
|
|
|
//驳回到项目经理人工判断问题
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
- vars.put("processer",user.getProjectManageRole());
|
|
|
+ vars.put("processer",UserUtils.getByUserName(user.getProjectManageRole()));
|
|
|
}
|
|
|
// vars.put("yes".equals(act.getFlag())?"operators":"processer",fullName);
|
|
|
vars.put("flagNo","yes".equals(act.getFlag())?false:true);
|
|
@@ -1846,9 +1847,9 @@ public class ActTaskService extends BaseService {
|
|
|
Map<String, Object> vars = Maps.newHashMap();
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
if ("yes".equals(flag)) {
|
|
|
- vars.put("systemfulltime", user.getDistributionSystem());
|
|
|
+ vars.put("systemfulltime", UserUtils.getByUserName(user.getDistributionSystem()));
|
|
|
} else {
|
|
|
- vars.put("itemClose",user.getDistributionEngineering());
|
|
|
+ vars.put("itemClose",UserUtils.getByUserName(user.getDistributionEngineering()));
|
|
|
}
|
|
|
// vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?fullTime:fullTime);
|
|
|
vars.put("systemNo","yes".equals(act.getFlag())?false:true);
|
|
@@ -2062,11 +2063,11 @@ public class ActTaskService extends BaseService {
|
|
|
vars.put("sealNo", false);
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
if ("yes".equals(flag)) {
|
|
|
- vars.put("sealPerson",user.getDistributionPolicy());
|
|
|
+ vars.put("sealPerson",UserUtils.getByUserName(user.getDistributionPolicy()));
|
|
|
act.setComment("[没有问题]"+act.getComment());
|
|
|
vars.put("sealYes", true);
|
|
|
} else {
|
|
|
- vars.put("phasePerson",user.getProjectManageRole());
|
|
|
+ vars.put("phasePerson",UserUtils.getByUserName(user.getProjectManageRole()));
|
|
|
act.setComment("[驳回]" + act.getComment());
|
|
|
vars.put("sealNo", true);
|
|
|
}
|
|
@@ -2092,7 +2093,7 @@ public class ActTaskService extends BaseService {
|
|
|
vars.put("receiptYes", true);
|
|
|
} else {
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
- vars.put("coveredPerson",user.getConstructionUnitRole());
|
|
|
+ vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()));
|
|
|
act.setComment("[驳回]" + act.getComment());
|
|
|
vars.put("receiptNo", true);
|
|
|
}
|
|
@@ -2145,7 +2146,7 @@ public class ActTaskService extends BaseService {
|
|
|
vars.put("singleYes", true);
|
|
|
} else {
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
- vars.put("coveredPerson",user.getConstructionUnitRole());
|
|
|
+ vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()));
|
|
|
act.setComment("[驳回]" + act.getComment());
|
|
|
vars.put("singleNo", true);
|
|
|
}
|
|
@@ -2172,7 +2173,7 @@ public class ActTaskService extends BaseService {
|
|
|
vars.put("policyYes", true);
|
|
|
} else {
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
- vars.put("coveredPerson",user.getConstructionUnitRole());
|
|
|
+ vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()));
|
|
|
act.setComment("[驳回]" + act.getComment());
|
|
|
vars.put("singleNo", true);
|
|
|
}
|
|
@@ -2198,7 +2199,7 @@ public class ActTaskService extends BaseService {
|
|
|
vars.put("finishYes", true);
|
|
|
} else {
|
|
|
Project user = MyActiviUtils.findUser(act.getProcInsId());
|
|
|
- vars.put("coveredPerson",user.getConstructionUnitRole());
|
|
|
+ vars.put("coveredPerson",UserUtils.get(user.getConstructionUnitRole()));
|
|
|
act.setComment(act.getComment());
|
|
|
vars.put("finishNo", true);
|
|
|
}
|