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

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

@@ -35,8 +35,8 @@ public class TProcessesCrusher implements Serializable {
     /**
      * 破碎站名称
      */
-    @TableField("CrusherStationName")
-    private String CrusherStationName;
+    @TableField("CrusherStationID")
+    private String CrusherStationID;
 
     /**
      * 破碎日期

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java

@@ -258,7 +258,9 @@ public class ProjectEnum {
 
         A(1, "a.","别名a"),
 
-        B(2, "b.","别名b");
+        B(2, "b.","别名b"),
+
+        C(3, "c.","别名c");
 
         // 成员变量
         private int value;

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

@@ -6,7 +6,7 @@
     <!-- 表和实体字段对照关系, 类似RestultMap -->
     <sql id="TProcessesCrusherColumns">
         a.Uid,
-        a.CrusherStationName,
+        a.CrusherStationID,
         a.CrushDate,
         a.Manager,
         a.Supervisor,

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

@@ -99,15 +99,15 @@ public class TProcessesAuxiliaryQuery {
     @ApiModelProperty("Tag")
     private String Tag;
 
-    /**
-     * 司机
-     */
-    @ApiModelProperty("Driver")
-    private String Driver;
-    /**
-     * 作业日期
-     */
-    @ApiModelProperty("作业日期")
-    private String Zyrq;
+//    /**
+//     * 司机
+//     */
+//    @ApiModelProperty("Driver")
+//    private String Driver;
+//    /**
+//     * 作业日期
+//     */
+//    @ApiModelProperty("作业日期")
+//    private String Zyrq;
 
 }

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

@@ -34,8 +34,8 @@ public class TProcessesCrusherQuery {
     /**
      * 破碎站名称
      */
-    @ApiModelProperty("CrusherStationName")
-    private String CrusherStationName;
+    @ApiModelProperty("CrusherStationID")
+    private String CrusherStationID;
 
     /**
      * 破碎日期

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java

@@ -57,7 +57,7 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         //如果设计时间不为空 因为涉及到表连接，需要创建字段别名
         if (tProcessesBlastQuery.getBlastDate() != null) {
             StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlast.BLAST_DATE.getLabel());
+            stringBuilder.append(ProjectEnum.TableAlias.C.getLabel()).append(ProjectEnum.TProcessesBlast.BLAST_DATE.getLabel());
             //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
             queryWrapper
                     .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(tProcessesBlastQuery.getBlastDate()))

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.xml

@@ -6,7 +6,7 @@
     <!-- 表和实体字段对照关系, 类似RestultMap -->
     <sql id="TProcessesCrusherColumns">
         a.Uid,
-        a.CrusherStationName,
+        a.CrusherStationID,
         a.CrushDate,
         a.Manager,
         a.Supervisor,