Skip to content

C
cfld-know-admin
Commit 0c2c6633 authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

合伙招商后台

parent 4186c7f2
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 6 deletions
ruoyi-system/src/main/java/com/ruoyi/system/controller/PartnerProjectInfoController.java
View file @ 0c2c6633
...@@ -12,6 +12,7 @@ import com.ruoyi.system.VO.ProjectInfoVO; ...@@ -12,6 +12,7 @@ import com.ruoyi.system.VO.ProjectInfoVO;
import com.ruoyi.system.domain.PartnerProjectStatusChangeLog; import com.ruoyi.system.domain.PartnerProjectStatusChangeLog;
import com.ruoyi.system.domain.ProjectInfo; import com.ruoyi.system.domain.ProjectInfo;
import com.ruoyi.system.enumerate.PartnerProjectExamineEnum; import com.ruoyi.system.enumerate.PartnerProjectExamineEnum;
import com.ruoyi.system.enumerate.PartnerProjectPushEnum;
import com.ruoyi.system.service.*; import com.ruoyi.system.service.*;
import com.ruoyi.system.util.BussinessUtils; import com.ruoyi.system.util.BussinessUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
...@@ -52,7 +53,6 @@ public class PartnerProjectInfoController extends BaseController ...@@ -52,7 +53,6 @@ public class PartnerProjectInfoController extends BaseController
@RequiresPermissions("partnerProject:info:view")
@GetMapping() @GetMapping()
public String info() public String info()
{ {
...@@ -159,6 +159,36 @@ public class PartnerProjectInfoController extends BaseController ...@@ -159,6 +159,36 @@ public class PartnerProjectInfoController extends BaseController
return prefix + "/editProjectInfo"; return prefix + "/editProjectInfo";
} }
/**
* 修改合伙人项目
*/
@GetMapping("/editPushProjectInfo/{id}")
public String editPushProjectInfo(@PathVariable("id") Long id, ModelMap mmap)
{
PartnerProjectInfo partnerProjectInfo = partnerProjectInfoService.selectPartnerProjectInfoById(id);
PartnerProjectStatusChangeLogVO statusChangeLog = new PartnerProjectStatusChangeLogVO();
statusChangeLog.setProjectId(id);
List<Integer> array = new ArrayList<>();
for(PartnerProjectPushEnum ppe: PartnerProjectPushEnum.values()){
array.add(ppe.getCode());
}
statusChangeLog.setProjectStatus(array);
List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = projectStatusChangeService.selectStatusChangeLogList(statusChangeLog);
mmap.put("partnerProjectInfo", partnerProjectInfo);
// mmap.put("partnerProjectStatusChangeLogs", partnerProjectStatusChangeLogs);
if(partnerProjectStatusChangeLogs != null && partnerProjectStatusChangeLogs.size()==6){
mmap.put("status9", partnerProjectStatusChangeLogs.get(0));
mmap.put("status10", partnerProjectStatusChangeLogs.get(1));
mmap.put("status11", partnerProjectStatusChangeLogs.get(2));
mmap.put("status12", partnerProjectStatusChangeLogs.get(3));
mmap.put("status13", partnerProjectStatusChangeLogs.get(4));
mmap.put("status14", partnerProjectStatusChangeLogs.get(5));
}
return prefix + "/editPushProjectInfo";
}
/** /**
* 修改保存合伙人项目 * 修改保存合伙人项目
*/ */
......
ruoyi-system/src/main/java/com/ruoyi/system/enumerate/PartnerProjectStatusEnum.java
View file @ 0c2c6633
...@@ -13,7 +13,8 @@ public enum PartnerProjectStatusEnum { ...@@ -13,7 +13,8 @@ public enum PartnerProjectStatusEnum {
PROJECTINFO_CONFIRM(1,"已确认"), PROJECTINFO_CONFIRM(1,"已确认"),
CURRENT_NODES_START(0,"未进行"), CURRENT_NODES_START(0,"未进行"),
CURRENT_NODES_STARTING(1,"进行中"), CURRENT_NODES_STARTING(1,"进行中"),
CURRENT_NODES_END(2,"已完成"); CURRENT_NODES_END(2,"已完成")
;
private int code; private int code;
private String message; private String message;
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PartnerProjectInfoServiceImpl.java
View file @ 0c2c6633
...@@ -124,9 +124,11 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService ...@@ -124,9 +124,11 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
PartnerProjectStatusChangeLog statusChange = new PartnerProjectStatusChangeLog(); PartnerProjectStatusChangeLog statusChange = new PartnerProjectStatusChangeLog();
statusChange.setId(changeStatusVO.getId()); statusChange.setId(changeStatusVO.getId());
statusChange.setDescription(changeStatusVO.getFeedBack()); statusChange.setDescription(changeStatusVO.getFeedBack());
statusChange.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_END.getCode());
if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()){ if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()){
if(changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_REPRATE.getCode()){ if(changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_REPRATE.getCode()){
statusChange.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS0.getCode()); statusChange.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS0.getCode());
statusChange.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());
} }
if(changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_NO_REPRATE.getCode()){ if(changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_NO_REPRATE.getCode()){
statusChange.setTodoStatus(null); statusChange.setTodoStatus(null);
...@@ -140,8 +142,9 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService ...@@ -140,8 +142,9 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
statusChange.setTodoStatus(null); statusChange.setTodoStatus(null);
} }
} }
statusChange.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_END.getCode());
projectStatusChangeService.updatePartnerProjectStatusChangeLog(statusChange); projectStatusChangeService.updatePartnerProjectStatusChangeLog(statusChange);
//关联产业知道id //关联产业知道id
if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS4.getCode()){ if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS4.getCode()){
PartnerProjectInfo partnerProjectInfo = new PartnerProjectInfo(); PartnerProjectInfo partnerProjectInfo = new PartnerProjectInfo();
...@@ -161,6 +164,11 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService ...@@ -161,6 +164,11 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
//更新下一个节点 //更新下一个节点
PartnerProjectStatusChangeLog partnerProjectStatusChangeLog = partnerProjectStatusChangeLogs.get(0); PartnerProjectStatusChangeLog partnerProjectStatusChangeLog = partnerProjectStatusChangeLogs.get(0);
partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode()); partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());
if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()) {
if (changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_REPRATE.getCode()) {
partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_START.getCode());
}
}
return projectStatusChangeService.updatePartnerProjectStatusChangeLog(partnerProjectStatusChangeLog); return projectStatusChangeService.updatePartnerProjectStatusChangeLog(partnerProjectStatusChangeLog);
} }
} }
ruoyi-system/src/main/resources/templates/partnerProject/info/editProjectInfo.html
View file @ 0c2c6633
...@@ -428,10 +428,10 @@ ...@@ -428,10 +428,10 @@
// if($("#currentNodeStatus1").text() == '1'){ // if($("#currentNodeStatus1").text() == '1'){
// //
// } // }
if($("#currentNodeStatus2").text() == '1'){ if($("#currentNodeStatus2").text() == '1' ){
changeStatus2(); changeStatus2();
} }
if($("#currentNodeStatus4").text() == '1'){ if($("#currentNodeStatus4").text() == '1' ){
changeStatus4(); changeStatus4();
} }
if($("#currentNodeStatus5").text() == '1'){ if($("#currentNodeStatus5").text() == '1'){
......
ruoyi-system/src/main/resources/templates/partnerProject/info/editPushProjectInfo.html 0 → 100644
View file @ 0c2c6633
<!DOCTYPE html>
<html lang="zh">
<head>
<th:block th:include="include :: header('基本表单')" />
<style>
.myselfClass{
float: left;
background-color: azure;
width: 200px;
height: 75px;
margin-right: 13px;
margin-bottom: 10px;
}
.sizeDiv{
height:100px;
display: none;
margin-top: 10px;
}
</style>
<link rel="tag" href="http://java.sun.com/jsp/jstl/core" prefix="c">
<link href=".https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/partner/file/2023-10-31/demo.css"
rel="stylesheet"/>
<link href="https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/partner/file/2023-10-31/bootstrap-directional-buttons.css"
rel="stylesheet"/>
</head>
<body class="gray-bg">
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row">
<div class="col-sm-12" id="changeStatusLogs">
<div >
<span id="projectId1" th:text="${status9.projectId}" hidden="hidden"></span>
<span id="id1" th:text="${status9.id}" hidden="hidden"></span>
<span id="projectStatus1" th:text="${status9.projectStatus}" hidden="hidden"></span>
<span id="currentNodeStatus1" th:text="${status9.currentNodeStatus}" hidden="hidden"></span>
<button type="button" > [[${status9.projectStatusDisplay}]]</span></button>
<!-- <span id="projectStatusDisplay1" th:text="${status1.projectStatusDisplay}"></span>-->
<span id="projectId2" th:text="${status10.projectId}" hidden="hidden"></span>
<span id="id2" th:text="${status10.id}" hidden="hidden"></span>
<span id="projectStatus2" th:text="${status10.projectStatus}" hidden="hidden"></span>
<span id="currentNodeStatus2" th:text="${status10.currentNodeStatus}" hidden="hidden"></span>
<button type="button" class="btn btn-lg btn-info btn-arrow-right" >
[[${status10.projectStatusDisplay}]]</span></button>
<!-- <span id="projectStatusDisplay2" th:text="${status2.projectStatusDisplay}"></span>-->
<span id="projectId4" th:text="${status11.projectId}" hidden="hidden"></span>
<span id="id4" th:text="${status11.id}" hidden="hidden"></span>
<span id="projectStatus4" th:text="${status11.projectStatus}" hidden="hidden"></span>
<span id="currentNodeStatus4" th:text="${status11.currentNodeStatus}" hidden="hidden"></span>
<button type="button" class="btn btn-lg btn-info btn-arrow-right" >
[[${status11.projectStatusDisplay}]]</span></button>
<!-- <span id="projectStatusDisplay4" th:text="${status4.projectStatusDisplay}"></span>-->
<span id="projectId5" th:text="${status12.projectId}" hidden="hidden"></span>
<span id="id5" th:text="${status12.id}" hidden="hidden"></span>
<span id="projectStatus5" th:text="${status12.projectStatus}" hidden="hidden"></span>
<span id="currentNodeStatus5" th:text="${status12.currentNodeStatus}" hidden="hidden"></span>
<button type="button" class="btn btn-lg btn-info btn-arrow-right" >
[[${status12.projectStatusDisplay}]]</span></button>
<!-- <span id="projectStatusDisplay5" th:text="${status5.projectStatusDisplay}"></span>-->
<span id="projectId6" th:text="${status13.projectId}" hidden="hidden"></span>
<span id="id6" th:text="${status13.id}" hidden="hidden"></span>
<span id="projectStatus6" th:text="${status13.projectStatus}" hidden="hidden"></span>
<span id="currentNodeStatus6" th:text="${status13.currentNodeStatus}" hidden="hidden"></span>
<button type="button" class="btn btn-lg btn-info btn-arrow-right" >
[[${status13.projectStatusDisplay}]]</span></button>
<!-- <span id="projectStatusDisplay6" th:text="${status6.projectStatusDisplay}"></span>-->
<span id="projectId7" th:text="${status14.projectId}" hidden="hidden"></span>
<span id="id7" th:text="${status14.id}" hidden="hidden"></span>
<span id="projectStatus7" th:text="${status14.projectStatus}" hidden="hidden"></span>
<span id="currentNodeStatus7" th:text="${status14.currentNodeStatus}" hidden="hidden"></span>
<button type="button" class="btn btn-lg btn-info btn-arrow-right" >
[[${status14.projectStatusDisplay}]]</span></button>
<!-- <span id="projectStatusDisplay7" th:text="${status7.projectStatusDisplay}"></span>-->
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>合伙人提报信息项目</h5>
<div class="ibox-tools">
</div>
</div>
<div class="ibox-content">
<form class="form-horizontal m" id="form-info-edit" th:object="${partnerProjectInfo}">
<input name="id" th:field="*{id}" type="hidden">
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">近年营收：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="continuousRevenue" th:field="*{continuousRevenue}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">投资主体：</label>
<div class="col-sm-8">
<input readonly="readonly" name="investmentSubject" th:field="*{investmentSubject}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">企业亮点：</label>
<div class="col-sm-8">
<input readonly="readonly" name="enterpriseHighlights" th:field="*{enterpriseHighlights}" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">产业基地：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="industrialBase" th:field="*{industrialBase}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">建设内容建设内容：</label>
<div class="col-sm-8">
<input readonly="readonly" class="form-control" name="constructionContent" th:field="*{constructionContent}" type="text">
<!-- <div class="summernote" id="constructionContent"></div>-->
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">投资总额：</label>
<div class="col-sm-8">
<input readonly="readonly" name="projectInvestmentTotal" th:field="*{projectInvestmentTotal}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">固定资产投资总额：</label>
<div class="col-sm-8">
<input readonly="readonly" name="projectInvestmentRegular" th:field="*{projectInvestmentRegular}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">投资内容：</label>
<div class="col-sm-8">
<input readonly="readonly" class="form-control" name="projectInvestmentRegular" th:field="*{investmentContent}" type="text">
<!-- <div class="summernote" id="investmentContent"></div>-->
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">项目诉求：</label>
<div class="col-sm-8">
<input readonly="readonly" name="projectAppeal" th:field="*{projectAppeal}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">意向区域：</label>
<div class="col-sm-8">
<input readonly="readonly" name="intendedRegion" th:field="*{intendedRegion}" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">佣金比例：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="regionCommissionRate" th:field="*{regionCommissionRate}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">土地需求：</label>
<div class="col-sm-8">
<input readonly="readonly" name="carrierRequirementsLandDemand" th:field="*{carrierRequirementsLandDemand}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">厂房需求：</label>
<div class="col-sm-8">
<input readonly="readonly" name="carrierRequirementsFactoryDemand" th:field="*{carrierRequirementsFactoryDemand}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">决策人：</label>
<div class="col-sm-8">
<input readonly="readonly" name="decisionMaker" th:field="*{decisionMaker}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">决策人职位：</label>
<div class="col-sm-8">
<input readonly="readonly" name="decisionMakerPosition" th:field="*{decisionMakerPosition}" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">项目状态</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="statusDescription" th:field="*{status}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">项目状态</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="statusDescription" th:field="*{statusDescription}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">项目归属人：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="partnerId" th:field="*{partnerId}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">归属人是否已确认：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="partnerHasConfirm" th:field="*{partnerHasConfirm}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">匹配招商公司：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="investmentPromotionCompany" th:field="*{investmentPromotionCompany}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">租户id：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="tenantId" th:field="*{tenantId}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">秘书id：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="secretaryId" th:field="*{secretaryId}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">产业知道项目id：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="projectId" th:field="*{projectId}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">0-项目查重确认 1-确认项目所属 2-确认佣金比例：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="todoStatusDescription" th:field="*{todoStatusDescription}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</form>
</div>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
$(function () {
for (let i = 1; i <= 8; i++) {
let element = "#currentNodeStatus" + i;
let text = $(element).text();
if (0 == text) {
$(element).next("button").addClass("btn btn-lg btn-warning btn-arrow-right");
}
if (1 == text) {
$(element).next("button").addClass("btn btn-lg btn-danger btn-arrow-right");
}
if (2 == text) {
$(element).next("button").addClass("btn btn-lg btn-info btn-arrow-right");
}
}
});
</script>
</body>
</html>
ruoyi-system/src/main/resources/templates/partnerProject/info/info.html
View file @ 0c2c6633
...@@ -113,7 +113,8 @@ ...@@ -113,7 +113,8 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核中</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'审核中项目\',\'/partnerProject/info/editProjectInfo/'+ row.id +'\')"><i class="fa fa-edit"></i>审核中</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'推进中项目\',\'/partnerProject/info/editPushProjectInfo/'+ row.id +'\')"><i class="fa fa-edit"></i>推进中</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment