Browse Source

新增派单明细导入sop

wangliang 1 year ago
parent
commit
186a952e87

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

@@ -42,6 +42,14 @@ public class TBCrmDetailController {
     @Resource
     TBCrmDetailService tbCrmDetailService;
 
+    @ApiOperation(value = "派单明细sop变量保存")
+    @RequestMapping(value = "/sop/var/save", method = RequestMethod.POST)
+    @ApiResponses({ @ApiResponse(code = 200, message = "派单明细sop变量信息", response = EditResult.class) })
+    public Result sopVarSave(@ApiParam(value = "派单号", required = true) @RequestParam String crmNo,
+            @ApiParam(value = "过程变量", required = true) @RequestParam String processVar) {
+        return ResultUtil.ok(tbCrmDetailService.sopVarSave(crmNo, processVar));
+    }
+
     @ApiOperation(value = "导入派单明细")
     @RequestMapping(value = "/sop/import", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })

+ 11 - 0
sop-business/src/main/java/com/qmth/sop/business/bean/result/CrmProjectResult.java

@@ -84,6 +84,17 @@ public class CrmProjectResult {
     @ApiModelProperty(value = "标准人天")
     private Integer peoperDay;
 
+    @ApiModelProperty(value = "过程变量")
+    private String processVar;
+
+    public String getProcessVar() {
+        return processVar;
+    }
+
+    public void setProcessVar(String processVar) {
+        this.processVar = processVar;
+    }
+
     public Integer getPeoperDay() {
         return peoperDay;
     }

+ 6 - 1
sop-business/src/main/java/com/qmth/sop/business/entity/TBCrm.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2023-08-01
  */
-@ApiModel(value="TBCrm对象", description="派单信息表")
+@ApiModel(value = "TBCrm对象", description = "派单信息表")
 public class TBCrm extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -101,6 +101,11 @@ public class TBCrm extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "过程变量")
     private String processVar;
 
+    public void updateProcessVar(String processVar, Long userId) {
+        this.processVar = processVar;
+        updateInfo(userId);
+    }
+
     public String getProcessVar() {
         return processVar;
     }

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

@@ -17,6 +17,15 @@ import java.util.Map;
  */
 public interface TBCrmDetailService extends IService<TBCrmDetail> {
 
+    /**
+     * 派单明细sop变量保存
+     *
+     * @param crmNo
+     * @param processVar
+     * @return
+     */
+    public boolean sopVarSave(String crmNo, String processVar);
+
     /**
      * 派单明细sop导入
      *

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

@@ -57,6 +57,22 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
     @Resource
     TBServiceService tbServiceService;
 
+    /**
+     * 派单明细sop变量保存
+     *
+     * @param crmNo
+     * @param processVar
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean sopVarSave(String crmNo, String processVar)  {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        TBCrm tbCrm = tbCrmService.findByCrmNo(crmNo);
+        tbCrm.updateProcessVar(processVar, sysUser.getId());
+        return tbCrmService.updateById(tbCrm);
+    }
+
     /**
      * 派单明细sop导入
      *
@@ -73,6 +89,9 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
 
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         TBCrm tbCrm = tbCrmService.findByCrmNo(crmNo);
+        if (Objects.isNull(tbCrm.getProcessVar()) || Objects.equals(tbCrm.getProcessVar().trim(), "")) {
+            throw ExceptionResultEnum.ERROR.exception("请先保存属性【部署方式】【阅卷方式】【扫描场地网络】");
+        }
         TBService tbService = tbServiceService.getById(tbCrm.getServiceId());
         Objects.requireNonNull(tbService, "未找到服务单元");
 

+ 4 - 2
sop-business/src/main/resources/mapper/TBCrmMapper.xml

@@ -273,7 +273,8 @@
             regionManager.real_name AS regionManagerName,
             regionCoordinator.id AS regionCoordinatorId,
             regionCoordinator.real_name AS regionCoordinatorName,
-            sc.peoper_day as peoperDay
+            sc.peoper_day as peoperDay,
+            tbc.process_var as processVar
         FROM
             t_f_custom_flow_entity tfcfe
                 LEFT JOIN
@@ -317,7 +318,8 @@
             regionManager.real_name AS regionManagerName,
             regionCoordinator.id AS regionCoordinatorId,
             regionCoordinator.real_name AS regionCoordinatorName,
-            sc.peoper_day as peoperDay
+            sc.peoper_day as peoperDay,
+            tbc.process_var as processVar
         FROM
             t_b_crm tbc
                 LEFT JOIN