From 4ae053d60246a7f3279b6f1d3f2185d6fb1dee81 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:30:45 +0800
Subject: [PATCH] 修改bug3

---
 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java |   17 ++++++++++++++++-
 1 files changed, 16 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 0924ecd..1582cad 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
@@ -1,6 +1,7 @@
 package com.matrix.system.hive.action;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.matrix.core.anotations.RemoveRequestToken;
 import com.matrix.core.constance.MatrixConstance;
 import com.matrix.core.exception.GlobleException;
@@ -504,7 +505,9 @@
         if (balanceverifyResult.isError()) {
             return new AjaxResult(AjaxResult.STATUS_FAIL, balanceverifyResult.getMsg());
         }
-        sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
+        if (StrUtil.isEmpty(sysProjServices.getState())) {
+            sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
+        }
         SysProjServices newSysProjServices = sysProjServicesService.addSysProjServices(sysProjServices);
         if (newSysProjServices != null) {
             return AjaxResult.buildSuccessInstance(Arrays.asList(newSysProjServices));
@@ -558,6 +561,18 @@
         }
     }
 
+    /**
+     * 删除服务单项目/套餐
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/delServiceOrderItems")
+    @ResponseBody
+    public AjaxResult delServiceOrderItems(Long id) {
+        sysProjServicesService.deleteProjServiceItemById(id);
+        return AjaxResult.buildSuccessInstance("删除成功");
+    }
+
 
     // 准备页面数据
     private void  pageDate() {

--
Gitblit v1.9.1