核注单代码提交

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/param/QySecondlineHfdPageParam.java

@@ -48,4 +48,28 @@ public class QySecondlineHfdPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 核放单预录入号 */
+    @Schema(description = "核放单预录入号")
+    private String hfdrCode;
+
+    /** 核放单号 */
+    @Schema(description = "核放单号")
+    private String hfdCode;
+
+    /** 台账编号 */
+    @Schema(description = "台账编号")
+    private String ledgerCode;
+
+    /** 进出标志 */
+    @Schema(description = "进出标志")
+    private String jcbz;
+
+    /** 关联核注清单编号 */
+    @Schema(description = "关联核注清单编号")
+    private String glhzqdbh;
+
+    /** 单据状态 */
+    @Schema(description = "单据状态")
+    private String status;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/service/impl/QySecondlineHfdServiceImpl.java

@@ -66,6 +66,24 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
     @Override
     public Page<QySecondlineHfd> page(QySecondlineHfdPageParam qySecondlineHfdPageParam) {
         QueryWrapper<QySecondlineHfd> queryWrapper = new QueryWrapper<QySecondlineHfd>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdrCode())) {
+            queryWrapper.lambda().like(QySecondlineHfd::getHfdrCode, qySecondlineHfdPageParam.getHfdrCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdCode())) {
+            queryWrapper.lambda().like(QySecondlineHfd::getHfdCode, qySecondlineHfdPageParam.getHfdCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getLedgerCode())) {
+            queryWrapper.lambda().like(QySecondlineHfd::getLedgerCode, qySecondlineHfdPageParam.getLedgerCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getJcbz())) {
+            queryWrapper.lambda().eq(QySecondlineHfd::getJcbz, qySecondlineHfdPageParam.getJcbz());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getGlhzqdbh())) {
+            queryWrapper.lambda().like(QySecondlineHfd::getGlhzqdbh, qySecondlineHfdPageParam.getGlhzqdbh());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getStatus())) {
+            queryWrapper.lambda().eq(QySecondlineHfd::getStatus, qySecondlineHfdPageParam.getStatus());
+        }
         if(ObjectUtil.isAllNotEmpty(qySecondlineHfdPageParam.getSortField(), qySecondlineHfdPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(qySecondlineHfdPageParam.getSortOrder());
             queryWrapper.orderBy(true, qySecondlineHfdPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/entity/QySecondlineHzdTz.java

@@ -152,4 +152,24 @@ public class QySecondlineHzdTz {
     @ColumnWidth(12)
     @ExcelProperty(index = 18,value = "台账性质")
     private String tzNature;
+
+    @Schema(description = "申报类型")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 19,value = "申报类型")
+    private String sblx;
+
+    @Schema(description = "单据类型")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 20,value = "单据类型")
+    private String applyType;
+
+    @Schema(description = "单据状态")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 20,value = "单据状态")
+    private String status;
+
+    @Schema(description = "申报时间")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 21,value = "申报时间")
+    private Date sbsj;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/impl/QySecondlineHzdTzServiceImpl.java

@@ -198,7 +198,6 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
     public List<String> tzCodeByCondition(QySecondlineHzdTzIdParam qySecondlineHzdIdParam){
         List<QySecondlineHzdTz> list = this.list();
         List<String> tzCode = list.stream().map(QySecondlineHzdTz::getTzCode).distinct().toList();
-
         return tzCode;
     }