Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
737aa37f
Commit
737aa37f
authored
Aug 25, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充筛选功能
parent
20cde7d7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
325 additions
and
141 deletions
+325
-141
FailureDetailsMapper.java
...s/boot/module/common/api/mapper/FailureDetailsMapper.java
+19
-9
FailureDetailsMapper.xml
...on-api/src/main/resources/mapper/FailureDetailsMapper.xml
+272
-71
FailureDetailsController.java
...odule/common/biz/controller/FailureDetailsController.java
+8
-15
FailureDetailsServiceImpl.java
...le/common/biz/service/impl/FailureDetailsServiceImpl.java
+26
-46
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java
View file @
737aa37f
...
...
@@ -38,7 +38,9 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
*
* @return
*/
IPage
<
FailureDetails
>
selectISubPage
(
Page
page
,
String
submissionPid
);
IPage
<
FailureDetails
>
selectISubPage
(
Page
page
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
// IPage<FailureDetails> selectISubPage(int current,int size, String submissionPid);
/**
* 查询待处理 分页
...
...
@@ -46,23 +48,31 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @param page
* @return
*/
IPage
<
FailureDetails
>
selectInProcessing
(
Page
page
);
IPage
<
FailureDetails
>
selectInProcessing
(
Page
page
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
// IPage<FailureDetails> selectInProcessing(int current,int size);
IPage
<
FailureDetails
>
selectStatusWaitTj
(
Page
page
);
IPage
<
FailureDetails
>
selectStatusWaitTj
(
Page
page
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
// IPage<FailureDetails> selectStatusWaitTj(int current,int size);
IPage
<
FailureDetails
>
selectStatusWaitWx
();
List
<
FailureDetails
>
selectStatusWaitWx
(
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
// IPage<FailureDetails> selectStatusWaitWx(int current,int size);
List
<
StatusDto
>
selectStatusCount
();
List
<
StatusDto
>
selectStatusCount
(
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
List
<
StatusDto
>
selectStatusWx
();
List
<
StatusDto
>
selectStatusWx
(
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
List
<
StatusDto
>
selectStatusFq
();
List
<
StatusDto
>
selectStatusFq
(
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
List
<
StatusDto
>
selectStatusFqp
(
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
List
<
StatusDto
>
selectStatusLeader
(
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
);
List
<
StatusDto
>
selectStatusFqp
(
Integer
submissionPid
);
List
<
StatusDto
>
selectStatusLeader
();
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml
View file @
737aa37f
...
...
@@ -18,7 +18,6 @@
FROM
cb_failure_details
<where>
<if
test=
"currentStatus!= null "
>
and current_status = #{currentStatus}
</if>
...
...
@@ -30,131 +29,333 @@
</if>
</where>
order by submission_time DESC
</select>
<!-- <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM
cb_failure_details
<where>
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
limit #{current},#{size}
</select>
-->
<select
id=
"selectISubPage"
resultType=
"com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"
>
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE submission_pid = #{submissionPid}
<where>
<if
test=
"currentStatus!= null "
>
and current_status = #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
</select>
<!-- <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE submission_pid = #{submissionPid}
order by submission_time DESC
limit #{current},#{size}
</select>-->
<select
id=
"selectInProcessing"
resultType=
"com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"
>
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE cb_failure_details.current_status = 3
OR cb_failure_details.current_status = 0
<where>
<if
test=
"currentStatus == null "
>
and current_status in (0,3)
</if>
<if
test=
"currentStatus != null "
>
current_status = #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
</select>
<!--
<select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE cb_failure_details.current_status = 3
OR cb_failure_details.current_status = 0
order by submission_time DESC
limit #{current},#{size}
</select>
-->
<select
id=
"selectStatusWaitTj"
resultType=
"com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"
>
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE cb_failure_details.current_status = 1
<where>
<if
test=
"currentStatus != null "
>
and current_status = #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
</select>
<!-- <select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE cb_failure_details.current_status = 1
order by submission_time DESC
limit #{current},#{size}
</select>-->
<select
id=
"selectStatusWaitWx"
resultType=
"com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"
>
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE cb_failure_details.current_status = 6
OR cb_failure_details.current_status = 2
<where>
<if
test=
"currentStatus == null "
>
current_status IN (2,6)
</if>
<if
test=
"currentStatus != null "
>
current_status = #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
</select>
<!--
<select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM cb_failure_details
WHERE cb_failure_details.current_status = 6
OR cb_failure_details.current_status = 2
order by submission_time DESC
limit #{current},#{size}
</select>-->
<select
id=
"selectStatusCount"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.StatusDto"
>
SELECT cb_failure_details.current_status,
count(cb_failure_details.current_status)
AS currentStatusCount
count(cb_failure_details.current_status)
AS currentStatusCount
FROM cb_failure_details
<where>
<if
test=
"currentStatus!= null "
>
and current_status = #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY cb_failure_details.current_status
</select>
<select
id=
"selectStatusWx"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.StatusDto"
>
SELECT cb_failure_details.current_status,
count(cb_failure_details.current_status)
AS currentStatusCount
count(cb_failure_details.current_status)
AS currentStatusCount
FROM cb_failure_details
WHERE cb_failure_details.current_status = 6
OR cb_failure_details.current_status = 2
<where>
<if
test=
"currentStatus == null "
>
and current_status in (2,6)
</if>
<if
test=
"currentStatus != null "
>
and current_status #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY cb_failure_details.current_status
</select>
<select
id=
"selectStatusFq"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.StatusDto"
>
SELECT cb_failure_details.current_status,
count(cb_failure_details.current_status)
AS currentStatusCount
count(cb_failure_details.current_status)
AS currentStatusCount
FROM cb_failure_details
WHERE cb_failure_details.current_status = 1
<where>
<if
test=
"currentStatus!= null "
>
and current_status = 1
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY cb_failure_details.current_status
</select>
<select
id=
"selectStatusLeader"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.StatusDto"
>
SELECT cb_failure_details.current_status,
count(cb_failure_details.current_status)
AS currentStatusCount
count(cb_failure_details.current_status)
AS currentStatusCount
FROM cb_failure_details
WHERE cb_failure_details.current_status = 0
or cb_failure_details.current_status = 3
<where>
<if
test=
"currentStatus == null "
>
and current_status in (0,3)
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY cb_failure_details.current_status
</select>
<select
id=
"selectStatusFqp"
parameterType=
"integer"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.StatusDto"
>
SELECT cb_failure_details.current_status,
count(cb_failure_details.current_status)
AS currentStatusCount
count(cb_failure_details.current_status)
AS currentStatusCount
FROM cb_failure_details
WHERE submission_pid = #{submissionPid}
<where>
<if
test=
"currentStatus!= null "
>
and current_status = #{currentStatus}
</if>
<if
test=
"startTime!= null and endTime != null"
>
and submission_time between #{startTime} and #{endTime}
</if>
<if
test=
"submissionPid!= null "
>
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY cb_failure_details.current_status
</select>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java
View file @
737aa37f
...
...
@@ -3,27 +3,22 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService
;
import
com.yeejoin.amos.boot.module.common.api.dto.CurrentStatusDto
;
import
com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum
;
import
feign.Response
;
import
org.apache.poi.ss.formula.functions.T
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -36,16 +31,14 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto
;
import
com.yeejoin.amos.boot.module.common.api.entity.FailureDetails
;
import
com.yeejoin.amos.boot.module.common.biz.constats.Constants
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -128,7 +121,7 @@ public class FailureDetailsController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页查询"
,
notes
=
"分页查询"
)
public
ResponseModel
<
IPage
<
FailureDetailsDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
,
@RequestParam
Integer
type
,
Long
currentStatus
,
Integer
submissionPi
d
,
Integer
userI
d
,
String
startTime
,
String
endTime
)
{
Page
<
FailureDetails
>
page
=
new
Page
<
FailureDetails
>();
page
.
setCurrent
(
current
);
...
...
@@ -137,7 +130,7 @@ public class FailureDetailsController extends BaseController {
IPage
<
FailureDetailsDto
>
failureDetailDTOsIPage
=
new
Page
<>();
//IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage((current - 1) * size,size,userInfo,currentStatus, startTime,endTime,submissionPid,type);
IPage
<
FailureDetails
>
failureDetailsIPage
=
failureDetailsServiceImpl
.
queryForFailureDetailsPage
(
page
,
userInfo
,
currentStatus
,
startTime
,
endTime
,
submissionPi
d
,
type
);
IPage
<
FailureDetails
>
failureDetailsIPage
=
failureDetailsServiceImpl
.
queryForFailureDetailsPage
(
page
,
userInfo
,
currentStatus
,
startTime
,
endTime
,
userI
d
,
type
);
BeanUtils
.
copyProperties
(
failureDetailsIPage
,
FailureDetailsDto
.
class
);
List
<
FailureDetails
>
records
=
failureDetailsIPage
.
getRecords
();
...
...
@@ -155,18 +148,18 @@ public class FailureDetailsController extends BaseController {
return
ResponseHelper
.
buildResponse
(
failureDetailDTOsIPage
);
}
/**
/* */
/**
* 列表全部数据查询
*
* @return
*/
*/
/*
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<FailureDetailsDto>> selectForList() {
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsList());
}
*/
/**
* 根据状态查询当前下全部数据
*
...
...
@@ -188,8 +181,8 @@ public class FailureDetailsController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询当前状态任务数量"
,
notes
=
"查询当前状态任务数量"
)
@GetMapping
(
value
=
"/list/count"
)
public
ResponseModel
<
List
<
CurrentStatusDto
>>
selectStatusCount
(
Integer
type
)
{
return
ResponseHelper
.
buildResponse
(
failureDetailsServiceImpl
.
queryStatusCount
(
getSelectedOrgInfo
(),
type
));
public
ResponseModel
<
List
<
CurrentStatusDto
>>
selectStatusCount
(
Integer
type
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
userId
)
{
return
ResponseHelper
.
buildResponse
(
failureDetailsServiceImpl
.
queryStatusCount
(
getSelectedOrgInfo
(),
type
,
currentStatus
,
startTime
,
endTime
,
userId
));
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @
737aa37f
...
...
@@ -74,25 +74,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
public
String
[]
roleName
=
{
"maintenance_department_maintenance_personnel"
,
"emergency_command_staff"
};
/**
* 分页查询
*/
public
IPage
<
FailureDetails
>
queryAllPage
(
long
size
,
long
current
)
{
Page
pages
=
new
Page
<>(
current
,
size
);
LambdaQueryWrapper
<
FailureDetails
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
();
lambdaQueryWrapper
.
orderByDesc
(
FailureDetails:
:
getSubmissionTime
);
return
page
(
pages
,
lambdaQueryWrapper
);
}
public
IPage
<
FailureDetails
>
queryForFailureDetailsPage
(
Page
<
FailureDetails
>
page
,
ReginParams
userInfo
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
submissionPid
,
Integer
type
)
{
String
startTime
,
String
endTime
,
Integer
userId
,
Integer
type
)
{
//当传递类型参数为全部查询时
if
(
type
.
equals
(
SELECY_ALL
))
{
return
this
.
baseMapper
.
selectAllPage
(
page
,
currentStatus
,
startTime
,
endTime
,
submissionPi
d
);
return
this
.
baseMapper
.
selectAllPage
(
page
,
currentStatus
,
startTime
,
endTime
,
userI
d
);
}
//当传递类型参数为我提交时
if
(
type
.
equals
(
SELECY_ISUBMIT
))
{
return
baseMapper
.
selectISubPage
(
page
,
userInfo
.
getUserModel
().
getUserId
(
));
return
baseMapper
.
selectISubPage
(
page
,
currentStatus
,
startTime
,
endTime
,
Integer
.
parseInt
(
userInfo
.
getUserModel
().
getUserId
()
));
}
return
this
.
queryForWaitManage
(
page
,
userInfo
);
//否则就查询待处理
return
this
.
queryForWaitManage
(
page
,
userInfo
,
currentStatus
,
startTime
,
endTime
,
userId
);
}
...
...
@@ -102,48 +96,34 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
return this.baseMapper.selectAllPage(current,size,currentStatus,startTime ,endTime,submissionPid);
}
*//* if (type.equals(SELECY_ISUBMIT)) {
return baseMapper.selectISubPage(
pag
e, userInfo.getUserModel().getUserId());
return baseMapper.selectISubPage(
current,siz
e, userInfo.getUserModel().getUserId());
}
return this.queryForWaitManage(
pag
e, userInfo);*//*
return null;
return this.queryForWaitManage(
current,siz
e, userInfo);*//*
}*/
/**
* 我发起分页查询
*/
public
IPage
<
FailureDetails
>
queryForPage
(
Page
<
FailureDetails
>
page
,
String
submissionPid
)
{
if
(
submissionPid
==
null
)
{
return
null
;
}
Page
pages
=
new
Page
<>(
page
.
getCurrent
(),
page
.
getSize
());
LambdaQueryWrapper
<
FailureDetails
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
();
lambdaQueryWrapper
.
eq
(
FailureDetails:
:
getSubmissionPid
,
submissionPid
);
lambdaQueryWrapper
.
orderByDesc
(
FailureDetails:
:
getSubmissionTime
);
return
page
(
pages
,
lambdaQueryWrapper
);
}
/**
* 待处理分页查询
*/
public
IPage
<
FailureDetails
>
queryForWaitManage
(
Page
<
FailureDetails
>
page
,
ReginParams
userInfo
)
{
public
IPage
<
FailureDetails
>
queryForWaitManage
(
Page
<
FailureDetails
>
page
,
ReginParams
userInfo
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
userId
)
{
if
(
userInfo
.
getRole
().
getRoleName
().
equals
(
roleName
[
0
]))
{
return
baseMapper
.
selectStatusWaitWx
();
IPage
<
FailureDetails
>
wxIpage
=
new
Page
<>();
List
<
FailureDetails
>
list
=
baseMapper
.
selectStatusWaitWx
(
currentStatus
,
startTime
,
endTime
,
userId
);
wxIpage
.
setRecords
(
list
);
return
wxIpage
;
}
else
if
(
userInfo
.
getRole
().
getRoleName
().
equals
(
roleName
[
1
]))
{
return
baseMapper
.
selectStatusWaitTj
(
page
);
currentStatus
=
FailureStatuEnum
.
WAITING_SUBMIT
.
getCode
().
longValue
();
return
baseMapper
.
selectStatusWaitTj
(
page
,
currentStatus
,
startTime
,
endTime
,
userId
);
}
return
baseMapper
.
selectInProcessing
(
page
);
return
baseMapper
.
selectInProcessing
(
page
,
currentStatus
,
startTime
,
endTime
,
userId
);
}
/**
* 列表查询 示例
*/
public
List
<
FailureDetailsDto
>
queryForFailureDetailsList
()
{
return
this
.
queryForList
(
""
,
false
);
}
/**
* 根据状态查询
*/
...
...
@@ -181,18 +161,18 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
/**
* 查询任务状态数量
*/
public
List
<
CurrentStatusDto
>
queryStatusCount
(
ReginParams
userInfo
,
Integer
type
)
{
public
List
<
CurrentStatusDto
>
queryStatusCount
(
ReginParams
userInfo
,
Integer
type
,
Long
currentStatus
,
String
startTime
,
String
endTime
,
Integer
userId
)
{
List
<
StatusDto
>
statusDtos
=
null
;
if
(
type
.
equals
(
SELECY_STATUS
)
&&
userInfo
.
getRole
().
getRoleName
().
equals
(
roleName
[
0
]))
{
statusDtos
=
baseMapper
.
selectStatusWx
();
statusDtos
=
baseMapper
.
selectStatusWx
(
currentStatus
,
startTime
,
endTime
,
userId
);
}
else
if
(
type
.
equals
(
SELECY_STATUS
)
&&
userInfo
.
getRole
().
getRoleName
().
equals
(
roleName
[
1
]))
{
statusDtos
=
baseMapper
.
selectStatusFq
();
statusDtos
=
baseMapper
.
selectStatusFq
(
currentStatus
,
startTime
,
endTime
,
userId
);
}
else
if
(
type
.
equals
(
SELECY_ISUBMIT
))
{
statusDtos
=
baseMapper
.
selectStatusFqp
(
Integer
.
parseInt
(
userInfo
.
getUserModel
().
getUserId
()));
statusDtos
=
baseMapper
.
selectStatusFqp
(
currentStatus
,
startTime
,
endTime
,
Integer
.
parseInt
(
userInfo
.
getUserModel
().
getUserId
()));
}
else
if
(
type
.
equals
(
SELECY_ALL
)){
statusDtos
=
baseMapper
.
selectStatusCount
();
statusDtos
=
baseMapper
.
selectStatusCount
(
currentStatus
,
startTime
,
endTime
,
userId
);
}
else
{
statusDtos
=
baseMapper
.
selectStatusLeader
();
statusDtos
=
baseMapper
.
selectStatusLeader
(
currentStatus
,
startTime
,
endTime
,
userId
);
}
List
<
CurrentStatusDto
>
currentStatusDtoList
=
new
ArrayList
<>();
statusDtos
.
forEach
(
e
->
{
...
...
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