Compare commits

..

No commits in common. '3036116937ae8ecdc3a6da74d433b8f52cada64a' and '4e4e6e5fe158621e0f26eee51c86cb4c18bd4f35' have entirely different histories.

  1. 5
      application-tenant/tenant-admin/pom.xml
  2. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java
  3. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java
  4. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java
  5. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java
  6. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java
  7. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java
  8. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java
  9. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java
  10. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
  11. 5
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java
  12. 32
      common/common-association/src/main/java/apelet/association/controller/ProjectListController.java
  13. 17
      common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/ClueManageFormPlugin.java
  14. 56
      common/common-association/src/main/java/apelet/association/plugin/MembershipPayPopupPlugin.java
  15. 40
      common/common-association/src/main/java/apelet/association/plugin/MembershipPayShowHidePlugin.java
  16. 25
      common/common-association/src/main/java/apelet/association/plugin/UnitNameChangeFormPlugin.java
  17. 295
      common/common-association/src/main/java/apelet/association/plugin/UnitNameChangeOperationPlugin.java
  18. 11
      common/common-association/src/main/java/apelet/association/utils/CreatNumberUtils.java

5
application-tenant/tenant-admin/pom.xml

@ -147,11 +147,6 @@
<artifactId>common-ext</artifactId> <artifactId>common-ext</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>apelet</groupId>
<artifactId>common-association</artifactId>
<version>1.0.0</version>
</dependency>

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ConfirmPlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ConfirmPlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectCollection;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ContractPlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ContractPlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.online.abstractplugin.ListPlugin; import apelet.common.online.abstractplugin.ListPlugin;
import apelet.common.orm.impl.Filter; import apelet.common.orm.impl.Filter;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/OpenPopupPlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/OpenPopupPlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/PopupGetIdPlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/PopupGetIdPlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;
import apelet.common.online.abstractplugin.ExecutePluginParent; import apelet.common.online.abstractplugin.ExecutePluginParent;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/QuotationPlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/QuotationPlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectCollection;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewPastPlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewPastPlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectCollection;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/ReviewRefusePlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/ReviewRefusePlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectCollection;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;

2
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/quotation/StatusChangePlugin.java → application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/quotation/StatusChangePlugin.java

@ -1,4 +1,4 @@
package apelet.association.controller.plugin.formPlugin.quotation; package apelet.tenantadmin.tenant.plugin.quotation;
import apelet.common.core.object.ObjectCollection; import apelet.common.core.object.ObjectCollection;
import apelet.common.core.object.ObjectValue; import apelet.common.core.object.ObjectValue;

2
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java

@ -1472,7 +1472,7 @@ public class LoginController {
List<SysMenuPerm> onlineMenuPermList = allMenuPermList.stream() List<SysMenuPerm> onlineMenuPermList = allMenuPermList.stream()
.filter(m -> m.getOnlineFormId() != null .filter(m -> m.getOnlineFormId() != null
// && m.getOnlineFlowEntryId() == null // && m.getOnlineFlowEntryId() == null
&& (m.getMenuType().equals(SysMenuType.TYPE_MENU) || m.getMenuType().equals(SysMenuType.TYPE_PERM_MENU))) && m.getMenuType().equals(SysMenuType.TYPE_MENU))
.collect(Collectors.toList()); .collect(Collectors.toList());
Map<Long, List<SysMenuPerm>> onlineMenuPermMap = Map<Long, List<SysMenuPerm>> onlineMenuPermMap =
onlineMenuPermList.stream().collect(Collectors.groupingBy(SysMenuPerm::getOnlineFormId)); onlineMenuPermList.stream().collect(Collectors.groupingBy(SysMenuPerm::getOnlineFormId));

5
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java

@ -27,10 +27,6 @@ public final class SysMenuType {
* 按钮类型 * 按钮类型
*/ */
public static final int TYPE_BUTTON = 3; public static final int TYPE_BUTTON = 3;
/**
* 权限表单
*/
public static final int TYPE_PERM_MENU = 4;
private static final Map<Object, String> DICT_MAP = new HashMap<>(4); private static final Map<Object, String> DICT_MAP = new HashMap<>(4);
static { static {
@ -38,7 +34,6 @@ public final class SysMenuType {
DICT_MAP.put(TYPE_MENU, "普通菜单"); DICT_MAP.put(TYPE_MENU, "普通菜单");
DICT_MAP.put(TYPE_UI_FRAGMENT, "表单片段类型"); DICT_MAP.put(TYPE_UI_FRAGMENT, "表单片段类型");
DICT_MAP.put(TYPE_BUTTON, "按钮类型"); DICT_MAP.put(TYPE_BUTTON, "按钮类型");
DICT_MAP.put(TYPE_PERM_MENU, "权限菜单");
} }
/** /**

32
common/common-association/src/main/java/apelet/association/controller/ProjectListController.java

@ -1,32 +0,0 @@
package apelet.association.controller;
import apelet.common.core.annotation.MyRequestBody;
import apelet.common.core.object.MyPageParam;
import apelet.common.core.object.ResponseResult;
import apelet.common.core.object.TokenData;
import com.github.pagehelper.page.PageMethod;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
@RestController
@RequestMapping("/tenantadmin/project")
public class ProjectListController {
@GetMapping(value = "/list")
public ResponseResult<?> list() {
Map<String, Object> pammap= new HashMap<>();
return ResponseResult.success(pammap);
}
@PostMapping("/update")
public ResponseResult<Void> update(
@MyRequestBody String entryId){
return ResponseResult.success(null);
}
}

17
common/common-association/src/main/java/apelet/association/controller/plugin/formPlugin/ClueManageFormPlugin.java

@ -1,17 +0,0 @@
package apelet.association.controller.plugin.formPlugin;
import apelet.association.utils.CreatNumberUtils;
import apelet.common.core.object.ObjectValue;
import apelet.common.online.abstractplugin.ExecutePluginParent;
import apelet.common.online.model.constant.AttributeEnum;
public class ClueManageFormPlugin extends ExecutePluginParent {
@Override
public void formCreated(String widgetVariableName, ObjectValue objectValue) {
super.formCreated(widgetVariableName, objectValue);
// this.setAttribute("seekInfo","11");
// this.setWidgetAttribute("number", AttributeEnum.VALUE_CHANGE, "123");
CreatNumberUtils creatNumberUtils = new CreatNumberUtils();
this.setWidgetAttribute("billstatus", AttributeEnum.VALUE_CHANGE,"1");
}
}

56
common/common-association/src/main/java/apelet/association/plugin/MembershipPayPopupPlugin.java

@ -1,56 +0,0 @@
package apelet.association.plugin;
import apelet.common.core.object.ObjectValue;
import apelet.common.online.abstractplugin.ExecutePluginParent;
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;
/**
* @ClassName: MembershipPayPopupPlugin
* @Author: huangdehua
* @Date: 2026/4/30 09:37
* @Description:
*/
public class MembershipPayPopupPlugin extends ExecutePluginParent {
/**
* 目标表单ID - membershipFeePay 表单在平台中的表单ID
*/
private static final Object FORM_ID = "2049040032123064320";
/**
* 触发按钮的标识 - 对应表单上按钮的 key/标识
* 点击此按钮时触发弹窗
*/
private static final String BUTTON_KEY = "会费缴纳";
/**
* 按钮点击事件
* 点击按钮时以弹窗方式打开 membershipFeePay 表单
*
* @param buttonKey 按钮标识
* @param objectValue 当前表单数据对象
*/
@Override
public void buttonTriggered(String buttonKey, ObjectValue objectValue) {
// 仅响应指定按钮的点击事件
if (!BUTTON_KEY.equals(buttonKey)) {
return;
}
// 调用 showForm 打开 membershipFeePay 表单
ShowParameter showParameter = new ShowParameter();
showParameter.setFormId(FORM_ID.toString());
showParameter.setHowType(ShowTypeEnum.OPEN_ONLINE_MODAL);
showParameter.setStatus(ViewStatus.EDIT);
Map<String, Object> customParam = new HashMap<>();
customParam.put("id"," ");
showParameter.setCustomParam(customParam);
super.showForm(showParameter);
}
}

40
common/common-association/src/main/java/apelet/association/plugin/MembershipPayShowHidePlugin.java

@ -1,40 +0,0 @@
package apelet.association.plugin;
import apelet.common.core.object.ObjectValue;
import apelet.common.online.abstractplugin.ExecutePluginParent;
import apelet.common.online.model.constant.AttributeEnum;
import java.util.Objects;
/**
* @ClassName: MembershipPayShowHidePlugin
* @Author: huangdehua
* @Date: 2026/5/7 15:00
* @Description: 会费缴纳界面会员类别为非会员时显示银行收款凭证号字段其他情况隐藏
*/
public class MembershipPayShowHidePlugin extends ExecutePluginParent {
@Override
public void formCreated(String widgetVariableName, ObjectValue objectValue) {
super.formCreated(widgetVariableName, objectValue);
String membershipType = objectValue.getString("membershipType");
if (Objects.equals(membershipType, "E")){
super.setWidgetAttribute("bankReceiptV", AttributeEnum.SHOW, true);
}else {
super.setWidgetAttribute("bankReceiptV", AttributeEnum.SHOW, false);
}
}
@Override
public void change(String widgetVariableName, ObjectValue objectValue) {
super.change(widgetVariableName, objectValue);
String membershipType = objectValue.getString("membership_type");
if (Objects.equals(widgetVariableName, "membershipType")){
if (Objects.equals(membershipType, "E")){
super.setWidgetAttribute("bankReceiptV", AttributeEnum.SHOW, true);
}else {
super.setWidgetAttribute("bankReceiptV", AttributeEnum.SHOW, false);
}
}
}
}

25
common/common-association/src/main/java/apelet/association/plugin/UnitNameChangeFormPlugin.java

@ -1,25 +0,0 @@
package apelet.association.plugin;
import apelet.common.core.object.ObjectValue;
import apelet.common.online.abstractplugin.ExecutePluginParent;
import apelet.common.online.model.constant.AttributeEnum;
/**
* @ClassName: UnitNameChangeFormPlugin
* @Author: huangdehua
* @Date: 2026/4/30 10:40
* @Description: 入会申请与审核界面初始化
*/
public class UnitNameChangeFormPlugin extends ExecutePluginParent {
/**
* 界面初始化事件
* 将单据状态 billStatus 赋值为 "A"
*/
@Override
public void formCreated(String str, ObjectValue objectValue) {
super.formCreated(str, objectValue);
//objectValue.setString("billStatus", "A");
//this.setWidgetAttribute("billstatus", AttributeEnum.VALUE_CHANGE, "A");
}
}

295
common/common-association/src/main/java/apelet/association/plugin/UnitNameChangeOperationPlugin.java

@ -1,295 +0,0 @@
package apelet.association.plugin;
import apelet.common.core.object.ObjectCollection;
import apelet.common.core.object.ObjectValue;
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.orm.impl.Filter;
import apelet.common.orm.impl.FilterItem;
import java.util.Iterator;
import java.util.Map;
/**
* @ClassName: UnitNameChangeOperationPlugin
* @Author: huangdehua
* @Date: 2026/4/30 11:02
* @Description: 入会申请与审核 变更单位名称
*/
public class UnitNameChangeOperationPlugin extends OperationServicePlugIn {
// 主表与子表数据源变量名,需与在线表单配置保持一致。
private static final String TABLE_NAME = "membership_apply";
private static final String CHILD_TABLE_NAME = "membership_apply_entry";
private static final String FIELD_ID = "id";
private static final String FIELD_NUMBER = "number";
private static final String FIELD_UNIT_NAME = "unit_name";
private static final String FIELD_BILL_STATUS = "billstatus";
private static final String FIELD_IS_HISTORY = "is_history";
private static final String FIELD_VERSION_NUMBER = "version_number";
private static final String STATUS_ACTIVE = "A";
private static final String STATUS_CHANGED = "C";
private static final Integer IS_HISTORY_YES = 1;
private static final Integer IS_HISTORY_NO = 0;
@Override
public void beginOperationTransaction(BeginOperationTransactionArgs args) {
try {
ObjectValue model = args.getModel();
if (model == null) {
setFailResult("获取表单数据失败");
return;
}
String pkId = model.getString(FIELD_ID);
if (pkId == null || pkId.isEmpty()) {
setFailResult("新增单据不允许执行变更操作");
return;
}
String newUnitName = model.getString(FIELD_UNIT_NAME);
if (newUnitName == null || newUnitName.isEmpty()) {
setFailResult("单位名称不能为空");
return;
}
OrmGenDataSourceUtil ormUtil = ormGenDataSourceUtil();
if (ormUtil == null) {
setFailResult("获取数据库连接失败");
return;
}
Filter pkFilter = new Filter();
pkFilter.add(new FilterItem(FIELD_ID, "=", pkId));
ObjectCollection oldCollection = ormUtil.query(TABLE_NAME, pkFilter, null);
if (oldCollection == null || oldCollection.isEmpty()) {
setFailResult("未找到当前单据数据");
return;
}
ObjectValue oldBill = oldCollection.getObject(0);
String oldUnitName = oldBill.getString(FIELD_UNIT_NAME);
if (oldUnitName == null || oldUnitName.equals(newUnitName)) {
setFailResult("单位名称未发生变化,无需变更");
return;
}
String billNumber = oldBill.getString(FIELD_NUMBER);
if (billNumber == null || billNumber.isEmpty()) {
setFailResult("单据编号不能为空");
return;
}
// 通过单据编号 + 排除当前ID,查找同一业务单据之前变更产生的记录
ObjectValue previousChangedBill = findBillByNumberAndStatus(ormUtil, billNumber, pkId, STATUS_CHANGED);
ObjectValue previousActiveBill = findBillByNumberAndStatus(ormUtil, billNumber, pkId, STATUS_ACTIVE);
if (previousActiveBill != null) {
// 二次变更:同一单据编号下已存在 A 记录(上次变更产生的),直接更新其 unit_name,无需新增
// 获取当前历史单据的最大版本号
int currentMaxVersion = getMaxVersionNumber(ormUtil, billNumber, pkId);
if (previousChangedBill != null) {
// 已有历史 C 记录,用当前旧单据数据覆盖它,并更新版本号
overwriteBill(ormUtil, previousChangedBill, oldBill, currentMaxVersion + 1);
} else {
// 无历史 C 记录,将当前旧单据标记为 C,并设置版本号
oldBill.put(FIELD_BILL_STATUS, STATUS_CHANGED);
oldBill.put(FIELD_IS_HISTORY, IS_HISTORY_YES);
oldBill.put(FIELD_VERSION_NUMBER, currentMaxVersion + 1);
ormUtil.update(TABLE_NAME, oldBill, null);
}
// 直接更新 A 记录的 unit_name
previousActiveBill.put(FIELD_UNIT_NAME, newUnitName);
ormUtil.update(TABLE_NAME, previousActiveBill, null);
} else {
// 首次变更:同一单据编号下没有 A 记录,走新增逻辑
oldBill.put(FIELD_BILL_STATUS, STATUS_CHANGED);
oldBill.put(FIELD_IS_HISTORY, IS_HISTORY_YES);
oldBill.put(FIELD_VERSION_NUMBER, 1);
ormUtil.update(TABLE_NAME, oldBill, null);
ObjectValue newBill = new ObjectValue(TABLE_NAME);
copyValuesWithoutId(oldBill, newBill, FIELD_BILL_STATUS, FIELD_IS_HISTORY, FIELD_VERSION_NUMBER);
newBill.put(FIELD_UNIT_NAME, newUnitName);
newBill.put(FIELD_IS_HISTORY, IS_HISTORY_NO);
newBill.put(FIELD_VERSION_NUMBER, 1);
ObjectCollection copiedChildren = copyChildCollection(model.getValues().get(CHILD_TABLE_NAME));
if (copiedChildren != null && !copiedChildren.isEmpty()) {
newBill.put(CHILD_TABLE_NAME, copiedChildren);
}
ormUtil.addNew(TABLE_NAME, newBill);
updateNewBillStatus(ormUtil, pkId, newUnitName);
}
setSuccessResult();
} catch (Exception e) {
e.printStackTrace();
setFailResult("单位名称变更处理失败:" + e.getMessage());
}
}
private void copyValuesWithoutId(ObjectValue source, ObjectValue target, String... excludedFields) {
Map<String, Object> values = source.getValues();
Iterator<String> it = values.keySet().iterator();
while (it.hasNext()) {
String key = it.next();
if (FIELD_ID.equals(key) || isExcludedField(key, excludedFields)) {
continue;
}
// 排除 history 和 versionNumber 字段,由业务逻辑单独设置
if (FIELD_IS_HISTORY.equals(key) || FIELD_VERSION_NUMBER.equals(key)) {
continue;
}
target.put(key, values.get(key));
}
}
private boolean isExcludedField(String fieldName, String... excludedFields) {
if (excludedFields == null) {
return false;
}
for (String excludedField : excludedFields) {
if (fieldName.equals(excludedField)) {
return true;
}
}
return false;
}
private ObjectCollection copyChildCollection(Object childValue) {
if (!(childValue instanceof ObjectCollection)) {
return null;
}
// 子表行只去掉主键,其他字段原样复制,避免丢失联系人等历史明细。
ObjectCollection oldChildren = (ObjectCollection) childValue;
if (oldChildren.isEmpty()) {
return null;
}
ObjectCollection newChildren = new ObjectCollection();
for (int i = 0; i < oldChildren.size(); i++) {
ObjectValue oldChild = oldChildren.getObject(i);
if (oldChild == null) {
continue;
}
ObjectValue newChild = new ObjectValue(null);
copyValuesWithoutId(oldChild, newChild);
newChildren.addObject(newChild);
}
return newChildren;
}
/**
* 通过单据编号查找同一业务单据的变更记录
* 查询条件number = billNumber AND id != excludePkId AND billstatus = status
*
* @param ormUtil ORM 工具
* @param billNumber 单据编号关联同一业务单据
* @param excludePkId 排除的单据主键当前操作的记录
* @param status 单据状态
* @return 匹配的单据无则返回 null
*/
private ObjectValue findBillByNumberAndStatus(OrmGenDataSourceUtil ormUtil, String billNumber, String excludePkId, String status) throws Exception {
Filter filter = new Filter();
filter.add(new FilterItem(FIELD_NUMBER, "=", billNumber));
filter.add(new FilterItem(FIELD_ID, "<>", excludePkId));
//filter.add(new FilterItem(FIELD_BILL_STATUS, "=", status));
ObjectCollection collection = ormUtil.query(TABLE_NAME, filter, null);
if (collection == null || collection.isEmpty()) {
return null;
}
return collection.getObject(0);
}
/**
* 用源单据数据覆盖目标单据保留目标单据的 ID其他字段用源数据替换
*
* @param ormUtil ORM 工具
* @param targetBill 被覆盖的历史单据保留其 ID
* @param sourceBill 用于覆盖的数据源
* @param versionNumber 版本号
*/
private void overwriteBill(OrmGenDataSourceUtil ormUtil, ObjectValue targetBill, ObjectValue sourceBill, int versionNumber) throws Exception {
ObjectValue overwrittenBill = new ObjectValue(TABLE_NAME);
overwrittenBill.put(FIELD_ID, targetBill.getString(FIELD_ID));
copyValuesWithoutId(sourceBill, overwrittenBill, FIELD_BILL_STATUS, FIELD_IS_HISTORY, FIELD_VERSION_NUMBER);
overwrittenBill.put(FIELD_BILL_STATUS, STATUS_CHANGED);
overwrittenBill.put(FIELD_IS_HISTORY, IS_HISTORY_YES);
overwrittenBill.put(FIELD_VERSION_NUMBER, versionNumber);
ormUtil.update(TABLE_NAME, overwrittenBill, null);
}
private void updateNewBillStatus(OrmGenDataSourceUtil ormUtil, String oldPkId, String newUnitName) throws Exception {
Filter filter = new Filter();
filter.add(new FilterItem(FIELD_ID, "<>", oldPkId));
filter.add(new FilterItem(FIELD_UNIT_NAME, "=", newUnitName));
ObjectCollection collection = ormUtil.query(TABLE_NAME, filter, null);
if (collection == null || collection.isEmpty()) {
return;
}
ObjectValue newBill = collection.getObject(0);
if (newBill == null) {
return;
}
newBill.put(FIELD_BILL_STATUS, STATUS_ACTIVE);
newBill.put(FIELD_IS_HISTORY, IS_HISTORY_NO);
newBill.put(FIELD_VERSION_NUMBER, 1);
ormUtil.update(TABLE_NAME, newBill, null);
}
private void setSuccessResult() {
OperationResult result = new OperationResult();
result.setSuccess(true);
setOperationResult(result);
}
private void setFailResult(String message) {
OperationResult result = new OperationResult();
result.setSuccess(false);
result.setMessage(message);
result.setShowMessage(true);
setOperationResult(result);
}
/**
* 获取同一单据编号下的最大版本号排除当前操作的记录
*
* @param ormUtil ORM 工具
* @param billNumber 单据编号
* @param excludePkId 排除的单据主键
* @return 最大版本号未找到则返回 0
*/
private int getMaxVersionNumber(OrmGenDataSourceUtil ormUtil, String billNumber, String excludePkId) throws Exception {
Filter filter = new Filter();
filter.add(new FilterItem(FIELD_NUMBER, "=", billNumber));
filter.add(new FilterItem(FIELD_ID, "<>", excludePkId));
ObjectCollection collection = ormUtil.query(TABLE_NAME, filter, null);
if (collection == null || collection.isEmpty()) {
return 0;
}
int maxVersion = 0;
for (int i = 0; i < collection.size(); i++) {
ObjectValue bill = collection.getObject(i);
Object versionObj = bill.getValues().get(FIELD_VERSION_NUMBER);
if (versionObj != null) {
int version;
if (versionObj instanceof Integer) {
version = (Integer) versionObj;
} else {
version = Integer.parseInt(versionObj.toString());
}
if (version > maxVersion) {
maxVersion = version;
}
}
}
return maxVersion;
}
}

11
common/common-association/src/main/java/apelet/association/utils/CreatNumberUtils.java

@ -1,11 +0,0 @@
package apelet.association.utils;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
public class CreatNumberUtils {
public String creatNumber() {
return LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
}
}
Loading…
Cancel
Save