|
@@ -236,11 +236,13 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<AchievementObject> listMyAchievement(Integer auditStatus, String name,Integer dataCategory,
|
|
public Pagination<AchievementObject> listMyAchievement(Integer auditStatus, String name,Integer dataCategory,
|
|
|
- String startDate,String endDate, Integer pNo, Integer pSize) {
|
|
|
|
|
|
|
+ String startDate,String endDate,String cStartDate,String cEndDate, Integer pNo, Integer pSize) {
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
params.put("ownerId", TokenManager.getUserId());
|
|
params.put("ownerId", TokenManager.getUserId());
|
|
|
if (null != startDate) params.put("startDate", startDate);
|
|
if (null != startDate) params.put("startDate", startDate);
|
|
|
- if (null != endDate) params.put("endDate", endDate);
|
|
|
|
|
|
|
+ if (null != endDate) params.put("endDate", endDate+" 23:59:59");
|
|
|
|
|
+ if (null != cStartDate) params.put("cStartDate", cStartDate);
|
|
|
|
|
+ if (null != cEndDate) params.put("cEndDate", cEndDate+" 23:59:59");
|
|
|
if (null != auditStatus) params.put("auditStatus", auditStatus);
|
|
if (null != auditStatus) params.put("auditStatus", auditStatus);
|
|
|
if(null != dataCategory) params.put("dataCategory", dataCategory);
|
|
if(null != dataCategory) params.put("dataCategory", dataCategory);
|
|
|
if (!StringUtils.isBlank(name)) params.put("name", name);
|
|
if (!StringUtils.isBlank(name)) params.put("name", name);
|