From 61043248fabcb7c952c0974e5d71922eea952bed Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Thu, 7 May 2026 17:46:59 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenantadmin/tenant/plugin/QuotationPlugin.java | 5 +++ .../tenant/plugin/StatusChangePlugin.java | 40 +++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java index 40e08bc..e2a1255 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java @@ -7,6 +7,7 @@ import apelet.common.core.util.ApplicationContextHolder; import apelet.common.generator.utils.OrmGenDataSourceUtil; import apelet.common.online.abstractplugin.ExecutePluginParent; import apelet.common.online.model.constant.AttributeEnum; +import liquibase.repackaged.org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; @@ -72,5 +73,9 @@ public class QuotationPlugin extends ExecutePluginParent { } this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,allTotalAmount); } + //获取项目类型 + String type = objectValue.getString("type"); + type = StringUtils.removeEnd(type, ","); + this.setWidgetAttribute("type",AttributeEnum.VALUE_CHANGE,type); } } diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java index fd226b0..922b6d3 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java @@ -2,23 +2,47 @@ package apelet.tenantadmin.tenant.plugin; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; -import apelet.common.online.plugin.BeforeExecuteOperationArgs; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.BeginOperationTransactionArgs; import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.online.plugin.OperationServicePlugInArgs; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; //提交后修改状态 public class StatusChangePlugin extends OperationServicePlugIn { + + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + + public void AuditOperationServicePlugIn() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } @Override - public void beforeExecuteOperationTransaction(BeforeExecuteOperationArgs e){ - super.beforeExecuteOperationTransaction(e); + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("status"); + } + @Override + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); ObjectCollection modelCollcetion = e.getModelCollcetion(); if(modelCollcetion != null && !modelCollcetion.isEmpty()){ for (int i = 0; i < modelCollcetion.size(); i++) { - // 获取单据对象 - ObjectValue bill = modelCollcetion.getObject(i); - bill.setString("status","2"); - //保存入库 - + try { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.put("status", "2"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("status")); + ormGenDataSourceUtil().update(bill.getTableName(), bill, selector); + }catch (Exception ex) { + throw new RuntimeException(ex); + } } } } From 246da2018aa570f0a462480c176f902fb4e9d341 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Fri, 8 May 2026 11:54:36 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java index e2a1255..e09bf39 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java @@ -32,7 +32,11 @@ public class QuotationPlugin extends ExecutePluginParent { //隐藏拒绝理由 this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); //设置报价单状态 - this.setWidgetAttribute("status",AttributeEnum.VALUE_CHANGE,"1"); + //获取id + long id = objectValue.getLong("id"); + if(id == 0){ + this.setWidgetAttribute("status",AttributeEnum.VALUE_CHANGE,"1"); + } //设置总价初始值为0 this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,0); } From 3f63f4d3b37ebb5afd568aa958438ff650658754 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Fri, 8 May 2026 17:14:12 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=8D=95=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenantadmin/tenant/plugin/ConfirmPlugin.java | 74 ++++++++++++++++++++++ .../tenantadmin/tenant/plugin/OpenPopupPlugin.java | 53 ++++++++++++++++ .../tenant/plugin/PopupGetIdPlugin.java | 29 +++++++++ .../tenant/plugin/ReviewPastPlugin.java | 55 ++++++++++++++++ .../tenant/plugin/ReviewRefusePlugin.java | 54 ++++++++++++++++ 5 files changed, 265 insertions(+) create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java new file mode 100644 index 0000000..adb7707 --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java @@ -0,0 +1,74 @@ +package apelet.tenantadmin.tenant.plugin; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.BeginOperationTransactionArgs; +import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.online.plugin.OperationServicePlugInArgs; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Filter; +import apelet.common.orm.impl.FilterItem; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; + +/* +弹窗确认后，保存数据库 + */ +public class ConfirmPlugin extends OperationServicePlugIn { + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + + public ConfirmPlugin() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } + @Override + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("canaelreason"); + } + + @Override + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if (ormGenDataSourceUtil == null) { + throw new RuntimeException("ORM工具类初始化失败，无法执行数据库操作"); + } + + if (modelCollcetion != null && !modelCollcetion.isEmpty()) { + for (int i = 0; i < modelCollcetion.size(); i++) { + try { + ObjectValue object = modelCollcetion.getObject(i); + Object id = object.get("id"); + String reason = object.getString("canaelreason"); + //根据id查找对应单据 + OrmGenDataSourceUtil ormUtil = ormGenDataSourceUtil; + + if (ormUtil == null) { + return; + } + + Filter pkFilter = new Filter(); + pkFilter.add(new FilterItem("id", "=", id)); + ObjectCollection oldCollection = ormUtil.query("quotation", pkFilter, null); + ObjectValue oldBill = oldCollection.getObject(0); + oldBill.put("status", "4"); + oldBill.put("canaelreason", reason); + oldBill.put("billstatus","A"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("status")); + selector.getList().add(new SelectorItem("canaelreason")); + selector.getList().add(new SelectorItem("billstatus")); + ormGenDataSourceUtil.update(oldBill.getTableName(), oldBill, selector); + }catch (Exception ex) { + // 抛出运行时异常，使事务回滚 + throw new RuntimeException("更新单据状态失败: " + ex.getMessage(), ex); + } + } + } + } +} diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java new file mode 100644 index 0000000..75f20a2 --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java @@ -0,0 +1,53 @@ +package apelet.tenantadmin.tenant.plugin; + + +import apelet.common.core.object.ObjectValue; +import apelet.common.online.abstractplugin.ListPlugin; +import apelet.common.online.model.ShowParameter; +import apelet.common.online.model.constant.ShowTypeEnum; +import apelet.common.online.model.constant.ViewStatus; + +import java.util.HashMap; +import java.util.Map; + +/* +取消报价插件,打开弹窗 + */ +public class OpenPopupPlugin extends ListPlugin { + + /** + * 目标表单ID - 表单在平台中的表单ID + */ + private static final Object FORM_ID = "2052578317407621120"; + + /** + * 触发按钮的标识 - 对应表单上按钮的 key/标识 + * 点击此按钮时触发弹窗 + */ + private static final String BUTTON_KEY = "取消报价"; + + /** + * 按钮点击事件 + * + * @param widgetVariableName 按钮名称 + * @param objectValue 数据 + */ + @Override + public void buttonTriggered(String widgetVariableName, ObjectValue objectValue){ + super.buttonTriggered(widgetVariableName, objectValue); + if (BUTTON_KEY.equals(widgetVariableName)){ + //打开弹窗 + ShowParameter showParameter = new ShowParameter(); + showParameter.setFormId(FORM_ID.toString()); + showParameter.setHowType(ShowTypeEnum.OPEN_ONLINE_MODAL); + showParameter.setStatus(ViewStatus.EDIT); + // 传参 + Map map = new HashMap<>(); + // 为弹窗中的隐藏字段标识 + map.put("id",""); + // 设置参数 + showParameter.setCustomParam(map); + super.showForm(showParameter); + } + } +} diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java new file mode 100644 index 0000000..0328b69 --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java @@ -0,0 +1,29 @@ +package apelet.tenantadmin.tenant.plugin; + +import apelet.common.core.object.ObjectValue; +import apelet.common.online.abstractplugin.ExecutePluginParent; +import apelet.common.online.dto.OnlineEventPluginExecuteDto; +import apelet.common.online.model.constant.AttributeEnum; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import java.util.Collection; +import java.util.Map; + +/* +弹窗获取id + */ +public class PopupGetIdPlugin extends ExecutePluginParent { + @Override + public void formCreated(String widgetVariableName, ObjectValue objectValue){ + OnlineEventPluginExecuteDto dto = getDto(); + Map rowData = dto.getModel().getRowData(); + if (rowData != null && !rowData.isEmpty()){ + Collection values = rowData.values(); + Object firstValue = values.iterator().next(); + JSONArray jsonArray = (JSONArray) firstValue; + JSONObject item = jsonArray.getJSONObject(0); + String id = item.getString("id"); + this.setWidgetAttribute("id", AttributeEnum.VALUE_CHANGE,id); + } + } +} diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java new file mode 100644 index 0000000..be36246 --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java @@ -0,0 +1,55 @@ +package apelet.tenantadmin.tenant.plugin; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.BeginOperationTransactionArgs; +import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.online.plugin.OperationServicePlugInArgs; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; + +/* +审核通过插件 + */ +public class ReviewPastPlugin extends OperationServicePlugIn { + + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + + public void AuditOperationServicePlugIn() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } + + @Override + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("status"); + } + + @Override + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if(modelCollcetion != null && !modelCollcetion.isEmpty()){ + for (int i = 0; i < modelCollcetion.size(); i++) { + try { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.put("status", "3"); + bill.put("billstatus","C"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("status")); + selector.getList().add(new SelectorItem("billstatus")); + ormGenDataSourceUtil().update(bill.getTableName(), bill, selector); + }catch (Exception ex) { + throw new RuntimeException(ex); + } + } + } + } +} diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java new file mode 100644 index 0000000..c0fd1cc --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java @@ -0,0 +1,54 @@ +package apelet.tenantadmin.tenant.plugin; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.BeginOperationTransactionArgs; +import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.online.plugin.OperationServicePlugInArgs; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; + +/* +审核驳回插件 + */ +public class ReviewRefusePlugin extends OperationServicePlugIn { + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + + public void AuditOperationServicePlugIn() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } + + @Override + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("status"); + } + + @Override + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if(modelCollcetion != null && !modelCollcetion.isEmpty()){ + for (int i = 0; i < modelCollcetion.size(); i++) { + try { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.put("status", "1"); + bill.put("billstatus","A"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("status")); + selector.getList().add(new SelectorItem("billstatus")); + ormGenDataSourceUtil().update(bill.getTableName(), bill, selector); + }catch (Exception ex) { + throw new RuntimeException(ex); + } + } + } + } +} From 95c42a233e388a5cbfb24c4d59497f5302ce78da Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Fri, 8 May 2026 17:14:52 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=9A=90=E8=97=8F=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java index e09bf39..723ef1f 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java @@ -29,13 +29,14 @@ public class QuotationPlugin extends ExecutePluginParent { this.setWidgetAttribute("managerperson", AttributeEnum.VALUE_CHANGE, sysUserInfo); } - //隐藏拒绝理由 - this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); //设置报价单状态 //获取id long id = objectValue.getLong("id"); if(id == 0){ this.setWidgetAttribute("status",AttributeEnum.VALUE_CHANGE,"1"); + //隐藏拒绝理由 + this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); + this.setWidgetAttribute("billstatus",AttributeEnum.VALUE_CHANGE,"A"); } //设置总价初始值为0 this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,0); From 3d2b9dfd69a0d7cdf18c038150a126369f458cd0 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Sat, 9 May 2026 11:29:37 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java index 723ef1f..fdd1146 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java @@ -34,10 +34,14 @@ public class QuotationPlugin extends ExecutePluginParent { long id = objectValue.getLong("id"); if(id == 0){ this.setWidgetAttribute("status",AttributeEnum.VALUE_CHANGE,"1"); - //隐藏拒绝理由 - this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); this.setWidgetAttribute("billstatus",AttributeEnum.VALUE_CHANGE,"A"); } + //获取报价单状态 + String status = objectValue.getString("status"); + if(!("4").equals(status)){ + //隐藏取消原因 + this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); + } //设置总价初始值为0 this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,0); } From 3665c7be0c6ae7975dc6df953dd4cb404de083ac Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Sat, 9 May 2026 16:55:44 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=87=B3quotation?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenantadmin/tenant/plugin/{ => quotation}/ConfirmPlugin.java | 2 +- .../tenantadmin/tenant/plugin/{ => quotation}/OpenPopupPlugin.java | 2 +- .../tenantadmin/tenant/plugin/{ => quotation}/PopupGetIdPlugin.java | 2 +- .../tenantadmin/tenant/plugin/{ => quotation}/QuotationPlugin.java | 6 +++--- .../tenantadmin/tenant/plugin/{ => quotation}/ReviewPastPlugin.java | 2 +- .../tenant/plugin/{ => quotation}/ReviewRefusePlugin.java | 2 +- .../tenant/plugin/{ => quotation}/StatusChangePlugin.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/ConfirmPlugin.java (98%) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/OpenPopupPlugin.java (96%) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/PopupGetIdPlugin.java (95%) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/QuotationPlugin.java (95%) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/ReviewPastPlugin.java (97%) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/ReviewRefusePlugin.java (97%) rename application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/{ => quotation}/StatusChangePlugin.java (97%) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java similarity index 98% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java index adb7707..c99592c 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ConfirmPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java similarity index 96% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java index 75f20a2..64165b8 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/OpenPopupPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java similarity index 95% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java index 0328b69..072034f 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/PopupGetIdPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectValue; import apelet.common.online.abstractplugin.ExecutePluginParent; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java similarity index 95% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java index fdd1146..1d45e5d 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; @@ -35,6 +35,8 @@ public class QuotationPlugin extends ExecutePluginParent { if(id == 0){ this.setWidgetAttribute("status",AttributeEnum.VALUE_CHANGE,"1"); this.setWidgetAttribute("billstatus",AttributeEnum.VALUE_CHANGE,"A"); + //设置总价初始值为0 + this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,0); } //获取报价单状态 String status = objectValue.getString("status"); @@ -42,8 +44,6 @@ public class QuotationPlugin extends ExecutePluginParent { //隐藏取消原因 this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); } - //设置总价初始值为0 - this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,0); } @Override diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java similarity index 97% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java index be36246..afd5e5e 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewPastPlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java similarity index 97% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java index c0fd1cc..9e7f596 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/ReviewRefusePlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java similarity index 97% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java rename to application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java index 922b6d3..eb36659 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin; +package apelet.tenantadmin.tenant.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; From 56d0f597da227a768946b8e54b016a606608c5d4 Mon Sep 17 00:00:00 2001 From: lihuangbin666 <1361490203@qq.com> Date: Sat, 9 May 2026 16:57:45 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/formPlugin => plugin/clueManage}/ClueManageFormPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin/clueManage}/ClueManageFormPlugin.java (92%) diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/ClueManageFormPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java similarity index 92% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/ClueManageFormPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java index 7568352..3ac2d7b 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/ClueManageFormPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueManageFormPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin; +package apelet.association.plugin.clueManage; import apelet.association.utils.CreatNumberUtils; import apelet.common.core.object.ObjectValue; From 4e4e6e5fe158621e0f26eee51c86cb4c18bd4f35 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Mon, 11 May 2026 10:30:13 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=AE=BE=E7=BD=AE=E8=BF=87=E6=BB=A4=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant/plugin/quotation/ContractPlugin.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java new file mode 100644 index 0000000..3f1a50a --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java @@ -0,0 +1,18 @@ +package apelet.tenantadmin.tenant.plugin.quotation; + +import apelet.common.online.abstractplugin.ListPlugin; +import apelet.common.orm.impl.Filter; +import apelet.common.orm.impl.FilterItem; + + +/* +合同列表界面设置过滤条件 + */ +public class ContractPlugin extends ListPlugin { + @Override + protected Filter getFilter(){ + Filter filter = new Filter(); + filter.add(new FilterItem("status",FilterItem.equals,"3")); + return filter; + } +} From 3036116937ae8ecdc3a6da74d433b8f52cada64a Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Mon, 11 May 2026 14:19:28 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/plugin/formPlugin}/quotation/ConfirmPlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/ContractPlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/OpenPopupPlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/PopupGetIdPlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/QuotationPlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/ReviewPastPlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/ReviewRefusePlugin.java | 2 +- .../controller/plugin/formPlugin}/quotation/StatusChangePlugin.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/ConfirmPlugin.java (97%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/ContractPlugin.java (86%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/OpenPopupPlugin.java (96%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/PopupGetIdPlugin.java (94%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/QuotationPlugin.java (98%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/ReviewPastPlugin.java (96%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/ReviewRefusePlugin.java (96%) rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin => common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin}/quotation/StatusChangePlugin.java (96%) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java similarity index 97% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java index c99592c..a3dc546 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java similarity index 86% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java index 3f1a50a..774cc29 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.online.abstractplugin.ListPlugin; import apelet.common.orm.impl.Filter; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java similarity index 96% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java index 64165b8..79ededd 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java similarity index 94% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java index 072034f..aae3dfa 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectValue; import apelet.common.online.abstractplugin.ExecutePluginParent; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java similarity index 98% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java index 1d45e5d..0aee9bb 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java similarity index 96% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java index afd5e5e..8d26d59 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java similarity index 96% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java index 9e7f596..241917c 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java similarity index 96% rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java rename to common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java index eb36659..d24e07d 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java +++ b/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java @@ -1,4 +1,4 @@ -package apelet.tenantadmin.tenant.plugin.quotation; +package apelet.association.controller.plugin.formPlugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; From 2e066dfbb8c6ee386f1338fd486d6f3c2ac01ce2 Mon Sep 17 00:00:00 2001 From: lihuangbin666 <1361490203@qq.com> Date: Mon, 11 May 2026 14:22:07 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/clueManage/ClueActivateOpPlugin.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java diff --git a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java new file mode 100644 index 0000000..d12ee21 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java @@ -0,0 +1,33 @@ +package apelet.association.plugin.clueManage; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.online.plugin.BeforeExecuteOperationArgs; +import apelet.common.online.plugin.OperationServicePlugIn; + +/** + * @ClassName: ClueActivateOpPlugin + * @Author: lihuangbin + * @Date: 2026/5/11 + * @Description: 激活放弃的线索 + */ + +public class ClueActivateOpPlugin extends OperationServicePlugIn { + + @Override + public void beforeExecuteOperationTransaction(BeforeExecuteOperationArgs e){ + super.beforeExecuteOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if(modelCollcetion != null && !modelCollcetion.isEmpty()){ + for (int i = 0; i < modelCollcetion.size(); i++) { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.setString("status","2"); + //保存入库 + + } + } + } + +} From 6a2305eba0cdabe21a046c0dc02d25a939468331 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Mon, 11 May 2026 14:30:07 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E8=87=B3plugin=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/formPlugin => plugin}/quotation/ConfirmPlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/ContractPlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/OpenPopupPlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/PopupGetIdPlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/QuotationPlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/ReviewPastPlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/ReviewRefusePlugin.java | 2 +- .../plugin/formPlugin => plugin}/quotation/StatusChangePlugin.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/ConfirmPlugin.java (97%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/ContractPlugin.java (86%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/OpenPopupPlugin.java (96%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/PopupGetIdPlugin.java (94%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/QuotationPlugin.java (98%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/ReviewPastPlugin.java (96%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/ReviewRefusePlugin.java (96%) rename common/common-association/src/main/java/apelet/association/{controller/plugin/formPlugin => plugin}/quotation/StatusChangePlugin.java (96%) diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/ConfirmPlugin.java similarity index 97% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/ConfirmPlugin.java index a3dc546..d186eb5 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/ConfirmPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/ContractPlugin.java similarity index 86% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/ContractPlugin.java index 774cc29..62785fb 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/ContractPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.online.abstractplugin.ListPlugin; import apelet.common.orm.impl.Filter; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/OpenPopupPlugin.java similarity index 96% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/OpenPopupPlugin.java index 79ededd..4da0d25 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/OpenPopupPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectValue; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/PopupGetIdPlugin.java similarity index 94% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/PopupGetIdPlugin.java index aae3dfa..97f0f1c 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/PopupGetIdPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectValue; import apelet.common.online.abstractplugin.ExecutePluginParent; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/QuotationPlugin.java similarity index 98% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/QuotationPlugin.java index 0aee9bb..d1d4f9e 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/QuotationPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/ReviewPastPlugin.java similarity index 96% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/ReviewPastPlugin.java index 8d26d59..d84b423 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/ReviewPastPlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/ReviewRefusePlugin.java similarity index 96% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/ReviewRefusePlugin.java index 241917c..0d2d4d5 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/ReviewRefusePlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; diff --git a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java b/common/common-association/src/main/java/apelet/association/plugin/quotation/StatusChangePlugin.java similarity index 96% rename from common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java rename to common/common-association/src/main/java/apelet/association/plugin/quotation/StatusChangePlugin.java index d24e07d..74f77bf 100644 --- a/common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/quotation/StatusChangePlugin.java @@ -1,4 +1,4 @@ -package apelet.association.controller.plugin.formPlugin.quotation; +package apelet.association.plugin.quotation; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; From 35d433695e307e2fef66da71f4af8fbfad85f7ef Mon Sep 17 00:00:00 2001 From: lihuangbin666 <1361490203@qq.com> Date: Mon, 11 May 2026 16:51:36 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/clueManage/ClueActivateOpPlugin.java | 47 +++++++++++++++++---- .../plugin/clueManage/ClueAuditOpPlugin.java | 48 ++++++++++++++++++++++ .../plugin/clueManage/ClueManageFormPlugin.java | 2 +- .../plugin/clueManage/ClueSubmitOpPlugin.java | 48 ++++++++++++++++++++++ 4 files changed, 136 insertions(+), 9 deletions(-) create mode 100644 common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueAuditOpPlugin.java create mode 100644 common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueSubmitOpPlugin.java diff --git a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java index d12ee21..f517bc6 100644 --- a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java +++ b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueActivateOpPlugin.java @@ -2,8 +2,12 @@ package apelet.association.plugin.clueManage; import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectValue; -import apelet.common.online.plugin.BeforeExecuteOperationArgs; -import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.*; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; /** * @ClassName: ClueActivateOpPlugin @@ -13,19 +17,46 @@ import apelet.common.online.plugin.OperationServicePlugIn; */ public class ClueActivateOpPlugin extends OperationServicePlugIn { + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + public void AuditOperationServicePlugIn() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } + @Override + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("clue_type"); + e.addFiledKey("billstatus"); + } @Override - public void beforeExecuteOperationTransaction(BeforeExecuteOperationArgs e){ - super.beforeExecuteOperationTransaction(e); + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); ObjectCollection modelCollcetion = e.getModelCollcetion(); if(modelCollcetion != null && !modelCollcetion.isEmpty()){ for (int i = 0; i < modelCollcetion.size(); i++) { - // 获取单据对象 - ObjectValue bill = modelCollcetion.getObject(i); - bill.setString("status","2"); - //保存入库 + try { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + if(bill.get("clue_type").equals("2")){ + bill.put("clue_type", "0"); + bill.put("billstatus", "A"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("clue_type")); + selector.getList().add(new SelectorItem("billstatus")); + ormGenDataSourceUtil().update(bill.getTableName(), bill, selector); + } + else { + OperationResult operationResult = this.getOperationResult(); + operationResult.setSuccess(false); + operationResult.setMessage("有状态不为放弃的数据"); + } + }catch (Exception ex) { + throw new RuntimeException(ex); + } } } } diff --git a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueAuditOpPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueAuditOpPlugin.java new file mode 100644 index 0000000..983df77 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueAuditOpPlugin.java @@ -0,0 +1,48 @@ +package apelet.association.plugin.clueManage; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.BeginOperationTransactionArgs; +import apelet.common.online.plugin.OperationResult; +import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.online.plugin.OperationServicePlugInArgs; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; + +public class ClueAuditOpPlugin extends OperationServicePlugIn { + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + + public void AuditOperationServicePlugIn() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } + @Override + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("clue_type"); + } + @Override + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if(modelCollcetion != null && !modelCollcetion.isEmpty()){ + for (int i = 0; i < modelCollcetion.size(); i++) { + try { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.put("clue_type", "2"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("clue_type")); + ormGenDataSourceUtil().update(bill.getTableName(), bill, selector); + }catch (Exception ex) { + throw new RuntimeException(ex); + } + } + } + } +} 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 3ac2d7b..3935159 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 @@ -11,7 +11,7 @@ public class ClueManageFormPlugin extends ExecutePluginParent { // this.setAttribute("seekInfo","11"); // this.setWidgetAttribute("number", AttributeEnum.VALUE_CHANGE, "123"); CreatNumberUtils creatNumberUtils = new CreatNumberUtils(); - this.setWidgetAttribute("billstatus", AttributeEnum.VALUE_CHANGE,"1"); + this.setWidgetAttribute("clueType", AttributeEnum.VALUE_CHANGE,"0"); } } diff --git a/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueSubmitOpPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueSubmitOpPlugin.java new file mode 100644 index 0000000..0c8f6f7 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/plugin/clueManage/ClueSubmitOpPlugin.java @@ -0,0 +1,48 @@ +package apelet.association.plugin.clueManage; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.plugin.BeginOperationTransactionArgs; +import apelet.common.online.plugin.OperationServicePlugIn; +import apelet.common.online.plugin.OperationServicePlugInArgs; +import apelet.common.online.service.impl.OnlineFormServiceImpl; +import apelet.common.orm.impl.Selector; +import apelet.common.orm.impl.SelectorItem; + +public class ClueSubmitOpPlugin extends OperationServicePlugIn { + private OnlineFormServiceImpl onlineFormService; + private OrmGenDataSourceUtil ormGenDataSourceUtil; + + public void AuditOperationServicePlugIn() { + onlineFormService = ApplicationContextHolder.getBean("onlineFormService"); + ormGenDataSourceUtil = ApplicationContextHolder.getBean("ormGenDataSourceUtil"); + } + @Override + public void onPreparePropertys(OperationServicePlugInArgs e) { + e.addFiledKey("id"); + e.addFiledKey("clue_type"); + } + @Override + public void beginOperationTransaction(BeginOperationTransactionArgs e){ + super.beginOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if(modelCollcetion != null && !modelCollcetion.isEmpty()){ + for (int i = 0; i < modelCollcetion.size(); i++) { + try { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.put("clue_type", "1"); + Selector selector = new Selector(); + selector.getList().add(new SelectorItem("clue_type")); + ormGenDataSourceUtil().update(bill.getTableName(), bill, selector); + + }catch (Exception ex) { + throw new RuntimeException(ex); + } + } + } + } +}