From bda1c0165c6188056f2b33332008e6ecefb264c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 18:09:09 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index 20ffba2..86db596 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -14,7 +14,11 @@
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
+import com.matrix.system.app.dto.IdSubmitDto;
+import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
@@ -23,10 +27,13 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.*;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -387,6 +394,17 @@
}
}
+ @ApiOperation(value = "确认服务", notes = "确认服务")
+ @PostMapping(value = "/confirmServiceOrder")
+ public @ResponseBody AjaxResult confirmServiceOrder(Long id) {
+ int i=sysProjServicesService.confirmServiceOrder(id);
+ if(i>0){
+ return AjaxResult.buildSuccessInstance("确认成功");
+ }
+ return AjaxResult.buildFailInstance("确认失败");
+ }
+
+
/**
* @author jiangyouyao
@@ -478,6 +496,8 @@
}
}
+ @Autowired
+ BusParameterSettingsDao busParameterSettingsDao;
/**
* 根据id取消预约
@@ -485,6 +505,24 @@
@RequestMapping(value = "/cancelOrder")
public @ResponseBody
AjaxResult cancelOrder(SysProjServices services) {
+
+ SysProjServices checkProjServices = sysProjServicesDao.selectById(services.getId());
+ BusParameterSettings shopManageAbleCancelDfkOrder = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER, checkProjServices.getCompanyId());
+ if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
+ && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
+ if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY)
+ && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
+ }
+ }
+ return erpCancelOrder(services);
+ }
+ /**
+ * 根据id取消预约
+ */
+ @RequestMapping(value = "/erpCancelOrder")
+ public @ResponseBody
+ AjaxResult erpCancelOrder(SysProjServices services) {
int i = sysProjServicesService.modifyCancelProjServices(services);
if (i > 0) {
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "取消预约成功");
@@ -492,7 +530,6 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "取消预约失败");
}
}
-
/**
* 设置服务单划扣成功
--
Gitblit v1.9.1