Commit 28933449 authored by 竹天卫's avatar 竹天卫

设备台账表 设备状态 isusing 改成 sbzt

地磅表  UID  改成 ID
parent 34983118
...@@ -130,8 +130,8 @@ public class TEquipmentAccount implements Serializable { ...@@ -130,8 +130,8 @@ public class TEquipmentAccount implements Serializable {
/** /**
* 状态,分为在用1和报废0 * 状态,分为在用1和报废0
*/ */
@TableField("IsUsing") @TableField("Sbzt")
private Boolean IsUsing; private Boolean Sbzt;
/** /**
* 备注 * 备注
......
...@@ -29,8 +29,8 @@ public class TWeight implements Serializable { ...@@ -29,8 +29,8 @@ public class TWeight implements Serializable {
/** /**
* ID号 * ID号
*/ */
@TableId("Uid") @TableId("ID")
private String Uid; private String ID;
/** /**
* 日期 日期=日期+时间 * 日期 日期=日期+时间
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<select id="countByTable" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo"> <select id="countByTable" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo">
SELECT tw.Uid,Convert(varchar(19),tw.Rq,120)as Rq,tw.TruckID,'发货单位' as clientName,tpt.WorkType,tw.Mz,tw.Pz,tw.Jz SELECT tw.ID as Uid,Convert(varchar(19),tw.Rq,120)as Rq,tw.TruckID,'发货单位' as clientName,tpt.WorkType,tw.Mz,tw.Pz,tw.Jz
FROM T_Weight tw FROM T_Weight tw
left join T_Processes_Truck tpt on tpt.TruckID = tw.TruckID left join T_Processes_Truck tpt on tpt.TruckID = tw.TruckID
where 1=1 where 1=1
......
...@@ -122,7 +122,7 @@ public class TEquipmentAccountQuery { ...@@ -122,7 +122,7 @@ public class TEquipmentAccountQuery {
* 状态,分为在用1和报废0 * 状态,分为在用1和报废0
*/ */
@ApiModelProperty("状态,分为在用1和报废0") @ApiModelProperty("状态,分为在用1和报废0")
private Boolean isUsing; private Boolean sbzt;
/** /**
* 备注 * 备注
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment