Merge tag 'refs/tags/jenkins-back-end-1499' into release

develop

mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java

@@ -80,7 +80,15 @@ public class WxFlowAbleController extends BaseController {
         logger.debug("[" + getIpAddr() + "] FlowAbleController::myApplyList");
         record.setUserId(super.getUser().getId());
         record.setStatus(EnumFlowRecordStatus.NEW.getCode());
-        return new ResultData(wxFlowService.listAsPage(record,pageNum,pageSize));
+
+        PageInfo<WxFlowRecord> pageInfo = wxFlowService.listAsPage(record,pageNum,pageSize);
+        List<WxFlowRecord> recordList = pageInfo.getList();
+        for (WxFlowRecord wxFlowRecord:recordList) {
+            if(StringUtils.isBlank(wxFlowRecord.getVariables())){
+                wxFlowRecord.setVariables("{}");
+            }
+        }
+        return new ResultData(pageInfo);
     }
 
     /**

mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java

@@ -131,6 +131,15 @@ public class WxBillProperty implements Serializable {
 	@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
 	private String comments;
 
+	@io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate")
+	private Integer receivePayUpdate;
+	public Integer getReceivePayUpdate() {
+		return receivePayUpdate;
+	}
+	public void setReceivePayUpdate(Integer receivePayUpdate) {
+		this.receivePayUpdate = receivePayUpdate;
+	}
+
 	public String getComments() {
 		return comments;
 	}

mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java

@@ -134,6 +134,15 @@ public class WxBillRent implements Serializable {
 	@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
 	private String comments;
 
+	@io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate")
+	private Integer receivePayUpdate;
+	public Integer getReceivePayUpdate() {
+		return receivePayUpdate;
+	}
+	public void setReceivePayUpdate(Integer receivePayUpdate) {
+		this.receivePayUpdate = receivePayUpdate;
+	}
+
 	public String getComments() {
 		return comments;
 	}

mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml

@@ -30,7 +30,6 @@
 		<result column="pay_way" jdbcType="INTEGER" property="payWay"/>
 		<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
 		<result column="comments" jdbcType="VARCHAR" property="comments"/>
-
 	</resultMap>
 
 	<sql id="allColumns">

mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

@@ -30,6 +30,8 @@
 		<result column="pay_way" jdbcType="INTEGER" property="payWay"/>
 		<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
 		<result column="comments" jdbcType="VARCHAR" property="comments"/>
+		<result column="starttime" property="starttime"/>
+		<result column="endtime" property="endtime"/>
 
 	</resultMap>
 
@@ -61,7 +63,6 @@
 		<if test=" null != shopId ">and `shop_id` = #{shopId}</if>
 		<if test=" null != updatetime ">and `updatetime` = #{updatetime}</if>
 		<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
-		<if test=" null == isPreview ">and is_preview = 0</if>
 		<if test=" null != isPreview ">and is_preview = #{isPreview}</if>
 		<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
 		<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>