合伙招商api

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

@@ -55,10 +55,6 @@ public class PartnerProjectController extends BaseController{
     @ResponseBody
     @ApiOperation(value = "项目暂存或者提报（status：0暂存；1提交）",notes = "")
     public Integer saveOrUpdatePersonProject(@RequestBody PartnerProjectInfoVO partnerProjectInfoVO) {
-        Integer id = partnerProjectInfoService.saveOrUpdatePersonProject(partnerProjectInfoVO, getUserInfo().getUserId());
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.putOpt("id",id);
-        jsonObject.putOpt("fromStr",partnerProjectInfoVO.getFormStr());
         return partnerProjectInfoService.saveOrUpdatePersonProject(partnerProjectInfoVO,getUserInfo().getUserId());
     }
 
@@ -79,10 +75,9 @@ public class PartnerProjectController extends BaseController{
     @ApiOperation(value = "审核中项目详情页",notes = "")
     @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);
+    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) {
+        return partnerProjectInfoService.examineProjectDetail(id);
     }
 
 
@@ -109,8 +104,8 @@ public class PartnerProjectController extends BaseController{
             @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);
+    public PartnerSaveProjectInfoVO saveProjectDetail(Integer id){
+        return partnerProjectInfoService.saveProjectDetail(id);
     }
 
     @PostMapping("/getProjectConfirmTemplate")

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

@@ -61,7 +61,7 @@ public class PersonalController extends BaseController{
     @PostMapping("/saveOrUpdatePersonalInfo")
     @ResponseBody
     @ApiOperation(value = "保存我的信息",notes = "")
-    public Integer saveOrUpdatePersonalInfo(PartnerBaseInfo partnerBaseInfo)  {
+    public Integer saveOrUpdatePersonalInfo(@RequestBody PartnerBaseInfo partnerBaseInfo)  {
         partnerBaseInfo.setId(getUserInfo().getUserId());
         partnerBaseInfoService.saveOrUpdate(partnerBaseInfo);
         return partnerBaseInfo.getId();

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

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

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

@@ -6,14 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.partner.admin.VO.*;
 import com.partner.admin.domain.*;
 import com.partner.admin.enumerate.*;
-import com.partner.admin.mapper.PartnerFileSourceMapper;
-import com.partner.admin.mapper.PartnerImageSourceMapper;
-import com.partner.admin.mapper.PartnerProjectStatusChangeLogMapper;
-import com.partner.admin.service.PartnerFileSourceService;
-import com.partner.admin.service.PartnerProjectInfoService;
-import com.partner.admin.mapper.PartnerProjectInfoMapper;
-import com.partner.admin.service.PartnerSecretaryBindService;
-import com.partner.admin.service.PartnerSecretaryService;
+import com.partner.admin.mapper.*;
+import com.partner.admin.service.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +45,9 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
     @Autowired
     PartnerSecretaryService partnerSectetaryService;
 
+    @Autowired
+    PartnerFormstrInfoMapper partnerFormstrInfoMapper;
+
     @Override
     public PersonalStatisticsVO getPersonalStatistics(Integer userId) {
         return partnerProjectInfoMapper.getPersonalStatistics(userId);
@@ -186,10 +183,15 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
                 }
             }
         }
+
+        PartnerFormstrInfo partnerFormstrInfo = new PartnerFormstrInfo();
+        partnerFormstrInfo.setFormstr(partnerProjectInfoVO.getFormStr());
+        partnerFormstrInfo.setProjectId(projectId);
+        partnerFormstrInfoMapper.insert(partnerFormstrInfo);
         return projectId;
     }
 
-    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id, String formStr) {
+    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) {
         PartnerExamineProjectInfoVO partnerExamineProjectInfoVO = new PartnerExamineProjectInfoVO();
 
         //获取项目详情
@@ -225,8 +227,10 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
         BeanUtils.copyProperties(partnerSecretary,partnerSecretaryVO);
         partnerExamineProjectInfoVO.setPartnerSecretary(partnerSecretaryVO);
 
-        partnerExamineProjectInfoVO.setFormStr(formStr);
-
+        QueryWrapper<PartnerFormstrInfo> pfiQW = new QueryWrapper<>();
+        pfiQW.eq("project_id", id);
+        PartnerFormstrInfo partnerFormstrInfo = partnerFormstrInfoMapper.selectOne(pfiQW);
+        partnerExamineProjectInfoVO.setFormStr(partnerFormstrInfo.getFormstr());
         return partnerExamineProjectInfoVO;
     }
 
@@ -305,7 +309,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
         return partnerAllocationProjectInfoVO;
     }
 
-    public PartnerSaveProjectInfoVO saveProjectDetail(Integer id, String formStr) {
+    public PartnerSaveProjectInfoVO saveProjectDetail(Integer id) {
         PartnerSaveProjectInfoVO partnerProjectInfoVO = new PartnerSaveProjectInfoVO();
 
         PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id);
@@ -327,7 +331,10 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
         List<PartnerFileSource> partnerFileSources = partnerFileSourceMapper.selectList(pfsQW);
         partnerProjectInfoVO.setPartnerFileSourceList(partnerFileSources);
 
-        partnerProjectInfoVO.setFormStr(formStr);
+        QueryWrapper<PartnerFormstrInfo> pfiQW = new QueryWrapper<>();
+        pfiQW.eq("project_id", id);
+        PartnerFormstrInfo partnerFormstrInfo = partnerFormstrInfoMapper.selectOne(pfiQW);
+        partnerProjectInfoVO.setFormStr(partnerFormstrInfo.getFormstr());
 
         return partnerProjectInfoVO;
     }