|
|
@@ -27,6 +27,7 @@ import com.goafanti.common.enums.NoticeReadStatus;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.enums.UserType;
|
|
|
import com.goafanti.common.model.Achievement;
|
|
|
+import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.Notice;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
@@ -45,9 +46,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listAchievement(Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
- Integer category, Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
- Integer releaseStatus, Integer pNo, Integer pSize) {
|
|
|
+ public Pagination<AchievementListBo> listAchievement(Integer auditStatus, Integer serialNumber, String name,
|
|
|
+ String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
|
|
|
+ String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -55,9 +56,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (pSize == null || pSize < 0) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
- return (Pagination<AchievementListBo>) findPage(
|
|
|
- "findManageAchievementListByPage", "findManageAchievementCount", disposeParams(auditStatus, serialNumber, name,
|
|
|
- keyword, category, ownerType, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
|
|
|
+ return (Pagination<AchievementListBo>) findPage("findManageAchievementListByPage", "findManageAchievementCount",
|
|
|
+ disposeParams(auditStatus, serialNumber, name, keyword, category, ownerType, status,
|
|
|
+ releaseDateStartDate, releaseDateEndDate, releaseStatus),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
@@ -69,7 +70,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
|
|
|
- a.setSalesmanId(TokenManager.getAdminId());
|
|
|
+ if (TokenManager.getToken() instanceof Admin) {
|
|
|
+ a.setSalesmanId(TokenManager.getAdminId());
|
|
|
+ }
|
|
|
a.setReleaseStatus(AchievementReleaseStatus.UNRELEASE.getCode());
|
|
|
|
|
|
if (AchievementAuditStatus.SUBMIT.getCode().equals(a.getAuditStatus())) {
|
|
|
@@ -102,11 +105,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
- Integer category, Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
- Integer releaseStatus, Integer pNo, Integer pSize) {
|
|
|
- Map<String, Object> params = disposeParams(auditStatus, serialNumber, name, keyword, category, ownerType, status,
|
|
|
- releaseDateStartDate, releaseDateEndDate, releaseStatus);
|
|
|
+ public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
|
|
|
+ String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
|
|
|
+ String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
|
|
|
+ Map<String, Object> params = disposeParams(auditStatus, serialNumber, name, keyword, category, ownerType,
|
|
|
+ status, releaseDateStartDate, releaseDateEndDate, releaseStatus);
|
|
|
params.put("ownerId", TokenManager.getUserId());
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
@@ -119,8 +122,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
- private Map<String, Object> disposeParams(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category,
|
|
|
- Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
+ private Map<String, Object> disposeParams(Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
+ Integer category, Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
Integer releaseStatus) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
@@ -148,8 +151,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (null != rEnd) {
|
|
|
params.put("rEnd", rEnd);
|
|
|
}
|
|
|
-
|
|
|
- if (null != auditStatus){
|
|
|
+
|
|
|
+ if (null != auditStatus) {
|
|
|
params.put("auditStatus", auditStatus);
|
|
|
}
|
|
|
|
|
|
@@ -183,7 +186,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
return params;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public int updateAuditAchievement(Achievement a, String techBroderId, Integer auditStatus) {
|
|
|
a.setAuditStatus(auditStatus);
|
|
|
@@ -197,7 +200,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
}
|
|
|
return achievementMapper.updateByPrimaryKeySelective(a);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public int updateReleaseStatus(Achievement a) {
|
|
|
a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
|
|
|
@@ -220,10 +223,12 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
n.setRid(a.getId());
|
|
|
n.setAid(s);
|
|
|
if (UserType.PERSONAL.getCode().equals(a.getOwnerType())) {
|
|
|
- n.setContent(NoticeStatus.PERSONALACHIEVEMENTT.getDesc() + " " + AchievementAuditStatus.SUBMIT.getDesc());
|
|
|
+ n.setContent(NoticeStatus.PERSONALACHIEVEMENTT.getDesc() + " "
|
|
|
+ + AchievementAuditStatus.SUBMIT.getDesc());
|
|
|
n.setNoticeType(NoticeStatus.PERSONALACHIEVEMENTT.getCode());
|
|
|
} else if (UserType.ORGANIZATION.getCode().equals(a.getOwnerType())) {
|
|
|
- n.setContent(NoticeStatus.ORGANIZATIONACHIEVEMENT.getDesc() + " " + AchievementAuditStatus.SUBMIT.getDesc());
|
|
|
+ n.setContent(NoticeStatus.ORGANIZATIONACHIEVEMENT.getDesc() + " "
|
|
|
+ + AchievementAuditStatus.SUBMIT.getDesc());
|
|
|
n.setNoticeType(NoticeStatus.ORGANIZATIONACHIEVEMENT.getCode());
|
|
|
}
|
|
|
noticeMapper.insert(n);
|
|
|
@@ -231,8 +236,4 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|