[CODE]: 审批添加审核操作日期、撤回审核清空请核时间

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/AuditItems.java

@@ -121,6 +121,13 @@ public class AuditItems extends BaseEntity {
     private Date auditItem;
 
     /**
+     * 审核通过时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date auditOpTime;
+
+    /**
      * 审核意见
      */
     @Excel(name = "审核意见")
@@ -268,6 +275,14 @@ public class AuditItems extends BaseEntity {
         return auditItem;
     }
 
+    public Date getAuditOpTime() {
+        return auditOpTime;
+    }
+
+    public void setAuditOpTime(Date auditOpTime) {
+        this.auditOpTime = auditOpTime;
+    }
+
     public void setAuditMsg(String auditMsg) {
         this.auditMsg = auditMsg;
     }
@@ -304,6 +319,7 @@ public class AuditItems extends BaseEntity {
                 .append("sendMsg", getSendMsg())
                 .append("auditUserId", getAuditUserId())
                 .append("auditItem", getAuditItem())
+                .append("auditOpTime", getAuditOpTime())
                 .append("auditMsg", getAuditMsg())
                 .append("auditStatus", getAuditStatus())
                 .toString();

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -280,6 +280,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     @Override
     @Transactional
     public AjaxResult approved(AuditItems auditItems) {
+        // 审核通过时间
+        Date auditItemtem = auditItems.getAuditItem();
         long fettle = 0L;
         int number = 0;
         AuditItems item = new AuditItems();
@@ -305,8 +307,10 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                         at.setAuditMsg(auditItems.getAuditMsg());
                     }
                     at.setAuditStatus("A");
-                    at.setAuditItem(new Date());
+                    //at.setAuditItem(new Date());
+                    at.setAuditOpTime(new Date());
                     at.setAuditUserId(au.getUserId());
+                    at.setAuditItem(auditItemtem);
                     int updateAuditItems = auditItemsMapper.updateAuditItems(at);
                     if (updateAuditItems <= 0) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -325,8 +329,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             fettle = 5L;
                         }
                         // 仓库模块
-                        tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle);
-                        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle);
+                        tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle, at.getAuditItem());
+                        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, at.getAuditItem());
                     } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
                         // 财务模块
                         if ("T".equals(at.getIffinalItem())) {
@@ -394,8 +398,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
         long fettle = 0L;
         if (auditItems.getActId() >= 110 && auditItems.getActId() <= 150) {
             fettle = 3L;
-            tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle);
-            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle);
+            tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle , auditItems.getAuditItem());
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
             fettle = 3L;
             // 财务模块
@@ -436,7 +440,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                     } else {
                         at.setAuditMsg(auditItems.getAuditMsg());
                     }
-                    at.setAuditItem(new Date());
+                    //at.setAuditItem(new Date());
+                    at.setAuditOpTime(new Date());
                     at.setAuditUserId(au.getUserId());
                     int updateAuditItems = auditItemsMapper.updateAuditItems(at);
                     if (updateAuditItems <= 0) {
@@ -483,8 +488,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("审批撤销失败: 已经过审批");
             }
-            tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle);
-            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle);
+            tWarehouseBillsMapper.warehouseFollowUpdate(auditItems.getBillId(), fettle,auditItems.getAuditItem() );
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
             fettle = 2L;
             // 查询财务状态

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -373,6 +373,7 @@ public class TFeeServiceImpl implements ITFeeService {
             auditItems.setSendTime(new Date());
             auditItems.setAuditUserId(loginUser.getUser().getUserId());
             auditItems.setAuditItem(new Date());
+            auditItems.setAuditOpTime(new Date());
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -6,6 +6,8 @@ import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import org.apache.ibatis.annotations.Param;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -79,7 +81,7 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @param fPid 主表id
      * @return  结果
      */
-    int warehouseFollowUpdate(@Param("fPid") Long fPid, @Param("fettle") Long fettle);
+    int warehouseFollowUpdate(@Param("fPid") Long fPid, @Param("fettle") Long fettle, @Param("auditItem") Date auditItem);
 
     /**
      * 查询详情主表列表

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -72,7 +73,7 @@ public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfee
      * @param fPid 主表id
      * @return  结果
      */
-    int warehouseFeesFollowUpdate(@Param("fPid") Long fPid, @Param("fettle") Long fettle);
+    int warehouseFeesFollowUpdate(@Param("fPid") Long fPid, @Param("fettle") Long fettle, @Param("auditItem") Date auditItem);
 
 
     public int updateTWarehousebillsfee(@Param("map") Map<String, Object> map);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -304,6 +304,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             auditItems.setSendTime(new Date());
             auditItems.setAuditUserId(loginUser.getUser().getUserId());
             auditItems.setAuditItem(new Date());
+            auditItems.setAuditOpTime(new Date());
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -699,6 +699,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setSendTime(new Date());
             auditItems.setAuditUserId(loginUser.getUser().getUserId());
             auditItems.setAuditItem(new Date());
+            auditItems.setAuditOpTime(new Date());
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
@@ -737,8 +738,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("仓库更新状态未找到主表信息，请与管理员联系");
         }
         try {
-            tWarehouseBillsMapper.warehouseFollowUpdate(fPid, fettle);
-            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(fPid, fettle);
+            tWarehouseBillsMapper.warehouseFollowUpdate(fPid, fettle, new Date());
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(fPid, fettle, new Date());
             TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(fPid);
             if ("SJRK".equals(tWarehouseBills.getfBilltype()) || "SJCK".equals(tWarehouseBills.getfBilltype())) {
                 fettle = 40L;
@@ -761,7 +762,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (StringUtils.isNull(fPid)) {
             return AjaxResult.error("仓库更新状态未找到主表信息，请与管理员联系");
         }
-        int warehouseUpdateResult = tWarehouseBillsMapper.warehouseFollowUpdate(fPid, fettle);
+        int warehouseUpdateResult = tWarehouseBillsMapper.warehouseFollowUpdate(fPid, fettle, new Date());
         if (warehouseUpdateResult <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新库存明细状态失败，请联系管理员");
@@ -794,7 +795,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
             }
         }
-        int feesUpdateResult = tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(fPid, fettle);
+        int feesUpdateResult = tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(fPid, fettle, new Date());
         if (feesUpdateResult <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新库存费用状态失败，请联系管理员");
@@ -1513,6 +1514,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 auditItems.setSendTime(new Date());
                 auditItems.setAuditUserId(loginUser.getUser().getUserId());
                 auditItems.setAuditItem(new Date());
+                auditItems.setAuditOpTime(new Date());
                 auditItems.setAuditMsg("提交");
                 auditItems.setAuditStatus("O");
                 AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
@@ -1732,8 +1734,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehousebills.setUpdateBy(loginUser.getUser().getUserName());
         tWarehousebills.setUpdateTime(new Date());
         tWarehousebills.setfBillstatus(2L); //撤销状态
+        tWarehousebills.setfReviewDate(null);// 审核通过时间清空
         tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
-        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(tWarehousebills.getfId(), 2L);
+        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(tWarehousebills.getfId(), 2L,new Date());
         return AjaxResult.success();
     }
 

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -22,12 +22,13 @@
         <result property="sendMsg" column="send_msg"/>
         <result property="auditUserId" column="audit_user_id"/>
         <result property="auditItem" column="audit_item"/>
+        <result property="auditOpTime" column="audit_op_time"/>
         <result property="auditMsg" column="audit_msg"/>
         <result property="auditStatus" column="audit_status"/>
     </resultMap>
 
     <sql id="selectAuditItemsVo">
-        select id, bill_no, bill_id, act_id, path_id, level_id, refno1, iffinal_item, refno2, refno3, branch_id, send_user_id, send_name, send_time, send_msg, audit_user_id, audit_item, audit_msg, audit_status from audit_items
+        select id, bill_no, bill_id, act_id, path_id, level_id, refno1, iffinal_item, refno2, refno3, branch_id, send_user_id, send_name, send_time, send_msg, audit_user_id, audit_item,audit_op_time, audit_msg, audit_status from audit_items
     </sql>
 
     <select id="selectAuditItemsList" parameterType="AuditItems" resultMap="AuditItemsResult">
@@ -49,6 +50,7 @@
             <if test="sendMsg != null  and sendMsg != ''">and send_msg = #{sendMsg}</if>
             <if test="auditUserId != null ">and audit_user_id = #{auditUserId}</if>
             <if test="auditItem != null ">and audit_item = #{auditItem}</if>
+            <if test="auditOpTime != null ">and audit_op_time = #{auditOpTime}</if>
             <if test="auditMsg != null  and auditMsg != ''">and audit_msg = #{auditMsg}</if>
             <if test="auditStatus != null  and auditStatus != ''">and audit_status = #{auditStatus}</if>
         </where>
@@ -78,6 +80,7 @@
             <if test="sendMsg != null">send_msg,</if>
             <if test="auditUserId != null">audit_user_id,</if>
             <if test="auditItem != null">audit_item,</if>
+            <if test="auditOpTime != null ">audit_op_time,</if>
             <if test="auditMsg != null">audit_msg,</if>
             <if test="auditStatus != null">audit_status,</if>
         </trim>
@@ -98,6 +101,7 @@
             <if test="sendMsg != null">#{sendMsg},</if>
             <if test="auditUserId != null">#{auditUserId},</if>
             <if test="auditItem != null">#{auditItem},</if>
+            <if test="auditOpTime != null ">#{auditOpTime},</if>
             <if test="auditMsg != null">#{auditMsg},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
         </trim>
@@ -122,6 +126,7 @@
             <if test="sendMsg != null">send_msg = #{sendMsg},</if>
             <if test="auditUserId != null">audit_user_id = #{auditUserId},</if>
             <if test="auditItem != null">audit_item = #{auditItem},</if>
+            <if test="auditOpTime != null ">audit_op_time = #{auditOpTime},</if>
             <if test="auditMsg != null">audit_msg = #{auditMsg},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
         </trim>
@@ -185,7 +190,8 @@
             us.nick_name AS nickName,
             aud.audit_status AS auditStatus,
             aud.audit_msg AS auditMsg,
-            aud.audit_item AS auditItem
+            aud.audit_item AS auditItem,
+            aud.audit_op_time AS auditOpTime
         FROM
             audit_items aud
             LEFT JOIN sys_user us ON us.user_id = aud.audit_user_id

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

@@ -437,6 +437,7 @@
             <if test="fDriverTel != null">f_driver_tel = #{fDriverTel},</if>
             <if test="fDriverIdCar != null">f_driver_id_car = #{fDriverIdCar},</if>
             <if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
+            <if test="fReviewDate == null">f_review_date = null,</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -468,7 +469,8 @@
             t_warehousebills
         <trim prefix="SET" suffixOverrides=",">
             <if test="fettle != null">f_billstatus = #{fettle},</if>
-            <if test="fettle != null and fettle == 6">f_review_date = now(),</if>
+            <if test="auditItem != null and fettle == 6">f_review_date = #{auditItem},</if>
+            <if test="auditItem != null and fettle != 6">f_review_date = null,</if>
         </trim>
         where f_id = #{fPid}
     </update>

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

@@ -278,7 +278,8 @@
             t_warehousebillsfees
         <trim prefix="SET" suffixOverrides=",">
             <if test="fettle != null">f_billstatus = #{fettle},</if>
-            <if test="fettle != null and fettle == 6">f_review_date = now(),</if>
+            <if test="auditItem != null and fettle == 6">f_review_date = #{auditItem},</if>
+            <if test="auditItem != null and fettle != 6">f_review_date = null,</if>
         </trim>
         where f_pid = #{fPid}
     </update>