|
|
@@ -94,11 +94,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
|
|
|
+ public Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId,
|
|
|
Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
|
|
|
Integer boutique, Integer hot) {
|
|
|
- Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
+ Map<String, Object> params = disposeParams(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
|
|
|
boutique,null, hot);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
@@ -119,11 +119,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
|
|
|
+ public Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId,
|
|
|
Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
|
|
|
Integer boutique, Integer hot) {
|
|
|
- Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
+ Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
|
|
|
boutique,internationalFlag, hot);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
@@ -215,12 +215,12 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pSize = 10;
|
|
|
}
|
|
|
return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
|
|
|
- disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
|
|
|
+ disposeParams(ownerType,null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
|
|
|
status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
|
|
|
+ private Map<String, Object> disposeParams(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
|
|
|
Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
|
|
|
Integer boutique,String internationalFlag, Integer hot) {
|
|
|
@@ -230,7 +230,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
Date rEnd = null;
|
|
|
Date cStart = null;
|
|
|
Date cEnd = null;
|
|
|
-
|
|
|
+ if (null != ownerType) {
|
|
|
+ params.put("ownerType", ownerType);
|
|
|
+ }
|
|
|
if (!StringUtils.isBlank(releaseDateStartDate)) {
|
|
|
try {
|
|
|
rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
|
|
|
@@ -725,7 +727,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
- Map<String, Object> params=disposeParams(null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
|
|
|
+ Map<String, Object> params=disposeParams(ownerType,null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
|
|
|
status, releaseDateStartDate, releaseDateEndDate,null, null, releaseStatus, null, null,null, null);
|
|
|
if (null!=fieldA) {
|
|
|
params.put("fieldA", fieldA);
|