diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
index 5f9f2ec..e0cf4b0 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
@@ -232,7 +232,9 @@ public class MaMachine extends BaseEntity {
/**
* 领料时间
*/
- private String leaseTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date leaseTime;
/**
* 退料单位
*/
@@ -244,7 +246,9 @@ public class MaMachine extends BaseEntity {
/**
* 退料时间
*/
- private String backTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date backTime;
@ApiModelProperty(value = "1:二维码绑定标识 2:rfid绑定标识")
private Integer flag;
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
index ba8c901..9d718f2 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
@@ -159,12 +159,12 @@ public class MaMachineServiceImpl implements MaMachineService {
if (leaseProject != null){
ma.setLeaseUnit(leaseProject.getUnitName());
ma.setLeasePro(leaseProject.getProjectName());
- ma.setLeaseTime(String.valueOf(leaseProject.getCreateTime()));
+ ma.setLeaseTime(leaseProject.getCreateTime());
}
if (backProject != null){
ma.setBackUnit(backProject.getUnitName());
ma.setBackPro(backProject.getProjectName());
- ma.setBackTime(String.valueOf(backProject.getCreateTime()));
+ ma.setBackTime(backProject.getCreateTime());
}
}else {
throw new ServiceException("二维码对应机具信息无效");
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java
index 3ac12f2..589119f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java
@@ -1,6 +1,8 @@
package com.bonus.sgzb.material.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -29,11 +31,15 @@ public class ProjectMonthDetail {
/**
* 开始日期
*/
- private String startTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
/**
* 结束日期
*/
- private String endTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
/**
* 结算天数
*/
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
index b0124cc..3c0cea1 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
@@ -154,8 +154,8 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
projectMonthDetail.setMaId(Integer.valueOf(bean.getMaId()));
}
projectMonthDetail.setUnit(bean.getNuitName());
- projectMonthDetail.setStartTime(String.valueOf(bean.getStartTime()));
- projectMonthDetail.setEndTime(String.valueOf(bean.getEndTime()));
+ projectMonthDetail.setStartTime(bean.getStartTime());
+ projectMonthDetail.setEndTime(bean.getEndTime());
projectMonthDetail.setSltDays(bean.getLeaseDays());
projectMonthDetail.setNum(bean.getNum());
projectMonthDetail.setLeasePrice(bean.getLeasePrice());
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
index 87bb5f8..0e5b28a 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
@@ -135,6 +135,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
//修改装备状态
for (ScrapApplyDetails scrapApplyDetails: scrapApplyDetailList){
scrapApplyDetails.setAuditTime(new Date());
+ scrapApplyDetails.setUpdateTime(DateUtils.getNowDate());
scrapApplyDetailsMapper.updateScrapApplyDetails(scrapApplyDetails);
}
//根据任务id查看是否还有未审核的设备
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
index 581c5fd..6240bb9 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -542,8 +542,8 @@
)
- insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type)
- values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},#{info.leaseType});
+ insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time)
+ values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},#{info.leaseType},now());
@@ -568,6 +568,7 @@
update slt_agreement_info
set end_time = now(),
+ update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
@@ -576,13 +577,14 @@
update slt_agreement_info
set num = #{backNum},
end_time = now(),
+ update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
- update back_check_details set is_finished = 1 where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
+ update back_check_details set is_finished = 1, update_time = now() where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
index f8f8c91..367f0d6 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
@@ -71,7 +71,7 @@
values (#{code,jdbcType=VARCHAR}, #{taskId,jdbcType=INTEGER}, #{leasePerson,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR}, #{companyAuditBy,jdbcType=INTEGER}, #{companyAuditTime,jdbcType=VARCHAR},
#{companyAuditRemark,jdbcType=VARCHAR}, #{deptAuditBy,jdbcType=INTEGER}, #{deptAuditTime,jdbcType=VARCHAR},
- #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+ #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, NOW(),
#{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
#{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR},#{costBearingParty,jdbcType=VARCHAR})
@@ -116,9 +116,7 @@
create_by,
-
- create_time,
-
+ create_time,
update_by,
@@ -178,9 +176,7 @@
#{createBy,jdbcType=VARCHAR},
-
- #{createTime,jdbcType=TIMESTAMP},
-
+ NOW(),
#{updateBy,jdbcType=VARCHAR},
@@ -248,15 +244,13 @@
update_by = #{updateBy,jdbcType=VARCHAR},
-
- update_time = #{updateTime,jdbcType=TIMESTAMP},
-
remark = #{remark,jdbcType=VARCHAR},
company_id = #{companyId,jdbcType=INTEGER},
+ update_time = NOW(),
where id = #{id,jdbcType=INTEGER}
@@ -277,7 +271,7 @@
create_by = #{createBy,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_by = #{updateBy,jdbcType=VARCHAR},
- update_time = #{updateTime,jdbcType=TIMESTAMP},
+ update_time = NOW(),
remark = #{remark,jdbcType=VARCHAR},
company_id = #{companyId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
@@ -509,7 +503,7 @@
#{item.type,jdbcType=VARCHAR}, #{item.companyAuditBy,jdbcType=INTEGER}, #{item.companyAuditTime,jdbcType=VARCHAR},
#{item.companyAuditRemark,jdbcType=VARCHAR}, #{item.deptAuditBy,jdbcType=INTEGER},
#{item.deptAuditTime,jdbcType=VARCHAR}, #{item.deptAuditRemark,jdbcType=VARCHAR},
- #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
+ #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
#{item.updateTime,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}
)
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
index 6e456bb..a48df0c 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
@@ -310,7 +310,8 @@
update slt_agreement_info
- set num = #{num}
+ set num = #{num},
+ update_time = now()
where id = #{id}
@@ -384,8 +385,8 @@
- insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type)
- values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType});
+ insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time)
+ values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now());
- update ma_type_keeper set user_id = #{userId} where type_id = #{typeId}
+ update ma_type_keeper set user_id = #{userId},update_time = now() where type_id = #{typeId}
- update ma_type_repair set user_id = #{userId} where type_id = #{typeId}
+ update ma_type_repair set user_id = #{userId},update_time = now() where type_id = #{typeId}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml
index dba5333..43422e0 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
file_name = #{fileName},
file_url = #{fileUrl},
user_id = #{userId},
- time = #{time},
+ update_time = now(),
status = #{status},
company_id = #{companyId},
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index ad253c7..a255fed 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
- insert into ma_type_keeper(type_id, user_id,company_id,time) values
+ insert into ma_type_keeper(type_id, user_id,company_id,create_time) values
(#{item.typeIds},#{item.userId},#{item.companyId},NOW())
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 1102058..e4fd483 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -302,7 +302,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update back_apply_details
- set pre_num =#{num}
+ set pre_num =#{num},
+ update_time = NOW()
where id = #{detailsId}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
index a128bba..15a9b77 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
@@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
- insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id)
- values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId});
+ insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,create_time)
+ values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},now());
update ma_machine
@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update slt_agreement_info
set end_time = now(),
+ update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update slt_agreement_info
set num = #{backNum},
end_time = now(),
+ update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
index e02f52f..010e2ef 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
@@ -8,17 +8,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
INSERT INTO slt_project_month (month,create_time) VALUES (#{month},now())
- insert into project_month_costs(agreement_id,task_id,unit_id,project_id,month,cost_bearing_party)
+ insert into project_month_costs(agreement_id,task_id,unit_id,project_id,month,cost_bearing_party,create_time)
values
- (#{agreementId},#{taskId},#{unitId},#{projectId},#{month},#{costBearingParty})
+ (#{agreementId},#{taskId},#{unitId},#{projectId},#{month},#{costBearingParty},now())
- insert into project_month_detail (type_id,ma_id,unit,start_time,end_time,slt_days,slt_costs,month_temporarily_costs,pro_month_cost_id,num,lease_price)
+ insert into project_month_detail (type_id,ma_id,unit,start_time,end_time,slt_days,slt_costs,month_temporarily_costs,pro_month_cost_id,num,lease_price,create_time)
values
- (#{typeId},#{maId},#{unit},#{startTime},#{endTime},#{sltDays},#{sltCosts},#{monthTemporarilyCosts},#{proMonthCostId},#{num},#{leasePrice})
+ (#{typeId},#{maId},#{unit},#{startTime},#{endTime},#{sltDays},#{sltCosts},#{monthTemporarilyCosts},#{proMonthCostId},#{num},#{leasePrice},now())
- update project_month_costs set costs = #{costs} where id = #{id}
+ update project_month_costs set costs = #{costs},update_time = now() where id = #{id}
- update repair_apply_record set status = 1 where id = #{id}
+ update repair_apply_record set status = 1,update_time = now() where id = #{id}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
index f5c4e52..5b2accf 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
values (#{code},#{creator},now(),'0',#{companyId},#{cost});
- insert into slt_agreement_relation (apply_id,agreement_id,add_cost,sub_cost,remark,cost,status,lease_one_cost,lease_three_cost,repair_cost,scrap_cost,lose_cost)
- values (#{applyId},#{agreementId},#{addCost},#{subCost},#{remark},#{cost},'0',#{leaseCostOne},#{leaseCostThree},#{repairCost},#{scrapCost},#{loseCost});
+ insert into slt_agreement_relation (apply_id,agreement_id,add_cost,sub_cost,remark,cost,status,lease_one_cost,lease_three_cost,repair_cost,scrap_cost,lose_cost,create_time)
+ values (#{applyId},#{agreementId},#{addCost},#{subCost},#{remark},#{cost},'0',#{leaseCostOne},#{leaseCostThree},#{repairCost},#{scrapCost},#{loseCost},now());
insert into slt_agreement_details
@@ -64,12 +64,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update slt_agreement_info
set is_slt = '1',
- slt_time = now()
+ slt_time = now(),
+ update_time = now(),
where agreement_id = #{agreementId}
update slt_agreement_relation
- set status = #{status}
+ set status = #{status},
+ update_time = now()
where agreement_id = #{agreementId}
@@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
set status = #{status},
auditor = #{auditor},
audit_time = now(),
+ update_time = now(),
remark = #{remark}
where id = #{id}
@@ -114,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bm_agreement_info set is_slt = 1 where agreement_id = #{agreementId}
- update repair_apply_record set is_slt = 1 where id = #{id}
+ update repair_apply_record set is_slt = 1,update_time = now() where id = #{id}