生产工序业务修改

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java

@@ -189,10 +189,20 @@ public class ProjectEnum {
      */
     public enum TSampleListType {
 
-        YH(1, "Yh","样号"),
-
-        HOLES_ID(2, "HolesID","炮孔编号");
 
+        YH(1, "Yh","样号"),
+        HOLES_ID(2, "HolesID","炮孔编号"),
+        QR_CODE(2, "QRCode","二维码"),
+        STOPE_NAME(2, "StopeName","采区名称"),
+        STEP_NAME(3, "StepName","平台名称"),
+        BLAST_AREA_NAME(4, "BlastAreaName","爆区名称"),
+        START(4, "Start","从"),
+        END_TO(4, "EndTo","至"),
+        SYR(4, "Syr","送样人"),
+        SYRQ(4, "Syrq","送样时间"),
+        BZ(4, "Bz","备注"),
+        RECORD_NAME(4, "RecordName","记录对象"),
+        RECORD_CODE(4, "RecordCode","记录形式");
 
 
         // 成员变量

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java

@@ -44,11 +44,16 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         Page<TSampleList> page = new Page<>(query.getPageNum(), query.getPageSize());
         //条件封装 因为图片字节太长，排除QR_CODE,RECORD_CODE
         QueryWrapper<TSampleList> queryWrapper = new QueryWrapper<>();
-
+        queryWrapper.select(
+                ProjectEnum.TSampleListType.HOLES_ID.getLabel(),
+                ProjectEnum.TSampleListType.START.getLabel(),
+                ProjectEnum.TSampleListType.END_TO.getLabel(),
+                ProjectEnum.TSampleListType.YH.getLabel(),
+                ProjectEnum.TSampleListType.RECORD_NAME.getLabel(),
+                ProjectEnum.TSampleListType.SYR.getLabel(),
+                ProjectEnum.TSampleListType.SYRQ.getLabel()
+        );
         queryWrapper
-                .select(TSampleList.class, info ->
-                        !info.getColumn().equals(ProjectEnum.ImageType.QR_CODE.getLabel())
-                                && !info.getColumn().equals(ProjectEnum.ImageType.RECORD_CODE.getLabel()))
                 .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.YH.getLabel(), tSampleListQuery.getSearch())
                 .or()
                 .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch());