Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
hongawen
2024-12-03 10:24:08 +08:00
parent 6a3b848dc0
commit 9be058b9e9
4 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java
View File

@@ -78,6 +78,8 @@ public enum AdvanceResponseEnum {
MACHINE_HAS_UNIT("A0102","当前设备存在元器件"),
EVENT_TIME_ERROR("A0102","暂降事件时间格式有误，请检查"),
INVALID_FILE_TYPE("A0102","请选择CSV文件"),
;
private final String code;

7
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/govern/voltage/SgEventController.java
View File

@@ -106,6 +106,13 @@ public class SgEventController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<String> importEventData(@RequestParam("file") MultipartFile file, @RequestParam("incomingLineId") String incomingLineId, @RequestParam("productLineId") String productLineId, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importEventData");
// 检查文件MIME类型是否为csv
String contentType = file.getContentType();
if (!"text/csv".equals(contentType)) {
throw new BusinessException(AdvanceResponseEnum.INVALID_FILE_TYPE);
}
ImportParams params = new ImportParams();
params.setHeadRows(1);
params.setNeedVerify(true);

19
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java
View File

@@ -3,6 +3,7 @@ package com.njcn.bpm.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.bpm.enums.BpmTaskStatusEnum;
import com.njcn.bpm.pojo.dto.PageResult;
import com.njcn.bpm.pojo.param.task.*;
import com.njcn.bpm.pojo.po.BpmCategory;
@@ -217,6 +218,24 @@ public class BpmTaskController extends BaseController {
page.setTotal(bpmTaskRespVOPageResult.getTotal());
page.setSize(PageFactory.getPageSize(bpmTaskQueryParam));
page.setCurrent(PageFactory.getPageNum(bpmTaskQueryParam));
List<BpmTaskVO> records = page.getRecords();
for (BpmTaskVO record : records) {
if(record.getStatus().equals(BpmTaskStatusEnum.CANCEL.getStatus()) && record.getReason().equals("系统自动取消")){
record.setStatus(BpmTaskStatusEnum.APPROVE.getStatus());
record.setReason(BpmTaskStatusEnum.APPROVE.getName());
// 找到由谁完成的
HttpResult<List<BpmTaskVO>> taskListByProcessInstanceId = this.getTaskListByProcessInstanceId(record.getProcessInstanceId());
if(CollectionUtil.isNotEmpty(taskListByProcessInstanceId.getData())){
for (BpmTaskVO datum : taskListByProcessInstanceId.getData()) {
if(datum.getStatus().equals(BpmTaskStatusEnum.APPROVE.getStatus()) && datum.getTaskDefinitionKey().equals(record.getTaskDefinitionKey())){
record.setReason("由".concat(datum.getAssigneeUser().getName()).concat("完成审批"));
}
}
}
}
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}

2
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java
View File

@@ -140,7 +140,7 @@ public class BpmTaskServiceImpl implements IBpmTaskService {
// 审批时间倒序
.orderByHistoricTaskInstanceEndTime().desc();
if (StrUtil.isNotBlank(bpmTaskQueryParam.getSearchValue())) {
taskQuery.taskNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%");
taskQuery.processDefinitionNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%");
}
String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
String endTimeStr = bpmTaskQueryParam.getSearchEndTime();