valhalla / fw-valhalla

Commit bf996c1cfc9d0f39424135b848343d84b4f18e66

Authored by 张志伟
2 parents 7487bb98 adec0e78

Merge remote-tracking branch 'origin/dev' into test

Inline Side-by-side
Showing 2 changed files with 23 additions and 0 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
  View file @bf996c1
... ... @@ -50,6 +50,12 @@
50 50 #{id}
51 51 </foreach>
52 52 </if>
  53 + <if test="condition.closed !=null and condition.closed == 1">
  54 + and t1.state != 1
  55 + </if>
  56 + <if test="condition.closed !=null and condition.closed == 0">
  57 + and t1.state = 1
  58 + </if>
53 59 <if test="condition.loanCustomer !=null and condition.loanCustomer == 1">
54 60 and t2.expires > now()
55 61 </if>
... ... @@ -129,6 +135,12 @@
129 135 #{id}
130 136 </foreach>
131 137 </if>
  138 + <if test="condition.closed !=null and condition.closed == 1">
  139 + and t1.state != 1
  140 + </if>
  141 + <if test="condition.closed !=null and condition.closed == 0">
  142 + and t1.state = 1
  143 + </if>
132 144 <if test="condition.loanCustomer !=null and condition.loanCustomer == 1">
133 145 and t2.expires > now()
134 146 </if>
... ...
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java
  View file @bf996c1
... ... @@ -52,6 +52,17 @@ public class FollowPoolQueryVO extends PoolQuery {
52 52 * 区间
53 53 */
54 54 private String defeatTime;
  55 + /**
  56 + * 是否关单
  57 + */
  58 + private Boolean closed;
  59 +
  60 + public Integer getClosed() {
  61 + if (Objects.isNull(closed)) {
  62 + return null;
  63 + }
  64 + return closed ? 1 : 0;
  65 + }
55 66  
56 67 public Integer getLoanCustomer() {
57 68 if (Objects.isNull(loanCustomer)) {
... ...