Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cfld-know-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cfld-backend
cfld-know-admin
Commits
075721b8
Commit
075721b8
authored
Oct 31, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合伙招商后台
parent
84137aad
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
640 additions
and
39 deletions
+640
-39
ChangeStatusVO.java
...tem/src/main/java/com/ruoyi/system/VO/ChangeStatusVO.java
+22
-0
SelectProjectInfoVO.java
...rc/main/java/com/ruoyi/system/VO/SelectProjectInfoVO.java
+319
-0
ProjectInfoController.java
...va/com/ruoyi/system/controller/ProjectInfoController.java
+18
-0
PartnerProjectStatusEnum.java
.../com/ruoyi/system/enumerate/PartnerProjectStatusEnum.java
+3
-0
ProjectInfoMapper.java
.../main/java/com/ruoyi/system/mapper/ProjectInfoMapper.java
+4
-0
IProjectInfoService.java
...in/java/com/ruoyi/system/service/IProjectInfoService.java
+4
-0
PartnerProjectInfoServiceImpl.java
...yi/system/service/impl/PartnerProjectInfoServiceImpl.java
+32
-2
ProjectInfoServiceImpl.java
...com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
+7
-0
ProjectInfoMapper.xml
...m/src/main/resources/mapper/project/ProjectInfoMapper.xml
+58
-0
PartnerProjectStatusChangeLogMapper.xml
...pper/statusChange/PartnerProjectStatusChangeLogMapper.xml
+2
-1
editProjectInfo.html
...ources/templates/partnerProject/info/editProjectInfo.html
+0
-0
selectProject.html
...esources/templates/partnerProject/info/selectProject.html
+3
-36
selectProjectInfo.html
...n/resources/templates/project/info/selectProjectInfo.html
+168
-0
No files found.
ruoyi-system/src/main/java/com/ruoyi/system/VO/ChangeStatusVO.java
View file @
075721b8
...
...
@@ -11,10 +11,14 @@ public class ChangeStatusVO {
private
Integer
status
;
private
Long
chanyezhidaoPeojectId
;
private
String
feedBack
;
private
Integer
repeateType
;
private
Integer
projectInfoConfirm
;
public
Long
getId
()
{
return
id
;
}
...
...
@@ -55,6 +59,22 @@ public class ChangeStatusVO {
this
.
projectId
=
projectId
;
}
public
Long
getChanyezhidaoPeojectId
()
{
return
chanyezhidaoPeojectId
;
}
public
void
setChanyezhidaoPeojectId
(
Long
chanyezhidaoPeojectId
)
{
this
.
chanyezhidaoPeojectId
=
chanyezhidaoPeojectId
;
}
public
Integer
getProjectInfoConfirm
()
{
return
projectInfoConfirm
;
}
public
void
setProjectInfoConfirm
(
Integer
projectInfoConfirm
)
{
this
.
projectInfoConfirm
=
projectInfoConfirm
;
}
@Override
public
String
toString
()
{
return
"ChangeStatusVO{"
+
...
...
@@ -63,6 +83,8 @@ public class ChangeStatusVO {
", status="
+
status
+
", feedBack='"
+
feedBack
+
'\''
+
", repeateType="
+
repeateType
+
", chanyezhidaoPeojectId="
+
chanyezhidaoPeojectId
+
", projectInfoConfirm="
+
projectInfoConfirm
+
'}'
;
}
}
ruoyi-system/src/main/java/com/ruoyi/system/VO/SelectProjectInfoVO.java
0 → 100644
View file @
075721b8
package
com
.
ruoyi
.
system
.
VO
;
import
com.ruoyi.common.annotation.Excel
;
import
com.ruoyi.common.core.domain.BaseEntity
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
java.math.BigDecimal
;
/**
* 产业知道项目信息对象 project_info
*
* @author ruoyi
* @date 2023-10-27
*/
public
class
SelectProjectInfoVO
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** 主键 */
private
Long
id
;
/** 项目编号(年月日) */
@Excel
(
name
=
"项目编号"
,
readConverterExp
=
"年=月日"
)
private
String
projectNumber
;
/** 项目编号(UUID) */
@Excel
(
name
=
"项目编号"
,
readConverterExp
=
"U=UID"
)
private
String
projectId
;
/** 项目名称 */
@Excel
(
name
=
"项目名称"
)
private
String
projectName
;
/** 投资方企业ID */
@Excel
(
name
=
"投资方企业ID"
)
private
Long
cid
;
@Excel
(
name
=
"投资方企业ID"
)
private
String
entName
;
/** 应用领域 */
@Excel
(
name
=
"应用领域"
)
private
String
applyScope
;
/** 投资动因ID */
@Excel
(
name
=
"投资动因ID"
)
private
Integer
investReasonId
;
/** 载体类型 1-基地 2-厂房 3-混合 */
@Excel
(
name
=
"载体类型 1-基地 2-厂房 3-混合"
)
private
Integer
baseType
;
/** 总投资额(亿元) */
@Excel
(
name
=
"总投资额"
,
readConverterExp
=
"亿=元"
)
private
BigDecimal
investAmount
;
/** 固定资产投资额(亿元) */
@Excel
(
name
=
"固定资产投资额"
,
readConverterExp
=
"亿=元"
)
private
BigDecimal
fixAssetInvestAmount
;
/** 达产后年产值(亿元) */
@Excel
(
name
=
"达产后年产值"
,
readConverterExp
=
"亿=元"
)
private
BigDecimal
futureOutputValue
;
/** 达产后年纳税(亿元) */
@Excel
(
name
=
"达产后年纳税"
,
readConverterExp
=
"亿=元"
)
private
BigDecimal
futureTax
;
/** 达产后拉动就业人数(人) */
@Excel
(
name
=
"达产后拉动就业人数"
,
readConverterExp
=
"人="
)
private
Long
futureJobNum
;
/** 当前状态 1-待审批 2-进行中 3-中止 4-终止 5-草稿 6-结束 */
@Excel
(
name
=
"当前状态 1-待审批 2-进行中 3-中止 4-终止 5-草稿 6-结束"
)
private
Integer
currentStatus
;
/** 当前状态 1-项目线索 2-初期沟通 3-区域匹配/确认 4-政企互访 5-项目谈判 6-项目签约 */
@Excel
(
name
=
"当前状态 1-项目线索 2-初期沟通 3-区域匹配/确认 4-政企互访 5-项目谈判 6-项目签约"
)
private
Integer
currentStage
;
/** 创建者 */
@Excel
(
name
=
"创建者"
)
private
String
creator
;
/** 投资内容 */
@Excel
(
name
=
"投资内容"
)
private
String
investContent
;
/** 终止原因类型 */
@Excel
(
name
=
"终止原因类型"
)
private
Integer
endCauseType
;
/** 终止原因描述 */
@Excel
(
name
=
"终止原因描述"
)
private
String
endCauseDesc
;
/** 项目状态 1 储备 2 在推 */
@Excel
(
name
=
"项目状态 1 储备 2 在推"
)
private
Integer
projectStatus
;
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
Long
getId
()
{
return
id
;
}
public
void
setProjectNumber
(
String
projectNumber
)
{
this
.
projectNumber
=
projectNumber
;
}
public
String
getProjectNumber
()
{
return
projectNumber
;
}
public
void
setProjectId
(
String
projectId
)
{
this
.
projectId
=
projectId
;
}
public
String
getProjectId
()
{
return
projectId
;
}
public
void
setProjectName
(
String
projectName
)
{
this
.
projectName
=
projectName
;
}
public
String
getProjectName
()
{
return
projectName
;
}
public
void
setCid
(
Long
cid
)
{
this
.
cid
=
cid
;
}
public
Long
getCid
()
{
return
cid
;
}
public
void
setApplyScope
(
String
applyScope
)
{
this
.
applyScope
=
applyScope
;
}
public
String
getApplyScope
()
{
return
applyScope
;
}
public
void
setInvestReasonId
(
Integer
investReasonId
)
{
this
.
investReasonId
=
investReasonId
;
}
public
Integer
getInvestReasonId
()
{
return
investReasonId
;
}
public
void
setBaseType
(
Integer
baseType
)
{
this
.
baseType
=
baseType
;
}
public
Integer
getBaseType
()
{
return
baseType
;
}
public
void
setInvestAmount
(
BigDecimal
investAmount
)
{
this
.
investAmount
=
investAmount
;
}
public
BigDecimal
getInvestAmount
()
{
return
investAmount
;
}
public
void
setFixAssetInvestAmount
(
BigDecimal
fixAssetInvestAmount
)
{
this
.
fixAssetInvestAmount
=
fixAssetInvestAmount
;
}
public
BigDecimal
getFixAssetInvestAmount
()
{
return
fixAssetInvestAmount
;
}
public
void
setFutureOutputValue
(
BigDecimal
futureOutputValue
)
{
this
.
futureOutputValue
=
futureOutputValue
;
}
public
BigDecimal
getFutureOutputValue
()
{
return
futureOutputValue
;
}
public
void
setFutureTax
(
BigDecimal
futureTax
)
{
this
.
futureTax
=
futureTax
;
}
public
BigDecimal
getFutureTax
()
{
return
futureTax
;
}
public
void
setFutureJobNum
(
Long
futureJobNum
)
{
this
.
futureJobNum
=
futureJobNum
;
}
public
Long
getFutureJobNum
()
{
return
futureJobNum
;
}
public
void
setCurrentStatus
(
Integer
currentStatus
)
{
this
.
currentStatus
=
currentStatus
;
}
public
Integer
getCurrentStatus
()
{
return
currentStatus
;
}
public
void
setCurrentStage
(
Integer
currentStage
)
{
this
.
currentStage
=
currentStage
;
}
public
Integer
getCurrentStage
()
{
return
currentStage
;
}
public
void
setCreator
(
String
creator
)
{
this
.
creator
=
creator
;
}
public
String
getCreator
()
{
return
creator
;
}
public
void
setInvestContent
(
String
investContent
)
{
this
.
investContent
=
investContent
;
}
public
String
getInvestContent
()
{
return
investContent
;
}
public
void
setEndCauseType
(
Integer
endCauseType
)
{
this
.
endCauseType
=
endCauseType
;
}
public
Integer
getEndCauseType
()
{
return
endCauseType
;
}
public
void
setEndCauseDesc
(
String
endCauseDesc
)
{
this
.
endCauseDesc
=
endCauseDesc
;
}
public
String
getEndCauseDesc
()
{
return
endCauseDesc
;
}
public
void
setProjectStatus
(
Integer
projectStatus
)
{
this
.
projectStatus
=
projectStatus
;
}
public
Integer
getProjectStatus
()
{
return
projectStatus
;
}
public
String
getEntName
()
{
return
entName
;
}
public
void
setEntName
(
String
entName
)
{
this
.
entName
=
entName
;
}
@Override
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"id"
,
getId
())
.
append
(
"projectNumber"
,
getProjectNumber
())
.
append
(
"projectId"
,
getProjectId
())
.
append
(
"projectName"
,
getProjectName
())
.
append
(
"cid"
,
getCid
())
.
append
(
"applyScope"
,
getApplyScope
())
.
append
(
"investReasonId"
,
getInvestReasonId
())
.
append
(
"baseType"
,
getBaseType
())
.
append
(
"investAmount"
,
getInvestAmount
())
.
append
(
"fixAssetInvestAmount"
,
getFixAssetInvestAmount
())
.
append
(
"futureOutputValue"
,
getFutureOutputValue
())
.
append
(
"futureTax"
,
getFutureTax
())
.
append
(
"futureJobNum"
,
getFutureJobNum
())
.
append
(
"currentStatus"
,
getCurrentStatus
())
.
append
(
"currentStage"
,
getCurrentStage
())
.
append
(
"creator"
,
getCreator
())
.
append
(
"createTime"
,
getCreateTime
())
.
append
(
"updateTime"
,
getUpdateTime
())
.
append
(
"investContent"
,
getInvestContent
())
.
append
(
"endCauseType"
,
getEndCauseType
())
.
append
(
"endCauseDesc"
,
getEndCauseDesc
())
.
append
(
"projectStatus"
,
getProjectStatus
())
.
append
(
"entName"
,
getEntName
())
.
toString
();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/controller/ProjectInfoController.java
View file @
075721b8
package
com
.
ruoyi
.
system
.
controller
;
import
java.util.List
;
import
com.ruoyi.system.VO.SelectProjectInfoVO
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
...
...
@@ -41,6 +43,22 @@ public class ProjectInfoController extends BaseController
return
prefix
+
"/info"
;
}
@GetMapping
(
"/selectProjectInfo"
)
public
String
selectProjectInfo
()
{
return
prefix
+
"/selectProjectInfo"
;
}
@PostMapping
(
"/listProjectInfo"
)
@ResponseBody
public
TableDataInfo
listProjectInfo
(
SelectProjectInfoVO
projectInfo
)
{
startPage
();
List
<
SelectProjectInfoVO
>
list
=
projectInfoService
.
selectCYZDProjectInfoList
(
projectInfo
);
return
getDataTable
(
list
);
}
/**
* 查询产业知道项目信息列表
*/
...
...
ruoyi-system/src/main/java/com/ruoyi/system/enumerate/PartnerProjectStatusEnum.java
View file @
075721b8
...
...
@@ -8,6 +8,9 @@ public enum PartnerProjectStatusEnum {
PROJECT_NO_REPRATE
(
0
,
"未重复"
),
PROJECT_REPRATE
(
1
,
"重复"
),
PROJECTINFO_NO_CONFIRM
(
0
,
"未确认"
),
PROJECTINFO_CONFIRM
(
1
,
"已确认"
),
CURRENT_NODES_START
(
0
,
"未进行"
),
CURRENT_NODES_STARTING
(
1
,
"进行中"
),
CURRENT_NODES_END
(
2
,
"已完成"
);
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProjectInfoMapper.java
View file @
075721b8
package
com
.
ruoyi
.
system
.
mapper
;
import
java.util.List
;
import
com.ruoyi.system.VO.SelectProjectInfoVO
;
import
com.ruoyi.system.domain.ProjectInfo
;
/**
...
...
@@ -27,6 +29,8 @@ public interface ProjectInfoMapper
*/
public
List
<
ProjectInfo
>
selectProjectInfoList
(
ProjectInfo
projectInfo
);
public
List
<
SelectProjectInfoVO
>
selectCYZDProjectInfoList
(
SelectProjectInfoVO
projectInfo
);
/**
* 新增产业知道项目信息
*
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/IProjectInfoService.java
View file @
075721b8
package
com
.
ruoyi
.
system
.
service
;
import
java.util.List
;
import
com.ruoyi.system.VO.SelectProjectInfoVO
;
import
com.ruoyi.system.domain.ProjectInfo
;
/**
...
...
@@ -27,6 +29,8 @@ public interface IProjectInfoService
*/
public
List
<
ProjectInfo
>
selectProjectInfoList
(
ProjectInfo
projectInfo
);
public
List
<
SelectProjectInfoVO
>
selectCYZDProjectInfoList
(
SelectProjectInfoVO
projectInfo
);
/**
* 新增产业知道项目信息
*
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PartnerProjectInfoServiceImpl.java
View file @
075721b8
...
...
@@ -9,6 +9,7 @@ import com.ruoyi.system.enumerate.PartnerProjectExamineEnum;
import
com.ruoyi.system.enumerate.PartnerProjectStatusEnum
;
import
com.ruoyi.system.enumerate.PartnerProjectToDoEnum
;
import
com.ruoyi.system.service.IPartnerProjectStatusChangeLogService
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.ruoyi.system.mapper.PartnerProjectInfoMapper
;
...
...
@@ -111,14 +112,43 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
@Override
public
int
updateChangeStatus
(
ChangeStatusVO
changeStatusVO
){
//更新项目的信息
PartnerProjectInfo
partnerProjectInfoUp
=
new
PartnerProjectInfo
();
partnerProjectInfoUp
.
setStatus
(
changeStatusVO
.
getStatus
());
partnerProjectInfoUp
.
setStatusDescription
(
PartnerProjectExamineEnum
.
getValueByCode
(
changeStatusVO
.
getStatus
()));
partnerProjectInfoUp
.
setId
(
changeStatusVO
.
getProjectId
());
partnerProjectInfoMapper
.
updatePartnerProjectInfo
(
partnerProjectInfoUp
);
//更新当前节点
PartnerProjectStatusChangeLog
statusChange
=
new
PartnerProjectStatusChangeLog
();
statusChange
.
setId
(
changeStatusVO
.
getId
());
statusChange
.
setDescription
(
changeStatusVO
.
getFeedBack
());
if
(
changeStatusVO
.
getStatus
()
==
PartnerProjectExamineEnum
.
PROJECTSTATUS2
.
getCode
()){
if
(
changeStatusVO
.
getRepeateType
()
==
PartnerProjectStatusEnum
.
PROJECT_REPRATE
.
getCode
()){
statusChange
.
setTodoStatus
(
PartnerProjectToDoEnum
.
TODOSTATUS0
.
getCode
());
}
if
(
changeStatusVO
.
getRepeateType
()
==
PartnerProjectStatusEnum
.
PROJECT_NO_REPRATE
.
getCode
()){
statusChange
.
setTodoStatus
(
null
);
}
}
if
(
changeStatusVO
.
getStatus
()
==
PartnerProjectExamineEnum
.
PROJECTSTATUS7
.
getCode
()){
if
(
changeStatusVO
.
getProjectInfoConfirm
()
==
PartnerProjectStatusEnum
.
PROJECTINFO_NO_CONFIRM
.
getCode
()){
statusChange
.
setTodoStatus
(
PartnerProjectToDoEnum
.
TODOSTATUS1
.
getCode
());
}
if
(
changeStatusVO
.
getProjectInfoConfirm
()
==
PartnerProjectStatusEnum
.
PROJECTINFO_CONFIRM
.
getCode
()){
statusChange
.
setTodoStatus
(
null
);
}
}
statusChange
.
setCurrentNodeStatus
(
PartnerProjectStatusEnum
.
CURRENT_NODES_END
.
getCode
());
projectStatusChangeService
.
updatePartnerProjectStatusChangeLog
(
statusChange
);
//关联产业知道id
if
(
changeStatusVO
.
getStatus
()
==
PartnerProjectExamineEnum
.
PROJECTSTATUS4
.
getCode
()){
PartnerProjectInfo
partnerProjectInfo
=
new
PartnerProjectInfo
();
partnerProjectInfo
.
setProjectId
(
changeStatusVO
.
getChanyezhidaoPeojectId
());
partnerProjectInfo
.
setId
(
changeStatusVO
.
getProjectId
());
partnerProjectInfoMapper
.
updatePartnerProjectInfo
(
partnerProjectInfo
);
}
PartnerProjectStatusChangeLog
statusChangeNext
=
new
PartnerProjectStatusChangeLog
();
int
nextCode
=
PartnerProjectExamineEnum
.
getNextCodeByCode
(
changeStatusVO
.
getStatus
());
...
...
@@ -128,9 +158,9 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
statusChangeNext
.
setProjectStatus
(
nextCode
);
statusChangeNext
.
setProjectId
(
changeStatusVO
.
getProjectId
());
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
projectStatusChangeService
.
selectPartnerProjectStatusChangeLogList
(
statusChangeNext
);
//更新下一个节点
PartnerProjectStatusChangeLog
partnerProjectStatusChangeLog
=
partnerProjectStatusChangeLogs
.
get
(
0
);
partnerProjectStatusChangeLog
.
setCurrentNodeStatus
(
PartnerProjectStatusEnum
.
CURRENT_NODES_STARTING
.
getCode
());
return
projectStatusChangeService
.
updatePartnerProjectStatusChangeLog
(
statusChange
);
return
projectStatusChangeService
.
updatePartnerProjectStatusChangeLog
(
partnerProjectStatusChangeLog
);
}
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
View file @
075721b8
...
...
@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import
java.util.List
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.system.VO.SelectProjectInfoVO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.ruoyi.system.mapper.ProjectInfoMapper
;
...
...
@@ -45,6 +46,12 @@ public class ProjectInfoServiceImpl implements IProjectInfoService
return
projectInfoMapper
.
selectProjectInfoList
(
projectInfo
);
}
@Override
public
List
<
SelectProjectInfoVO
>
selectCYZDProjectInfoList
(
SelectProjectInfoVO
projectInfo
)
{
return
projectInfoMapper
.
selectCYZDProjectInfoList
(
projectInfo
);
}
/**
* 新增产业知道项目信息
*
...
...
ruoyi-system/src/main/resources/mapper/project/ProjectInfoMapper.xml
View file @
075721b8
...
...
@@ -29,6 +29,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"projectStatus"
column=
"project_status"
/>
</resultMap>
<resultMap
type=
"com.ruoyi.system.VO.SelectProjectInfoVO"
id=
"SelectProjectInfoResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"projectNumber"
column=
"project_number"
/>
<result
property=
"projectId"
column=
"project_id"
/>
<result
property=
"projectName"
column=
"project_name"
/>
<result
property=
"cid"
column=
"cid"
/>
<result
property=
"entName"
column=
"ent_name"
/>
<result
property=
"applyScope"
column=
"apply_scope"
/>
<result
property=
"investReasonId"
column=
"invest_reason_id"
/>
<result
property=
"baseType"
column=
"base_type"
/>
<result
property=
"investAmount"
column=
"invest_amount"
/>
<result
property=
"fixAssetInvestAmount"
column=
"fix_asset_invest_amount"
/>
<result
property=
"futureOutputValue"
column=
"future_output_value"
/>
<result
property=
"futureTax"
column=
"future_tax"
/>
<result
property=
"futureJobNum"
column=
"future_job_num"
/>
<result
property=
"currentStatus"
column=
"current_status"
/>
<result
property=
"currentStage"
column=
"current_stage"
/>
<result
property=
"creator"
column=
"creator"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"investContent"
column=
"invest_content"
/>
<result
property=
"endCauseType"
column=
"end_cause_type"
/>
<result
property=
"endCauseDesc"
column=
"end_cause_desc"
/>
<result
property=
"projectStatus"
column=
"project_status"
/>
</resultMap>
<sql
id=
"selectProjectInfoVo"
>
select id, project_number, project_id, project_name, cid, apply_scope, invest_reason_id, base_type, invest_amount, fix_asset_invest_amount, future_output_value, future_tax, future_job_num, current_status, current_stage, creator, create_time, update_time, invest_content, end_cause_type, end_cause_desc, project_status from project_info
</sql>
...
...
@@ -59,6 +85,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select
id=
"selectCYZDProjectInfoList"
parameterType=
"com.ruoyi.system.VO.SelectProjectInfoVO"
resultMap=
"SelectProjectInfoResult"
>
select p.id, p.project_number, p.project_id, p.project_name, p.cid,c.ent_name, p.apply_scope,
p.invest_reason_id, p.base_type, p.invest_amount, p.fix_asset_invest_amount,
p.future_output_value, p.future_tax, p.future_job_num, p.current_status,
p.current_stage, p.creator, p.create_time, p.update_time, p.invest_content,
p.end_cause_type, p.end_cause_desc, p.project_status from project_info p
LEFT JOIN company c ON c.id = p.cid
<where>
<if
test=
"id != null and id != ''"
>
and p.id = #{id}
</if>
<if
test=
"projectNumber != null and projectNumber != ''"
>
and p.project_number = #{projectNumber}
</if>
<if
test=
"projectId != null and projectId != ''"
>
and p.project_id = #{projectId}
</if>
<if
test=
"projectName != null and projectName != ''"
>
and p.project_name like concat('%', #{projectName}, '%')
</if>
<if
test=
"cid != null "
>
and p.cid = #{cid}
</if>
<if
test=
"entName != null and entName != ''"
>
and c.ent_name like concat('%', #{entName},'%')
</if>
<if
test=
"applyScope != null and applyScope != ''"
>
and p.apply_scope = #{applyScope}
</if>
<if
test=
"investReasonId != null "
>
and p.invest_reason_id = #{investReasonId}
</if>
<if
test=
"baseType != null "
>
and p.base_type = #{baseType}
</if>
<if
test=
"investAmount != null "
>
and p.invest_amount = #{investAmount}
</if>
<if
test=
"fixAssetInvestAmount != null "
>
and p.fix_asset_invest_amount = #{fixAssetInvestAmount}
</if>
<if
test=
"futureOutputValue != null "
>
and p.future_output_value = #{futureOutputValue}
</if>
<if
test=
"futureTax != null "
>
and p.future_tax = #{futureTax}
</if>
<if
test=
"futureJobNum != null "
>
and p.future_job_num = #{futureJobNum}
</if>
<if
test=
"currentStatus != null "
>
and p.current_status = #{currentStatus}
</if>
<if
test=
"currentStage != null "
>
and p.current_stage = #{currentStage}
</if>
<if
test=
"creator != null and creator != ''"
>
and p.creator = #{creator}
</if>
<if
test=
"investContent != null and investContent != ''"
>
and p.invest_content = #{investContent}
</if>
<if
test=
"endCauseType != null "
>
and p.end_cause_type = #{endCauseType}
</if>
<if
test=
"endCauseDesc != null and endCauseDesc != ''"
>
and p.end_cause_desc = #{endCauseDesc}
</if>
<if
test=
"projectStatus != null "
>
and p.project_status = #{projectStatus}
</if>
</where>
</select>
<select
id=
"selectProjectInfoById"
parameterType=
"Long"
resultMap=
"ProjectInfoResult"
>
<include
refid=
"selectProjectInfoVo"
/>
where id = #{id}
...
...
ruoyi-system/src/main/resources/mapper/statusChange/PartnerProjectStatusChangeLogMapper.xml
View file @
075721b8
...
...
@@ -103,7 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"operaterId != null"
>
operater_id = #{operaterId},
</if>
<if
test=
"tenantId != null"
>
tenant_id = #{tenantId},
</if>
<if
test=
"description != null"
>
description = #{description},
</if>
<if
test=
"todoStatus != null"
>
todo_status = #{todoStatus},
</if>
<!-- <if test="todoStatus != null">todo_status = #{todoStatus},</if>-->
todo_status = #{todoStatus},
<if
test=
"todoStatusDescription != null"
>
todo_status_description = #{todoStatusDescription},
</if>
<if
test=
"currentNodeStatus != null"
>
current_node_status = #{currentNodeStatus},
</if>
</trim>
...
...
ruoyi-system/src/main/resources/templates/partnerProject/info/editProjectInfo.html
View file @
075721b8
This diff is collapsed.
Click to expand it.
ruoyi-system/src/main/resources/templates/partnerProject/info/selectProject.html
View file @
075721b8
...
...
@@ -17,9 +17,6 @@
<label>
名称:
</label>
<input
type=
"text"
name=
"name"
/>
</li>
<li>
<input
type=
"hidden"
name=
"type"
id=
"type"
th:value=
"${type}"
>
</li>
<li>
<a
class=
"btn btn-primary btn-rounded btn-sm"
onclick=
"$.table.search()"
><i
class=
"fa fa-search"
></i>
搜索
</a>
<a
class=
"btn btn-warning btn-rounded btn-sm"
onclick=
"$.form.reset()"
><i
class=
"fa fa-refresh"
></i>
重置
</a>
...
...
@@ -67,39 +64,12 @@
field
:
'name'
,
title
:
'名称'
}
// ,
// {
// title: '操作',
// align: 'center',
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('
<
a
class
=
"btn btn-success btn-xs"
href
=
"#"
><
i
class
=
"fa fa-edit"
><
/i>编辑</
a
>
');
// actions.push('
<
a
class
=
"btn btn-danger btn-xs"
href
=
"#"
><
i
class
=
"fa fa-remove"
><
/i>删除</
a
>
');
// return actions.join('');
// }
// }
]
};
$
.
table
.
init
(
options
);
});
/* 添加用户-选择用户-提交(子页面调用父页面形式) */
// function submitHandler(index, layero) {
// var id = $.table.selectFirstColumns();
// if (id.length == 0) {
// $.modal.alertWarning("请选择一条记录");
// return;
// }
// var name = $.table.selectColumns('
name
');
// $.modal.close();
// // 父页面的方法
// // activeWindow().selectUsers();
// // 父页面的变量
// console.info("qqqqqq",id[0],name[0]);
// debugger;
// activeWindow().$('
#
associationName
').val(name[0]);
// activeWindow().$('
#
associationId
').val(id[0]);
// }
/* 添加用户-选择用户-提交(回调形式-父页面调用子页面) */
function
getSelections
()
{
...
...
@@ -112,11 +82,7 @@
return
dataObject
;
}
// $("#bootstrap-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rowsAfter, rowsBefore) {
// var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter;
// var rowIds = $.table.affectedRowIds(rows);
// $("#rowIds").val(rowIds);
// });
</script>
</body>
</html>
\ No newline at end of file
ruoyi-system/src/main/resources/templates/project/info/selectProjectInfo.html
0 → 100644
View file @
075721b8
<!DOCTYPE html>
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
xmlns:shiro=
"http://www.pollix.at/thymeleaf/shiro"
>
<head>
<th:block
th:include=
"include :: header('产业知道项目信息列表')"
/>
</head>
<body
class=
"gray-bg"
>
<div
class=
"container-div"
>
<div
class=
"row"
>
<div
class=
"col-sm-12 search-collapse"
>
<form
id=
"formId"
>
<div
class=
"select-list"
>
<ul>
<li>
<label>
项目名称:
</label>
<input
type=
"text"
name=
"projectName"
/>
</li>
<li>
<label>
企业名称:
</label>
<input
type=
"text"
name=
"entName"
/>
</li>
<li>
<a
class=
"btn btn-primary btn-rounded btn-sm"
onclick=
"$.table.search()"
><i
class=
"fa fa-search"
></i>
搜索
</a>
<a
class=
"btn btn-warning btn-rounded btn-sm"
onclick=
"$.form.reset()"
><i
class=
"fa fa-refresh"
></i>
重置
</a>
</li>
</ul>
</div>
</form>
</div>
<div
class=
"col-sm-12 select-table table-striped"
>
<table
id=
"bootstrap-table"
></table>
</div>
</div>
</div>
<th:block
th:include=
"include :: footer"
/>
<script
th:inline=
"javascript"
>
var
editFlag
=
[[
$
{@
permission
.
hasPermi
(
'project:info:edit'
)}]];
var
removeFlag
=
[[
$
{@
permission
.
hasPermi
(
'project:info:remove'
)}]];
var
prefix
=
ctx
+
"project/info"
;
$
(
function
()
{
var
options
=
{
url
:
prefix
+
"/listProjectInfo"
,
createUrl
:
prefix
+
"/add"
,
updateUrl
:
prefix
+
"/edit/{id}"
,
removeUrl
:
prefix
+
"/remove"
,
exportUrl
:
prefix
+
"/export"
,
modalName
:
"产业知道项目信息"
,
columns
:
[{
checkbox
:
true
},
{
field
:
'id'
,
title
:
'主键'
,
visible
:
false
},
// {
// field: 'projectNumber',
// title: '项目编号'
// },
{
field
:
'projectId'
,
title
:
'项目编号'
,
visible
:
false
},
{
field
:
'projectName'
,
title
:
'项目名称'
},
{
field
:
'cid'
,
title
:
'投资方企业ID'
,
visible
:
false
},
{
field
:
'entName'
,
title
:
'企业名称'
},
// {
// field: 'applyScope',
// title: '应用领域'
// },
// {
// field: 'investReasonId',
// title: '投资动因ID'
// },
// {
// field: 'baseType',
// title: '载体类型 1-基地 2-厂房 3-混合'
// },
{
field
:
'investAmount'
,
title
:
'总投资额'
},
{
field
:
'fixAssetInvestAmount'
,
title
:
'固定资产投资额'
},
// {
// field: 'futureOutputValue',
// title: '达产后年产值'
// },
// {
// field: 'futureTax',
// title: '达产后年纳税'
// },
// {
// field: 'futureJobNum',
// title: '达产后拉动就业人数'
// },
// {
// field: 'currentStatus',
// title: '当前状态 1-待审批 2-进行中 3-中止 4-终止 5-草稿 6-结束'
// },
// {
// field: 'currentStage',
// title: '当前状态 1-项目线索 2-初期沟通 3-区域匹配/确认 4-政企互访 5-项目谈判 6-项目签约'
// },
{
field
:
'investContent'
,
title
:
'投资内容'
},
{
field
:
'creator'
,
title
:
'创建者'
}
// {
// field: 'endCauseType',
// title: '终止原因类型'
// },
// {
// field: 'endCauseDesc',
// title: '终止原因描述'
// },
// {
// field: 'projectStatus',
// title: '项目状态 1 储备 2 在推'
// },
// {
// title: '操作',
// align: 'center',
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + editFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.edit(
\
'' + 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
>
');
// return actions.join('');
// }
// }
]
};
$.table.init(options);
});
function getSelections() {
var dataObject = {};
// var name = $.table.selectColumns('
name
');
// dataObject.name = name[0];
var id = $.table.selectFirstColumns();
dataObject.id = id[0];
// return $.table.selectFirstColumns();
return dataObject;
}
</script>
</body>
</html>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment