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
邬吉朋
ops
Commits
d04dcfd6
Commit
d04dcfd6
authored
Apr 07, 2025
by
zhuxiang
Browse files
增加回退接口
parent
205a5162
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/sms/controller/ReportDataInfoController.java
View file @
d04dcfd6
...
...
@@ -70,4 +70,9 @@ public class ReportDataInfoController extends BaseController {
return
toAjax
(
reportDataInfoService
.
submit
(
id
));
}
@PutMapping
(
"/rollback/{id}"
)
public
Result
rollback
(
@PathVariable
String
id
)
{
return
toAjax
(
reportDataInfoService
.
rollback
(
id
));
}
}
src/main/java/com/ruzhoukj/sms/service/ReportDataInfoService.java
View file @
d04dcfd6
...
...
@@ -29,4 +29,12 @@ public interface ReportDataInfoService extends IService<ReportDataInfoEntity> {
* @return
*/
boolean
submit
(
String
id
);
/**
* 回退
*
* @param id
* @return
*/
boolean
rollback
(
String
id
);
}
src/main/java/com/ruzhoukj/sms/service/impl/ReportDataInfoServiceImpl.java
View file @
d04dcfd6
...
...
@@ -3,6 +3,7 @@ package com.ruzhoukj.sms.service.impl;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.platform.exception.BusinessException
;
import
com.platform.utils.StringUtils
;
import
com.ruzhoukj.sms.common.Constant
;
import
com.ruzhoukj.sms.dao.ReportDataInfoDao
;
...
...
@@ -13,6 +14,7 @@ import com.ruzhoukj.sms.service.*;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
java.time.LocalDate
;
import
java.util.List
;
/**
...
...
@@ -39,6 +41,12 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
@Override
public
List
<
ReportDataInfoVO
>
queryList
(
ReportDataInfoDTO
reportDataInfoDTO
)
{
//获取当前月份
// 获取当前日期
LocalDate
now
=
LocalDate
.
now
();
// 获取当前月份(1 到 12)
int
currentMonth
=
now
.
getMonthValue
();
reportDataInfoDTO
.
setMonth
(
currentMonth
);
return
baseMapper
.
queryList
(
reportDataInfoDTO
);
}
...
...
@@ -46,13 +54,13 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
public
void
countPerformance
(
ReportDataInfoEntity
reportDataInfoEntity
)
{
//查看模板信息
ReportTemplateEntity
reportTemplateEntity
=
reportTemplateService
.
getById
(
reportDataInfoEntity
.
getTemplateId
());
if
(
reportTemplateEntity
!=
null
&&
reportTemplateEntity
.
getType
().
equals
(
"绩效"
))
{
if
(
reportTemplateEntity
!=
null
&&
reportTemplateEntity
.
getType
().
equals
(
"绩效"
))
{
//查看已填写完成,未计算的绩效
String
content
=
reportDataInfoEntity
.
getAllContent
();
// 解析JSON字符串为JSONArray
JSONArray
jsonArray
=
JSONArray
.
parseArray
(
content
);
// 获取第一个元素(假设第一个元素是Sheet1的数据)
if
(
jsonArray
.
size
()
>
0
)
{
if
(
!
jsonArray
.
isEmpty
()
)
{
JSONObject
jsonObject
=
jsonArray
.
getJSONObject
(
0
);
// 获取Sheet1中的data数组
JSONArray
data
=
jsonObject
.
getJSONArray
(
"data"
);
...
...
@@ -97,7 +105,7 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
}
else
{
System
.
out
.
println
(
"No data available in the JSON array."
);
}
}
else
{
}
else
{
reportDataInfoEntity
.
setStatus
(
"3"
);
}
reportDataInfoService
.
updateById
(
reportDataInfoEntity
);
...
...
@@ -147,10 +155,34 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, Re
//查看部门负责人Id
DeptEntity
deptEntity
=
deptService
.
getById
(
user
.
getDeptId
());
reportDataInfoEntity
.
setActorUser
(
deptEntity
.
getDeptAdmin
());
}
else
if
(
user
.
getUserRole
().
equals
(
Constant
.
D_ADMIN
))
{
reportDataInfoEntity
.
setActorUser
(
Constant
.
OA_ADMIN_ID
);
}
else
if
(
reportDataInfoEntity
.
getActorUser
().
equals
(
Constant
.
OA_ADMIN_ID
))
{
countPerformance
(
reportDataInfoEntity
);
}
else
{
//不嫩负责人提交
reportDataInfoEntity
.
setActorUser
(
Constant
.
OA_ADMIN_ID
);
}
return
updateById
(
reportDataInfoEntity
);
}
@Override
public
boolean
rollback
(
String
id
)
{
//查看信息
ReportDataInfoEntity
reportDataInfoEntity
=
getById
(
id
);
if
(
reportDataInfoEntity
==
null
)
{
return
Boolean
.
FALSE
;
}
//查看被处理人信息
UserEntity
user
=
userService
.
getById
(
reportDataInfoEntity
.
getUserId
());
if
(
reportDataInfoEntity
.
getActorUser
().
equals
(
reportDataInfoEntity
.
getUserId
()))
{
throw
new
BusinessException
(
"当前不可回退"
);
}
else
if
(
reportDataInfoEntity
.
getActorUser
().
equals
(
Constant
.
OA_ADMIN_ID
))
{
//是总经理
DeptEntity
deptEntity
=
deptService
.
getById
(
user
.
getDeptId
());
//回退至部门负责人
reportDataInfoEntity
.
setActorUser
(
deptEntity
.
getDeptAdmin
());
}
else
{
//回退至当前绩效被考核人
reportDataInfoEntity
.
setActorUser
(
reportDataInfoEntity
.
getUserId
());
}
return
updateById
(
reportDataInfoEntity
);
}
...
...
src/main/java/com/ruzhoukj/sms/service/impl/UserPerformanceServiceImpl.java
View file @
d04dcfd6
...
...
@@ -8,6 +8,8 @@ import com.ruzhoukj.sms.model.vo.UserPerformanceVO;
import
com.ruzhoukj.sms.service.UserPerformanceService
;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDate
;
import
java.time.format.DateTimeFormatter
;
import
java.util.List
;
/**
...
...
@@ -22,6 +24,12 @@ import java.util.List;
public
class
UserPerformanceServiceImpl
extends
ServiceImpl
<
UserPerformanceDao
,
UserPerformanceEntity
>
implements
UserPerformanceService
{
@Override
public
List
<
UserPerformanceVO
>
queryList
(
UserPerformanceDTO
userPerformanceDTO
)
{
//获取当前年月
LocalDate
now
=
LocalDate
.
now
();
// 格式化为 "yyyy-MM"
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM"
);
String
currentYearMonth
=
now
.
format
(
formatter
);
userPerformanceDTO
.
setPerformanceDate
(
currentYearMonth
);
return
baseMapper
.
queryList
(
userPerformanceDTO
);
}
}
src/main/resources/com/ruzhoukj/sms/dao/ReportDataInfoDao.xml
View file @
d04dcfd6
...
...
@@ -29,6 +29,9 @@
<if
test=
"userId != null and userId != ''"
>
r.user_id = #{userId}
</if>
<if
test=
"month != null and month != ''"
>
r.month = #{month}
</if>
</where>
</select>
</mapper>
src/main/resources/com/ruzhoukj/sms/dao/UserPerformanceDao.xml
View file @
d04dcfd6
...
...
@@ -24,6 +24,9 @@
<if
test=
"deptId != null and deptId != ''"
>
and up.dept_id = #{deptId}
</if>
<if
test=
"performanceDate != null and performanceDate != ''"
>
and up.performance_date = #{performanceDate}
</if>
</where>
</select>
</mapper>
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