20230419 08:57

ruoyi-anpin/src/main/java/com/ruoyi/anpin/domain/TCostManagement.java

@@ -103,7 +103,8 @@ public class TCostManagement extends BaseEntity
     private String applicantName;
 
     /** 审核时间 */
-    @Excel(name = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fReviewDate;
 
     /** 状态名称 */

ruoyi-anpin/src/main/java/com/ruoyi/anpin/service/impl/TCostManagementServiceImpl.java

@@ -123,6 +123,12 @@ public class TCostManagementServiceImpl implements ITCostManagementService
     {
         Map<String, Object> map = new HashMap<>();
         TCostManagement detailed = JSONArray.parseObject(tCostManagement, TCostManagement.class);
+        if (StringUtils.isNotNull(detailed.getfId())){
+            TCostManagement management = tCostManagementMapper.selectTCostManagementById(detailed.getfId());
+            if (management.getfBillstatus() > 0){
+                return AjaxResult.error("该订单已提交,请刷新页面");
+            }
+        }
         if (ObjectUtils.isEmpty(detailed.getDeptId())){
             return AjaxResult.error("部门不能为空");
         }

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

@@ -550,7 +550,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                         }
                         Integer fBillstatus = 5;
                         //变更费用管理审核状态
-                        AjaxResult ajaxResult = tWarehouseBillsService.updateCostMessage(auditItems.getBillId(), status, fBillstatus);
+                        AjaxResult ajaxResult = tWarehouseBillsService.updateCostMessage(auditItems.getBillId(), status, fBillstatus, at.getAuditItem());
                         String string = ajaxResult.get("code").toString();
                         if ("500".equals(string)) {
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -706,7 +706,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             String status = "0";
             Integer fBillstatus = 0;
             //变更费用管理审核状态
-            AjaxResult ajaxResult = tWarehouseBillsService.updateCostMessage(auditItems.getBillId(), status, fBillstatus);
+            AjaxResult ajaxResult = tWarehouseBillsService.updateCostMessage(auditItems.getBillId(), status, fBillstatus, null);
             String string = ajaxResult.get("code").toString();
             if ("500".equals(string)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -917,7 +917,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             String status = "0";
             Integer fBillstatus = 0;
             //变更费用管理审核状态
-            AjaxResult ajaxResult = tWarehouseBillsService.updateCostMessage(auditItems.getBillId(), status, fBillstatus);
+            AjaxResult ajaxResult = tWarehouseBillsService.updateCostMessage(auditItems.getBillId(), status, fBillstatus,null);
             String string = ajaxResult.get("code").toString();
             if ("500".equals(string)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -218,7 +218,8 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      */
     public int updateCostMessage(@Param("fId")Long fId,
                                    @Param("status")String status,
-                                 @Param("fBillstatus") Integer fBillstatus);
+                                 @Param("fBillstatus") Integer fBillstatus,
+                                 @Param("fAuditTime") Date dateTim);
     /**
      * 更新项目审核信息
      * @param fPid

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

@@ -4629,9 +4629,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * @return
      */
     @Transactional
-    public AjaxResult updateCostMessage(Long fid, String status, Integer fBillstatus){
+    public AjaxResult updateCostMessage(Long fid, String status, Integer fBillstatus, Date dateTim){
         Integer i = null;
-        i = tWarehouseBillsMapper.updateCostMessage(fid, status, fBillstatus);
+        i = tWarehouseBillsMapper.updateCostMessage(fid, status, fBillstatus, dateTim);
         if (i != null && i>0){
             return AjaxResult.success();
         }else {

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

@@ -2643,7 +2643,7 @@
 
     <update id="updateCostMessage">
         update t_cost_management
-        set f_status = #{status},f_billstatus = #{fBillstatus}
+        set f_status = #{status},f_billstatus = #{fBillstatus},f_review_date = #{fAuditTime}
         where f_id = #{fId}
     </update>