Browse Source

公出最大工时发起修改

anderx 1 year ago
parent
commit
f2e31952e7

+ 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 11:37:18
+ * @since 2024-09-23 11:49:04
  */
 public interface OrderPublicReleaseLogMapper {
 

+ 24 - 11
src/main/java/com/goafanti/common/mapper/OrderPublicReleaseLogMapper.xml

@@ -3,15 +3,16 @@
 <mapper namespace="com.goafanti.common.dao.OrderPublicReleaseLogMapper">
     <resultMap type="com.goafanti.common.model.OrderPublicReleaseLog" id="OrderPublicReleaseLogMap">
         <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="orderNo" column="order_no" jdbcType="INTEGER"/>
+        <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
         <result property="processStatus" column="process_status" jdbcType="INTEGER"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="auditor" column="auditor" jdbcType="VARCHAR"/>
+        <result property="auditorName" column="auditor_name" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="OrderPublicReleaseLogAllSql">
-        id, order_no, process_status, remarks, auditor, create_time
+        id, order_no, process_status, remarks, auditor, auditor_name, create_time
     </sql>
 
     <!--查询单个-->
@@ -32,7 +33,7 @@
             <if test="id != null">
                 and id = #{id}
             </if>
-            <if test="orderNo != null">
+            <if test="orderNo != null and orderNo != ''">
                 and order_no = #{orderNo}
             </if>
             <if test="processStatus != null">
@@ -44,6 +45,9 @@
             <if test="auditor != null and auditor != ''">
                 and auditor = #{auditor}
             </if>
+            <if test="auditorName != null and auditorName != ''">
+                and auditor_name = #{auditorName}
+            </if>
             <if test="createTime != null">
                 and create_time = #{createTime}
             </if>
@@ -61,7 +65,7 @@
             <if test="id != null">
                 and id = #{id}
             </if>
-            <if test="orderNo != null">
+            <if test="orderNo != null and orderNo != ''">
                 and order_no = #{orderNo}
             </if>
             <if test="processStatus != null">
@@ -73,6 +77,9 @@
             <if test="auditor != null and auditor != ''">
                 and auditor = #{auditor}
             </if>
+            <if test="auditorName != null and auditorName != ''">
+                and auditor_name = #{auditorName}
+            </if>
             <if test="createTime != null">
                 and create_time = #{createTime}
             </if>
@@ -81,29 +88,32 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into order_public_release_log(order_no, process_status, remarks, auditor, create_time)
-        values (#{orderNo}, #{processStatus}, #{remarks}, #{auditor}, #{createTime})
+        insert into order_public_release_log(order_no, process_status, remarks, auditor, auditor_name, create_time)
+        values (#{orderNo}, #{processStatus}, #{remarks}, #{auditor}, #{auditorName}, #{createTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into order_public_release_log(order_no, process_status, remarks, auditor, create_time)
+        insert into order_public_release_log(order_no, process_status, remarks, auditor, auditor_name, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.orderNo}, #{entity.processStatus}, #{entity.remarks}, #{entity.auditor}, #{entity.createTime})
+            (#{entity.orderNo}, #{entity.processStatus}, #{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, remarks, auditor, create_time)
+        insert into order_public_release_log(order_no, process_status, remarks, auditor, auditor_name, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.orderNo}, #{entity.processStatus}, #{entity.remarks}, #{entity.auditor}, #{entity.createTime})
+            (#{entity.orderNo}, #{entity.processStatus}, #{entity.remarks}, #{entity.auditor}, #{entity.auditorName},
+            #{entity.createTime})
         </foreach>
         on duplicate key update
         order_no = values(order_no),
         process_status = values(process_status),
         remarks = values(remarks),
         auditor = values(auditor),
+        auditor_name = values(auditor_name),
         create_time = values(create_time)
     </insert>
 
@@ -111,7 +121,7 @@
     <update id="update">
         update order_public_release_log
         <set>
-            <if test="orderNo != null">
+            <if test="orderNo != null and orderNo != ''">
                 order_no = #{orderNo},
             </if>
             <if test="processStatus != null">
@@ -123,6 +133,9 @@
             <if test="auditor != null and auditor != ''">
                 auditor = #{auditor},
             </if>
+            <if test="auditorName != null and auditorName != ''">
+                auditor_name = #{auditorName},
+            </if>
             <if test="createTime != null">
                 create_time = #{createTime},
             </if>

+ 18 - 6
src/main/java/com/goafanti/common/model/OrderPublicReleaseLog.java

@@ -8,10 +8,10 @@ import java.util.Date;
  * 最大报销审核日志(OrderPublicReleaseLog)实体类
  *
  * @author makejava
- * @since 2024-09-23 11:37:18
+ * @since 2024-09-23 13:45:50
  */
 public class OrderPublicReleaseLog implements Serializable {
-    private static final long serialVersionUID = -85150094532643793L;
+    private static final long serialVersionUID = 149252062043866637L;
     /**
      * id
      */
@@ -19,7 +19,7 @@ public class OrderPublicReleaseLog implements Serializable {
     /**
      * 报销编号
      */
-    private Integer orderNo;
+    private String orderNo;
     /**
      * 审核 0=未发起,1=技术总监审核中,2=财务总监审核中,3=驳回,4=完成
      */
@@ -29,10 +29,14 @@ public class OrderPublicReleaseLog implements Serializable {
      */
     private String remarks;
     /**
-     * 操作人
+     * 操作人
      */
     private String auditor;
     /**
+     * 操作人名称
+     */
+    private String auditorName;
+    /**
      * 创建时间
      */
     private Date createTime;
@@ -46,11 +50,11 @@ public class OrderPublicReleaseLog implements Serializable {
         this.id = id;
     }
 
-    public Integer getOrderNo() {
+    public String getOrderNo() {
         return orderNo;
     }
 
-    public void setOrderNo(Integer orderNo) {
+    public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
 
@@ -78,6 +82,14 @@ public class OrderPublicReleaseLog implements Serializable {
         this.auditor = auditor;
     }
 
+    public String getAuditorName() {
+        return auditorName;
+    }
+
+    public void setAuditorName(String auditorName) {
+        this.auditorName = auditorName;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

+ 12 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1196,10 +1196,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		in.setOrderNo(orderNo);
 		in.setMaxDuration(maxDuration);
 		in.setMaxProcess(1);
+		addOrderPublicReleaseLog(orderNo,maxDuration,0,remarks);
 		tOrderPublicReleaseCountMapper.updateByOrderNo(in);
 		return 1;
 	}
 
+	private void addOrderPublicReleaseLog(String orderNo, Double maxDuration,Integer type, String remarks) {
+		Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		OrderPublicReleaseLog log = new OrderPublicReleaseLog();
+		log.setOrderNo(orderNo);
+		log.setProcessStatus(0);
+		log.setAuditor(admin.getId());
+		log.setAuditorName(admin.getName());
+		log.setRemarks(remarks);
+
+	}
+
 	private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
 		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
 		String endTime=startTime+" 23:59:59";