Commit a2c1f5f1 authored by wangxl's avatar wangxl

1

parent 1c036bac
...@@ -261,8 +261,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD ...@@ -261,8 +261,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
if (model.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) { if (model.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
if (unitLevel.equals(1)) { if (unitLevel.equals(1)) {
if (auditMethod.equals(CommonEnum.auditMethod.audit.getCode())) { if (auditMethod.equals(CommonEnum.auditMethod.audit.getCode())) {
if (model.getAuditType().equals(CommonEnum.auditType.project.getCode())) { // if (model.getAuditType().equals(CommonEnum.auditType.project.getCode())) {
// 查询上级单位上报记录
ComProjectAudit auditNote = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.last.getCode(), null); ComProjectAudit auditNote = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.last.getCode(), null);
if (null != auditNote) { if (null != auditNote) {
// 更新上级单位上报记录 // 更新上级单位上报记录
...@@ -274,19 +273,19 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD ...@@ -274,19 +273,19 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
// 插入审核记录表 // 插入审核记录表
comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId()); comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
unitId = auditUnitId; unitId = auditUnitId;
} // }
} }
} else { } else {
// 获取上级单位 // 获取上级单位
if (model.getAuditType().equals(CommonEnum.auditType.talent.getCode())) { // if (model.getAuditType().equals(CommonEnum.auditType.talent.getCode())) {
if ((auditUnitTreeCode.length() / properties.getDefaultCodeLength()) > 3) { // if ((auditUnitTreeCode.length() / properties.getDefaultCodeLength()) > 3) {
upTreeCode = auditUnitTreeCode.substring(0, 10); // upTreeCode = auditUnitTreeCode.substring(0, 10);
} else { // } else {
upTreeCode = auditUnitTreeCode.substring(0, auditUnitTreeCode.length() - properties.getDefaultCodeLength()); // upTreeCode = auditUnitTreeCode.substring(0, auditUnitTreeCode.length() - properties.getDefaultCodeLength());
} // }
} else { // } else {
upTreeCode = auditUnitTreeCode.substring(0, 5); upTreeCode = auditUnitTreeCode.substring(0, 5);
} // }
unitLevel = upTreeCode.length() / properties.getDefaultCodeLength(); unitLevel = upTreeCode.length() / properties.getDefaultCodeLength();
ComUnitDTO unit = comUnitService.getByTreeCode(upTreeCode); ComUnitDTO unit = comUnitService.getByTreeCode(upTreeCode);
if (null == unit) if (null == unit)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment