添加主表时间戳字段

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -547,6 +547,11 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "审批提交次数")
     private Long fTimes;
 
+    /**
+     * 校验时间戳
+     */
+    private String fDateChanged;
+
     //起运港中文名
     private String loadportidName;
     //目的港中文名
@@ -1595,6 +1600,14 @@ public class TWarehouseBills extends BaseEntity {
         this.fTimes = fTimes;
     }
 
+    public String getfDateChanged() {
+        return fDateChanged;
+    }
+
+    public void setfDateChanged(String fDateChanged) {
+        this.fDateChanged = fDateChanged;
+    }
+
     @Override
     public String toString() {
         return "TWarehouseBills{" +
@@ -1687,6 +1700,9 @@ public class TWarehouseBills extends BaseEntity {
                 ", sendSampleDate=" + sendSampleDate +
                 ", fIfweightRecovery=" + fIfweightRecovery +
                 ", weightRecoveryDate=" + weightRecoveryDate +
+                ", warehouseStatus=" + warehouseStatus +
+                ", fTimes=" + fTimes +
+                ", fDateChanged='" + fDateChanged + '\'' +
                 ", loadportidName='" + loadportidName + '\'' +
                 ", destportidName='" + destportidName + '\'' +
                 ", serviceitemsName='" + serviceitemsName + '\'' +

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -103,6 +103,7 @@
         <result property="weightRecoveryDate"    column="weight_recovery_date"    />
         <result property="warehouseStatus"    column="warehouse_status"    />
         <result property="fTimes"    column="f_times"    />
+        <result property="fDateChanged" column="f_date_changed"/>
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -114,7 +115,7 @@
         f_loadportid, f_destportid, f_serviceitems, f_invoceobj, f_sign, f_detentioncargo, f_booksmarks, f_shippername, f_shipperattn, f_shippertel, f_consigneername,
         f_consigneeattn, f_consigneetel, f_insurance, f_insuranceamt, f_closedate, f_docmentdate, f_vslid, f_voyid, f_typeid, f_paymode, f_laneid, f_cntval,
         free_container_date, f_business_attribution, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
-        f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times from t_warehousebills
+        f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times ,f_date_changed from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -860,6 +861,7 @@
             <if test="weightRecoveryDate != null">weight_recovery_date,</if>
             <if test="warehouseStatus != null">warehouse_status,</if>
             <if test="fTimes != null">f_times,</if>
+            <if test="fDateChanged != null">f_date_changed,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -959,6 +961,7 @@
             <if test="weightRecoveryDate != null">#{weightRecoveryDate},</if>
             <if test="warehouseStatus != null">#{warehouseStatus},</if>
             <if test="fTimes != null">#{fTimes},</if>
+            <if test="fDateChanged != null">#{fDateChanged},</if>
         </trim>
     </insert>
 
@@ -1062,6 +1065,7 @@
             <if test="weightRecoveryDate != null">weight_recovery_date = #{weightRecoveryDate},</if>
             <if test="warehouseStatus != null">warehouse_status = #{warehouseStatus},</if>
             <if test="fTimes != null">f_times = #{fTimes},</if>
+            <if test="fDateChanged != null">f_date_changed = #{fDateChanged},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1167,6 +1171,7 @@
             <if test="weightRecoveryDate != null">weight_recovery_date = #{weightRecoveryDate},</if>
             <if test="warehouseStatus != null">warehouse_status = #{warehouseStatus},</if>
             <if test="fTimes != null">f_times = #{fTimes},</if>
+            <if test="fDateChanged != null">f_date_changed = #{fDateChanged},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1229,6 +1234,13 @@
         where f_id = #{auditItem.billId}
     </update>
 
+    <update id="warehouseApprovalUpdate">
+        update
+        t_warehousebills
+        SET #{auditItem.fidStatus} = #{fettle}
+        where f_id = #{auditItem.billId}
+    </update>
+
     <select id="selectDetailedList" resultType="java.util.Map">
         SELECT
             t.f_id AS fId,