|
@@ -221,11 +221,13 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
@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, Integer pNo, Integer pSize) {
|
|
|
|
|
+ System.out.println("as:"+auditStatus+" dc:"+ dataCategory);
|
|
|
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);
|
|
|
if (null != auditStatus) params.put("auditStatus", auditStatus);
|
|
if (null != auditStatus) params.put("auditStatus", auditStatus);
|
|
|
|
|
+ if(null != dataCategory) params.put("dataCategory", dataCategory);
|
|
|
if (!StringUtils.isBlank(name)) params.put("name", name);
|
|
if (!StringUtils.isBlank(name)) params.put("name", name);
|
|
|
return (Pagination<AchievementObject>) findPage("listMyAchievementByPage", "listMyAchievementCount",params,
|
|
return (Pagination<AchievementObject>) findPage("listMyAchievementByPage", "listMyAchievementCount",params,
|
|
|
pNo, pSize);
|
|
pNo, pSize);
|
|
@@ -399,11 +401,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
@Override
|
|
@Override
|
|
|
public int updateReleaseStatus(Achievement a) {
|
|
public int updateReleaseStatus(Achievement a) {
|
|
|
a.setAuditStatus(AchievementAuditStatus.REVOKE.getCode());
|
|
a.setAuditStatus(AchievementAuditStatus.REVOKE.getCode());
|
|
|
- if(a.getReleaseStatus()==1){
|
|
|
|
|
- Calendar now = Calendar.getInstance();
|
|
|
|
|
- now.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
- a.setReleaseDate(now.getTime());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if(a.getReleaseStatus()==1){
|
|
|
|
|
+// Calendar now = Calendar.getInstance();
|
|
|
|
|
+// now.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
+// a.setReleaseDate(now.getTime());
|
|
|
|
|
+// }
|
|
|
achievementDemandMapper.deleteByAchievementId(a.getId());
|
|
achievementDemandMapper.deleteByAchievementId(a.getId());
|
|
|
achievementKeywordMapper.batchDeleteByAchievementId(a.getId());
|
|
achievementKeywordMapper.batchDeleteByAchievementId(a.getId());
|
|
|
achievementPublishMapper.batchDeleteByAchievementId(a.getId());
|
|
achievementPublishMapper.batchDeleteByAchievementId(a.getId());
|