diff --git a/common/common-association/pom.xml b/common/common-association/pom.xml
index d5df353..1b9cc10 100644
--- a/common/common-association/pom.xml
+++ b/common/common-association/pom.xml
@@ -29,26 +29,44 @@
- apelet
- common-core
- 1.0.0
-
+ apelet
+ common-core
+ 1.0.0
+
-
- apelet
- common-generator
- 1.0.0
-
-
- apelet
- common-online
- 1.0.0
-
-
- common-orm
- apelet
- 1.0.0
-
+
+ apelet
+ common-generator
+ 1.0.0
+
+
+ apelet
+ common-online
+ 1.0.0
+
+
+ common-orm
+ apelet
+ 1.0.0
+
+
+
+ common-msg-notice
+ apelet
+ 1.0.0
+
+
+
+
+ com.google.zxing
+ core
+ 3.5.1
+
+
+ com.google.zxing
+ javase
+ 3.5.1
+
apelet
common-core
diff --git a/common/common-association/src/main/java/apelet/association/controller/AssociationActivitiesController.java b/common/common-association/src/main/java/apelet/association/controller/AssociationActivitiesController.java
new file mode 100644
index 0000000..4f635ad
--- /dev/null
+++ b/common/common-association/src/main/java/apelet/association/controller/AssociationActivitiesController.java
@@ -0,0 +1,109 @@
+package apelet.association.controller;
+
+import apelet.association.utils.DataTransformationUtil;
+import apelet.common.core.object.ObjectCollection;
+import apelet.common.core.object.ObjectValue;
+import apelet.common.core.object.ResponseResult;
+import apelet.common.generator.utils.OrmGenDataSourceUtil;
+import apelet.common.orm.impl.Filter;
+import apelet.common.orm.impl.FilterItem;
+import apelet.common.orm.impl.Selector;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/tenantadmin/activity")
+public class AssociationActivitiesController {
+
+ @Autowired
+ private OrmGenDataSourceUtil ormGenDataSourceUtil;
+
+ /**
+ * 签到/签退
+ *
+ * @param jsonObject
+ * @return
+ */
+ @PostMapping("/checkInOut")
+ public ResponseResult> activityCheckIn(@RequestBody JSONObject jsonObject) throws Exception {
+ String activityId = jsonObject.getString("activityId");
+ String activityName = jsonObject.getString("activityName");
+ if (StringUtils.isEmpty(activityId) || StringUtils.isEmpty(activityName)) {
+ return ResponseResult.error("500", "活动信息为空!!!");
+ }
+ String signInPerson = jsonObject.getString("signInPerson");
+ if (StringUtils.isEmpty(signInPerson)) {
+ return ResponseResult.error("500", "签到人为空!!!");
+ }
+ String phoneNumber = jsonObject.getString("phoneNumber");
+ if (StringUtils.isEmpty(phoneNumber)) {
+ return ResponseResult.error("500", "用户手机号为空!!!");
+ }
+
+ String signInUnit = jsonObject.getString("signInUnit");
+ if (StringUtils.isEmpty(signInUnit)) {
+ return ResponseResult.error("500", "签到单位为空!!!");
+ }
+ Integer type = jsonObject.getInteger("type");
+
+ Filter filter = new Filter();
+ filter.add(new FilterItem("unit_name", FilterItem.equals, signInUnit));
+ ObjectCollection collection = ormGenDataSourceUtil.query("membership_apply", filter, new Selector());
+
+ if (collection == null || collection.isEmpty()) {
+ return ResponseResult.error("500", "签到单位不存在, 请检查签到单位!!!");
+ }
+
+ ObjectCollection managerCollection = ormGenDataSourceUtil.query("membership_manager", new Filter(), new Selector());
+ List