查询从表BUG修改

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -118,5 +118,33 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
 
     private Double pd_yqty;
 
-    private ProductDTO productDTO;
+    //private ProductDTO productDTO;
+    private Long pr_id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private Date pr_docdate;
+    private long pr_recordmanid;
+    private String pr_recordman;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
 }

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

@@ -54,36 +54,34 @@
         <result column="pd_text4" property="pd_text4" jdbcType="VARCHAR" />
         <result column="pd_text5" property="pd_text5" jdbcType="VARCHAR" />
         <result column="pd_yqty" property="pd_yqty" jdbcType="DOUBLE" />
-        <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
-            <id column="pr_id" property="id"/>
-            <result column="pr_code" property="pr_code"/>
-            <result column="pr_detail" property="pr_detail"/>
-            <result column="pr_spec" property="pr_spec"/>
-            <result column="pr_unit" property="pr_unit"/>
-            <result column="pr_kind" property="pr_kind"/>
-            <result column="pr_orispeccode" property="pr_orispeccode"/>
-            <result column="pr_whid" property="pr_whid"/>
-            <result column="pr_whcode" property="pr_whcode"/>
-            <result column="pr_whname" property="pr_whname"/>
-            <result column="pr_zxbzs" property="pr_zxbzs"/>
-            <result column="pr_leadtime" property="pr_leadtime"/>
-            <result column="pr_brand" property="pr_brand"/>
-            <result column="pr_standardprice" property="pr_standardprice"/>
-            <result column="pr_purcprice" property="pr_purcprice"/>
-            <result column="pr_saleprice" property="pr_saleprice"/>
-            <result column="pr_vendid" property="pr_vendid"/>
-            <result column="pr_vendname" property="pr_vendname"/>
-            <result column="pr_vendcode" property="pr_vendcode"/>
-            <result column="pr_docdate" property="pr_docdate"/>
-            <result column="pr_recordmanid" property="pr_recordmanid"/>
-            <result column="pr_recordman" property="pr_recordman"/>
-            <result column="pr_status" property="pr_status"/>
-            <result column="pr_statuscode" property="pr_statuscode"/>
-            <result column="pr_text1" property="pr_text1"/>
-            <result column="pr_text2" property="pr_text2"/>
-            <result column="pr_text3" property="pr_text3"/>
-            <result column="pr_text4" property="pr_text4"/>
-        </association>
+        <result column="pr_id" property="pr_id"/>
+        <result column="pr_code" property="pr_code"/>
+        <result column="pr_detail" property="pr_detail"/>
+        <result column="pr_spec" property="pr_spec"/>
+        <result column="pr_unit" property="pr_unit"/>
+        <result column="pr_kind" property="pr_kind"/>
+        <result column="pr_orispeccode" property="pr_orispeccode"/>
+        <result column="pr_whid" property="pr_whid"/>
+        <result column="pr_whcode" property="pr_whcode"/>
+        <result column="pr_whname" property="pr_whname"/>
+        <result column="pr_zxbzs" property="pr_zxbzs"/>
+        <result column="pr_leadtime" property="pr_leadtime"/>
+        <result column="pr_brand" property="pr_brand"/>
+        <result column="pr_standardprice" property="pr_standardprice"/>
+        <result column="pr_purcprice" property="pr_purcprice"/>
+        <result column="pr_saleprice" property="pr_saleprice"/>
+        <result column="pr_vendid" property="pr_vendid"/>
+        <result column="pr_vendname" property="pr_vendname"/>
+        <result column="pr_vendcode" property="pr_vendcode"/>
+        <result column="pr_docdate" property="pr_docdate"/>
+        <result column="pr_recordmanid" property="pr_recordmanid"/>
+        <result column="pr_recordman" property="pr_recordman"/>
+        <result column="pr_status" property="pr_status"/>
+        <result column="pr_statuscode" property="pr_statuscode"/>
+        <result column="pr_text1" property="pr_text1"/>
+        <result column="pr_text2" property="pr_text2"/>
+        <result column="pr_text3" property="pr_text3"/>
+        <result column="pr_text4" property="pr_text4"/>
     </resultMap>
 
     <select id="selectPurchaseListByCondition"  resultMap="BaseResultMap">
@@ -109,7 +107,7 @@
                and  companyId = #{companyId}
             </if>
         </where>
-        order by pu_id desc
+        order by pu_date desc
     </select>
 
 </mapper>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -106,5 +106,33 @@ public class SaleList implements Serializable{
 
     private String sd_text5;
 
-    private ProductDTO productDTO;
+    //private ProductDTO productDTO;级联属性会导致分页查询出现BUG，设置数与查询数量不一致
+    private Long pr_id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private Date pr_docdate;
+    private long pr_recordmanid;
+    private String pr_recordman;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
 }

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -49,36 +49,34 @@
         <result column="sd_text3" property="sd_text3" jdbcType="VARCHAR" />
         <result column="sd_text4" property="sd_text4" jdbcType="VARCHAR" />
         <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
-        <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
-            <id column="pr_id" property="id"/>
-            <result column="pr_code" property="pr_code"/>
-            <result column="pr_detail" property="pr_detail"/>
-            <result column="pr_spec" property="pr_spec"/>
-            <result column="pr_unit" property="pr_unit"/>
-            <result column="pr_kind" property="pr_kind"/>
-            <result column="pr_orispeccode" property="pr_orispeccode"/>
-            <result column="pr_whid" property="pr_whid"/>
-            <result column="pr_whcode" property="pr_whcode"/>
-            <result column="pr_whname" property="pr_whname"/>
-            <result column="pr_zxbzs" property="pr_zxbzs"/>
-            <result column="pr_leadtime" property="pr_leadtime"/>
-            <result column="pr_brand" property="pr_brand"/>
-            <result column="pr_standardprice" property="pr_standardprice"/>
-            <result column="pr_purcprice" property="pr_purcprice"/>
-            <result column="pr_saleprice" property="pr_saleprice"/>
-            <result column="pr_vendid" property="pr_vendid"/>
-            <result column="pr_vendname" property="pr_vendname"/>
-            <result column="pr_vendcode" property="pr_vendcode"/>
-            <result column="pr_docdate" property="pr_docdate"/>
-            <result column="pr_recordmanid" property="pr_recordmanid"/>
-            <result column="pr_recordman" property="pr_recordman"/>
-            <result column="pr_status" property="pr_status"/>
-            <result column="pr_statuscode" property="pr_statuscode"/>
-            <result column="pr_text1" property="pr_text1"/>
-            <result column="pr_text2" property="pr_text2"/>
-            <result column="pr_text3" property="pr_text3"/>
-            <result column="pr_text4" property="pr_text4"/>
-        </association>
+        <result column="pr_id" property="pr_id"/>
+        <result column="pr_code" property="pr_code"/>
+        <result column="pr_detail" property="pr_detail"/>
+        <result column="pr_spec" property="pr_spec"/>
+        <result column="pr_unit" property="pr_unit"/>
+        <result column="pr_kind" property="pr_kind"/>
+        <result column="pr_orispeccode" property="pr_orispeccode"/>
+        <result column="pr_whid" property="pr_whid"/>
+        <result column="pr_whcode" property="pr_whcode"/>
+        <result column="pr_whname" property="pr_whname"/>
+        <result column="pr_zxbzs" property="pr_zxbzs"/>
+        <result column="pr_leadtime" property="pr_leadtime"/>
+        <result column="pr_brand" property="pr_brand"/>
+        <result column="pr_standardprice" property="pr_standardprice"/>
+        <result column="pr_purcprice" property="pr_purcprice"/>
+        <result column="pr_saleprice" property="pr_saleprice"/>
+        <result column="pr_vendid" property="pr_vendid"/>
+        <result column="pr_vendname" property="pr_vendname"/>
+        <result column="pr_vendcode" property="pr_vendcode"/>
+        <result column="pr_docdate" property="pr_docdate"/>
+        <result column="pr_recordmanid" property="pr_recordmanid"/>
+        <result column="pr_recordman" property="pr_recordman"/>
+        <result column="pr_status" property="pr_status"/>
+        <result column="pr_statuscode" property="pr_statuscode"/>
+        <result column="pr_text1" property="pr_text1"/>
+        <result column="pr_text2" property="pr_text2"/>
+        <result column="pr_text3" property="pr_text3"/>
+        <result column="pr_text4" property="pr_text4"/>
     </resultMap>
 
     <select id="selectSaleListByCondition" resultMap="BaseResultMap">