diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index 70e2b614..631c2a16 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -276,7 +276,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user su on pci.purchaser = su.user_id LEFT JOIN sys_user us on us.user_id = tk.update_by LEFT JOIN purchase_check_details pcd on pcd.task_id=pci.task_id - where task_type = 23 and tk.task_status in (26,28,105,106,107) + where task_type = 23 + and tk.task_status = #{taskStatus} + and tk.task_status in (28,105,106,107,122,123) and (tk.code like concat('%',#{keyWord},'%') or su.user_name like concat('%',#{keyWord},'%') diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysFileController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysFileController.java index d7b7d012..f752ecad 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysFileController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysFileController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.system.config.ErrorCode; import com.bonus.sgzb.system.domain.FileInfo; import com.bonus.sgzb.system.service.SysFileService; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.IOUtils; import org.springframework.core.io.ResourceLoader; import org.springframework.web.bind.annotation.GetMapping; @@ -25,6 +26,7 @@ import java.util.List; /** * @author bns */ +@Slf4j @RestController @RequestMapping("/sys/file") public class SysFileController { @@ -47,11 +49,12 @@ public class SysFileController { FileInfo file = new FileInfo(); try { file = service.uploadFile(request); - String suffix = file.getFileName().substring(file.getFileName().lastIndexOf(".") + 1); - if (! ATTACHMENT_FILE_SUFFIX.contains(suffix) || ! COST_FILE_SUFFIX.contains(suffix)) { + // String suffix = file.getFileName().substring(file.getFileName().lastIndexOf(".") + 1); + + /* if (! ATTACHMENT_FILE_SUFFIX.contains(suffix) || ! COST_FILE_SUFFIX.contains(suffix)) { return AjaxResult.error(ErrorCode.COMMISSION_BILL_ATTACHMENT_NOT_SUPPORT.getCode(), ErrorCode.COMMISSION_BILL_ATTACHMENT_NOT_SUPPORT.getMessage()); - } + }*/ if (limitWords != null && file.getWords() > Integer.parseInt(limitWords)){ return AjaxResult.error(ErrorCode.ATTACHMENT_UPLOAD_FAILED.getCode(), ErrorCode.ATTACHMENT_UPLOAD_FAILED.getMessage()); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java index 3b60e105..24e78abe 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java @@ -68,7 +68,7 @@ public class SysFileServiceImpl implements SysFileService { public FileInfo uploadFile(HttpServletRequest request) throws Exception { FileInfo file = new FileInfo(); StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request; - String photoType = req.getParameter("fileType"); + // String photoType = req.getParameter("fileType"); Long userId = SecurityUtils.getLoginUser().getUserid(); HashMap map = getFile(req); List items = (List) map.get("filePath"); @@ -84,6 +84,7 @@ public class SysFileServiceImpl implements SysFileService { String type = fileName.substring(fileName.lastIndexOf(".") + 1); long size = item.getSize() / 1024 / 1024; file.setFileName(fileName); + log.info("文件名为:{}",fileName); file.setFileUrl(url); file.setCreator(userId.toString()); file.setType(type); diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml index 01f4a674..6d0a1a04 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml @@ -40,8 +40,8 @@