ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 80210

Browse Source
This commit is contained in:
yjz
2024-01-04 11:00:20 +08:00
parent 86ddedb445
commit 6328c60e79
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
-2
View File
@@ -375,7 +375,6 @@ public class DocumentSplitController {
@RequiresPermissions("split:sarFileSplitItems:copy") @RequiresPermissions("split:sarFileSplitItems:copy")
@ApiOperationSupport(order = 19) @ApiOperationSupport(order = 19)
public Result<T> copyDocumentSplitDetail(String id) { public Result<T> copyDocumentSplitDetail(String id) {
documentSplitService.isHorizontalOverstep(id);
documentSplitService.copyDocumentSplitDetail(id); documentSplitService.copyDocumentSplitDetail(id);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
@@ -391,7 +390,6 @@ public class DocumentSplitController {
@RequiresPermissions("split:sarFileSplitItems:batchCopy") @RequiresPermissions("split:sarFileSplitItems:batchCopy")
@ApiOperationSupport(order = 20) @ApiOperationSupport(order = 20)
public Result<T> copyBatchDocumentSplitDetail(String ids) { public Result<T> copyBatchDocumentSplitDetail(String ids) {
documentSplitService.isHorizontalOverstep(ids);
documentSplitService.copyBatchDocumentSplitDetail(ids); documentSplitService.copyBatchDocumentSplitDetail(ids);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+7 -8
View File
@@ -787,7 +787,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
// 字段名 // 字段名
StringBuilder fieldsBuilder = new StringBuilder(); StringBuilder fieldsBuilder = new StringBuilder();
// 字段值 // 字段值
StringBuilder valuesBuilder = new StringBuilder(); List<String> valuesList = new ArrayList<>();
Date date = new Date(); Date date = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format = dateFormat.format(date); String format = dateFormat.format(date);
@@ -798,8 +798,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
resultMap.put("update_by", loginUser.getUsername()); resultMap.put("update_by", loginUser.getUsername());
resultMap.put("update_time", format); resultMap.put("update_time", format);
// 字段名和值 // 字段名和值
manageData(resultMap, fieldsBuilder, valuesBuilder); manageData(resultMap, fieldsBuilder, valuesList);
documentSplitMapper.insertLawsDocumentSplit(fieldsBuilder.toString(), Arrays.asList(valuesBuilder.toString().split(","))); documentSplitMapper.insertLawsDocumentSplit(fieldsBuilder.toString(), valuesList);
} }
@Override @Override
@@ -1190,14 +1190,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发布的只有自己可见，发布的数据所有人可见 // 发布的只有自己可见，发布的数据所有人可见
String roleIds = loginUser.getRoleIds(); String roleIds = loginUser.getRoleIds();
QueryWrapper<LawsDocumentSplit> queryWrapper = new QueryWrapper<>(); QueryWrapper<SarFileSplitInfoEO> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", Arrays.asList(ids.split(","))); queryWrapper.in("id", Arrays.asList(ids.split(",")));
queryWrapper.and(qw -> queryWrapper.and(qw ->
qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1) qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1)
.eq("author", loginUser.calcNameWorkNo())) .eq("author", loginUser.calcNameWorkNo()))
.or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2) .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2)
.or().eq(roleIds.contains("admin"), "author", "云平台")); .or().eq(roleIds.contains("admin"), "author", "云平台"));
int count = lawsDocumentSplitMapper.selectCount(queryWrapper); int count = sarFileSplitInfoService.count(queryWrapper);
if (count <= 0) { if (count <= 0) {
if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
throw new JeroBootException("无权限!"); throw new JeroBootException("无权限!");
@@ -1207,14 +1207,13 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
} }
} }
private void manageData(Map<String, Object> resultMap, StringBuilder fieldsBuilder, StringBuilder valuesBuilder) { private void manageData(Map<String, Object> resultMap, StringBuilder fieldsBuilder, List<String> valuesList) {
// 所有key(字段名) // 所有key(字段名)
resultMap.forEach((k, v) -> { resultMap.forEach((k, v) -> {
fieldsBuilder.append(k).append(","); fieldsBuilder.append(k).append(",");
valuesBuilder.append(v).append(","); valuesList.add(v.toString());
}); });
fieldsBuilder.deleteCharAt(fieldsBuilder.length() - 1); fieldsBuilder.deleteCharAt(fieldsBuilder.length() - 1);
valuesBuilder.deleteCharAt(valuesBuilder.length() - 1);
} }