ecology
/
ebu_ecology_dev1
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

冲突提交修改

dev
wangxuanran 2023-07-10 16:14:32 +08:00
parent baddd2b747
commit 5ba3b46d7d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/weaver/xuanran/wang/ajx/work_flow_split/action/ChildWorkFlowSplitAction.java
View File

@ -68,7 +68,7 @@ public class ChildWorkFlowSplitAction extends SafeCusBaseAction {
log.error("detail " + selectDetailNo + " table info is empty!");
return;
}
Set<String> accountNumber = detailInfo.stream().map(item -> item.get(selectAccountNumberField)).collect(Collectors.toSet());
Set<String> accountNumber = detailInfo.stream().map(item -> Util.null2DefaultStr(item.get(selectAccountNumberField),"")).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
if(CollectionUtils.isEmpty(accountNumber) || accountNumber.size() == 1){
log.error("明细数据根据帐套号分组后为空, 或不存在多个帐套!");
log.info("accountNumber : [ " + JSONObject.toJSONString(accountNumber) + " ]");
@ -81,6 +81,10 @@ public class ChildWorkFlowSplitAction extends SafeCusBaseAction {
if (!mapper.updateMainTable(billTable, hasMoreAccountField, hasMoreAccountFieldValue, requestId)) {
throw new CustomerException("更新主表是否包含多账套字段失败!");
}
// 如果插入表的帐套号字段名配置为空 那么与插入表的字段名保持一致
if(StringUtils.isBlank(this.insertAccountNumberField)){
this.insertAccountNumberField = selectAccountNumberField;
}
List<Map<String, String>> insertList = accountNumber.stream()
.map(item -> {
Map<String, String> map = new HashMap<>();
@ -88,11 +92,7 @@ public class ChildWorkFlowSplitAction extends SafeCusBaseAction {
map.put("insertAccountNumber", item);
return map;
}).collect(Collectors.toList());
// 如果插入表的帐套号字段名配置为空 那么与插入表的字段名保持一致
if(StringUtils.isBlank(this.insertAccountNumberField)){
this.insertAccountNumberField = selectAccountNumberField;
}
boolean delete = mapper.selectAccountNumber(mainMap.get("id"), billTable + "_dt" + insertDetailNo);
boolean delete = mapper.selectAccountNumber(id, billTable + "_dt" + insertDetailNo);
if(!delete){
throw new CustomerException("删除明细表数据失败!");
}

2
src/test/java/builderpackage/AutoPackageJar.java
View File

@ -25,7 +25,7 @@ public class AutoPackageJar {
public static void createJar(String targetPath) {
String path = AutoPackageJar.class.getResource("").getPath();
String finalPath = path.split(File.separator + targetPath)[0] + File.separator + targetPath + File.separator + FileTreeBuilder.classPath;
String finalPath = path.split(File.separator + targetPath)[0] + File.separator + targetPath + FileTreeBuilder.classPath;
createJar(finalPath + "aiyh", finalPath + "aiyh_utils.jar");
createJar(finalPath + "ebu7common", finalPath + "ebu7common.jar");
}