Skip to content

A
amos-boot-biz
Commit 9acb27ad authored by chenzhao's avatar chenzhao
Browse files
Options

增添筛选 排序

parent bea994cd
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 160 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/FailureStatuEnum.java
View file @ 9acb27ad
package com.yeejoin.amos.boot.module.common.api.enums; package com.yeejoin.amos.boot.module.common.api.enums;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
public enum FailureStatuEnum { public enum FailureStatuEnum {
WAITING_AUDIT(0,"待审核"), WAITING_AUDIT(0,"待审核"),
...@@ -27,5 +32,14 @@ public enum FailureStatuEnum { ...@@ -27,5 +32,14 @@ public enum FailureStatuEnum {
return name; return name;
} }
public static List<HashMap<String,String>> getEnumList() {
List<HashMap<String, String>> list = new ArrayList<>();
for (FailureStatuEnum testEnum : EnumSet.allOf(FailureStatuEnum.class)) {
HashMap<String, String> map = new HashMap<>();
map.put(testEnum.name,testEnum.code.toString());
list.add(map);
}
return list;
} }
}
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 @ 9acb27ad
...@@ -26,8 +26,11 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -26,8 +26,11 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @param page * @param page
* @return * @return
*/ */
IPage<FailureDetails> selectAllPage(Page page); // IPage<FailureDetails> selectAllPage(Page page);
IPage<FailureDetails> selectAllPage(Page<FailureDetails> page, Long currentStatus,
String startTime,String endTime, Integer submissionPid);
/*IPage<FailureDetails> selectAllPage(int current,int size, Long currentStatus,
String startTime,String endTime, Integer submissionPid);*/
/** /**
* 查询我发起的 分页 * 查询我发起的 分页
* current 当前页 * current 当前页
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml
View file @ 9acb27ad
...@@ -3,178 +3,160 @@ ...@@ -3,178 +3,160 @@
<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper"> <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper">
<select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"> <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT SELECT
sequence_nbr, sequence_nbr,
current_status, current_status,
failure_equipment_id, failure_equipment_id,
failure_equipment, failure_equipment,
fault_time, fault_time,
fault_phenomenon, fault_phenomenon,
submission_name, submission_name,
submission_pid, submission_pid,
biz_code, biz_code,
submission_time, submission_time,
submission_branch, submission_branch,
submission_branch_id submission_branch_id
FROM FROM
cb_failure_details 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
</select> </select>
<select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"> <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT SELECT sequence_nbr,
sequence_nbr, current_status,
current_status, failure_equipment_id,
failure_equipment_id, failure_equipment,
failure_equipment, fault_time,
fault_time, fault_phenomenon,
fault_phenomenon, submission_name,
submission_name, submission_pid,
submission_pid, biz_code,
biz_code, submission_time,
submission_time, submission_branch,
submission_branch, submission_branch_id
submission_branch_id FROM cb_failure_details
FROM WHERE submission_pid = #{submissionPid}
cb_failure_details order by submission_time DESC
WHERE
submission_pid = #{submissionPid}
</select> </select>
<select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"> <select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT SELECT sequence_nbr,
sequence_nbr, current_status,
current_status, failure_equipment_id,
failure_equipment_id, failure_equipment,
failure_equipment, fault_time,
fault_time, fault_phenomenon,
fault_phenomenon, submission_name,
submission_name, submission_pid,
submission_pid, biz_code,
biz_code, submission_time,
submission_time, submission_branch,
submission_branch, submission_branch_id
submission_branch_id FROM cb_failure_details
FROM WHERE cb_failure_details.current_status = 3
cb_failure_details OR cb_failure_details.current_status = 0
WHERE order by submission_time DESC
cb_failure_details.current_status = 3
OR
cb_failure_details.current_status = 0
</select> </select>
<select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"> <select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT SELECT sequence_nbr,
sequence_nbr, current_status,
current_status, failure_equipment_id,
failure_equipment_id, failure_equipment,
failure_equipment, fault_time,
fault_time, fault_phenomenon,
fault_phenomenon, submission_name,
submission_name, submission_pid,
submission_pid, biz_code,
biz_code, submission_time,
submission_time, submission_branch,
submission_branch, submission_branch_id
submission_branch_id FROM cb_failure_details
FROM WHERE cb_failure_details.current_status = 1
cb_failure_details order by submission_time DESC
WHERE
cb_failure_details.current_status = 1
</select> </select>
<select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails"> <select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT SELECT sequence_nbr,
sequence_nbr, current_status,
current_status, failure_equipment_id,
failure_equipment_id, failure_equipment,
failure_equipment, fault_time,
fault_time, fault_phenomenon,
fault_phenomenon, submission_name,
submission_name, submission_pid,
submission_pid, biz_code,
biz_code, submission_time,
submission_time, submission_branch,
submission_branch, submission_branch_id
submission_branch_id FROM cb_failure_details
FROM WHERE cb_failure_details.current_status = 6
cb_failure_details OR cb_failure_details.current_status = 2
WHERE order by submission_time DESC
cb_failure_details.current_status = 6
OR
cb_failure_details.current_status = 2
</select> </select>
<select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto"> <select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT SELECT cb_failure_details.current_status,
cb_failure_details.current_status , count(cb_failure_details.current_status)
count(cb_failure_details.current_status) AS currentStatusCount
AS currentStatusCount FROM cb_failure_details
FROM GROUP BY cb_failure_details.current_status
cb_failure_details
GROUP BY
cb_failure_details.current_status
</select> </select>
<select id="selectStatusWx" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto"> <select id="selectStatusWx" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT SELECT cb_failure_details.current_status,
cb_failure_details.current_status , count(cb_failure_details.current_status)
count(cb_failure_details.current_status) AS currentStatusCount
AS currentStatusCount FROM cb_failure_details
FROM WHERE cb_failure_details.current_status = 6
cb_failure_details OR cb_failure_details.current_status = 2
WHERE GROUP BY cb_failure_details.current_status
cb_failure_details.current_status = 6
OR
cb_failure_details.current_status = 2
GROUP BY
cb_failure_details.current_status
</select> </select>
<select id="selectStatusFq" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto"> <select id="selectStatusFq" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT SELECT cb_failure_details.current_status,
cb_failure_details.current_status , count(cb_failure_details.current_status)
count(cb_failure_details.current_status) AS currentStatusCount
AS currentStatusCount FROM cb_failure_details
FROM WHERE cb_failure_details.current_status = 1
cb_failure_details
WHERE
cb_failure_details.current_status = 1
GROUP BY GROUP BY cb_failure_details.current_status
cb_failure_details.current_status
</select> </select>
<select id="selectStatusLeader" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto"> <select id="selectStatusLeader" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT SELECT cb_failure_details.current_status,
cb_failure_details.current_status , count(cb_failure_details.current_status)
count(cb_failure_details.current_status) AS currentStatusCount
AS currentStatusCount FROM cb_failure_details
FROM WHERE cb_failure_details.current_status = 0
cb_failure_details or cb_failure_details.current_status = 3
WHERE GROUP BY cb_failure_details.current_status
cb_failure_details.current_status = 0
or
cb_failure_details.current_status = 3
GROUP BY
cb_failure_details.current_status
</select> </select>
<select id="selectStatusFqp" parameterType="integer" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto"> <select id="selectStatusFqp" parameterType="integer"
SELECT resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
cb_failure_details.current_status , SELECT cb_failure_details.current_status,
count(cb_failure_details.current_status) count(cb_failure_details.current_status)
AS currentStatusCount AS currentStatusCount
FROM FROM cb_failure_details
cb_failure_details WHERE submission_pid = #{submissionPid}
WHERE GROUP BY cb_failure_details.current_status
submission_pid = #{submissionPid}
GROUP BY
cb_failure_details.current_status
</select> </select>
</mapper> </mapper>
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 @ 9acb27ad
package com.yeejoin.amos.boot.module.common.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; 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.dto.CurrentStatusDto;
import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -54,6 +58,9 @@ public class FailureDetailsController extends BaseController { ...@@ -54,6 +58,9 @@ public class FailureDetailsController extends BaseController {
@Autowired @Autowired
FailureDetailsServiceImpl failureDetailsServiceImpl; FailureDetailsServiceImpl failureDetailsServiceImpl;
@Autowired
WorkflowFeignService workflowFeignService;
/** /**
* 新增 * 新增
* *
...@@ -88,18 +95,6 @@ public class FailureDetailsController extends BaseController { ...@@ -88,18 +95,6 @@ public class FailureDetailsController extends BaseController {
return ResponseHelper.buildResponse(failureDetailsServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(failureDetailsServiceImpl.updateWithModel(model));
} }
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(failureDetailsServiceImpl.removeById(sequenceNbr));
}
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
...@@ -126,13 +121,18 @@ public class FailureDetailsController extends BaseController { ...@@ -126,13 +121,18 @@ public class FailureDetailsController extends BaseController {
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<IPage<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<IPage<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size, @RequestParam Integer type) { (value = "size") int size, @RequestParam Integer type,Long currentStatus,
Integer submissionPid,
String startTime,String endTime) {
Page<FailureDetails> page = new Page<FailureDetails>(); Page<FailureDetails> page = new Page<FailureDetails>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
ReginParams userInfo = getSelectedOrgInfo(); ReginParams userInfo = getSelectedOrgInfo();
IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>(); IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage(page, userInfo, type); //IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage((current - 1) * size,size, userInfo, type);
//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,submissionPid,type);
BeanUtils.copyProperties(failureDetailsIPage,FailureDetailsDto.class); BeanUtils.copyProperties(failureDetailsIPage,FailureDetailsDto.class);
List<FailureDetails> records = failureDetailsIPage.getRecords(); List<FailureDetails> records = failureDetailsIPage.getRecords();
List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<>(); List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<>();
...@@ -208,4 +208,26 @@ public class FailureDetailsController extends BaseController { ...@@ -208,4 +208,26 @@ public class FailureDetailsController extends BaseController {
return ResponseHelper.buildResponse(failureDetailsServiceImpl.getCurrentTask(sequenceNbr)); return ResponseHelper.buildResponse(failureDetailsServiceImpl.getCurrentTask(sequenceNbr));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "流程图高亮", notes = "流程图高亮")
@GetMapping(value = "/activistHistory/gethighLine")
public ResponseModel<Object> thighLine(@RequestParam("instanceId") String instanceId) {
return ResponseHelper.buildResponse(workflowFeignService.thighLine(instanceId));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "流程图高亮图片", notes = "流程图高亮图片")
@GetMapping(value = "/activityHistory/gettingLineImg/{processInstanceId}")
public ResponseModel<Object> gothLineImg(@PathVariable("processInstanceId") String processInstanceId, HttpServletResponse resp) {
return ResponseHelper.buildResponse(workflowFeignService.thighLineImg(processInstanceId,resp));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "查询状态枚举", notes = "查询状态枚举")
@GetMapping(value = "/getStatus")
public ResponseModel<Object> getStatusEunms() {
return ResponseHelper.buildResponse(FailureStatuEnum.getEnumList());
}
} }
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 @ 9acb27ad
...@@ -84,11 +84,10 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -84,11 +84,10 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
return page(pages, lambdaQueryWrapper); return page(pages, lambdaQueryWrapper);
} }
public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo,Long currentStatus,
public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, String startTime,String endTime,Integer submissionPid,Integer type) {
Integer type) {
if (type.equals(SELECY_ALL)) { if (type.equals(SELECY_ALL)) {
return this.baseMapper.selectAllPage(page); return this.baseMapper.selectAllPage(page,currentStatus,startTime ,endTime,submissionPid);
} }
if (type.equals(SELECY_ISUBMIT)) { if (type.equals(SELECY_ISUBMIT)) {
return baseMapper.selectISubPage(page, userInfo.getUserModel().getUserId()); return baseMapper.selectISubPage(page, userInfo.getUserModel().getUserId());
...@@ -96,6 +95,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -96,6 +95,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
return this.queryForWaitManage(page, userInfo); return this.queryForWaitManage(page, userInfo);
} }
/* public IPage<FailureDetails> queryForFailureDetailsPage(int current,int size, ReginParams userInfo,Long currentStatus,
String startTime,String endTime,Integer submissionPid,Integer type) {
if (type.equals(SELECY_ALL)) {
return this.baseMapper.selectAllPage(current,size,currentStatus,startTime ,endTime,submissionPid);
}
*//* if (type.equals(SELECY_ISUBMIT)) {
return baseMapper.selectISubPage(page, userInfo.getUserModel().getUserId());
}
return this.queryForWaitManage(page, userInfo);*//*
return null;
}*/
/** /**
* 我发起分页查询 * 我发起分页查询
*/ */
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java
View file @ 9acb27ad
...@@ -110,7 +110,7 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail ...@@ -110,7 +110,7 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
Date processTime = model.getVerifyTime(); Date processTime = model.getVerifyTime();
String processDepartment = model.getVerifyDepartment(); String processDepartment = model.getVerifyDepartment();
Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId()); Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
String processAuditorCid = userInfo.getRole().getRoleName(); String processAuditorCid = userInfo.getUserModel().getRealName();
Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr()); Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
Boolean repairlog = null; Boolean repairlog = null;
if (condition == AuditResultEnum.AGREE.getCode()) { if (condition == AuditResultEnum.AGREE.getCode()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment