Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java

@@ -130,8 +130,8 @@ public class TEquipmentAccount implements Serializable {
     /**
      * 状态,分为在用1和报废0
      */
-    @TableField("IsUsing")
-    private Boolean IsUsing;
+    @TableField("Sbzt")
+    private Boolean Sbzt;
 
     /**
      * 备注

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWeight.java

@@ -29,8 +29,8 @@ public class TWeight implements Serializable {
     /**
      * ID号
      */
-      @TableId("Uid")
-    private String Uid;
+    @TableId("ID")
+    private String ID;
 
     /**
      * 日期 日期=日期+时间

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/DataStatisticsMapper.xml

@@ -35,7 +35,7 @@
 
 
     <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
         left join T_Processes_Truck tpt on tpt.TruckID = tw.TruckID
         where 1=1

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentAccountQuery.java

@@ -122,7 +122,7 @@ public class TEquipmentAccountQuery {
      * 状态,分为在用1和报废0
      */
     @ApiModelProperty("状态,分为在用1和报废0")
-    private Boolean isUsing;
+    private Boolean sbzt;
 
     /**
      * 备注

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentRunQuery.java

@@ -41,7 +41,7 @@ public class TEquipmentRunQuery {
     /**
      * 运行日期
      */
-    @ApiModelProperty("运行日期")
+    @ApiModelProperty("运行时间")
     private LocalDateTime runDate;
 
     /**
@@ -53,31 +53,31 @@ public class TEquipmentRunQuery {
     /**
      * 当天停机时间
      */
-    @ApiModelProperty("StopHour")
+    @ApiModelProperty("当天停机时间")
     private Float stopHour;
 
     /**
      * 停机原因:故障/维修/保养
      */
-    @ApiModelProperty("StopType")
+    @ApiModelProperty("停机原因:故障/维修/保养")
     private String stopType;
 
     /**
      * 驾驶员/操作人员
      */
-    @ApiModelProperty("Driver")
+    @ApiModelProperty("驾驶员/操作人员")
     private String driver;
 
     /**
      * 填写人
      */
-    @ApiModelProperty("Txr")
+    @ApiModelProperty("填写人")
     private String txr;
 
     /**
      * 日期标记,如:2021年01月
      */
-    @ApiModelProperty("Tag")
+    @ApiModelProperty("日期标记,如:2021年01月")
     private String tag;