查询条件处理

applications/commons/commons-dto/pom.xml

@@ -15,6 +15,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
     </dependencies>
 
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -5,6 +5,7 @@ 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.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.*;
 import com.usoftchina.saas.purchase.po.PurchaseList;
@@ -34,7 +35,7 @@ public class PurchaseController {
      * @return
      */
     @GetMapping("/list")
-    public Result<PageInfo<PurchaseList>> getListData(PageRequest page, PurchaseReqDTO req) {
+    public Result<PageInfo<PurchaseList>> getListData(PageRequest page, ListReqDTO req) {
         PageInfo<PurchaseList> listData = purchaseService.getListData(page, req);
         return Result.success(listData);
     }
@@ -163,7 +164,7 @@ public class PurchaseController {
     public Result turnProdin(@PathVariable("id") Long id){
         purchaseService.turnProdin(id);
         return Result.success();
-    };
+    }
 
 
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseListMapper.java

@@ -1,11 +1,13 @@
 package com.usoftchina.saas.purchase.mapper;
 
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;
 import com.usoftchina.saas.purchase.po.PurchaseList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface PurchaseListMapper {
-    List<PurchaseList> selectPurchaseListByCondition(PurchaseReqDTO reqDTO);
-    List<PurchaseList> selectPurchaseBycondition(PurchaseReqDTO reqDTO);
+    List<PurchaseList> selectPurchaseListByCondition(@Param("con") String con,@Param("companyId") Long companyId);
+    List<PurchaseList> selectPurchaseBycondition(@Param("con") String con,@Param("companyId") Long companyId);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -8,6 +8,7 @@ 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.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;
@@ -34,7 +35,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param page,req
      * @return
      */
-    PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req);
+    PageInfo<PurchaseList> getListData(PageRequest page, ListReqDTO req);
 
     /**
      * 采购订单列表查询

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -8,6 +8,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.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
@@ -55,7 +56,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     private MessageLogService messageLogService;
 
     @Override
-    public PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req) {
+    public PageInfo<PurchaseList> getListData(PageRequest page, ListReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -425,12 +426,17 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
     }
 
-    private List<PurchaseList> getListByMode(PurchaseReqDTO req) {
+    private List<PurchaseList> getListByMode(ListReqDTO req) {
         List<PurchaseList> list = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
         if (null == req || StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
-            list = purchaseListMapper.selectPurchaseBycondition(req);
+            list = purchaseListMapper.selectPurchaseBycondition(con, companyId);
         } else {
-            list = purchaseListMapper.selectPurchaseListByCondition(req);
+            list = purchaseListMapper.selectPurchaseListByCondition(con, companyId);
         }
         return list;
     }

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -55,39 +55,26 @@
         <result column="pd_yqty" property="pd_yqty" jdbcType="DOUBLE" />
     </resultMap>
 
-    <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.purchase.dto.PurchaseReqDTO" resultMap="BaseResultMap">
+    <select id="selectPurchaseListByCondition" parameterType="string" resultMap="BaseResultMap">
         select  *  from purchase left join purchasedetail on pu_id=pd_puid
         <where>
-            <if test="begin != null">
-                pu_date &gt;= ${begin}
+            <if test="con != null">
+                 ${con}
             </if>
-            <if test="end!= null">
-                AND  pu_date &lt;= ${end}
+            <if test="companyId != null">
+              and   companyId = #{companyId}
             </if>
-            <if test="status != null">
-                AND pu_status=${status}
-            </if>
-            <if test="keyword != null">
-                AND ${keyword}
-            </if>
-            order by pu_id,pd_detno
-        </where>
+        </where>  order by pu_id,pd_detno
     </select>
 
     <select id="selectPurchaseBycondition" parameterType="com.usoftchina.saas.purchase.dto.PurchaseReqDTO" resultMap="BaseResultMap">
         select  *  from purchase
         <where>
-            <if test="begin != null">
-                pu_date &gt;= ${begin}
-            </if>
-            <if test="end!= null">
-                AND  pu_date &lt;= ${end}
-            </if>
-            <if test="status != null">
-                AND pu_status=${status}
+            <if test="con != null">
+               ${con}
             </if>
-            <if test="keyword != null">
-                AND ${keyword}
+            <if test="companyId != null">
+               and  companyId = #{companyId}
             </if>
         </where>
         order by pu_id

pom.xml

@@ -297,6 +297,11 @@
                 <artifactId>commons-fileupload</artifactId>
                 <version>${commons.fileupload.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>