diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/constant/Constant.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/constant/Constant.java index 0f85c0c64a13e4ae5c1e1127db117752a8a3ad97..da080ea5715e6b414a16deff7c4f9bc4ec66ae55 100644 --- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/constant/Constant.java +++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/constant/Constant.java @@ -12,9 +12,9 @@ public final class Constant { public static final String CREATE = "鍒涘缓浜嗚鍒跺害"; public static final String EDIT = "缂栬緫浜嗚鍒跺害"; public static final String ADUITPASS = "瀹℃牳閫氳繃浜嗚鍒跺害"; - public static final String ADUITREJECT = "椹冲洖浜嗚鍒跺害, 椹冲洖鐞嗙敱锛�"; + public static final String ADUITREJECT = "椹冲洖浜嗚鍒跺害, 椹冲洖鐞嗙敱:"; public static final String PUBLISH = "鍙戝竷浜嗚鍒跺害"; - public static final String CANCEL = "浣滃簾浜嗚鍒跺害"; + public static final String CANCEL = "浣滃簾浜嗚鍒跺害, 浣滃簾鐞嗙敱:"; public static final String RECOVER = "鎭㈠浜嗚鍒跺害"; public static final String DELETE = "鍒犻櫎浜嗚鍒跺害"; } diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/AuditServiceImpl.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/AuditServiceImpl.java index 4971185acac1e17cb264d2e736477b5f9f5579e7..d6bce4ef874861745ec5450919ad5b26ebe8a23b 100644 --- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/AuditServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/AuditServiceImpl.java @@ -135,7 +135,7 @@ public class AuditServiceImpl implements AuditService { //2.1.4 鑻� ${InstitutionPo}鐨勫鏍哥姸鎬佷负1 ,淇敼瀹℃牳鐘舵€佷负3 ,骞舵洿鏂版暟鎹簱 institutionMapper.updateById(institutionPo); //3. 灏嗘娆℃搷浣滀繚瀛樻搷浣滆褰� - institutionLogService.addInstitutionLog(new InstitutionLogPo(rejectCmd.getId(), Constant.InstitutionLogContent.ADUITREJECT, null, true)); + institutionLogService.addInstitutionLog(new InstitutionLogPo(rejectCmd.getId(), Constant.InstitutionLogContent.ADUITREJECT + rejectCmd.getRejectReason(), null, true)); } else { //2.2.1 鑻ヤ负2 鏍规嵁鏍规嵁id鍘荤煡璇嗚〃涓煡璇㈠嚭杩欐潯绱犳潗 ${knowledgePo} KnowledgePo knowledgePo = knowledgeMapper.selectById(rejectCmd.getId()); @@ -170,7 +170,7 @@ public class AuditServiceImpl implements AuditService { //2. 鍒涘缓鏌ヨ鏉′欢querywrapper 瀹℃牳浜篿d涓哄綋鍓嶇櫥褰曠敤鎴穒d 涓� 瀹℃牳鐘舵€�(auditStatus)涓� 1 寰呭鏍� QueryWrapper<InstitutionPo> wrapper = new QueryWrapper<InstitutionPo>() .select(InstitutionPo.class, i -> !i.getProperty().equals("content")) - .eq("audit_status", 1) + .eq("audit_status", AuditStatusEnum.TOBEAUDIT.getIndex()) .and(s -> s.eq("auditor_id", id).or().eq("creator", id)) .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()), "title", pageRequest.getTitle()) .orderByDesc("create_date"); diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java index f669612806b16adcd354f01342944a468c5fdc42..b5d83c1a1870a62dd84610007b6cfa639f7fee40 100644 --- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java @@ -525,7 +525,7 @@ public class InstitutionServiceImpl extends AbstractService<InstitutionPo, Insti //娣诲姞浣滃簾鐞嗙敱 institutionPo.setCancelReason(changeInstitutionStatusCmd.getCancelReason()); //鏍规嵁鍒跺害id淇濆瓨鎿嶄綔璁板綍 : xxx浣滃簾浜嗚鍒跺害 - institutionLogPo.setContent(Constant.InstitutionLogContent.CANCEL); + institutionLogPo.setContent(Constant.InstitutionLogContent.CANCEL + changeInstitutionStatusCmd.getCancelReason()); break; case RECOVER: if (!PublishStatusEnum.CANCEL.getIndex().equals(institutionPo.getPublishStatus())) {