|
|
@@ -82,8 +82,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listUserOwnerAchievement(String ownerId, Integer auditStatus,
|
|
|
- Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
+ public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
|
|
|
+ Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
@@ -93,15 +93,16 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pSize = 10;
|
|
|
}
|
|
|
return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
|
|
|
- "findUserOwnerAchievementCount", disposeParams(ownerId, auditStatus, serialNumber, name, keyword,
|
|
|
- category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
|
|
|
+ "findUserOwnerAchievementCount",
|
|
|
+ disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
+ releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.PERSONAL.getCode()),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listOrgOwnerAchievement(String ownerId, Integer auditStatus,
|
|
|
- Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
+ public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
|
|
|
+ Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
@@ -111,8 +112,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pSize = 10;
|
|
|
}
|
|
|
return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
|
|
|
- "findOrgOwnerAchievementCount", disposeParams(ownerId, auditStatus, serialNumber, name, keyword,
|
|
|
- category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
|
|
|
+ "findOrgOwnerAchievementCount",
|
|
|
+ disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
+ releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode()),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
@@ -193,14 +195,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pSize = 10;
|
|
|
}
|
|
|
return (Pagination<AchievementListBo>) findPage("findAchievementListByPage",
|
|
|
- "findAchievementCount", disposeParams(TokenManager.getUserId(), auditStatus, serialNumber, name,
|
|
|
- keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
|
|
|
+ "findAchievementCount", disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber,
|
|
|
+ name, keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> disposeParams(String ownerId, Integer auditStatus, Integer serialNumber, String name,
|
|
|
- String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
- Integer releaseStatus) {
|
|
|
+ private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
|
|
|
+ Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
+ String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
Date rStart = null;
|
|
|
@@ -220,6 +222,18 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(ownerName)) {
|
|
|
+ params.put("ownerName", ownerName);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null != type && StringUtils.isNotBlank(username)) {
|
|
|
+ if (UserType.PERSONAL.getCode().equals(type) ) {
|
|
|
+ params.put("username", username);
|
|
|
+ } else {
|
|
|
+ params.put("unitName", username);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (null != rStart) {
|
|
|
params.put("rStart", rStart);
|
|
|
}
|