From 15c677d6cd29fa2864a20459b4768bdd0f864623 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期二, 15 十一月 2022 14:55:46 +0800 Subject: [PATCH] 新增根据部门id获取导办事物列表接口 --- flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java index 71521b5..444bc96 100644 --- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java +++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java @@ -4,23 +4,34 @@ import com.dg.core.ResultData; import com.dg.core.annotation.Authorization; import com.dg.core.annotation.CurrentUser; +import com.dg.core.db.gen.AjaxResult; import com.dg.core.db.gen.entity.Slideshow; import com.dg.core.db.gen.entity.SysUser; import com.dg.core.db.gen.entity.TransactionEvent; import com.dg.core.db.manual.pojo.QueryResults; import com.dg.core.db.manual.pojo.RecommendResult; import com.dg.core.db.manual.pojo.Search; +import com.dg.core.file.FtpConstants; +import com.dg.core.file.MimeTypeUtils; +import com.dg.core.file.SFTPUtil; import com.dg.core.service.IOrganizationChartService; import com.dg.core.service.ITransactionEventService; import com.dg.core.util.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import java.io.InputStream; +import java.util.ArrayList; import java.util.List; +import java.util.UUID; + +import static com.dg.core.file.FileTypeUploadUtils.assertAllowed; @Api(tags = {"导办事项管理接口"}) @RestController @@ -70,6 +81,23 @@ List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword, classifyGrade,null); int num=iTransactionEventService.countNum(keyword,classifyGrade,null); + return getDataTable(list,num); + } + + /** + * 导办事物列表 + * @param + * @return + */ + @ApiOperation("根据部门id获取导办事物列表") + @GetMapping("/department/getList") + @Authorization + public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String DepartmentId, + @CurrentUser SysUser sysUser) + { + List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId()); + List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids); + int num=iTransactionEventService.countNum(null,null,ids); return getDataTable(list,num); } @@ -151,7 +179,11 @@ { Assert.notNull(Id, "Id 不能为空"); - return toAjax(iTransactionEventService.deleteConfigById(Id)); + int i = iTransactionEventService.deleteConfigById(Id); + if (i>0) + return ResultData.success("删除成功"); + else + return ResultData.error("删除失败可能该工单有单据"); } /** @@ -275,9 +307,30 @@ @Authorization public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids) { + if(ids==null || ids.size()<1) + { + ids=null; + } return getDataTable(iTransactionEventService.selectClassifyList(ids)); } + @ApiOperation("文件导入") + @PostMapping("/import") + public ResultData uploadFiles(MultipartFile file) throws Exception + { + boolean a = false; + String fileName = file.getOriginalFilename(); + Integer b = iTransactionEventService.batchImport(fileName, file); + if (b == 3) {// + return ResultData.success("全部导入成功");//全部导入成功 + } else if (b == 2) { + return ResultData.success("部分导入成功");//部分导入成功 + } else if (b == 0) { + return ResultData.error("部分失败");//导入失败 + } + return ResultData.error("部分失败");//导入失败 + } + -- Gitblit v1.7.1