Просмотр исходного кода

修改停车列表

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
e9fec0f78c
3 измененных файлов: 3 добавлений и 12 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java
  2. +1
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java
  3. +1
    -2
      mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java Просмотреть файл

@@ -22,7 +22,7 @@ public class WxFlowAbleController extends BaseController {
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;


@ApiOperation(value = "启动流程",notes = "{\"businessId\":\"215315084967149568\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"204398756307664896\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"204398756307664896\"}]}")
@ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}")
@PostMapping("/start") @PostMapping("/start")
public ResultData start(@RequestBody Map<String, Object> params) { public ResultData start(@RequestBody Map<String, Object> params) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::start"); logger.debug("[" + getIpAddr() + "] FlowAbleController::start");


+ 1
- 9
mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java Просмотреть файл

@@ -21,7 +21,7 @@ public class WxCarPayRecord implements Serializable {
private Date entranceTime; private Date entranceTime;
private Date exitTime; private Date exitTime;
private String fee; private String fee;
private Date feeTime;
// private Date feeTime;
private String coupon; private String coupon;
private String couponCode; private String couponCode;
private String fixParkingId; private String fixParkingId;
@@ -171,14 +171,6 @@ public class WxCarPayRecord implements Serializable {
this.fee = fee; this.fee = fee;
} }


public Date getFeeTime() {
return feeTime;
}

public void setFeeTime(Date feeTime) {
this.feeTime = feeTime;
}

public String getCoupon() { public String getCoupon() {
return coupon; return coupon;
} }


+ 1
- 2
mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml Просмотреть файл

@@ -13,7 +13,6 @@
<result column="entrance_time" property="entranceTime"/> <result column="entrance_time" property="entranceTime"/>
<result column="exit_time" property="exitTime"/> <result column="exit_time" property="exitTime"/>
<result column="fee" property="fee"/> <result column="fee" property="fee"/>
<result column="fee_time" property="feeTime"/>
<result column="coupon" property="coupon"/> <result column="coupon" property="coupon"/>
<result column="coupon_code" property="couponCode"/> <result column="coupon_code" property="couponCode"/>
<result column="fix_parking_id" property="fixParkingId"/> <result column="fix_parking_id" property="fixParkingId"/>
@@ -28,7 +27,7 @@
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`vendor_type`,`create_date`,`update_date`,syn_id,park_id,park_name,user_type, `id`,`tenant_id`,`vendor_type`,`create_date`,`update_date`,syn_id,park_id,park_name,user_type,
plate_number,entrance_time,exit_time,fee,fee_time,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone
plate_number,entrance_time,exit_time,fee,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone
,paid_service_fee,create_date,update_date,floor(stayed_time/60) stayed_time ,paid_service_fee,create_date,update_date,floor(stayed_time/60) stayed_time
</sql> </sql>


Загрузка…
Отмена
Сохранить