From c0c80bebcc93e90834e06404d6056322e51b02dd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:23:00 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java | 4 ++++
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java | 1 +
screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java | 3 ++-
screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java | 3 +++
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 10 +++++-----
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java | 2 +-
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java | 2 +-
8 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java b/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
index 8a924de..f2136d1 100644
--- a/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
+++ b/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
@@ -42,7 +42,7 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleUserNotExistException(BusinessException ex) {
- return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), "������������������������");
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ex.getMsg());
}
@ExceptionHandler
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java
index a08f7ce..1982fe0 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java
@@ -45,7 +45,7 @@
private String changeName;
@ApiModelProperty(value = "������")
- @NotEmpty(message = "���������������������")
+ @NotNull(message = "���������������������")
private Integer state;
@ApiModelProperty(value = "������������")
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java
index a998a8d..675faa4 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java
@@ -40,7 +40,7 @@
private String checkDescribe;
@ApiModelProperty(value = "������")
- @NotEmpty(message = "���������������������")
+ @NotNull(message = "���������������������")
private Integer state;
@ApiModelProperty(value = "������������")
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
index 0760bea..41c311b 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
@@ -72,6 +72,7 @@
private String problemDescribe;
@ApiModelProperty(value = "������")
+ @NotNull(message = "���������������������")
private Integer state;
@ApiModelProperty(value = "������������")
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java
index 4eb29dd..6a779e2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java
@@ -23,4 +23,7 @@
@ApiModelProperty(value = "������������")
private String fileName;
+
+ @ApiModelProperty(value = "������1������")
+ private Integer fileType;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java b/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java
index 95e8336..2f6c656 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java
@@ -27,4 +27,8 @@
* ������
*/
private String account;
+ /**
+ * ������������������������
+ */
+ private Integer unitId;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index ed0239b..35a76ce 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -13,6 +13,7 @@
import com.moral.api.pojo.query.PageCond;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.ApproveTableService;
@@ -77,6 +78,7 @@
private AllocationMapper allocationMapper;
@Autowired
private SysAreaService sysAreaService;
+ @Autowired
private ApproveTableService approveTableService;
@Autowired
private FileTableService fileTableService;
@@ -332,7 +334,6 @@
endTime = DateUtils.getCurDateTime();
if (s.equals("-1")){
//���������������
-
startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
}
if (s.equals("-2")){
@@ -396,7 +397,6 @@
AllocationUnitViewDto allocationUnitViewDto = new AllocationUnitViewDto();
List<Allocation> allocations1 = unitMap.get(integer);
-
//������
int marks=0;
//������
@@ -464,7 +464,7 @@
allocationExt.setFileBaseList(fileTableService.list(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
allocationExt.setFileChangeList(fileTableService.list(id,FileTableEnum.ALLOCATION_RECTIFICATION.value));
allocationExt.setFileApproveList(fileTableService.list(id,FileTableEnum.ALLOCATION_APPROVE.value));
- allocationExt.setApproveList(approveTableService.listAll(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
+ allocationExt.setApproveList(approveTableService.listAll(id, FileTableEnum.ALLOCATION_FOUNDATION.value));
return allocationExt;
}
@@ -525,7 +525,7 @@
}
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(checkCond.getFileApproveList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
}
@Override
@@ -564,7 +564,7 @@
if( !AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
type = true;
}
- if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getState())){
+ if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getChangeType())){
type = true;
}
if(type){
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
index 304d0bb..1fdde7a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
@@ -64,7 +64,7 @@
sysFile.setCreateId(user.getUserId()).setCreateName(user.getUserName());
}
save(sysFile);
- return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename);
+ return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename).setFileType(fileType.getValue());
}
@Override
@@ -230,6 +230,7 @@
FileVo fileVo = new FileVo();
fileVo.setFileId(it.getFileId());
fileVo.setFileName(it.getFileName());
+ fileVo.setFileType(it.getFileType());
list.add(fileVo);
});
return list;
--
Gitblit v1.8.0