diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java index 14ec4351..c0fa6fe7 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java @@ -7,7 +7,10 @@ import com.jero.modules.compare.entity.SarFileCompareResComVO; import com.jero.modules.compare.entity.SarFileCompareResComment; import com.jero.modules.compare.mapper.SarFileCompareResCommentMapper; import com.jero.modules.compare.service.ISarFileCompareResCommentService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.MyStringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -23,6 +26,8 @@ import java.util.*; public class SarFileCompareResCommentServiceImpl extends ServiceImpl implements ISarFileCompareResCommentService { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @Autowired + private ISysUserService sysUserService; /** * 保存 @@ -111,15 +116,26 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl sarFileCompareResComVOS = Lists.newArrayList(resCommentMap.values()); + // 填充属性 + for (SarFileCompareResComVO sarFileCompareResComVO : sarFileCompareResComVOS) { + SysUser user = sysUserService.getUserByName(sarFileCompareResComVO.getName()); + if (!Objects.isNull(user)){ + sarFileCompareResComVO.setName(user.calcNameWorkNo()); + } + } + return sarFileCompareResComVOS; } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java index efd695ca..07f55a76 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java @@ -93,7 +93,6 @@ public class DocumentSplitCommon { */ public static final String SPLIT_STATUS2 = "2"; public static final String INTERPRETATION = "interpretation"; - public static final String MEG_DEL = "删除成功!"; public static final String MEG_DEL_BATCH = "批量删除成功!"; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 3f2c0fbb..23496431 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -308,11 +308,11 @@ public class DocumentSplitController { * 文档拆分详情-导出 * @param request * @param response + * @AutoLog(value = "文档拆分详情-导出") + * @ApiOperation(value = "文档拆分详情-导出") + * @GetMapping("/exportDocumentSplitDetail") + * public void exportDocumentSplitDetail(@RequestBody Map parameter, HttpServletRequest request, HttpServletResponse response) { + * documentSplitService.exportDocumentSplitDetail(parameter, request, response); + * } */ - @AutoLog(value = "文档拆分详情-导出") - @ApiOperation(value = "文档拆分详情-导出") - @GetMapping("/exportDocumentSplitDetail") - public void exportDocumentSplitDetail(@RequestBody Map parameter, HttpServletRequest request, HttpServletResponse response) { - documentSplitService.exportDocumentSplitDetail(parameter, request, response); - } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 5003f542..a1256a70 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -126,7 +126,6 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { return documentSplitMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); } - @Override public List queryByList(DocumentSplitInfo documentSplitInfo) { // 构建查询条件 @@ -362,7 +361,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { if (DocumentSplitCommon.TEXT.equals(sarFileSplitItemsValEO.getType())) { valContent.append("

").append(sarFileSplitItemsValEO.getItemContent()).append("

"); } else if (DocumentSplitCommon.IMG.equals(sarFileSplitItemsValEO.getType())) { - valContent.append(""); + valContent.append(""); } else if (DocumentSplitCommon.TABLE.equals(sarFileSplitItemsValEO.getType())) { valContent.append(sarFileSplitItemsValEO.getItemContent()); } @@ -622,7 +622,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 填充说明 Cell cell = headerRowTwo.createCell(0); String explain = "模版说明:\n" + - "1. 条款号/条款标题/条文内容不能为空\n" + + "1. 条文号/条文标题/条文内容不能为空\n" + "2. 仅支持zip格式文件夹"; CellStyle cellStyleTwo = workbook.createCellStyle(); @@ -791,8 +791,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 文档拆分详情(旧) List> oldLawsDocumentSplitList = documentSplitMapper.queryLawsDocumentSplitByInfoId(id); /** - * List oldLawsDocumentSplitIdList = new ArrayList<>(); - * List newLawsDocumentSplitIdList = new ArrayList<>(); + * List oldLawsDocumentSplitIdList = new ArrayList<>(); + * List newLawsDocumentSplitIdList = new ArrayList<>(); */ for (Map map : oldLawsDocumentSplitList) { String oldId = (String) map.get(ID); @@ -802,7 +802,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { String newId = UUID.randomUUID().toString().replace("-", ""); map.put(ID, newId); /** - * newLawsDocumentSplitIdList.add(newId); + * newLawsDocumentSplitIdList.add(newId); */ map.put(INFO_ID, newInfo.getId()); @@ -853,7 +853,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 创建工作簿 // 创建sheet页 - Sheet sheet = workbook.createSheet("条款内容"); + Sheet sheet = workbook.createSheet("条文内容"); // 字段名 List keyList = new ArrayList<>(); if(!Objects.isNull(mapList) && !mapList.isEmpty()){ @@ -1066,7 +1066,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { }else { queryWrapper.isNull("publish_before_id"); } - // 逻辑删除 + // 逻辑删除 queryWrapper.eq("del_flag", 0); // 排序 queryWrapper.orderByDesc("create_time"); diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index fd0b4dc9..88040a78 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -221,7 +221,7 @@ public class FileSplitItemsEOController extends JeroController importSplitResult(String splitFileId, String cut, SarFileSplitInfoEO splitInfoEO) throws IOException {