From a88bb940e959db031e4bc18db92ae654438660ad Mon Sep 17 00:00:00 2001 From: xia Date: Fri, 19 Aug 2022 09:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A1=A3=E6=A1=88=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/archives/domain/ArchivesSummary.java | 4 ++++ .../archives/repository/ArchivesSummaryRepository.java | 2 ++ .../archives/service/impl/ArchivesServiceImpl.java | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesSummary.java b/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesSummary.java index adf1c16..be0c84f 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesSummary.java +++ b/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesSummary.java @@ -41,6 +41,10 @@ public class ArchivesSummary extends BaseEntity implements Serializable { @ApiModelProperty(value = "案卷号") private String recordNo; + @Column(name = "piece_no") + @ApiModelProperty(value = "件号") + private String pieceNo; + @Column(name = "doc_no") @ApiModelProperty(value = "文号") private String docNo; diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java index 7779cd1..340a9b2 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java +++ b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java @@ -70,6 +70,8 @@ public interface ArchivesSummaryRepository extends JpaRepository findAllByCaseNoLike(String caseId); + + @Query(nativeQuery = true,value = "select * from archives_summary where case_no = ?1 and category_type = ?2 order by piece_no asc ") List findAllByCaseNoAndCategoryType(String caseId,Integer categoryType); List findAllByCaseNoLikeAndCategoryType(String caseId,Integer categoryType); diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java index eea35bd..2f404b0 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java @@ -509,10 +509,14 @@ public class ArchivesServiceImpl implements ArchivesService { //文号 if(filedNameList.contains("doc_no")) archivesSummary.setDocNo(json.get("doc_no")==null?null:json.get("doc_no")+""); + //件号 + if(filedNameList.contains("piece_no")) + archivesSummary.setPieceNo(json.get("piece_no")==null?null:json.get("piece_no")+""); //页数 if(filedNameList.contains("page_qty")){ - Integer pageQty = json.get("page_qty")==null?null:Integer.parseInt(json.get("page_qty")+""); - archivesSummary.setPageQty(pageQty); + String pageQty = json.get("page_qty")==null?null:json.get("page_qty")+""; + Integer pageqty = StringUtils.isEmpty(pageQty)?null:Integer.parseInt(pageQty); + archivesSummary.setPageQty(pageqty); } //备注 if(filedNameList.contains("remarks"))