Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
王蔡翾
project_assessment
Commits
43a24fcb
Commit
43a24fcb
authored
Dec 11, 2025
by
王蔡翾
Browse files
bug修复
parent
965b7bdd
Changes
10
Hide whitespace changes
Inline
Side-by-side
project-business/src/main/java/com/platform/projectBusiness/controller/BsProjectRoleAssessmentController.java
View file @
43a24fcb
package
com.platform.projectBusiness.controller
;
package
com.platform.projectBusiness.controller
;
import
com.platform.controller.BaseController
;
import
com.platform.model.resp.Result
;
import
com.platform.model.resp.Result
;
import
com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO
;
import
com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO
;
import
com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO
;
import
com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO
;
...
@@ -14,7 +15,7 @@ import java.util.List;
...
@@ -14,7 +15,7 @@ import java.util.List;
@Api
(
tags
=
"项目考核标准管理"
)
@Api
(
tags
=
"项目考核标准管理"
)
@RestController
@RestController
@RequestMapping
(
"/assessment"
)
@RequestMapping
(
"/assessment"
)
public
class
BsProjectRoleAssessmentController
extends
B
sProject
Controller
{
public
class
BsProjectRoleAssessmentController
extends
B
ase
Controller
{
@Resource
@Resource
private
BsProjectRoleAssessmentService
bsProjectRoleAssessmentService
;
private
BsProjectRoleAssessmentService
bsProjectRoleAssessmentService
;
...
...
project-business/src/main/java/com/platform/projectBusiness/controller/SysRoleController.java
View file @
43a24fcb
...
@@ -18,7 +18,7 @@ public class SysRoleController extends BaseController {
...
@@ -18,7 +18,7 @@ public class SysRoleController extends BaseController {
@Resource
@Resource
private
SysRoleService
sysRoleService
;
private
SysRoleService
sysRoleService
;
@
Pos
tMapping
(
"/list"
)
@
Ge
tMapping
(
"/list"
)
public
Result
<
List
<
SysRoleVO
>>
list
(){
public
Result
<
List
<
SysRoleVO
>>
list
(){
return
Result
.
data
(
sysRoleService
.
queryRoleList
());
return
Result
.
data
(
sysRoleService
.
queryRoleList
());
}
}
...
...
project-business/src/main/java/com/platform/projectBusiness/filter/JwtAuthFilter.java
View file @
43a24fcb
...
@@ -33,7 +33,9 @@ public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
...
@@ -33,7 +33,9 @@ public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
// 定义开放接口路径(支持通配符)
// 定义开放接口路径(支持通配符)
private
static
final
List
<
String
>
OPEN_API_PATHS
=
Arrays
.
asList
(
private
static
final
List
<
String
>
OPEN_API_PATHS
=
Arrays
.
asList
(
"/user/login"
,
"/user/login"
,
"/user/register"
"/user/register"
,
"/role/list"
,
"/dept/list"
);
);
@Override
@Override
...
...
project-business/src/main/java/com/platform/projectBusiness/model/entity/BsProjectEntity.java
View file @
43a24fcb
...
@@ -21,7 +21,11 @@ public class BsProjectEntity {
...
@@ -21,7 +21,11 @@ public class BsProjectEntity {
private
LocalDate
createTime
;
private
LocalDate
createTime
;
@TableField
(
"delivery_date"
)
@TableField
(
"delivery_date"
)
@ApiModelProperty
(
"交付日期"
)
@ApiModelProperty
(
"交付日期"
)
private
LocalDate
updateTime
;
private
LocalDate
deliveryDate
;
@ApiModelProperty
(
"开始时间"
)
@TableField
(
"start_time"
)
private
LocalDate
startTime
;
@ApiModelProperty
(
"项目描述"
)
@ApiModelProperty
(
"项目描述"
)
private
String
description
;
private
String
description
;
@ApiModelProperty
(
"项目状态"
)
@ApiModelProperty
(
"项目状态"
)
...
...
project-business/src/main/java/com/platform/projectBusiness/service/impl/BsProjectServiceImpl.java
View file @
43a24fcb
...
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
@Service
@Service
...
@@ -38,24 +39,52 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
...
@@ -38,24 +39,52 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
@Override
@Override
public
List
<
BsProjectVO
>
queryProjectList
(
BsProjectDTO
bsProjectDTO
){
public
List
<
BsProjectVO
>
queryProjectList
(
BsProjectDTO
bsProjectDTO
){
List
<
BsProjectVO
>
bsProjectVOList
=
baseMapper
.
queryProjectList
(
bsProjectDTO
);
List
<
BsProjectVO
>
bsProjectVOList
=
baseMapper
.
queryProjectList
(
bsProjectDTO
);
// 添加空值检查
if
(
bsProjectVOList
==
null
)
{
return
new
ArrayList
<>();
// 返回空列表而不是null
}
for
(
BsProjectVO
bsProjectVO
:
bsProjectVOList
){
for
(
BsProjectVO
bsProjectVO
:
bsProjectVOList
){
//获取项目创建时间
// 添加空值检查
LocalDate
createTime
=
bsProjectVO
.
getCreateTime
();
if
(
bsProjectVO
==
null
)
{
//根据周期判断状态
continue
;
if
(
LocalDate
.
now
().
isAfter
(
createTime
.
plusDays
(
bsProjectVO
.
getCycle
()))
}
&&
LocalDate
.
now
().
isBefore
(
createTime
.
plusDays
(
bsProjectVO
.
getCycle
()
*
2
))){
// 获取项目创建时间
LocalDate
createTime
=
bsProjectVO
.
getCreateTime
();
// 检查createTime是否为null
if
(
createTime
==
null
)
{
continue
;
}
// 根据周期判断状态
if
(
LocalDate
.
now
().
isAfter
(
createTime
)
&&
LocalDate
.
now
().
isBefore
(
bsProjectVO
.
getStartTime
())){
bsProjectVO
.
setStatus
(
"立项中"
);
bsProjectVO
.
setStatus
(
"立项中"
);
}
if
(
LocalDate
.
now
().
isAfter
(
bsProjectVO
.
getStartTime
())
&&
LocalDate
.
now
().
isBefore
(
bsProjectVO
.
getDeliveryDate
())){
bsProjectVO
.
setStatus
(
"进行中"
);
}
}
if
(
LocalDate
.
now
().
isAfter
(
createTime
.
plusDays
(
bsProjectVO
.
getCycle
()
*
2
))){
if
(
LocalDate
.
now
().
isAfter
(
bsProjectVO
.
getDeliveryDate
())){
bsProjectVO
.
setStatus
(
"已完结"
);
bsProjectVO
.
setStatus
(
"已完结"
);
}
}
save
(
DozerUtils
.
convertBean
(
bsProjectVO
,
BsProjectEntity
.
class
));
// 保存前检查转换结果
BsProjectEntity
entity
=
DozerUtils
.
convertBean
(
bsProjectVO
,
BsProjectEntity
.
class
);
if
(
entity
!=
null
)
{
save
(
entity
);
}
}
}
return
bsProjectVOList
;
return
bsProjectVOList
;
}
}
@Override
@Override
public
BsProjectVO
geDetail
(
Integer
projectId
){
public
BsProjectVO
geDetail
(
Integer
projectId
){
BsProjectEntity
bsProjectEntity
=
getById
(
projectId
);
BsProjectEntity
bsProjectEntity
=
getById
(
projectId
);
...
...
project-business/src/main/java/com/platform/projectBusiness/service/impl/SysDeptServiceImpl.java
View file @
43a24fcb
...
@@ -38,7 +38,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDeptEntity
...
@@ -38,7 +38,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDeptEntity
// 2. 构建树形结构
// 2. 构建树形结构
List
<
SysDeptVO
>
result
=
new
ArrayList
<>();
List
<
SysDeptVO
>
result
=
new
ArrayList
<>();
for
(
SysDeptVO
position
:
sysDeptVOS
)
{
for
(
SysDeptVO
position
:
sysDeptVOS
)
{
if
(
StringUtils
.
isEmpty
(
Collections
.
singleton
(
position
.
getParentId
()
))
)
{
//修改
if
(
position
.
getParentId
()
==
null
)
{
//修改
// 顶级节点
// 顶级节点
result
.
add
(
position
);
result
.
add
(
position
);
}
else
{
}
else
{
...
...
project-business/src/main/resources/mapper/BsProjectMapper.xml
View file @
43a24fcb
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
delivery_date,
delivery_date,
description,
description,
status,
status,
cycl
e
start_tim
e
from
from
bs_project
bs_project
<where>
<where>
...
...
project-business/src/main/resources/mapper/BsProjectPeopleScoreDetailMapper.xml
View file @
43a24fcb
...
@@ -22,13 +22,13 @@
...
@@ -22,13 +22,13 @@
project_id = #{projectId}
project_id = #{projectId}
</if>
</if>
<if
test=
"projectPeople != null and projectPeople != ''"
>
<if
test=
"projectPeople != null and projectPeople != ''"
>
project_people = #{projectPeople}
and
project_people = #{projectPeople}
</if>
</if>
<if
test=
"status != null and status != ''"
>
<if
test=
"status != null and status != ''"
>
status = #{status}
and
status = #{status}
</if>
</if>
<if
test=
"assessmentId != null and assessmentId != ''"
>
<if
test=
"assessmentId != null and assessmentId != ''"
>
assessment_id = #{assessmentId}
and
assessment_id = #{assessmentId}
</if>
</if>
</where>
</where>
</select>
</select>
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
project_id = #{projectId}
project_id = #{projectId}
</if>
</if>
<if
test=
"projectPeople != null and projectPeople != ''"
>
<if
test=
"projectPeople != null and projectPeople != ''"
>
project_people = #{projectPeople}
and
project_people = #{projectPeople}
</if>
</if>
and status = '已完成'
and status = '已完成'
</where>
</where>
...
...
project-business/src/main/resources/mapper/BsProjectPeopleScoreMapper.xml
View file @
43a24fcb
...
@@ -17,13 +17,13 @@
...
@@ -17,13 +17,13 @@
project_id = #{projectId}
project_id = #{projectId}
</if>
</if>
<if
test=
"projectPeople != null and projectPeople != ''"
>
<if
test=
"projectPeople != null and projectPeople != ''"
>
project_people = #{projectPeople}
and
project_people = #{projectPeople}
</if>
</if>
<if
test=
"projectRole != null and projectRole != ''"
>
<if
test=
"projectRole != null and projectRole != ''"
>
project_role = #{projectRole}
and
project_role = #{projectRole}
</if>
</if>
<if
test=
"status != null and status != ''"
>
<if
test=
"status != null and status != ''"
>
status = #{status}
and
status = #{status}
</if>
</if>
</where>
</where>
</select>
</select>
...
...
project-business/src/main/resources/mapper/SysUserMapper.xml
View file @
43a24fcb
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
user_name =#{userName}
user_name =#{userName}
</if>
</if>
<if
test=
"roleId != null and roleId != ''"
>
<if
test=
"roleId != null and roleId != ''"
>
role_id =#{roleId}
and
role_id =#{roleId}
</if>
</if>
...
...
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