diff --git a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionSimpleOut.java b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionSimpleOut.java
index c5b77ea20aece96304ff2f4ab69b92715795e9a3..29ffa9192d55105987e0e038b842c8bd470e1dd2 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionSimpleOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionSimpleOut.java
@@ -30,6 +30,12 @@ public class InstitutionSimpleOut implements Serializable {
@ApiModelProperty(value = "鏂囧彿")
private String documentNo;
+ @ApiModelProperty(value = "瀹℃壒浜篿d")
+ private Long auditorId;
+
+ @ApiModelProperty(value = "鎻愪氦浜篿d")
+ private Long creator;
+
@ApiModelProperty(value = "鏍囬")
private String title;
diff --git a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/knowledge/KnowledgeAuditOut.java b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/knowledge/KnowledgeAuditOut.java
index 3304e8a13ab65321d13240219b22da6433621424..87833b3f022b1adf1fc758129acb056dcbeb5f27 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/knowledge/KnowledgeAuditOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/knowledge/KnowledgeAuditOut.java
@@ -22,6 +22,12 @@ public class KnowledgeAuditOut implements Serializable {
@ApiModelProperty(value = "鐭ヨ瘑id")
private Long id;
+ @ApiModelProperty(value = "瀹℃壒浜篿d")
+ private Long auditorId;
+
+ @ApiModelProperty(value = "鎻愪氦浜篿d")
+ private Long creator;
+
@ApiModelProperty(value = "鏍囬")
private String title;
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 a520669e960c4c46c1cc55c31dba1b2a5b89f56f..0df679a4cad2f25f5c347f95b81cc4efd327bfbf 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
@@ -155,30 +155,29 @@ public class AuditServiceImpl implements AuditService {
//1. 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id ${id}
Long id = baseInfoService.getLoginInfo().getId();
//2. 鍒涘缓鏌ヨ鏉′欢querywrapper 瀹℃牳浜篿d涓哄綋鍓嶇櫥褰曠敤鎴穒d 涓� 瀹℃牳鐘舵€�(auditStatus)涓� 1 寰呭鏍�
- QueryWrapper<InstitutionPo> wrapper1 = new QueryWrapper<InstitutionPo>()
+ QueryWrapper<InstitutionPo> wrapper = new QueryWrapper<InstitutionPo>()
.select(InstitutionPo.class, i -> !i.getProperty().equals("content"))
.eq("audit_status",1)
- .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()),"title",pageRequest.getTitle());
-
- QueryWrapper<InstitutionPo> wrapper2 = new QueryWrapper<InstitutionPo>()
- .select(InstitutionPo.class, i -> !i.getProperty().equals("content"))
- .eq("audit_status",1)
- .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()),"title",pageRequest.getTitle());
+ .and(s->s.eq("auditor_id",id).or().eq("creator",id))
+ .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()),"title",pageRequest.getTitle())
+ .orderByDesc("create_date");
Page page = new Page<>(pageRequest.getPageIndex(),pageRequest.getPageSize());
//鍔犱笂鎴戞彁浜ょ殑寰呭鏍�
//3. 浣跨敤璇ユ煡璇㈡潯浠跺湪鍒跺害琛ㄤ腑鏌ヨ 鍑虹粨鏋� Pagination<Institution> &{InstitutionPage}
- List<InstitutionPo> list1 = institutionMapper.selectList(wrapper1.eq("auditor_id",id));
- List<InstitutionSimpleOut> institutionSimpleOuts1 = InstitutionConvert.listPoToSimpleOut1(list1);
- for (InstitutionSimpleOut institutionSimpleOut : institutionSimpleOuts1) {
- institutionSimpleOut.setIsShowBtn(true);
- }
- List<InstitutionPo> list2 = institutionMapper.selectList(wrapper2.eq("creator",id));
- List<InstitutionSimpleOut> institutionSimpleOuts2 = InstitutionConvert.listPoToSimpleOut1(list2);
- for (InstitutionSimpleOut institutionSimpleOut : institutionSimpleOuts2) {
- institutionSimpleOut.setIsShowBtn(false);
+ Page page1 = institutionMapper.selectPage(page, wrapper);
+ List<InstitutionPo> institutionPoList = page1.getRecords();
+ List<InstitutionSimpleOut> institutionSimpleOuts = InstitutionConvert.listPoToSimpleOut(institutionPoList);
+
+ for (InstitutionSimpleOut institutionSimpleOut : institutionSimpleOuts) {
+ if (id.equals(institutionSimpleOut.getAuditorId())){
+ //鏄剧ず闇€瑕佸鎵圭殑
+ institutionSimpleOut.setIsShowBtn(true);
+ }else {
+ //闅愯棌鑷繁鎻愪氦鐨�
+ institutionSimpleOut.setIsShowBtn(false);
+ }
}
- institutionSimpleOuts1.addAll(institutionSimpleOuts2);
- for (InstitutionSimpleOut institutionSimpleOut : institutionSimpleOuts1) {
+ for (InstitutionSimpleOut institutionSimpleOut : institutionSimpleOuts) {
Long classifyId = institutionSimpleOut.getClassifyId();
ClassifyPo classifyPo = classifyMapper.selectById(classifyId);
if (ObjectUtils.isEmpty(classifyPo)){
@@ -186,8 +185,8 @@ public class AuditServiceImpl implements AuditService {
}
institutionSimpleOut.setClassifyName(classifyPo.getName());
}
- page.setRecords(institutionSimpleOuts1);
- page.setTotal(institutionSimpleOuts1.size());
+ page.setRecords(institutionSimpleOuts);
+ page.setTotal(institutionSimpleOuts.size());
page.setPages(page.getTotal() / pageRequest.getPageSize());
return Pagination.fromPage(page);
}
@@ -197,32 +196,30 @@ public class AuditServiceImpl implements AuditService {
//1. 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id ${id}
Long id = baseInfoService.getLoginInfo().getId();
//2. 鍒涘缓鏌ヨ鏉′欢querywrapper 瀹℃牳浜篿d涓哄綋鍓嶇櫥褰曠敤鎴穒d 涓� 瀹℃牳鐘舵€�(auditStatus)涓� 1 寰呭鏍� 涓� type涓�2 绱犳潗
- QueryWrapper<KnowledgePo> wrapper1 = new QueryWrapper<KnowledgePo>()
+ QueryWrapper<KnowledgePo> wrapper = new QueryWrapper<KnowledgePo>()
.select(KnowledgePo.class, i -> !i.getProperty().equals("content"))
.eq("audit_status",1)
.eq("type",2)
- .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()),"title",pageRequest.getTitle());
- QueryWrapper<KnowledgePo> wrapper2 = new QueryWrapper<KnowledgePo>()
- .select(KnowledgePo.class, i -> !i.getProperty().equals("content"))
- .eq("audit_status",1)
- .eq("type",2)
- .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()),"title",pageRequest.getTitle());
+ .and(s->s.eq("auditor_id",id).or().eq("creator",id))
+ .like(ObjectUtils.isNotEmpty(pageRequest.getTitle()),"title",pageRequest.getTitle())
+ .orderByDesc("create_date");
//娣诲姞鏌ヨ鏉′欢
//3. 浣跨敤璇ユ煡璇㈡潯浠跺湪鐭ヨ瘑琛ㄤ腑鏌ヨ 鍑虹粨鏋� Pagination<Institution> &{knowledgePage}
Page page = new Page<>(pageRequest.getPageIndex(),pageRequest.getPageSize());
- List<KnowledgePo> knowledgePoList1 = knowledgeMapper.selectList(wrapper1.eq("auditor_id",id));
- List<KnowledgeAuditOut> knowledgeAuditOutList1 = KnowledgeConvert.poToAuditOut(knowledgePoList1);
- for (KnowledgeAuditOut knowledgeAuditOut : knowledgeAuditOutList1) {
- knowledgeAuditOut.setIsShowBtn(true);
- }
- List<KnowledgePo> knowledgePoList2 = knowledgeMapper.selectList(wrapper2.eq("creator",id));
- List<KnowledgeAuditOut> knowledgeAuditOutList2 = KnowledgeConvert.poToAuditOut(knowledgePoList2);
- for (KnowledgeAuditOut knowledgeAuditOut : knowledgeAuditOutList2) {
- knowledgeAuditOut.setIsShowBtn(false);
+ Page page1 = knowledgeMapper.selectPage(page, wrapper);
+ List<KnowledgePo> knowledgePoList = page1.getRecords();
+ List<KnowledgeAuditOut> knowledgeAuditOutList = KnowledgeConvert.listPoToAuditOut(knowledgePoList);
+ for (KnowledgeAuditOut knowledgeAuditOut : knowledgeAuditOutList) {
+ if (id.equals(knowledgeAuditOut.getAuditorId())){
+ //鏄剧ず闇€瑕佸鎵圭殑
+ knowledgeAuditOut.setIsShowBtn(true);
+ }else {
+ //闅愯棌鑷繁鎻愪氦鐨�
+ knowledgeAuditOut.setIsShowBtn(false);
+ }
}
- knowledgeAuditOutList1.addAll(knowledgeAuditOutList2);
- page.setRecords(knowledgeAuditOutList1);
- page.setTotal(knowledgeAuditOutList1.size());
+ page.setRecords(knowledgeAuditOutList);
+ page.setTotal(knowledgeAuditOutList.size());
page.setPages(page.getTotal() / pageRequest.getPageSize());
//4. 杩斿洖&{knowledgePage}
return Pagination.fromPage(page);
diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java
index c22a2981586d566e405d61c34743ee33e9297983..c31b2f3170dccd3714b604ff2353df0851122f07 100644
--- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java
@@ -76,6 +76,8 @@ public class InstitutionConvert {
institutionSimpleOut.setVersion(institutionPo.getVersion());
institutionSimpleOut.setCreatorName(institutionPo.getCreatorName());
institutionSimpleOut.setCreateDate(institutionPo.getCreateDate());
+ institutionSimpleOut.setAuditorId(institutionPo.getAuditorId());
+ institutionSimpleOut.setCreator(institutionPo.getCreator());
institutionSimpleOutList.add(institutionSimpleOut);
}
return institutionSimpleOutList;
diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/KnowledgeConvert.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/KnowledgeConvert.java
index 1b02d930d147e1af4837bc60b5bc297ddba07f82..99e67f1b46149eeedb7435a4cd621e0efe0f7b0d 100644
--- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/KnowledgeConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/KnowledgeConvert.java
@@ -44,7 +44,7 @@ public class KnowledgeConvert {
return knowledgePoOutList;
}
- public static List<KnowledgeAuditOut> poToAuditOut(List<KnowledgePo> KnowledgePoList) {
+ public static List<KnowledgeAuditOut> listPoToAuditOut(List<KnowledgePo> KnowledgePoList) {
//杞崲瀵瑰簲閿€糾ap
Map<String, String> map = new HashMap<>(3);
List<KnowledgeAuditOut> knowledgeAuditOutList = MapperUtils.INSTANCE.mapAsList(KnowledgeAuditOut.class, KnowledgePoList);