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

isc-common-core/src/main/java/com/brilliance/isc/mda/dao/GleMapper.java

@@ -2,6 +2,8 @@ package com.brilliance.isc.mda.dao;
 import java.math.BigDecimal;
 
 import com.brilliance.isc.bo.Gle;
+import com.brilliance.isc.vo.PvcRequestVo;
+import com.brilliance.isc.vo.PvcResponseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -48,4 +50,6 @@ public interface GleMapper {
 
     Gle selectForeignGle(@Param("trninr") String trninr);
 
+    List<PvcResponseVo> selectPVCList(PvcRequestVo gleRequestVo);
+
 }
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/PvcRequestVo.java

+package com.brilliance.isc.vo;
+
+import com.brilliance.isc.common.vo.BaseRequestPageVo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "列表分页查询对象")
+public class PvcRequestVo extends BaseRequestPageVo {
+
+    private String eastinf;
+    private String cliextkey;
+    private String branch;
+    private String dbtcdt;
+    private String peeact;
+    private BigDecimal amt1;
+    private BigDecimal amt2;
+    private Date dat1;
+    private Date dat2;
+
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/PvcResponseVo.java

+package com.brilliance.isc.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "列表展示对象")
+public class PvcResponseVo {
+
+    private String eastinf;
+
+    private String peeact;
+
+    private String ownref;
+
+    private String cliextkey;
+
+    private String nam;
+
+    private String branch;
+
+    private String bchname;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bucdat;
+
+    private String cur;
+
+    private BigDecimal amt;
+
+    private String dbtcdt;
+
+}
\ No newline at end of file

isc-common-core/src/main/resources/mapper/glemapper.xml

@@ -508,6 +508,53 @@
         newactcod ='5006'  and cur!='CNY' AND trninr= #{trninr,jdbcType=VARCHAR}
         limit 1
     </select>
+    <select id="selectPVCList" parameterType="com.brilliance.isc.vo.PvcRequestVo" resultType="com.brilliance.isc.vo.PvcResponseVo">
+        select gle.peeact,
+        trn.ownref,
+        gle.cliextkey,
+        pty.nam,
+        bch.branch,
+        bch.bchname,
+        gle.bucdat,
+        gle.cur,
+        gle.amt,
+        gle.dbtcdt,
+        gle.eastinf
+        from gle gle
+        left join trn trn on (gle.trninr = trn.inr)
+        left join bch bch on (gle.BRANCHINR = bch.inr)
+        left join pty pty on(gle.CLIEXTKEY=pty.EXTKEY)
+        <where>
+            <if test="eastinf!=null and eastinf!=''">
+                and gle.eastinf = #{eastinf}
+            </if>
+            <if test="cliextkey!=null and cliextkey!=''">
+                and gle.cliextkey = #{cliextkey}
+            </if>
+            <if test="branch!=null and branch!=''">
+                and bch.branch = #{branch}
+            </if>
+            <if test="dbtcdt!=null and dbtcdt!=''">
+                and gle.dbtcdt = #{dbtcdt}
+            </if>
+            <if test="amt1!=null">
+                and gle.amt &gt;= #{amt1}
+            </if>
+            <if test="amt2!=null">
+                and gle.amt &lt;= #{amt2}
+            </if>
+            <if test="peeact!=null and peeact!=''">
+                and gle.peeact = #{peeact}
+            </if>
+            <if test="dat1!=null">
+                and gle.bucdat &gt;= #{dat1}
+            </if>
+            <if test="dat2!=null">
+                and gle.bucdat &lt;= #{dat2}
+            </if>
+        </where>
+        order by gle.bucdat desc
+    </select>
 
 </mapper>