新增派单sop

sop-api/src/main/java/com/qmth/sop/server/api/TBCrmDetailController.java

@@ -5,22 +5,18 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.bean.params.CrmDetailSopParam;
 import com.qmth.sop.business.bean.result.EditResult;
-import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBCrmDetail;
 import com.qmth.sop.business.service.TBCrmDetailService;
 import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.common.contant.SystemConstant;
-import com.qmth.sop.common.enums.CrmStatusEnum;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.LogTypeEnum;
 import com.qmth.sop.common.lock.MemoryLock;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
-import com.qmth.sop.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -108,31 +104,17 @@ public class TBCrmDetailController {
     @ApiOperation(value = "派单明细sop发布")
     @RequestMapping(value = "/sop/publish", method = RequestMethod.POST)
     @OperationLog(logType = LogTypeEnum.EDIT)
-    @Transactional
     @ApiResponses({ @ApiResponse(code = 200, message = "派单明细sop发布", response = EditResult.class) })
     public Result sopPublish(@ApiParam(value = "派单明细sopId", required = true) @RequestParam Long id) {
-        TBCrmDetail tbCrmDetail = tbCrmDetailService.getById(id);
-        Objects.requireNonNull(tbCrmDetail, "未找到派单sop信息");
-
-        if (tbCrmDetail.getStatus() == CrmStatusEnum.PUBLISH) {
-            throw ExceptionResultEnum.ERROR.exception("该条派单sop已经发布");
-        }
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        tbCrmDetail.updateStatus(CrmStatusEnum.PUBLISH, sysUser.getId());
-        return ResultUtil.ok(tbCrmDetailService.updateById(tbCrmDetail));
+        return ResultUtil.ok(tbCrmDetailService.sopPublish(id));
     }
 
     @ApiOperation(value = "派单明细sop删除")
     @RequestMapping(value = "/sop/delete", method = RequestMethod.POST)
     @OperationLog(logType = LogTypeEnum.DELETE)
-    @Transactional
     @ApiResponses({ @ApiResponse(code = 200, message = "派单明细sop删除", response = EditResult.class) })
     public Result sopDelete(@ApiParam(value = "派单明细sopId", required = true) @RequestParam Long id) {
-        TBCrmDetail tbCrmDetail = tbCrmDetailService.getById(id);
-        Objects.requireNonNull(tbCrmDetail, "未找到派单sop信息");
-
-        //todo 补上流程信息
-        return ResultUtil.ok(tbCrmDetailService.removeById(tbCrmDetail.getId()));
+        return ResultUtil.ok(tbCrmDetailService.sopDelete(id));
     }
 
     @ApiOperation(value = "导入派单明细")

sop-business/src/main/java/com/qmth/sop/business/service/TBCrmDetailService.java

@@ -69,4 +69,20 @@ public interface TBCrmDetailService extends IService<TBCrmDetail> {
      * @return
      */
     public TFCustomFlow queryCustomFlow(String crmNo);
+
+    /**
+     * 派单明细sop发布
+     *
+     * @param id
+     * @return
+     */
+    public boolean sopPublish(Long id);
+
+    /**
+     * 派单明细sop删除
+     *
+     * @param id
+     * @return
+     */
+    public boolean sopDelete(Long id);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmDetailServiceImpl.java

@@ -13,10 +13,7 @@ import com.qmth.sop.business.mapper.TBCrmDetailMapper;
 import com.qmth.sop.business.service.*;
 import com.qmth.sop.business.util.excel.BasicExcelListener;
 import com.qmth.sop.common.contant.SystemConstant;
-import com.qmth.sop.common.enums.ExceptionResultEnum;
-import com.qmth.sop.common.enums.FieldUniqueEnum;
-import com.qmth.sop.common.enums.ProductTypeEnum;
-import com.qmth.sop.common.enums.TFCustomTypeEnum;
+import com.qmth.sop.common.enums.*;
 import com.qmth.sop.common.util.JacksonUtil;
 import com.qmth.sop.common.util.ResultUtil;
 import com.qmth.sop.common.util.ServletUtil;
@@ -221,7 +218,7 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
                 ResultUtil.error(e.getMessage());
             }
         }
-        return true;
+        return false;
     }
 
     /**
@@ -246,4 +243,42 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
         Objects.requireNonNull(tfCustomFlow, "未找到教务处流程");
         return tfCustomFlow;
     }
+
+    /**
+     * 派单明细sop发布
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean sopPublish(Long id) {
+        TBCrmDetail tbCrmDetail = tbCrmDetailService.getById(id);
+        Objects.requireNonNull(tbCrmDetail, "未找到派单sop信息");
+
+        if (tbCrmDetail.getStatus() == CrmStatusEnum.PUBLISH) {
+            throw ExceptionResultEnum.ERROR.exception("该条派单sop已经发布");
+        }
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        tbCrmDetail.updateStatus(CrmStatusEnum.PUBLISH, sysUser.getId());
+
+        //发布流程
+        return tbCrmDetailService.updateById(tbCrmDetail);
+    }
+
+    /**
+     * 派单明细sop删除
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean sopDelete(Long id) {
+        TBCrmDetail tbCrmDetail = tbCrmDetailService.getById(id);
+        Objects.requireNonNull(tbCrmDetail, "未找到派单sop信息");
+
+        //todo 补上流程信息
+        return tbCrmDetailService.removeById(tbCrmDetail.getId());
+    }
 }