9/10 优化1.2

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -182,7 +182,7 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private String corpName;
 
-    private Integer busType;
+    private String busType;
     private Integer inCodeStatus;
     private String relKey;
 

src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java

@@ -120,6 +120,7 @@ public class IoSplitFifoInvRequest extends ListPageRequest {
     private String keywords;
 
     private String remind;
+    private String cpmctymc;
 
 
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -22,10 +22,7 @@ import com.glxp.api.dao.collect.IoCollectOrderMapper;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.*;
-import com.glxp.api.entity.collect.IoCollectOrder;
-import com.glxp.api.entity.collect.IoCollectOrderBiz;
-import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
-import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
+import com.glxp.api.entity.collect.*;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
@@ -610,6 +607,11 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     }
 
 
+    @Resource
+    IoCollectOrderBackupService ioCollectOrderBackupService;
+
+    @Resource
+    IoCollectOrderBizBackupService ioCollectOrderBizBackupService;
     /**
      * @param billNo
      */
@@ -682,6 +684,22 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             }
 
         }
+        //插入处方备份表
+        IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
+        BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
+        boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup);
+        if (!save){
+            throw new JsonException(500,"处方备用上传失败");
+        }
+        List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
+        for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
+            IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
+            BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
+            boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup);
+            if (!save1){
+                throw new JsonException(500,"处方备用明细上传失败");
+            }
+        }
 
 
     }

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -99,7 +99,7 @@
                 AND io.invCode = #{invCode}
             </if>
             <if test="busType != null">
-                AND busType = #{busType}
+                AND io.busType = #{busType}
             </if>
             <if test="inCodeStatus != null">
                 AND inCodeStatus = #{inCodeStatus}

src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml

@@ -78,6 +78,9 @@
           <if test="busType != null and busType != ''">
               AND isfi.busType = #{busType}
           </if>
+          <if test="cpmctymc != null and cpmctymc != ''">
+              AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+          </if>
           <if test="keywords != null and keywords != ''">
               AND (
               isfi.workPlaceCode like concat('%', #{keywords}, '%')
@@ -85,6 +88,7 @@
               or isfi.batchNo like concat('%', #{keywords}, '%')
               or bp.cpmctymc like concat('%', #{keywords}, '%')
               or bp.ggxh like concat('%', #{keywords}, '%')
+              or bp.bzgg like concat('%', #{keywords}, '%')
               or bp.nameCode like concat('%', #{keywords}, '%')
               or bp.zczbhhzbapzbh like concat('%', #{keywords}, '%')
               or bp.ylqxzcrbarmc like concat('%', #{keywords}, '%')