|
|
@@ -110,7 +110,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
- a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
|
|
|
if (TokenManager.getToken() instanceof Admin) {
|
|
|
a.setSalesmanId(TokenManager.getAdminId());
|
|
|
}
|
|
|
@@ -119,6 +118,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (AchievementAuditStatus.SUBMIT.getCode().equals(a.getAuditStatus())) {
|
|
|
a.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
|
|
|
createAuditorNotice(a);
|
|
|
+ } else {
|
|
|
+ a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
|
|
|
}
|
|
|
|
|
|
a.setCreateTime(now.getTime());
|
|
|
@@ -355,7 +356,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
pNo = 1;
|
|
|
}
|
|
|
|
|
|
- if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
+ if (pSize == null || pSize < 0 || pSize > 12) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
return (Pagination<AchievementSearchListBo>) findPage("findSearchAchievementListByPage",
|
|
|
@@ -475,11 +476,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
- return (Pagination<AchievementPartnerListBo>) findPage("findPartnerAchievementListByPage", "findPartnerAchievementCount",
|
|
|
- params, pNo, pSize);
|
|
|
+ return (Pagination<AchievementPartnerListBo>) findPage("findPartnerAchievementListByPage",
|
|
|
+ "findPartnerAchievementCount", params, pNo, pSize);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public AchievementPortalDetailBo findUserPortalAchievementDetail(String id) {
|
|
|
return achievementMapper.findUserPortalAchievementDetail(id, TokenManager.getUserId());
|
|
|
@@ -492,9 +492,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@Override
|
|
|
public List<AchievementPortalSimilarListBo> findByFieldA(Integer fieldA, String id, Integer type) {
|
|
|
- if (UserType.PERSONAL.getCode().equals(type)){
|
|
|
+ if (UserType.PERSONAL.getCode().equals(type)) {
|
|
|
return achievementMapper.findUserPortalSimilarByFieldA(fieldA, id);
|
|
|
- } else if(UserType.ORGANIZATION.getCode().equals(type)){
|
|
|
+ } else if (UserType.ORGANIZATION.getCode().equals(type)) {
|
|
|
return achievementMapper.findOrgPortalSimilarByFieldA(fieldA, id);
|
|
|
}
|
|
|
return null;
|