合伙招商api

src/main/java/com/partner/admin/VO/PartnerExamineProjectInfoVO.java

@@ -25,5 +25,8 @@ public class PartnerExamineProjectInfoVO implements Serializable {
     @ApiModelProperty(value = "合伙人信息")
     private PartnerSecretaryVO partnerSecretary = new PartnerSecretaryVO();
 
+    @ApiModelProperty(value = "formStr标识符")
+    private String formStr = "";
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerProjectInfoVO.java

@@ -23,7 +23,9 @@ import java.util.List;
 @ApiModel(value="项目信息")
 public class PartnerProjectInfoVO implements Serializable {
 
+    @ApiModelProperty(value = "项目信息")
     private PartnerProjectInfo partnerProjectInfo;
+    @ApiModelProperty(value = "项目图片")
     private List<PartnerImageSource> partnerImageSourceList;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/partner/admin/VO/PartnerSaveProjectInfoVO.java

+package com.partner.admin.VO;
+
+import com.partner.admin.domain.PartnerImageSource;
+import com.partner.admin.domain.PartnerProjectInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+ * @TableName partner_project_info
+ */
+@Data
+@ApiModel(value="项目信息")
+public class PartnerSaveProjectInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "项目信息")
+    private PartnerProjectInfo partnerProjectInfo;
+    @ApiModelProperty(value = "项目图片")
+    private List<PartnerImageSource> partnerImageSourceList;
+    @ApiModelProperty(value = "formStr标识符")
+    private String formStr ="";
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/controller/PartnerProjectController.java

@@ -10,6 +10,7 @@ import com.partner.admin.service.PartnerProjectStatusChangeLogService;
 import com.partner.admin.service.ProjectInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +50,6 @@ public class PartnerProjectController extends BaseController{
     }
 
 
-
     @PostMapping("/saveOrUpdatePersonProject")
     @ResponseBody
     @ApiOperation(value = "项目暂存或者提报（status：0暂存；1提交）",notes = "")
@@ -72,9 +72,12 @@ public class PartnerProjectController extends BaseController{
     @PostMapping("/examineProjectDetail")
     @ResponseBody
     @ApiOperation(value = "审核中项目详情页",notes = "")
-    @ApiImplicitParam(name = "id", value = "项目id", type = "Integer")
-    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) {
-        return partnerProjectInfoService.examineProjectDetail(id);
+    @ApiImplicitParams ({
+            @ApiImplicitParam(name = "id", value = "项目id", type = "Integer"),
+            @ApiImplicitParam(name = "formStr", value = "formStr标识符", type = "String")
+    })
+    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id, String formStr) {
+        return partnerProjectInfoService.examineProjectDetail(id,formStr);
     }
 
 
@@ -94,6 +97,17 @@ public class PartnerProjectController extends BaseController{
         return partnerProjectInfoService.allocationProjectDetail(id);
     }
 
+    @PostMapping("/saveProjectDetail")
+    @ResponseBody
+    @ApiOperation(value = "草稿箱详情获取",notes = "")
+    @ApiImplicitParams ({
+            @ApiImplicitParam(name = "id", value = "项目id", type = "Integer"),
+        @ApiImplicitParam(name = "formStr", value = "formStr标识符", type = "String")
+    })
+    public PartnerSaveProjectInfoVO saveProjectDetail(Integer id, String formStr){
+        return partnerProjectInfoService.saveProjectDetail(id, formStr);
+    }
+
     @PostMapping("/getProjectConfirmTemplate")
     @ResponseBody
     @ApiOperation(value = "项目信息确认模板",notes = "")

src/main/java/com/partner/admin/controller/SysFileController.java

@@ -3,7 +3,9 @@ package com.partner.admin.controller;
 import com.partner.admin.common.config.PartnerConfig;
 import com.partner.admin.service.UploadService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 文件上传下载处理
  * @author yaobaizheng
@@ -22,22 +26,25 @@ public class SysFileController {
     @Autowired
     private PartnerConfig parterConfig;
 
-
     @Autowired
     UploadService uploadService;
 
-    @PostMapping("/uploadFileToHuaWeiOBS")
+    @PostMapping(value = "/uploadFileToHuaWeiOBS" , produces="application/json;charset=UTF-8")
     @ResponseBody
     @ApiOperation(value = "文件上传华为OBS",notes = "")
-    public String uploadFileToHuaWeiOBS(MultipartFile file) throws Exception {
+//    @ApiImplicitParam(name = "file", value = "项目id", paramType = "form", dataType="__file")
+    public String uploadFileToHuaWeiOBS(MultipartFile file, HttpServletResponse response) throws Exception {
+        response.setContentType("application/json;charset=GBK");
         return  parterConfig.getObsPath() + "/" + uploadService.uploadFile(file,"partner/file");
     }
 
 
-    @PostMapping("/uploadImgToHuaWeiOBS")
+    @PostMapping(value = "/uploadImgToHuaWeiOBS", produces="application/json;charset=UTF-8")
     @ResponseBody
     @ApiOperation(value = "图片上传华为OBS",notes = "")
-    public String uploadImgToHuaWeiOBS(MultipartFile file) throws Exception {
+    public String uploadImgToHuaWeiOBS(MultipartFile file, HttpServletResponse response) throws Exception {
+//        response.setContentType("application/json;charset=GBK");
+        response.addHeader("Access-Control-Allow-Origin", "*");
         return parterConfig.getObsPath()  + "/" +  uploadService.uploadFile(file,"partner/img");
     }
 

src/main/java/com/partner/admin/service/PartnerProjectInfoService.java

@@ -26,11 +26,12 @@ public interface PartnerProjectInfoService extends IService<PartnerProjectInfo>
 
     public Integer saveOrUpdatePersonProject( PartnerProjectInfoVO partnerProjectInfoVO,Integer userId);
 
-    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) ;
+    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id, String formStr) ;
 
     public PartnerPushProjectInfoVO pushProjectDetail(Integer id) ;
 
     public PartnerAllocationProjectInfoVO allocationProjectDetail(Integer id) ;
+    public PartnerSaveProjectInfoVO saveProjectDetail(Integer id, String formStr) ;
 
     public String getProjectConfirmTemplate(Integer id) ;
 

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

@@ -167,7 +167,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
         return projectId;
     }
 
-    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) {
+    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id, String formStr) {
         PartnerExamineProjectInfoVO partnerExamineProjectInfoVO = new PartnerExamineProjectInfoVO();
 
         //获取项目详情
@@ -203,6 +203,8 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
         BeanUtils.copyProperties(partnerSecretary,partnerSecretaryVO);
         partnerExamineProjectInfoVO.setPartnerSecretary(partnerSecretaryVO);
 
+        partnerExamineProjectInfoVO.setFormStr(formStr);
+
         return partnerExamineProjectInfoVO;
     }
 
@@ -281,6 +283,26 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
         return partnerAllocationProjectInfoVO;
     }
 
+    public PartnerSaveProjectInfoVO saveProjectDetail(Integer id, String formStr) {
+        PartnerSaveProjectInfoVO partnerProjectInfoVO = new PartnerSaveProjectInfoVO();
+
+        PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id);
+        partnerProjectInfoVO.setPartnerProjectInfo(partnerProjectInfo);
+
+        QueryWrapper<PartnerImageSource> pisQW = new QueryWrapper<>();
+        pisQW.eq("object_id", id);
+        pisQW.eq("object_type", ImageSourceTypeEnum.PROJECT.getCode());
+        pisQW.eq("status", ImageSourceTypeEnum.USESTATUS.getCode());
+        pisQW.orderByAsc("image_sort");
+        List<PartnerImageSource> list = partnerImageSourceMapper.selectList(pisQW);
+        partnerProjectInfoVO.setPartnerImageSourceList(list);
+
+        partnerProjectInfoVO.setFormStr(formStr);
+
+        return partnerProjectInfoVO;
+    }
+
+
     public String getProjectConfirmTemplate(Integer id){
         String content = PartnerProjectTemplate.projectConfirmTemplate;
         ProjectConfirmTemplateVO templateContent = partnerProjectInfoMapper.getProjectConfirmTemplate(id);