细节修改

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBCrmResult.java

@@ -6,6 +6,7 @@ import com.qmth.sop.common.enums.ServiceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class TBCrmResult extends TBCrm implements Serializable {
 
@@ -39,6 +40,32 @@ public class TBCrmResult extends TBCrm implements Serializable {
     @ApiModelProperty(value = "供应商")
     private String supplier;
 
+    @ApiModelProperty(value = "产品类型")
+    private ProductTypeEnum type;
+
+    @ApiModelProperty(value = "产品类型")
+    private String typeStr;
+
+    public ProductTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(ProductTypeEnum type) {
+        this.type = type;
+    }
+
+    public String getTypeStr() {
+        if (Objects.nonNull(this.type)) {
+            return this.type.getTitle();
+        } else {
+            return typeStr;
+        }
+    }
+
+    public void setTypeStr(String typeStr) {
+        this.typeStr = typeStr;
+    }
+
     public String getService() {
         return service;
     }

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

@@ -1,6 +1,8 @@
 package com.qmth.sop.business.service.impl;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -92,6 +94,8 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
                     throw ExceptionResultEnum.ERROR.exception("教务处sop公用控件未设置");
                 }
                 crmProjectResult.setProcessVar(JacksonUtil.parseJson(flowFormWidgetResultList));
+            } else {
+                throw ExceptionResultEnum.ERROR.exception(tbService.getType().getTitle() + "暂不支持创建sop");
             }
         }
         return crmProjectResult;
@@ -108,6 +112,15 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
     public boolean sopVarSave(CrmDetailSopParam crmDetailSopParam) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         TBCrm tbCrm = tbCrmService.findByCrmNo(crmDetailSopParam.getCrmNo());
+        List<FlowFormWidgetResult> flowFormWidgetResultList = JSONArray.parseArray(crmDetailSopParam.getProcessVar(),
+                FlowFormWidgetResult.class);
+        for (FlowFormWidgetResult f : flowFormWidgetResultList) {
+            JSONObject jsonObject = JSONObject.parseObject(f.getValue());
+            String value = jsonObject.getString(SystemConstant.VALUE);
+            if (Objects.isNull(value)) {
+                throw ExceptionResultEnum.ERROR.exception(f.getTitle() + "不能为空");
+            }
+        }
         tbCrm.updateProcessVar(crmDetailSopParam.getProcessVar(), sysUser.getId());
         return tbCrmService.updateById(tbCrm);
     }

sop-business/src/main/resources/mapper/TBCrmMapper.xml

@@ -205,7 +205,8 @@
         p.name product,
         lu.real_name leadName,
         cu.real_name createName,
-        tbs.status serviceUnitStatus
+        tbs.status serviceUnitStatus,
+        tbs.type as type
         FROM
         t_b_crm a
         LEFT JOIN sys_user cru ON cru.id = a.crm_user_id