Skip to content

Y
yn-health-science
Commit a2c1f5f1 authored by wangxl's avatar wangxl
Browse files
Options

1

parent 1c036bac
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 22 deletions
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java
View file @ a2c1f5f1
...@@ -261,32 +261,31 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD ...@@ -261,32 +261,31 @@ 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) { // 更新上级单位上报记录
// 更新上级单位上报记录 this.updateAudit(auditNote.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", index + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null);
this.updateAudit(auditNote.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", index + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null); } else {
} else { //插入上报表
//插入上报表 this.insertAudit(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
this.insertAudit(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;
} }
// 插入审核记录表
comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
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