Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
e2ac5f2a
Commit
e2ac5f2a
authored
Oct 15, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
非标产值
parent
12c03198
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
50 additions
and
35 deletions
+50
-35
NonStandardValueController.java
...ement/business/controller/NonStandardValueController.java
+4
-4
NonStandardApproval.java
...n/wise/sc/cement/business/entity/NonStandardApproval.java
+2
-2
NonStandardValue.java
...a/cn/wise/sc/cement/business/entity/NonStandardValue.java
+2
-2
NonStandardApprovalMapper.xml
.../cement/business/mapper/xml/NonStandardApprovalMapper.xml
+1
-1
NonStandardValueMapper.xml
.../sc/cement/business/mapper/xml/NonStandardValueMapper.xml
+5
-2
NonStandardApprovalQuery.java
...cement/business/model/query/NonStandardApprovalQuery.java
+3
-0
NonStandardValueQuery.java
...sc/cement/business/model/query/NonStandardValueQuery.java
+2
-2
NonStandardApplyVo.java
.../wise/sc/cement/business/model/vo/NonStandardApplyVo.java
+1
-1
NonStandardApprovalVo.java
...se/sc/cement/business/model/vo/NonStandardApprovalVo.java
+7
-4
NonStandardValueVo.java
.../wise/sc/cement/business/model/vo/NonStandardValueVo.java
+7
-4
INonStandardValueService.java
.../sc/cement/business/service/INonStandardValueService.java
+2
-2
NonStandardApprovalServiceImpl.java
...business/service/impl/NonStandardApprovalServiceImpl.java
+3
-2
NonStandardValueServiceImpl.java
...nt/business/service/impl/NonStandardValueServiceImpl.java
+9
-8
NormProductionServiceImpl.java
...ment/business/service/impl/NormProductionServiceImpl.java
+2
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java
View file @
e2ac5f2a
...
@@ -54,7 +54,7 @@ public class NonStandardValueController {
...
@@ -54,7 +54,7 @@ public class NonStandardValueController {
@GetMapping
(
"/user_id"
)
@GetMapping
(
"/user_id"
)
@ApiOperation
(
"非标产值统计"
)
@ApiOperation
(
"非标产值统计"
)
public
BaseResponse
nonValue
(
PageQuery
pageQuery
,
String
start
,
String
end
)
{
public
BaseResponse
nonValue
(
PageQuery
pageQuery
,
String
start
,
String
end
,
Integer
groups
)
{
Date
startParse
=
null
;
Date
startParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
start
))
{
if
(
StrUtil
.
isNotBlank
(
start
))
{
startParse
=
DateUtil
.
parse
(
start
);
startParse
=
DateUtil
.
parse
(
start
);
...
@@ -64,7 +64,7 @@ public class NonStandardValueController {
...
@@ -64,7 +64,7 @@ public class NonStandardValueController {
endParse
=
DateUtil
.
parse
(
end
);
endParse
=
DateUtil
.
parse
(
end
);
}
}
//将list拆分成分页
//将list拆分成分页
BaseResponse
<
List
<
NonStandardValue
>>
baseResponse
=
inonStandardValueService
.
nonValue
(
startParse
,
endParse
);
BaseResponse
<
List
<
NonStandardValue
>>
baseResponse
=
inonStandardValueService
.
nonValue
(
startParse
,
endParse
,
groups
);
List
<
NonStandardValue
>
data
=
baseResponse
.
getData
();
List
<
NonStandardValue
>
data
=
baseResponse
.
getData
();
if
(
data
.
size
()
!=
0
)
{
if
(
data
.
size
()
!=
0
)
{
Page
<
NonStandardValue
>
rts
=
PageUtil
.
listConvertToPage
(
data
,
pageQuery
);
Page
<
NonStandardValue
>
rts
=
PageUtil
.
listConvertToPage
(
data
,
pageQuery
);
...
@@ -75,7 +75,7 @@ public class NonStandardValueController {
...
@@ -75,7 +75,7 @@ public class NonStandardValueController {
@ApiOperation
(
value
=
"获取所有已通过的非标产值"
)
@ApiOperation
(
value
=
"获取所有已通过的非标产值"
)
@GetMapping
(
"/getList"
)
@GetMapping
(
"/getList"
)
public
BaseResponse
getList
(
String
start
,
String
end
)
{
public
BaseResponse
getList
(
String
start
,
String
end
,
Integer
groups
)
{
Date
startParse
=
null
;
Date
startParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
start
))
{
if
(
StrUtil
.
isNotBlank
(
start
))
{
startParse
=
DateUtil
.
parse
(
start
);
startParse
=
DateUtil
.
parse
(
start
);
...
@@ -85,7 +85,7 @@ public class NonStandardValueController {
...
@@ -85,7 +85,7 @@ public class NonStandardValueController {
endParse
=
DateUtil
.
parse
(
end
);
endParse
=
DateUtil
.
parse
(
end
);
}
}
try
{
try
{
return
inonStandardValueService
.
getList
(
startParse
,
endParse
);
return
inonStandardValueService
.
getList
(
startParse
,
endParse
,
groups
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
debug
(
"获取所有已通过的非标产值{}"
,
e
);
log
.
debug
(
"获取所有已通过的非标产值{}"
,
e
);
}
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardApproval.java
View file @
e2ac5f2a
...
@@ -37,8 +37,8 @@ public class NonStandardApproval implements Serializable {
...
@@ -37,8 +37,8 @@ public class NonStandardApproval implements Serializable {
@ApiModelProperty
(
"起止日期"
)
@ApiModelProperty
(
"起止日期"
)
private
String
statistical
;
private
String
statistical
;
@ApiModelProperty
(
"
上报
工时"
)
@ApiModelProperty
(
"
审批
工时"
)
private
Double
reported
Hours
;
private
Double
approval
Hours
;
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
private
Integer
status
;
private
Integer
status
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardValue.java
View file @
e2ac5f2a
...
@@ -36,8 +36,8 @@ public class NonStandardValue implements Serializable {
...
@@ -36,8 +36,8 @@ public class NonStandardValue implements Serializable {
@ApiModelProperty
(
"起止日期"
)
@ApiModelProperty
(
"起止日期"
)
private
String
statistical
;
private
String
statistical
;
@ApiModelProperty
(
"
上报
工时"
)
@ApiModelProperty
(
"
审批
工时"
)
private
Double
reported
Hours
;
private
Double
approval
Hours
;
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
private
Integer
status
;
private
Integer
status
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml
View file @
e2ac5f2a
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
su.name as 姓名,
su.name as 姓名,
su.username as 账户,
su.username as 账户,
na.statistical as 起止日期,
na.statistical as 起止日期,
na.
reported_hours as 上报
工时,
na.
approval_hours as 审批
工时,
(
(
CASE na.status
CASE na.status
WHEN 0 THEN '未提交'
WHEN 0 THEN '未提交'
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml
View file @
e2ac5f2a
...
@@ -16,6 +16,9 @@
...
@@ -16,6 +16,9 @@
<if
test=
"params.startTime !=null"
>
<if
test=
"params.startTime !=null"
>
and na.start_time = #{params.startTime}
and na.start_time = #{params.startTime}
</if>
</if>
<if
test=
"params.groups !=null"
>
and su.group_id = #{params.groups}
</if>
</where>
</where>
</sql>
</sql>
...
@@ -28,7 +31,7 @@
...
@@ -28,7 +31,7 @@
</select>
</select>
<select
id=
"getList"
resultType=
"cn.wise.sc.cement.business.model.vo.NonStandardValueVo"
>
<select
id=
"getList"
resultType=
"cn.wise.sc.cement.business.model.vo.NonStandardValueVo"
>
select na.*,su.name as name,su.username as account,na.start_time as startTime
select na.*,su.name as name,su.username as account,na.start_time as startTime
,su.group_id as groups
from nonstandard_apply na
from nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id
LEFT JOIN sys_user su ON su.id = na.user_id
<include
refid=
"where"
/>
<include
refid=
"where"
/>
...
@@ -41,7 +44,7 @@
...
@@ -41,7 +44,7 @@
su.name as 姓名,
su.name as 姓名,
su.username as 账户,
su.username as 账户,
na.statistical as 起止日期,
na.statistical as 起止日期,
na.
reported_hours as 上报
工时,
na.
approval_hours as 审批
工时,
na.appraisal_value as 考核公值,
na.appraisal_value as 考核公值,
na.final_value as 最终产值,
na.final_value as 最终产值,
na.work_type as 工作类别,
na.work_type as 工作类别,
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/NonStandardApprovalQuery.java
View file @
e2ac5f2a
...
@@ -16,6 +16,9 @@ import lombok.RequiredArgsConstructor;
...
@@ -16,6 +16,9 @@ import lombok.RequiredArgsConstructor;
public
class
NonStandardApprovalQuery
{
public
class
NonStandardApprovalQuery
{
private
Integer
id
;
private
Integer
id
;
@ApiModelProperty
(
name
=
"approvalHours"
,
value
=
"审批公值"
)
private
Double
approvalHours
;
@ApiModelProperty
(
name
=
"appraisalValue"
,
value
=
"考核公值"
)
@ApiModelProperty
(
name
=
"appraisalValue"
,
value
=
"考核公值"
)
private
Double
appraisalValue
;
private
Double
appraisalValue
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/NonStandardValueQuery.java
View file @
e2ac5f2a
...
@@ -27,8 +27,8 @@ public class NonStandardValueQuery {
...
@@ -27,8 +27,8 @@ public class NonStandardValueQuery {
@ApiModelProperty
(
name
=
"statistical"
,
value
=
"起止日期"
)
@ApiModelProperty
(
name
=
"statistical"
,
value
=
"起止日期"
)
private
String
statistical
;
private
String
statistical
;
@ApiModelProperty
(
name
=
"
reportedHours"
,
value
=
"上报
工时"
)
@ApiModelProperty
(
name
=
"
approvalHours"
,
value
=
"审批
工时"
)
private
Double
reported
Hours
;
private
Double
approval
Hours
;
@ApiModelProperty
(
name
=
"status"
,
value
=
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
@ApiModelProperty
(
name
=
"status"
,
value
=
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
private
Integer
status
;
private
Integer
status
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardApplyVo.java
View file @
e2ac5f2a
...
@@ -26,7 +26,7 @@ public class NonStandardApplyVo {
...
@@ -26,7 +26,7 @@ public class NonStandardApplyVo {
private
String
statistical
;
private
String
statistical
;
@ApiModelProperty
(
"上报工时"
)
@ApiModelProperty
(
"上报工时"
)
private
Integer
reportedHours
;
private
Double
reportedHours
;
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
private
Integer
status
;
private
Integer
status
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardApprovalVo.java
View file @
e2ac5f2a
...
@@ -26,14 +26,17 @@ public class NonStandardApprovalVo {
...
@@ -26,14 +26,17 @@ public class NonStandardApprovalVo {
@ApiModelProperty
(
"起止时间"
)
@ApiModelProperty
(
"起止时间"
)
private
String
statistical
;
private
String
statistical
;
@ApiModelProperty
(
"上报工时"
)
@ApiModelProperty
(
"审批工时"
)
private
Integer
reportedHours
;
private
Double
approvalHours
;
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
private
Integer
status
;
@ApiModelProperty
(
"最终产值"
)
@ApiModelProperty
(
"最终产值"
)
private
Integer
finalValue
;
private
Double
finalValue
;
@ApiModelProperty
(
"考核公值"
)
@ApiModelProperty
(
"考核公值"
)
private
Integer
appraisalValue
;
private
Double
appraisalValue
;
@ApiModelProperty
(
"驳回意见"
)
@ApiModelProperty
(
"驳回意见"
)
private
String
finalRejection
;
private
String
finalRejection
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardValueVo.java
View file @
e2ac5f2a
...
@@ -25,17 +25,17 @@ public class NonStandardValueVo {
...
@@ -25,17 +25,17 @@ public class NonStandardValueVo {
@ApiModelProperty
(
"起止时间"
)
@ApiModelProperty
(
"起止时间"
)
private
String
statistical
;
private
String
statistical
;
@ApiModelProperty
(
"
上报
工时"
)
@ApiModelProperty
(
"
审批
工时"
)
private
Integer
reported
Hours
;
private
Double
approval
Hours
;
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
@ApiModelProperty
(
"状态 0:未提交 1:待审批 2:已通过 3:未通过"
)
private
Integer
status
;
private
Integer
status
;
@ApiModelProperty
(
"考核公值"
)
@ApiModelProperty
(
"考核公值"
)
private
Integer
appraisalValue
;
private
Double
appraisalValue
;
@ApiModelProperty
(
"最终产值"
)
@ApiModelProperty
(
"最终产值"
)
private
Integer
finalValue
;
private
Double
finalValue
;
@ApiModelProperty
(
"工作类别"
)
@ApiModelProperty
(
"工作类别"
)
private
String
workType
;
private
String
workType
;
...
@@ -48,4 +48,7 @@ public class NonStandardValueVo {
...
@@ -48,4 +48,7 @@ public class NonStandardValueVo {
@ApiModelProperty
(
"用户id"
)
@ApiModelProperty
(
"用户id"
)
private
Integer
userId
;
private
Integer
userId
;
@ApiModelProperty
(
"部门"
)
private
String
groups
;
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java
View file @
e2ac5f2a
...
@@ -32,14 +32,14 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
...
@@ -32,14 +32,14 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
BaseResponse<List<NonStandardValue>> nonValue(Integer userId);*/
BaseResponse<List<NonStandardValue>> nonValue(Integer userId);*/
//计算每个用户提交的非标产值
//计算每个用户提交的非标产值
BaseResponse
<
List
<
NonStandardValue
>>
nonValue
(
Date
start
,
Date
end
);
BaseResponse
<
List
<
NonStandardValue
>>
nonValue
(
Date
start
,
Date
end
,
Integer
groups
);
/**
/**
* 获取所有非标产值信息
* 获取所有非标产值信息
*
*
* @return List
* @return List
*/
*/
BaseResponse
<
List
<
NonStandardValueVo
>>
getList
(
Date
start
,
Date
end
);
BaseResponse
<
List
<
NonStandardValueVo
>>
getList
(
Date
start
,
Date
end
,
Integer
groups
);
/**
/**
* 非标产值列表导出
* 非标产值列表导出
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java
View file @
e2ac5f2a
...
@@ -77,8 +77,9 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
...
@@ -77,8 +77,9 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
}
}
if
(
query
.
getMenuId
()==
1
){
//通过
if
(
query
.
getMenuId
()==
1
){
//通过
nonStandardApproval
.
setAppraisalValue
(
query
.
getAppraisalValue
());
nonStandardApproval
.
setAppraisalValue
(
query
.
getAppraisalValue
());
nonStandardApproval
.
setApprovalHours
(
query
.
getApprovalHours
());
//计算最终产值
//计算最终产值
Double
finalValue
=
query
.
getAppraisalValue
()
*
nonStandardApproval
.
getReported
Hours
();
Double
finalValue
=
query
.
getAppraisalValue
()
*
query
.
getApproval
Hours
();
nonStandardApproval
.
setFinalValue
(
finalValue
);
nonStandardApproval
.
setFinalValue
(
finalValue
);
nonStandardApproval
.
setStatus
(
2
);
nonStandardApproval
.
setStatus
(
2
);
}
else
if
(
query
.
getMenuId
()==
2
){
//拒绝
}
else
if
(
query
.
getMenuId
()==
2
){
//拒绝
...
@@ -142,7 +143,7 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
...
@@ -142,7 +143,7 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
headers
[
1
]
=
"姓名"
;
headers
[
1
]
=
"姓名"
;
headers
[
2
]
=
"账户"
;
headers
[
2
]
=
"账户"
;
headers
[
3
]
=
"起止日期"
;
headers
[
3
]
=
"起止日期"
;
headers
[
4
]
=
"
上报
工时"
;
headers
[
4
]
=
"
审批
工时"
;
headers
[
5
]
=
"状态"
;
headers
[
5
]
=
"状态"
;
headers
[
6
]
=
"最终产值"
;
headers
[
6
]
=
"最终产值"
;
headers
[
7
]
=
"考核公值"
;
headers
[
7
]
=
"考核公值"
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java
View file @
e2ac5f2a
...
@@ -44,8 +44,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
...
@@ -44,8 +44,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
@Override
@Override
//计算每个用户提交的非标产值
//计算每个用户提交的非标产值
public
BaseResponse
<
List
<
NonStandardValue
>>
nonValue
(
Date
start
,
Date
end
){
public
BaseResponse
<
List
<
NonStandardValue
>>
nonValue
(
Date
start
,
Date
end
,
Integer
groups
){
List
<
NonStandardValueVo
>
data
=
getList
(
start
,
end
).
getData
();
List
<
NonStandardValueVo
>
data
=
getList
(
start
,
end
,
groups
).
getData
();
//userId去重
//userId去重
Set
<
Integer
>
ids
=
new
HashSet
<>();
Set
<
Integer
>
ids
=
new
HashSet
<>();
//循环所有NonStandardValue的集合data,找到每个NonStandardValue.getuserId放到set
//循环所有NonStandardValue的集合data,找到每个NonStandardValue.getuserId放到set
...
@@ -65,7 +65,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
...
@@ -65,7 +65,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
NonStandardValue
finalNonStandardValue
=
new
NonStandardValue
();
NonStandardValue
finalNonStandardValue
=
new
NonStandardValue
();
//初始化最终结果===>不初始化默认为NULL,不能进行+——*/
//初始化最终结果===>不初始化默认为NULL,不能进行+——*/
finalNonStandardValue
.
setId
(
0
);
finalNonStandardValue
.
setId
(
0
);
finalNonStandardValue
.
set
Reported
Hours
(
0
D
);
finalNonStandardValue
.
set
Approval
Hours
(
0
D
);
finalNonStandardValue
.
setFinalValue
(
0
D
);
finalNonStandardValue
.
setFinalValue
(
0
D
);
//todo 为当前userID创建一天展示的产值对象 new 产值对象 ===>传出
//todo 为当前userID创建一天展示的产值对象 new 产值对象 ===>传出
for
(
NonStandardValueVo
nonStandardValue:
data
)
{
for
(
NonStandardValueVo
nonStandardValue:
data
)
{
...
@@ -88,10 +88,10 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
...
@@ -88,10 +88,10 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
finalNonStandardValue
.
setId
(
newId
);
finalNonStandardValue
.
setId
(
newId
);
//只要进来这个if ===> 我拿到了李国庆的其中一条记录
//只要进来这个if ===> 我拿到了李国庆的其中一条记录
Double
houers
=
nonStandardValue
.
get
Reported
Hours
().
doubleValue
();
Double
houers
=
nonStandardValue
.
get
Approval
Hours
().
doubleValue
();
Double
new
ReportHours
=
nonStandardValue
.
getReportedHours
()
+
finalNonStandardValue
.
getReported
Hours
();
Double
new
ApprovalHours
=
nonStandardValue
.
getApprovalHours
()
+
finalNonStandardValue
.
getApproval
Hours
();
//用新得到的最总工时覆盖掉原来的总工时===>累加
//用新得到的最总工时覆盖掉原来的总工时===>累加
finalNonStandardValue
.
set
ReportedHours
(
newReport
Hours
);
finalNonStandardValue
.
set
ApprovalHours
(
newApproval
Hours
);
Double
finalValue
=
nonStandardValue
.
getFinalValue
().
doubleValue
();
Double
finalValue
=
nonStandardValue
.
getFinalValue
().
doubleValue
();
Double
newFinalValue
=
nonStandardValue
.
getFinalValue
()
+
finalNonStandardValue
.
getFinalValue
();
Double
newFinalValue
=
nonStandardValue
.
getFinalValue
()
+
finalNonStandardValue
.
getFinalValue
();
...
@@ -105,11 +105,12 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
...
@@ -105,11 +105,12 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
@Override
@Override
public
BaseResponse
<
List
<
NonStandardValueVo
>>
getList
(
Date
start
,
Date
end
)
{
public
BaseResponse
<
List
<
NonStandardValueVo
>>
getList
(
Date
start
,
Date
end
,
Integer
groups
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"start"
,
start
);
params
.
put
(
"start"
,
start
);
params
.
put
(
"end"
,
end
);
params
.
put
(
"end"
,
end
);
params
.
put
(
"status"
,
2
);
params
.
put
(
"status"
,
2
);
params
.
put
(
"groups"
,
groups
);
List
<
NonStandardValueVo
>
list
=
nonStandardValueMapper
.
getList
(
params
);
List
<
NonStandardValueVo
>
list
=
nonStandardValueMapper
.
getList
(
params
);
return
BaseResponse
.
okData
(
list
);
return
BaseResponse
.
okData
(
list
);
}
}
...
@@ -129,7 +130,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
...
@@ -129,7 +130,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
headers
[
1
]
=
"姓名"
;
headers
[
1
]
=
"姓名"
;
headers
[
2
]
=
"账户"
;
headers
[
2
]
=
"账户"
;
headers
[
3
]
=
"起止日期"
;
headers
[
3
]
=
"起止日期"
;
headers
[
4
]
=
"
上报
工时"
;
headers
[
4
]
=
"
审批
工时"
;
headers
[
5
]
=
"考核公值"
;
headers
[
5
]
=
"考核公值"
;
headers
[
6
]
=
"最终产值"
;
headers
[
6
]
=
"最终产值"
;
headers
[
7
]
=
"工作类别"
;
headers
[
7
]
=
"工作类别"
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java
View file @
e2ac5f2a
...
@@ -371,6 +371,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
...
@@ -371,6 +371,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
Date
startDate
=
null
;
Date
startDate
=
null
;
Date
endDate
=
new
Date
();
Date
endDate
=
new
Date
();
Integer
group
=
null
;
if
(
start
!=
null
&&
start
!=
0
)
{
if
(
start
!=
null
&&
start
!=
0
)
{
startDate
=
DateUtil
.
date
(
start
);
startDate
=
DateUtil
.
date
(
start
);
}
}
...
@@ -379,7 +380,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
...
@@ -379,7 +380,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
}
}
//非标准产值
//非标准产值
List
<
NonStandardValue
>
nonStandardValues
=
iNonStandardValueService
.
nonValue
(
startDate
,
endDate
).
getData
();
List
<
NonStandardValue
>
nonStandardValues
=
iNonStandardValueService
.
nonValue
(
startDate
,
endDate
,
group
).
getData
();
//标准产值
//标准产值
List
<
NormProductionStatistics
>
productionStatistics
=
this
.
normProductionStatistics
(
start
,
end
,
name
).
getData
();
List
<
NormProductionStatistics
>
productionStatistics
=
this
.
normProductionStatistics
(
start
,
end
,
name
).
getData
();
//以userId找关系
//以userId找关系
...
...
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