增加lasttime字段

2024年9月2日09:19:09

service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java

@@ -45,14 +45,16 @@ public class DeliveryOrderEntity extends BaseEntity {
     private String pushFlagField;
     //帐套名
     private String dbname;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String startTime;//定时任务执行时传入的开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endTime;//定时任务执行时传入的结束时间
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //最后操作时间， isnull(dmodifysystime,dcreatesystime)
+    private String lasttime;
     public String getDlid() {
         return dlid;
     }
@@ -203,4 +205,11 @@ public class DeliveryOrderEntity extends BaseEntity {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+    public String getLasttime() {
+        return lasttime;
+    }
+
+    public void setLasttime(String lasttime) {
+        this.lasttime = lasttime;
+    }
 }

service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml

@@ -47,8 +47,8 @@
 			<if test="ccusname != null and ccusname !='' "> and ccusname = #{ccusname} </if>
 			<if test="csocode != null and csocode !='' "> and csocode = #{csocode} </if>
 			<if test="bReturnFlag != null and bReturnFlag !='' "> and bReturnFlag = #{bReturnFlag} </if>
-			<if test="startTime != null and startTime !='' "> and dmodifysystime >= #{startTime} </if>
+			<if test="startTime != null and startTime !='' "> and lasttime >= #{startTime} </if>
-			<if test="endTime != null and endTime !='' "><![CDATA[   and dmodifysystime < #{endTime}    ]]>  </if>
+			<if test="endTime != null and endTime !='' "><![CDATA[   and lasttime < #{endTime}    ]]>  </if>
 			and cVerifier is not null
 		</trim>
 		order by dlid

service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDTO.java

@@ -25,7 +25,7 @@ public class MomOrderDTO {
     private String createuser;
     //表体
     @JSONField(ordinal = 5)
-    private List<MomOrderDetailDTO> itesm;
+    private List<MomOrderDetailDTO> items;
     public String getMoId() {
         return moId;
     }
@@ -58,11 +58,11 @@ public class MomOrderDTO {
         this.createuser = createuser;
     }
 
-    public List<MomOrderDetailDTO> getItesm() {
+    public List<MomOrderDetailDTO> getItems() {
-        return itesm;
+        return items;
     }
 
-    public void setItesm(List<MomOrderDetailDTO> itesm) {
+    public void setItems(List<MomOrderDetailDTO> items) {
-        this.itesm = itesm;
+        this.items = items;
     }
 }

service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.java

@@ -1,6 +1,8 @@
 package com.hzya.frame.u8.production.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzya.frame.web.entity.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description u8生产订单表体 mom_orderdetail
@@ -28,6 +30,13 @@ public class MomOrderDetailEntity extends BaseEntity {
     private String relsUser;
     //审核时间
     private String relsTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startTime;//定时任务执行时传入的开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTime;//定时任务执行时传入的结束时间
+
     public String getMoId() {
         return moId;
     }
@@ -107,4 +116,20 @@ public class MomOrderDetailEntity extends BaseEntity {
     public void setRelsTime(String relsTime) {
         this.relsTime = relsTime;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.xml

@@ -34,6 +34,8 @@
             <if test="moId != null ">moId= #{moId} </if>
             <if test="cinvcode != null and cinvcode !='' "> and cinvcode = #{cinvcode} </if>
             <if test="cinvname != null and cinvname !='' "> and cinvname = #{cinvname} </if>
+            <if test="startTime != null and startTime !='' "> and relsTime >= #{startTime} </if>
+            <if test="endTime != null and endTime !='' "><![CDATA[   and relsTime < #{endTime}    ]]>  </if>
         </trim>
         order by moId
     </select>

service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java

@@ -34,6 +34,11 @@ public class MomOrderEntity extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endTime;//定时任务执行时传入的结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //最后操作时间， isnull(dmodifysystime,dcreatesystime)
+    private String lasttime;
+
     public String getMoId() {
         return moId;
     }
@@ -120,4 +125,12 @@ public class MomOrderEntity extends BaseEntity {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getLasttime() {
+        return lasttime;
+    }
+
+    public void setLasttime(String lasttime) {
+        this.lasttime = lasttime;
+    }
 }

service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml

@@ -27,8 +27,8 @@
         <trim prefix="where" prefixOverrides="and">
             <if test="moId != null ">moId= #{moId} </if>
             <if test="mocode != null and mocode !='' "> and mocode = #{mocode} </if>
-            <if test="startTime != null and startTime !='' "> and modifytime >= #{startTime} </if>
+            <if test="startTime != null and startTime !='' "> and lasttime >= #{startTime} </if>
-            <if test="endTime != null and endTime !='' "><![CDATA[   and modifytime < #{endTime}    ]]>  </if>
+            <if test="endTime != null and endTime !='' "><![CDATA[   and lasttime < #{endTime}    ]]>  </if>
         </trim>
         order by moId
     </select>