From 8a7693fb0c93235dfc9fdd9477992d0bfb41d5f9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 20:06:32 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
index 8594c8a..7c02437 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
@@ -105,10 +105,11 @@
List<Worktype> list = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
.eq(Worktype::getIsdeleted,Constants.ZERO)
.eq(Worktype::getDataType,Constants.TWO)
+ .eq(Worktype::getStatus,Constants.ZERO)
.apply(workTypeQueryDTO.getQueryType().equals(Constants.ZERO),
"id in ( select sw.worktype_id from solution_worktype sw where sw.SOLUTION_ID = "+workTypeQueryDTO.getId()+" )")
.apply(workTypeQueryDTO.getQueryType().equals(Constants.ONE),
- "id in ( select dw.work_type_id from du_worktype dw where dw.du_solution_id = "+workTypeQueryDTO.getId()+" )")
+ "id in ( select dw.work_type_id from du_worktype dw where dw.status = 1 and dw.du_solution_id = "+workTypeQueryDTO.getId()+" )")
.apply(workTypeQueryDTO.getQueryType().equals(Constants.TWO),
"id in ( select dw.WORKTYPE_ID from apply_detail dw where dw.APPLY_ID = "+workTypeQueryDTO.getId()+" )")
);
@@ -192,7 +193,7 @@
ExcelImporter ie = null;
List<WorktypeImport> dataList =null;
try {
- ie = new ExcelImporter(file,0,0);
+ ie = new ExcelImporter(file,1,0);
dataList = ie.getDataList(WorktypeImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -202,6 +203,9 @@
}
List<String> result = new ArrayList<>();
for(WorktypeImport model : dataList){
+ if(StringUtils.isBlank(model.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁瀛樺湪寮傚父");
+ }
// if(StringUtils.isNotBlank(model.getName()) && !isNewWorkTypeByName(model.getName(),list)){
result.add(model.getName());
// }
--
Gitblit v1.9.3