Merge remote-tracking branch 'origin/hlhyxyy' into hlhyxyy

src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java

@@ -40,73 +40,73 @@ public class VA002 implements Serializable {
     private String manufactory;
 
     @TableField(value = "SUPCODE")
-    private String SUPCODE;
+    private String supcode;
 
     @TableField(value = "SUPNAME")
-    private String SUPNAME;
+    private String supname;
 
     @TableField(value = "CPLB")
-    private String CPLB;
+    private String cplb;
 
     @TableField(value = "FLBM")
-    private String FLBM;
+    private String flbm;
 
     @TableField(value = "QXLB")
-    private String QXLB;
+    private String qxlb;
 
     @TableField(value = "YBBM")
-    private String YBBM;
+    private String ybbm;
 
     @TableField(value = "SPTM")
-    private String SPTM;
+    private String sptm;
 
     @TableField(value = "TYSHXYDM")
-    private String TYSHXYDM;
+    private String tyshxydm;
 
     @TableField(value = "YLQXZCRBARMC")
-    private String YLQXZCRBARMC;
+    private String ylqxzcrbarmc;
 
     @TableField(value = "YLQXZCRBARYWMC")
-    private String YLQXZCRBARYWMC;
+    private String ylqxzcrbarywmc;
 
     @TableField(value = "CPMS")
-    private String CPMS;
+    private String cpms;
 
     @TableField(value = "SPMC")
-    private String SPMC;
+    private String spmc;
 
     @TableField(value = "QTBM")
-    private String QTBM;
+    private String qtbm;
 
     @TableField(value = "ZCZYXQZ")
-    private String ZCZYXQZ;
+    private String zczyxqz;
 
     @TableField(value = "PRICE")
-    private String PRICE;
+    private String price;
 
     @TableField(value = "RETAILPRICE")
-    private String RETAILPRICE;
+    private String retailprice;
 
     @TableField(value = "INVCODE")
-    private String INVCODE;
+    private String invcode;
 
     @TableField(value = "REMARK")
-    private String REMARK;
+    private String remark;
 
     @TableField(value = "REMARK1")
-    private String REMARK1;
+    private String remark1;
 
     @TableField(value = "REMARK2")
-    private String REMARK2;
+    private String remark2;
 
     @TableField(value = "REMARK3")
-    private String REMARK3;
+    private String remark3;
 
     @TableField(value = "REMARK4")
-    private String REMARK4;
+    private String remark4;
 
     @TableField(value = "REMARK5")
-    private String REMARK5;
+    private String remark5;
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java

@@ -17,5 +17,6 @@ public class UdiwmsWarehouseRequest extends ListPageRequest {
      * 货位号，支持模糊查询
      */
     private String warehouseCode;
+    private String databaseProductName;
 
 }

src/main/java/com/glxp/mipsdl/res/PageSimpleResponseNew.java

@@ -0,0 +1,29 @@
+package com.glxp.mipsdl.res;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 简单的分页返回对象
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageSimpleResponseNew<T> {
+    // 总数
+    private Integer total;
+    // 列表
+    private List<T> list;
+
+    public void setTotal(Long total) {
+
+        this.total = total.intValue();
+    }
+    public void setTotal(Integer total) {
+
+        this.total = total.intValue();
+    }
+}

src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java

@@ -1,6 +1,8 @@
 package com.glxp.mipsdl.service.hlfyyy;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.glxp.mipsdl.entity.hlfyyy.VA010;
 import com.glxp.mipsdl.req.base.UdiwmsUnitRequest;
 import com.glxp.mipsdl.thirddao.hlfyyy.VA001Mapper;
 import org.springframework.stereotype.Service;
@@ -12,12 +14,8 @@ import com.glxp.mipsdl.entity.hlfyyy.VA001;
 @Service
 public class VA001Service extends ServiceImpl<VA001Mapper, VA001> {
     public List<VA001> filterList(UdiwmsUnitRequest udiwmsUnitRequest) {
-        if (null == udiwmsUnitRequest) {
+        Page page = new Page<VA010>(udiwmsUnitRequest.getPage(), udiwmsUnitRequest.getLimit());
-            return Collections.emptyList();
+
-        }
+        return this.baseMapper.filterList(page,udiwmsUnitRequest);
-        if (null != udiwmsUnitRequest.getPage() && null != udiwmsUnitRequest.getLimit()) {
-            PageHelper.offsetPage((udiwmsUnitRequest.getPage() - 1) * udiwmsUnitRequest.getLimit(), udiwmsUnitRequest.getLimit());
-        }
-        return this.baseMapper.filterList(udiwmsUnitRequest);
     }
 }

src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java

@@ -1,10 +1,30 @@
 package com.glxp.mipsdl.service.hlfyyy;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageInfo;
+import com.glxp.mipsdl.entity.hlfyyy.VA010;
+import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest;
+import com.glxp.mipsdl.res.PageSimpleResponse;
+import com.glxp.mipsdl.res.PageSimpleResponseNew;
 import com.glxp.mipsdl.thirddao.hlfyyy.VA004Mapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.mipsdl.entity.hlfyyy.VA004;
+
+import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class VA004Service extends ServiceImpl<VA004Mapper, VA004> {
-
+    @Resource
+    private VA004Mapper va004Mapper;
+    public PageSimpleResponseNew<VA004> filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest){
+        Page page = new Page<VA010>(udiwmsWarehouseRequest.getPage(), udiwmsWarehouseRequest.getLimit());
+        List list =  va004Mapper.filterList(page,udiwmsWarehouseRequest);
+        PageSimpleResponseNew<VA004> pageSimpleResponseNew = new PageSimpleResponseNew<>();
+        pageSimpleResponseNew.setList(list);
+        pageSimpleResponseNew.setTotal(list.size());
+        return pageSimpleResponseNew;
+    }
 }

src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java

@@ -2,15 +2,17 @@ package com.glxp.mipsdl.thirddao.hlfyyy;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.mipsdl.entity.hlfyyy.VA001;
 import com.glxp.mipsdl.req.base.UdiwmsUnitRequest;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 @DS("hlfyyySql")
 public interface VA001Mapper extends BaseMapper<VA001> {
-    List<VA001> filterList(UdiwmsUnitRequest udiwmsUnitRequest);
+    List<VA001> filterList(Page page, @Param("req") UdiwmsUnitRequest udiwmsUnitRequest);
 
 }

src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java

@@ -2,10 +2,16 @@ package com.glxp.mipsdl.thirddao.hlfyyy;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.mipsdl.entity.hlfyyy.VA004;
+import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("hlfyyySql")
 public interface VA004Mapper extends BaseMapper<VA004> {
+    List<VA004> filterList(Page page, UdiwmsWarehouseRequest udiwmsWarehouseRequest);
 }

src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml

@@ -19,47 +19,26 @@
   </sql>
   <select id="filterList" resultType="com.glxp.mipsdl.entity.hlfyyy.VA001">
     select *
-    from a001
+    from v_a001
     <where>
-      <if test="key != null and key != '' and databaseProductName == 'MySQL'">
+      <if test="req.databaseProductName == 'MySQL'">
-        AND (
+        <if test="req.unitId != null and req.unitId != '' ">
-        UNITID like concat('%', #{key}, '%') OR
+          AND UNITID = #{req.unitId}
-        NAME like concat('%', #{key}, '%') OR
-        ADDR like concat('%', #{key}, '%') OR
-        CREDITNO like concat('%', #{key}, '%') OR
-        SPELL like concat('%', #{key}, '%') OR
-        CONTACT like concat('%', #{key}, '%') OR
-        MOBILE like concat('%', #{key}, '%')
-        )
         </if>
-      <if test="unitId != null and unitId != '' and databaseProductName == 'MySQL'">
+        <if test="req.name != null and req.name != ''">
-        AND UNITID like concat('%', #{unitId}, '%')
+          AND NAME like concat('%', #{req.name}, '%')
         </if>
-      <if test="name != null and name != '' and databaseProductName == 'MySQL'">
-        AND NAME like concat('%', #{name}, '%')
       </if>
 
-
+      <if test="req.databaseProductName == 'Oracle'">
-
+        <if test="req.unitId != null and req.unitId != '' ">
-
+          AND UNITID = #{req.unitId}
-
-      <if test="key != null and key != '' and databaseProductName == 'Oracle'">
-        AND (
-        UNITID LIKE '%' || #{key} || '%' OR
-        NAME LIKE '%' || #{key} || '%' OR
-        ADDR LIKE '%' || #{key} || '%' OR
-        CREDITNO LIKE '%' || #{key} || '%' OR
-        SPELL LIKE '%' || #{key} || '%' OR
-        CONTACT LIKE '%' || #{key} || '%' OR
-        MOBILE LIKE '%' || #{key} || '%' OR
-        )
         </if>
-      <if test="unitId != null and unitId != ''  and databaseProductName == 'Oracle'">
+        <if test="req.name != null and req.name != ''">
-        AND UNITID LIKE '%' || #{unitId} || '%'  OR
+          AND NAME LIKE '%' || #{req.name} || '%'
         </if>
-      <if test="name != null and name != ''  and databaseProductName == 'Oracle'">
-        AND NAME LIKE '%' || #{name} || '%'
       </if>
+
     </where>
     order by LASTUPDATETIME
   </select>

src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml

@@ -12,4 +12,21 @@
     <!--@mbg.generated-->
     CODE, `NAME`, REMARK
   </sql>
+  <select id="filterList" resultType="com.glxp.mipsdl.entity.hlfyyy.VA004">
+    select *
+    from v_a004
+    <where>
+      <if test="inventoryCode != null and inventoryCode != ''  and databaseProductName == 'MySQL'">
+        AND (
+        CODE like concat('%', #{inventoryCode}, '%')
+        )
+      </if>
+      <if test="inventoryCode != null and inventoryCode != ''  and databaseProductName == 'Oracle'">
+        AND (
+        CODE LIKE '%' || #{inventoryCode} || '%'
+        )
+      </if>
+    </where>
+    order by CODE
+  </select>
 </mapper>

src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml

@@ -25,6 +25,12 @@
         <include refid="Base_Column_List">
         </include>
         from v_a010 WHERE 1=1
+            <if test="req.busType == 'YPCF002'">
+                AND REMARK ='门诊'
+            </if>
+             <if test="req.busType != 'YPCF002'">
+                 AND REMARK !='门诊'
+            </if>
             <if  test="req.databaseProductName == 'MySQL'">
                 <if test="req.startTime != '' and req.startTime != null and req.endTime != '' and req.endTime != null">
                     AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s')  >= #{req.startTime} AND  STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') &lt; #{req.endTime}