根据最后更新时间查询同步

bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/domain/BuyDomain.java

@@ -5,13 +5,14 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 @Data
 public class BuyDomain {
     private Integer id;
     private String no; // 采购计划单号
     private String buyno; //  采购单号
     private Integer buystatus;//采购单状态，-1：作废，0：待确认 1：待出纳审核 2：出纳未付款 3：已付款 4：发货入库中，5：退换货 6：采购完成
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date arrivaldate; // 预计到货日期
     private String warehouseid; // 接收货物仓库
     private String warehousename; // 接收货物仓库名称
@@ -24,11 +25,11 @@ public class BuyDomain {
     private BigDecimal payamount; // 实际支付总金额
     private Integer count; // 采购总数量
     private BigDecimal expressfee; // 快递费
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createtime; //` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
     private Integer lastupdateuserid; // 最后操作人id
     private String lastupdateusername; // 最后操作人名称
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastupdatetime; // 最后更新时间
     private Integer buyuserid; // 采购员id
     private Integer paystatus; // 付款状态，0：未付款，1：部分付款，2：已付款，3无需付款
@@ -46,7 +47,7 @@ public class BuyDomain {
     private String departmentname; // 部门名称
     private Integer audituserid; // 审核人id
     private String auditusername; // 审核人名称
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date audittime; // 审核时间
     private String auditnote; // 审核备注
     private String skucode; // sku 编码
@@ -60,7 +61,7 @@ public class BuyDomain {
     private String supplierBankname; // 供应商银行名称
     private String supplierCardno; // 供应商银行账号
     private String supplierCardusername; // 供应商持卡人
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date payTime; // 付款时间
     private String skuTypeName; // sku 大类标题
     private Integer companyValue; // 采购公司主体value

bailuntec-cost-core/src/main/resources/mapper/BuyMapper.xml

@@ -4,67 +4,61 @@
 <mapper namespace="com.blt.other.module.purchasing.dao.BuyDao">
 
     <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO
-        buy(
-        no,buyno,buystatus,arrivaldate,warehouseid,warehousename,paycompanyid,paycompanyname,supplierid,suppliername,
-        paytype,amount,payamount,count,expressfee,createtime,lastupdateuserid,lastupdateusername,lastupdatetime,
-        buyuserid,paystatus,sendstatus,createuserid,createusername,
-        orderno,note,delstatus,isurgency,buyusername,fileid,filepath,departmentid,departmentname,
-        audituserid,auditusername,audittime,auditnote,skucode,skuname,company,supplier_no,reject_reason,detail_key,link_lend_cost_no,
-        supplier_bankname,supplier_cardno,supplier_cardusername,pay_time,sku_type_name,company_value,buy_type,installment_info
-        )
-        VALUE
-        (
-        #{no},#{buyno},#{buystatus},#{arrivaldate},#{warehouseid},#{warehousename},#{paycompanyid},#{paycompanyname},#{supplierid},#{suppliername},
-        #{paytype},#{amount},#{payamount},#{count},#{expressfee},#{createtime},#{lastupdateuserid},#{lastupdateusername},#{lastupdatetime},
-        #{buyuserid},#{paystatus},#{sendstatus},#{createuserid},#{createusername},
-        #{orderno},#{note},#{delstatus},#{isurgency},#{buyusername},#{fileid},#{filepath},#{departmentid},#{departmentname},
-        #{audituserid},#{auditusername},#{audittime},#{auditnote},#{skucode},#{skuname},#{company},#{supplierNo},#{rejectReason},#{detailKey},#{linkLendCostNo},
-        #{supplierBankname},#{supplierCardno},#{supplierCardusername},#{payTime},#{skuTypeName},#{companyValue},#{buyType},#{installmentInfo}
-        )
+        INSERT INTO buy(no, buyno, buystatus, arrivaldate, warehouseid, warehousename, paycompanyid, paycompanyname,
+                        supplierid, suppliername,
+                        paytype, amount, payamount, count, expressfee, createtime, lastupdateuserid, lastupdateusername,
+                        lastupdatetime,
+                        buyuserid, paystatus, sendstatus, createuserid, createusername,
+                        orderno, note, delstatus, isurgency, buyusername, fileid, filepath, departmentid,
+                        departmentname,
+                        audituserid, auditusername, audittime, auditnote, skucode, skuname, company, supplier_no,
+                        reject_reason, detail_key, link_lend_cost_no,
+                        supplier_bankname, supplier_cardno, supplier_cardusername, pay_time, sku_type_name,
+                        company_value, buy_type, installment_info)
+            VALUE
+            (
+             #{no}, #{buyno}, #{buystatus}, #{arrivaldate}, #{warehouseid}, #{warehousename}, #{paycompanyid},
+             #{paycompanyname}, #{supplierid}, #{suppliername},
+             #{paytype}, #{amount}, #{payamount}, #{count}, #{expressfee}, #{createtime}, #{lastupdateuserid},
+             #{lastupdateusername}, #{lastupdatetime},
+             #{buyuserid}, #{paystatus}, #{sendstatus}, #{createuserid}, #{createusername},
+             #{orderno}, #{note}, #{delstatus}, #{isurgency}, #{buyusername}, #{fileid}, #{filepath}, #{departmentid},
+             #{departmentname},
+             #{audituserid}, #{auditusername}, #{audittime}, #{auditnote}, #{skucode}, #{skuname}, #{company},
+             #{supplierNo}, #{rejectReason}, #{detailKey}, #{linkLendCostNo},
+             #{supplierBankname}, #{supplierCardno}, #{supplierCardusername}, #{payTime}, #{skuTypeName},
+             #{companyValue}, #{buyType}, #{installmentInfo}
+                )
     </insert>
 
     <select id="selectByNoAndSkucode" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        no = #{no}
-        AND
-        skucode = #{skucode}
+        SELECT *
+        FROM buy
+        WHERE no = #{no}
+          AND skucode = #{skucode}
     </select>
 
     <select id="selectAll" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        ORDER BY
-        id DESC
+        SELECT *
+        FROM buy
+        ORDER BY id DESC
     </select>
 
     <select id="selectBySkucode" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        skucode = #{skucode}
+        SELECT *
+        FROM buy
+        WHERE skucode = #{skucode}
     </select>
 
     <select id="selectByBuyno" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        buyno = #{buyno}
+        SELECT *
+        FROM buy
+        WHERE buyno = #{buyno}
     </select>
 
     <update id="update" parameterType="com.bailuntec.cost.api.domain.BuyDomain">
-    UPDATE
-    buy
+        UPDATE
+        buy
         <set>
             <if test="no !=null">no=#{no},</if>
             <if test="buyno !=null">buyno=#{buyno},</if>
@@ -125,74 +119,58 @@
 
     <update id="updateInstallment" parameterType="com.bailuntec.cost.api.domain.BuyDomain">
         UPDATE
-        buy
-        SET
-        buy_type=#{buyType},
-        installment_info=#{installmentInfo}
-        WHERE
-        buyno = #{buyno}
+            buy
+        SET buy_type=#{buyType},
+            installment_info=#{installmentInfo}
+        WHERE buyno = #{buyno}
     </update>
 
     <delete id="deleteBuy">
-        delete from buy where buyno = #{buyNo}
+        delete
+        from buy
+        where buyno = #{buyNo}
     </delete>
 
     <select id="selectBuy" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        buyno = #{buyno}
+        SELECT *
+        FROM buy
+        WHERE buyno = #{buyno}
     </select>
 
     <select id="selectByPlanNo" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        no = #{planNo}
+        SELECT *
+        FROM buy
+        WHERE no = #{planNo}
     </select>
 
     <select id="selectBySkuKeyWord" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        skuname LIKE CONCAT('%',#{searchKey},'%')
+        SELECT *
+        FROM buy
+        WHERE skuname LIKE CONCAT('%', #{searchKey}, '%')
     </select>
 
     <select id="selectLastBuy" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        buy_type != 2
-        ORDER BY
-        id DESC
+        SELECT *
+        FROM buy
+        WHERE buy_type != 2
+        ORDER BY id DESC
         LIMIT 1
     </select>
 
     <update id="updateNewBuyno">
-    UPDATE
-    buy
-    <set>
-        buyno = #{newBuyno}
-    </set>
-    WHERE
-    buyno = #{oldBuyno}
+        UPDATE
+        buy
+        <set>
+            buyno = #{newBuyno}
+        </set>
+        WHERE
+        buyno = #{oldBuyno}
     </update>
 
     <select id="findByBuyNo" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT
-        *
-        FROM
-        buy
-        WHERE
-        buyno = #{buyNo}
+        SELECT *
+        FROM buy
+        WHERE buyno = #{buyNo}
         LIMIT 1
     </select>
 
@@ -233,6 +211,11 @@
     </select>
 
     <select id="selectBalanceSheetBuy" resultType="com.bailuntec.cost.api.domain.BuyDomain">
-        SELECT * FROM buy WHERE pay_time <![CDATA[>=]]> #{startDate} AND pay_time <![CDATA[<]]>#{endDate} AND sku_type_name = '固定资产' and buy_type <![CDATA[<]]> 3
+        SELECT *
+        FROM buy
+        WHERE lastupdatetime <![CDATA[>=]]> #{startDate}
+          AND lastupdatetime <![CDATA[<]]> #{endDate}
+          AND sku_type_name = '固定资产'
+          and buy_type <![CDATA[<]]> 3
     </select>
 </mapper>

bailuntec-cost-core/src/main/resources/mapper/Cost.xml

@@ -521,23 +521,23 @@
         WHERE cost_form = 3
           AND is_lend = 1
           AND cost_status = 4
-          AND pay_time <![CDATA[>=]]> #{startDate}
-          AND pay_time <![CDATA[<]]> #{endDate}
+          AND last_modify_date <![CDATA[>=]]> #{startDate}
+          AND last_modify_date <![CDATA[<]]> #{endDate}
         UNION
         SELECT *
         FROM cost
         WHERE cost_form = 3
           AND is_lend = 2
           AND cost_status = 4
-          AND pay_time <![CDATA[>=]]> #{startDate}
-          AND pay_time <![CDATA[<]]> #{endDate}
+          AND last_modify_date <![CDATA[>=]]> #{startDate}
+          AND last_modify_date <![CDATA[<]]> #{endDate}
         UNION
         SELECT *
         FROM cost
         WHERE cost_form = 1
           AND cost_status = 4
-          AND pay_time <![CDATA[>=]]> #{startDate}
-          AND pay_time <![CDATA[<]]> #{endDate}
+          AND last_modify_date <![CDATA[>=]]> #{startDate}
+          AND last_modify_date <![CDATA[<]]> #{endDate}
           AND kind_name IN ('还款--其他应付款', '借出--其他应付款')
         UNION
         SELECT *
@@ -545,14 +545,14 @@
         WHERE cost_form = 1
           AND cost_status = 2
           AND audit_time <![CDATA[>=]]> #{startDate}
-          AND audit_time <![CDATA[<]]> #{endDate}
+          AND last_modify_date <![CDATA[<]]> #{endDate}
         UNION
         SELECT *
         FROM cost
         WHERE cost_form = 2
           AND cost_status = 4
-          AND pay_time <![CDATA[>=]]> #{startDate}
-          AND pay_time <![CDATA[<]]> #{endDate}
+          AND last_modify_date <![CDATA[>=]]> #{startDate}
+          AND last_modify_date <![CDATA[<]]> #{endDate}
           AND kind_name IN ('借款--其他应付款', '收款--其他应付款')
     </select>