diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java index fa172368..73d17340 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java @@ -54,9 +54,13 @@ public class DataReceiveDetail { private String checkUnit; @ApiModelProperty(value = "检验日期") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date checkDate; @ApiModelProperty(value = "下次检验日期") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date nextCheckDate; @ApiModelProperty(value = "机手姓名") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java index fad7cd7a..5fbfd83a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java @@ -21,6 +21,7 @@ public class MaReceiveServiceImpl implements MaReceiveService { private MaReceiveMapper maReceiveMapper; @Override + @Transactional public int saveDataReceiveInfo(DataReceiveInfo dataReceiveInfo) { maReceiveMapper.saveDataReceiveInfo(dataReceiveInfo); if (dataReceiveInfo.getId() != null) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaReceiveMapper.xml index e9bb055a..52847545 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaReceiveMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values(#{pushNum},now()) - insert into data_receive_detail(receiveId,check_code,check_unit,check_date,is_new,ma_id,ma_user_name,next_check_date,out_factory_time,rent_price,rent_time,supplier,type_id,unit_id) + insert into data_receive_detail(receive_id,check_code,check_unit,check_date,is_new,ma_id,ma_user_name,next_check_date,out_factory_time,rent_price,rent_time,supplier,type_id,unit_id) values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName},#{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId})