From 710b32a988b8c1881c815595a3d390cd1106c560 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Apr 2021 16:04:13 +0800
Subject: [PATCH] 20210422 签到
---
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
index 8839bcd..c203dae 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
@@ -53,7 +53,12 @@
//获取当前登录人员信息
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
Long companyId = user.getCompanyId();
-
+ //签到活动的唯一性
+ List<ShopActivities> shopActivitiesDone = shopActivitiesDao.selectOneByCompanyIdAndActType(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN);
+ if(CollUtil.isNotEmpty(shopActivitiesDone)){
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "签到活动只能创建一次");
+ }
+
//新增活动主表信息
ShopActivities shopActivities = new ShopActivities();
shopActivities.setActName(addSignAwardSetDto.getActName());
@@ -189,7 +194,7 @@
//获取当前登录人员信息
QueryUtil.setQueryLimitCom(updateSignAwardSetDto);
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- Long actId = updateSignAwardSetDto.getActId();
+ Long actId = updateSignAwardSetDto.getActMainId();
Long companyId = user.getCompanyId();
ShopActivities shopActivity = shopActivitiesDao.selectById(actId);
//更新活动主表信息
@@ -234,8 +239,10 @@
activitySignAwardSetUpdate.setUpdateBy(user.getSuName());
activitySignAwardSetUpdate.setCompanyId(companyId);
activitySignAwardSetUpdate.setActivityId(actId);
+ activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
activitySignAwardSetDao.insert(activitySignAwardSetUpdate);
}else {
+ activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
activitySignAwardSetDao.updateById(activitySignAwardSetUpdate);
arrayListUpdate.add(actSubid);
}
--
Gitblit v1.9.1