zhangyuewww 2 lat temu
rodzic
commit
a592e16247

+ 1 - 0
winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/service/impl/BillOprateHisImpl.java

@@ -29,6 +29,7 @@ public class BillOprateHisImpl implements IBillOperateHisService {
     public List<CommonBillOperateHis> getBillOperateHis(String id, String billType) {
         Wrapper<CommonBillOperateHis> wrapper = new EntityWrapper<>();
         wrapper.eq(CommonBillOperateHis.QueryFields.BILL_ID, id);
+        wrapper.isNull(CommonBillOperateHis.QueryFields.BUSINESS_HISTORY);
         if (StringUtils.isNotBlank(billType)) {
             wrapper.eq(CommonBillOperateHis.QueryFields.BILL_TYPE, billType);
         }

+ 1 - 0
winsea-haixin-plugin-base/src/main/java/com/yh/saas/plugin/base/entity/CommonBillOperateHis.java

@@ -107,6 +107,7 @@ public class CommonBillOperateHis extends BaseModel<CommonBillOperateHis> {
         public static final String BILL_NAME = "bill_name";
         public static final String CREATE_USER_ID = "create_user_id";
         public static final String BILL_TYPE = "bill_type";
+        public static final String BUSINESS_HISTORY = "business_history";
 
 
     }

+ 2 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/ExepenseListener.java

@@ -29,7 +29,7 @@ public class ExepenseListener extends AbstractWorkflowTaskListener {
         } else {
             expenseInfo.setApproveStatus(status);
         }
-        expenseInfoService.updateById(expenseInfo);
+        expenseInfoService.updateAllColumnById(expenseInfo);
     }
 
     @Override
@@ -41,7 +41,7 @@ public class ExepenseListener extends AbstractWorkflowTaskListener {
         expenseInfo.setStatusFlag(StatusEnum.PURCHASE_FAILED.getFlag());
         expenseInfo.setStatus(StatusEnum.PURCHASE_FAILED.getName());
         expenseInfo.setApproveStatus(null);
-        expenseInfoService.updateById(expenseInfo);
+        expenseInfoService.updateAllColumnById(expenseInfo);
 
     }