|
|
@@ -106,7 +106,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
Integer boutique, Integer hot) {
|
|
|
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);
|
|
|
+ boutique,null, hot,null);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -128,10 +128,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
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) {
|
|
|
+ Integer boutique, Integer hot,String recordPerson) {
|
|
|
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);
|
|
|
+ boutique,internationalFlag, hot,recordPerson);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -258,14 +258,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
}
|
|
|
return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
|
|
|
disposeParams(ownerType,null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
|
|
|
- status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
|
|
|
+ status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null,null),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
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) {
|
|
|
+ Integer boutique,String internationalFlag, Integer hot,String recordPerson) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
Date rStart = null;
|
|
|
@@ -275,6 +275,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (null != ownerType) {
|
|
|
params.put("ownerType", ownerType);
|
|
|
}
|
|
|
+ if (null != recordPerson) {
|
|
|
+ params.put("recordPerson", recordPerson);
|
|
|
+ }
|
|
|
+
|
|
|
if (!StringUtils.isBlank(releaseDateStartDate)) {
|
|
|
try {
|
|
|
rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
|
|
|
@@ -778,7 +782,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pSize = 10;
|
|
|
}
|
|
|
Map<String, Object> params=disposeParams(ownerType,null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
|
|
|
- status, releaseDateStartDate, releaseDateEndDate,null, null, releaseStatus, null, null,null, null);
|
|
|
+ status, releaseDateStartDate, releaseDateEndDate,null, null, releaseStatus, null, null,null, null,null);
|
|
|
if (null!=fieldA) {
|
|
|
params.put("fieldA", fieldA);
|
|
|
}
|
|
|
@@ -817,7 +821,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
Integer boutique, Integer hot) {
|
|
|
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);
|
|
|
+ boutique,internationalFlag, hot,null);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -839,10 +843,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
public Pagination<AchievementListBo> listManageAchievement(String techBrokerId,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) {
|
|
|
+ Integer boutique, Integer hot,String recordPerson) {
|
|
|
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);
|
|
|
+ boutique,internationalFlag, hot,recordPerson);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|