合伙招商api

src/main/java/com/partner/admin/domain/PartnerProjectStatusChangeLog.java

@@ -75,19 +75,19 @@ public class PartnerProjectStatusChangeLog implements Serializable {
     /**
      * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
      */
-    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
-    private Integer todoStatus = 0;
+    @ApiModelProperty(value = "0-项目查重确认 1-项目信息确认 2-确认佣金比例")
+    private Integer todoStatus = -1;
 
     /**
      * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
      */
-    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+    @ApiModelProperty(value = "0-项目查重确认 1-项目信息确认 2-确认佣金比例")
     private String todoStatusDescription = "";
 
     /**
      * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
      */
-    @ApiModelProperty(value = "当前节点状态（0-未审核；1-已审核）")
+    @ApiModelProperty(value = "当前节点状态（0-未进行；1-进行中；2-已完成）")
     private Integer currentNodeStatus = 0;
 
     @TableField(exist = false)

src/main/java/com/partner/admin/service/impl/PartnerProjectInfoServiceImpl.java

@@ -156,7 +156,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
             }
         }
 
-        if(partnerProjectInfoVO.getPartnerProjectInfo().getStatus() == 1){
+        if(partnerProjectInfoVO.getPartnerProjectInfo().getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()){
             QueryWrapper<PartnerProjectStatusChangeLog> clQW= new QueryWrapper<>();
             clQW.eq("project_id",projectId);
             boolean exists = changeLogMapper.exists(clQW);
@@ -168,6 +168,9 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
                     partnerProjectStatusChangeLog.setProjectStatus(ppee.getCode());
                     partnerProjectStatusChangeLog.setProjectStatusDisplay(ppee.getMessage());
                     partnerProjectStatusChangeLog.setOperaterId(userId);
+                    if( ppee.getCode() == PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()){
+                        partnerProjectStatusChangeLog.setCurrentNodeStatus(0);
+                    }
                     changeLogMapper.insert(partnerProjectStatusChangeLog);
                 }
                 for (PartnerProjectPushEnum ppee : PartnerProjectPushEnum.values()) {

src/main/java/com/partner/admin/service/impl/TianyanchaServiceImpl.java

 package com.partner.admin.service.impl;
 
 import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.partner.admin.common.tianyancha.CompanyTianyanchaSearchResponse;
 import com.partner.admin.common.tianyancha.JsonUtils;
 import com.partner.admin.service.TianyanchaService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +42,14 @@ public class TianyanchaServiceImpl implements TianyanchaService {
                 .timeout(20000)
                 .execute().body();
 
-        String jsonObjectStr = JSONUtil.parseObj(result).getJSONObject("result").getJSONArray("items").toString();
+        JSONObject jsonObject = JSONUtil.parseObj(result).getJSONObject("result");
+        if(jsonObject == null ){
+            return new ArrayList<>();
+        }
+        if(jsonObject.getJSONArray("items") == null){
+            return new ArrayList<>();
+        }
+        String jsonObjectStr = jsonObject.getJSONArray("items").toString();
         List<CompanyTianyanchaSearchResponse> list = JsonUtils.jsonToList(jsonObjectStr, CompanyTianyanchaSearchResponse.class, null);
         List<CompanyTianyanchaSearchResponse> listResp = list.stream().filter(e -> !e.getRegStatus().equals("注销")).collect(Collectors.toList());