Browse Source

公出最大工时发起修改

anderx 1 year ago
parent
commit
24a483c4a7

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrderPublicReleaseLogMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  * 最大报销审核日志(OrderPublicReleaseLog)表数据库访问层
  *
  * @author makejava
- * @since 2024-09-23 15:18:08
+ * @since 2024-09-24 09:53:27
  */
 public interface OrderPublicReleaseLogMapper {
 

+ 35 - 12
src/main/java/com/goafanti/common/mapper/OrderPublicReleaseLogMapper.xml

@@ -6,6 +6,8 @@
         <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
         <result property="processStatus" column="process_status" jdbcType="INTEGER"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="useDuration" column="use_duration" jdbcType="NUMERIC"/>
+        <result property="newDuration" column="new_duration" jdbcType="NUMERIC"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="auditor" column="auditor" jdbcType="VARCHAR"/>
         <result property="auditorName" column="auditor_name" jdbcType="VARCHAR"/>
@@ -13,7 +15,7 @@
     </resultMap>
 
     <sql id="OrderPublicReleaseLogAllSql">
-        id, order_no, process_status, status, remarks, auditor, auditor_name, create_time
+        id, order_no, process_status, status, use_duration, new_duration, remarks, auditor, auditor_name, create_time
     </sql>
 
     <!--查询单个-->
@@ -43,6 +45,12 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="useDuration != null">
+                and use_duration = #{useDuration}
+            </if>
+            <if test="newDuration != null">
+                and new_duration = #{newDuration}
+            </if>
             <if test="remarks != null and remarks != ''">
                 and remarks = #{remarks}
             </if>
@@ -78,6 +86,12 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="useDuration != null">
+                and use_duration = #{useDuration}
+            </if>
+            <if test="newDuration != null">
+                and new_duration = #{newDuration}
+            </if>
             <if test="remarks != null and remarks != ''">
                 and remarks = #{remarks}
             </if>
@@ -95,33 +109,36 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into order_public_release_log(order_no, process_status, status, remarks, auditor, auditor_name,
-                                             create_time)
-        values (#{orderNo}, #{processStatus}, #{status}, #{remarks}, #{auditor}, #{auditorName}, #{createTime})
+        insert into order_public_release_log(order_no, process_status, status, use_duration, new_duration, remarks,
+                                             auditor, auditor_name, create_time)
+        values (#{orderNo}, #{processStatus}, #{status}, #{useDuration}, #{newDuration}, #{remarks}, #{auditor},
+                #{auditorName}, #{createTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into order_public_release_log(order_no, process_status, status, remarks, auditor, auditor_name,
-        create_time)
+        insert into order_public_release_log(order_no, process_status, status, use_duration, new_duration, remarks,
+        auditor, auditor_name, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.orderNo}, #{entity.processStatus}, #{entity.status}, #{entity.remarks}, #{entity.auditor},
-            #{entity.auditorName}, #{entity.createTime})
+            (#{entity.orderNo}, #{entity.processStatus}, #{entity.status}, #{entity.useDuration}, #{entity.newDuration},
+            #{entity.remarks}, #{entity.auditor}, #{entity.auditorName}, #{entity.createTime})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into order_public_release_log(order_no, process_status, status, remarks, auditor, auditor_name,
-        create_time)
+        insert into order_public_release_log(order_no, process_status, status, use_duration, new_duration, remarks,
+        auditor, auditor_name, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.orderNo}, #{entity.processStatus}, #{entity.status}, #{entity.remarks}, #{entity.auditor},
-            #{entity.auditorName}, #{entity.createTime})
+            (#{entity.orderNo}, #{entity.processStatus}, #{entity.status}, #{entity.useDuration}, #{entity.newDuration},
+            #{entity.remarks}, #{entity.auditor}, #{entity.auditorName}, #{entity.createTime})
         </foreach>
         on duplicate key update
         order_no = values(order_no),
         process_status = values(process_status),
         status = values(status),
+        use_duration = values(use_duration),
+        new_duration = values(new_duration),
         remarks = values(remarks),
         auditor = values(auditor),
         auditor_name = values(auditor_name),
@@ -141,6 +158,12 @@
             <if test="status != null">
                 status = #{status},
             </if>
+            <if test="useDuration != null">
+                use_duration = #{useDuration},
+            </if>
+            <if test="newDuration != null">
+                new_duration = #{newDuration},
+            </if>
             <if test="remarks != null and remarks != ''">
                 remarks = #{remarks},
             </if>

+ 27 - 3
src/main/java/com/goafanti/common/model/OrderPublicReleaseLog.java

@@ -8,10 +8,10 @@ import java.util.Date;
  * 最大报销审核日志(OrderPublicReleaseLog)实体类
  *
  * @author makejava
- * @since 2024-09-23 15:18:08
+ * @since 2024-09-24 09:53:27
  */
 public class OrderPublicReleaseLog implements Serializable {
-    private static final long serialVersionUID = 454237714414605584L;
+    private static final long serialVersionUID = 295133566431520933L;
     /**
      * id
      */
@@ -25,10 +25,18 @@ public class OrderPublicReleaseLog implements Serializable {
      */
     private Integer processStatus;
     /**
-     * 审核状态 1=同意,2=驳回
+     * 审核状态 0=发起,1=同意,2=驳回
      */
     private Integer status;
     /**
+     * 最大公出小时
+     */
+    private Double useDuration;
+    /**
+     * 最大公出小时
+     */
+    private Double newDuration;
+    /**
      * 备注
      */
     private String remarks;
@@ -78,6 +86,22 @@ public class OrderPublicReleaseLog implements Serializable {
         this.status = status;
     }
 
+    public Double getUseDuration() {
+        return useDuration;
+    }
+
+    public void setUseDuration(Double useDuration) {
+        this.useDuration = useDuration;
+    }
+
+    public Double getNewDuration() {
+        return newDuration;
+    }
+
+    public void setNewDuration(Double newDuration) {
+        this.newDuration = newDuration;
+    }
+
     public String getRemarks() {
         return remarks;
     }