From 0c6d811925175a5c1dfa61ce76b41ce80737a236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=8A?= <23> Date: Wed, 19 Aug 2026 10:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssociationActivitiesController.java | 48 ++++++------------- .../plugin/clueManage/ClueManageFormPlugin.java | 54 ++++++++++++++++++++++ .../plugin/member/MembershipSavePlugin.java | 3 +- 3 files changed, 70 insertions(+), 35 deletions(-) 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 index 1c8918a..d3e9f38 100644 --- a/common/common-association/src/main/java/apelet/association/controller/AssociationActivitiesController.java +++ b/common/common-association/src/main/java/apelet/association/controller/AssociationActivitiesController.java @@ -1,6 +1,7 @@ package apelet.association.controller; import apelet.association.utils.DataTransformationUtil; +import apelet.common.core.annotation.NoAuthInterface; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ResponseResult; @@ -8,16 +9,14 @@ 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.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; + @RestController @RequestMapping("/tenantadmin/activity") @@ -52,33 +51,14 @@ public class AssociationActivitiesController { if (StringUtils.isEmpty(signInUnit)) { return ResponseResult.error("500", "签到单位为空!!!"); } + + System.out.println("333333333333333333333333333333333333333333333333"); 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> managerList = DataTransformationUtil.objectCollectionToList(managerCollection); -// Map> mapMap = managerList.stream().collect(Collectors.toMap(map -> String.valueOf(map.get("id")), map -> map, (oldValue, newValue) -> oldValue)); -// -// ObjectValue member = null; -// for (int i = 0; i < collection.size(); i++) { -// ObjectValue object = collection.getObject(i); -// ObjectValue manger = object.getObjectValue("membership_manger_id"); -// Map map = mapMap.get(manger != null && manger.get("id") != null ? manger.get("id") : ""); -// Object phone = map.get("phone"); -// if (ObjectUtil.equal(phone, phoneNumber)) { -// member = object; -// } -// } -// if (member == null) { -// return ResponseResult.error("500", signInUnit + " 签到单位下签到人不存在!!!"); -// } + Filter filter = new Filter(); + filter.add(new FilterItem("unit_name", FilterItem.equals, signInUnit)); + ObjectCollection collection = ormGenDataSourceUtil.query("membership_apply", filter, new Selector()); + if (type == 1) { //签到 ObjectValue value = new ObjectValue("check_in_out"); @@ -86,7 +66,6 @@ public class AssociationActivitiesController { value.put("phone", phoneNumber); // value.put("membership_id", member); value.put("create_time", new Date()); - value.put("create_time", new Date()); value.put("parent_id", activityId); value.put("check_in", 1); ormGenDataSourceUtil.addNew(value.getTableName(), value); @@ -94,15 +73,16 @@ public class AssociationActivitiesController { if (type == 2) { //签退 - Filter filter = new Filter(); -// filter.add(new FilterItem("membership_id", FilterItem.equals, member.get("id"))); + filter = new Filter(); + filter.add(new FilterItem("name", FilterItem.equals, signInPerson)); + filter.add(new FilterItem("phone", FilterItem.equals, phoneNumber)); filter.add(new FilterItem("parent_id", FilterItem.equals, activityId)); filter.add(new FilterItem("check_in", FilterItem.equals, 1)); - ObjectCollection collection = ormGenDataSourceUtil.query("check_in_out", filter, new Selector()); + collection = ormGenDataSourceUtil.query("check_in_out", filter, new Selector()); if (collection != null && !collection.isEmpty()) { ObjectValue object = collection.getObject(0); object.put("check_out", 1); - ormGenDataSourceUtil.update("check_in_out", object, new Selector()); + ormGenDataSourceUtil.update("check_in_out", object, null); } } return ResponseResult.success("签到成功!!!"); diff --git a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java index 4c64b60..7603645 100644 --- a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java @@ -3,6 +3,11 @@ package apelet.association.plugin.clueManage; import apelet.common.core.object.ObjectValue; import apelet.common.online.abstractplugin.ExecutePluginParent; import apelet.common.online.model.constant.AttributeEnum; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +import java.util.Arrays; +import java.util.List; public class ClueManageFormPlugin extends ExecutePluginParent { @@ -10,6 +15,46 @@ public class ClueManageFormPlugin extends ExecutePluginParent { @Override public void formCreated(String widgetVariableName, ObjectValue objectValue) { + + if(objectValue.getString("id") != null){ + String billstatus = objectValue.getString("billstatus"); + if("A".equals(billstatus)){ + List list = Arrays.asList( + createButtonConfig("保存", true), + createButtonConfig("放弃线索申请", false), + createButtonConfig("审核", false), + createButtonConfig("激活", true), + createButtonConfig("撤销", false), + createButtonConfig("反审核", false) + ); + this.setWidgetAttribute("", AttributeEnum.BTN_HIDDEN, list); + } + if("B".equals(billstatus)){ + + List list = Arrays.asList( + createButtonConfig("保存", false), + createButtonConfig("放弃线索申请", false), + createButtonConfig("审核", false), + createButtonConfig("激活", false), + createButtonConfig("撤销", true), + createButtonConfig("反审核", false) + ); + this.setWidgetAttribute("", AttributeEnum.BTN_HIDDEN, list); + } + + if("C".equals(billstatus)){ + + List list = Arrays.asList( + createButtonConfig("保存", false), + createButtonConfig("放弃线索申请", true), + createButtonConfig("审核", false), + createButtonConfig("激活", false), + createButtonConfig("撤销", true), + createButtonConfig("反审核", false) + ); + this.setWidgetAttribute("", AttributeEnum.BTN_HIDDEN, list); + } + } super.formCreated(widgetVariableName, objectValue); if (objectValue.get("clue_type") == null) { this.setWidgetAttribute("clueType", AttributeEnum.VALUE_CHANGE, "0"); @@ -19,4 +64,13 @@ public class ClueManageFormPlugin extends ExecutePluginParent { } } + + private JSONObject createButtonConfig(String name, boolean isHidden) { + JSONObject btn = new JSONObject(); + btn.put("name", name); + btn.put("isHidden", !isHidden); + return btn; + } + + } diff --git a/common/common-association/src/main/java/apelet/association/plugin/member/MembershipSavePlugin.java b/common/common-association/src/main/java/apelet/association/plugin/member/MembershipSavePlugin.java index 301664a..f9e16ef 100644 --- a/common/common-association/src/main/java/apelet/association/plugin/member/MembershipSavePlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/member/MembershipSavePlugin.java @@ -141,7 +141,8 @@ public class MembershipSavePlugin extends ExecutePluginParent { // 新增验重：unit_name 已存在则拒绝新增 ObjectValue existBill = findExistBillByUnitName(unitName); if (existBill != null) { - throw new MyRuntimeException("单位【" + unitName + "】已存在，请勿重复新增"); + this.showErrorMessage("单位【" + unitName + "】已存在，请勿重复新增"); + return; } String number = generateNumber(); objectValue.put("number", number);