1.修复严重违法异议流程报错;2.修复文书穗字问题
This commit is contained in:
parent
e3fe7f50a1
commit
f0258bb965
|
|
@ -182,8 +182,10 @@ public class WorkFlowServiceImpl implements WorkFlowService {
|
|||
@Override
|
||||
public ResultMap completeTaskToOther(String processid, String nextNodeID, List<String> nextUserIDs) {
|
||||
boolean isEnd = false;
|
||||
if (nextUserIDs == null || nextUserIDs.size() == 0) {
|
||||
throw new BusinessException("nextUserIDs为空,请检查。processid=" + processid);
|
||||
if (!"endDissent".equals(nextNodeID)) {
|
||||
if (nextUserIDs == null || nextUserIDs.size() == 0) {
|
||||
throw new BusinessException("nextUserIDs为空,请检查。processid=" + processid);
|
||||
}
|
||||
}
|
||||
int flag = nextUserIDs.size() == 1 ? FLAG_SINGLE : FLAG_MULTI;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,13 +43,14 @@ public class TSWorkNoServiceImpl extends BaseServiceImpl<TSWorkNoMapper, TSWorkN
|
|||
Calendar a = Calendar.getInstance();
|
||||
TSWorkNo paramModel = new TSWorkNo();
|
||||
Map<String, String> map = Constant.GZ_REGION_CODE_SHORTNAME;
|
||||
String shortName = "穗";
|
||||
for (String code : map.keySet()) {
|
||||
if (code.equals(aicID) && !map.get(code).equals("穗")) {
|
||||
shortName += map.get(code);
|
||||
break;
|
||||
}
|
||||
}
|
||||
String shortName = map.get(aicID.substring(0, 4) + "00");
|
||||
// String shortName = "穗";
|
||||
// for (String code : map.keySet()) {
|
||||
// if (code.equals(aicID) && !map.get(code).equals("穗")) {
|
||||
// shortName += map.get(code);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
paramModel.setAicid(aicID.length() > 6 ? aicID.substring(0, 6) : aicID);
|
||||
paramModel.setWorkNoType(workNoType);
|
||||
String genRule = "";
|
||||
|
|
|
|||
Loading…
Reference in New Issue