优化代码仓库资料

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.service.WarehouseService;
 import com.usoftchina.saas.page.PageRequest;
@@ -80,14 +81,6 @@ public class WarehouseController {
         return Result.success(result);
     }
 
-    /**
-     * 获取列表
-     * @return
-     */
-    @GetMapping("/list")
-    public Result getList(){
-        return Result.success(warehouseService.selectAll());
-    }
 
     /**
      * 关闭

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -27,7 +27,7 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     void unPost(Map<String, Object> map);
 
-    List<Warehouse> selectAll(@Param("companyId") Long companyId);
+    List<Warehouse> selectWarehouseListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 
     int validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/WarehouseService.java

@@ -2,12 +2,13 @@ package com.usoftchina.saas.document.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 import com.usoftchina.saas.page.PageRequest;
 
-import java.util.List;
 import java.util.Map;
 
 public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
@@ -21,8 +22,7 @@ public interface WarehouseService extends CommonBaseService<WarehouseMapper, War
     DocBaseDTO insertSelective(Warehouse record);
 
     void unPost(Map<String, Object> map);
-
-    List<Warehouse> selectAll();
+    
 
     /**
      * 关闭

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -7,6 +7,7 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
@@ -15,10 +16,10 @@ import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 import com.usoftchina.saas.document.service.WarehouseService;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.print.Doc;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -55,7 +56,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         if (null == con) {
             con = "1=1";
         }
-        list = getMapper().selectCustomerListByCondition(con, companyId);
+        list = getMapper().selectWarehouseListByCondition(con, companyId);
         return list;
     }
 
@@ -127,10 +128,6 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         getMapper().unPost(map);
     }
 
-    @Override
-    public List<Warehouse> selectAll() {
-        return getMapper().selectAll(BaseContextHolder.getCompanyId());
-    }
 
     @Override
     public DocBaseDTO close(Long id) {

applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -309,8 +309,17 @@
         where wh_id = #{wh_id,jdbcType=INTEGER}
     </update>
 
-    <select id="selectAll" resultType="com.usoftchina.saas.document.entities.Warehouse">
-        SELECT * FROM WAREHOUSE WHERE COMPANYID = #{companyId}
+    <select id="selectWarehouseListByCondition"  resultMap="WarehouseResultMapper">
+        select  *  from customer left join customeraddress on cu_id=ca_cuid and customeraddress.ca_default = 1  left join customercontact on cu_id = cc_cuid
+        and customercontact.cc_default=1
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and   customer.companyid = #{companyId}
+            </if>
+        </where>  order by cu_id
     </select>
 
     <select id="validateCodeWhenInsert" resultType="int">