add:派单信息

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

@@ -23,6 +23,10 @@ public class CrmProjectResult {
     @ApiModelProperty("派单时间")
     private Long crmBeginTime;
 
+    @ApiModelProperty("客户经理id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long customManagerId;
+
     @ApiModelProperty("客户经理名称")
     private String customManagerName;
 
@@ -38,10 +42,18 @@ public class CrmProjectResult {
     @ApiModelProperty("考试开始时间")
     private Long examEndTime;
 
-    @ApiModelProperty("实施产品")
+    @ApiModelProperty("实施产品id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long productId;
+
+    @ApiModelProperty("实施产品名称")
     private String productName;
 
-    @ApiModelProperty("服务单元")
+    @ApiModelProperty("服务单元id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long serviceUnitId;
+
+    @ApiModelProperty("服务单元名称")
     private String serviceUnitName;
 
     @ApiModelProperty("大区经理id")
@@ -88,6 +100,14 @@ public class CrmProjectResult {
         this.crmBeginTime = crmBeginTime;
     }
 
+    public Long getCustomManagerId() {
+        return customManagerId;
+    }
+
+    public void setCustomManagerId(Long customManagerId) {
+        this.customManagerId = customManagerId;
+    }
+
     public String getCustomManagerName() {
         return customManagerName;
     }
@@ -128,6 +148,14 @@ public class CrmProjectResult {
         this.examEndTime = examEndTime;
     }
 
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
     public String getProductName() {
         return productName;
     }
@@ -136,6 +164,14 @@ public class CrmProjectResult {
         this.productName = productName;
     }
 
+    public Long getServiceUnitId() {
+        return serviceUnitId;
+    }
+
+    public void setServiceUnitId(Long serviceUnitId) {
+        this.serviceUnitId = serviceUnitId;
+    }
+
     public String getServiceUnitName() {
         return serviceUnitName;
     }

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

@@ -122,6 +122,7 @@ public interface TBCrmService extends IService<TBCrm> {
      * 根据sopNo或crmNo查询项目派单信息
      *
      * @param sopNo sopNo
+     * @param crmNo crmNo
      * @return 项目派单信息
      */
     CrmProjectResult findCrmProjectBySopNoOrCrmNo(String sopNo, String crmNo);

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

@@ -220,13 +220,13 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
     @Override
     public CrmProjectResult findCrmProjectBySopNoOrCrmNo(String sopNo, String crmNo) {
         CrmProjectResult result = new CrmProjectResult();
-        List<CrmProjectResult> crmProjectResults = new ArrayList<>();
+        List<CrmProjectResult> crmProjectResults;
         if (sopNo != null && sopNo.length() > 0) {
             crmProjectResults = this.baseMapper.findCrmProjectBySopNo(sopNo);
         } else if (crmNo != null && crmNo.length() > 0) {
             crmProjectResults = this.baseMapper.findCrmProjectByCrmNo(crmNo);
         } else {
-            throw ExceptionResultEnum.ERROR.exception("缺少sop单号或crm单号");
+            throw ExceptionResultEnum.ERROR.exception("缺少sop单号和crm单号");
         }
         if (CollectionUtils.isNotEmpty(crmProjectResults)) {
             if (crmProjectResults.size() > 1) {

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

@@ -231,10 +231,13 @@
             tbc.begin_time AS crmBeginTime,
             sc.type AS customType,
             sc.name AS customName,
+            customManager.id AS customManagerId,
             customManager.real_name AS customManagerName,
             tbc.exam_start_time AS examStartTime,
             tbc.exam_end_time AS examEndTime,
+            tbp.id AS productId,
             tbp.name AS productName,
+            tbs.id AS serviceUnitId,
             tbs.name AS serviceUnitName,
             regionManager.id AS regionManagerId,
             regionManager.real_name AS crmUserName,