优化档案模块

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;

archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java

@@ -70,6 +70,8 @@ public interface ArchivesSummaryRepository extends JpaRepository<ArchivesSummary
     ArchivesSummary findFirstByTagNo(String tagNo);
 
     List<ArchivesSummary> 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<ArchivesSummary> findAllByCaseNoAndCategoryType(String caseId,Integer categoryType);
     List<ArchivesSummary> findAllByCaseNoLikeAndCategoryType(String caseId,Integer categoryType);
 

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"))