diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java index b468946e..4a81c66c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java @@ -241,6 +241,16 @@ public class QcFAIRecordData extends QueryPage { private String submissionType; + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + public String getSubmissionRemark() { return submissionRemark; } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 054e8366..40835138 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -2085,7 +2085,11 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveFAIDetailedRecord(QcFAIRecordData data) { - data.setState("待审核"); + if ("1".equals(data.getType())) { // 应用 + data.setState("待检验"); + } else { // 保存 + data.setState("待审核"); + } qcMapper.updateFAIMasterRecord(data); // 修改明细记录信息 for (int i = 0; i < data.getItemList().size(); i++) { @@ -2780,7 +2784,11 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveFQCDetailedRecord(QcFAIRecordData data) { - data.setState("待审核"); + if ("1".equals(data.getType())) { // 应用 + data.setState("待检验"); + } else { // 保存 + data.setState("待审核"); + } qcMapper.updateFQCMasterRecord(data); // 修改明细记录信息 for (int i = 0; i < data.getItemList().size(); i++) { @@ -3397,7 +3405,11 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveIPQCDetailedRecord(QcFAIRecordData data) { - data.setState("待审核"); + if ("1".equals(data.getType())) { // 应用 + data.setState("待检验"); + } else { // 保存 + data.setState("待审核"); + } qcMapper.updateIPQCMasterRecord(data); // 修改明细记录信息 for (int i = 0; i < data.getItemList().size(); i++) { @@ -4151,7 +4163,11 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveIQCDetailedRecord(QcFAIRecordData data) { - data.setState("待审核"); + if ("1".equals(data.getType())) { // 应用 + data.setState("待检验"); + } else { // 保存 + data.setState("待审核"); + } qcMapper.updateIQCMasterRecord(data); // 修改明细记录信息 for (int i = 0; i < data.getItemList().size(); i++) { diff --git a/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java b/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java index a99e24d7..38d3568b 100644 --- a/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java +++ b/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java @@ -29,8 +29,8 @@ public class SysFileController extends AbstractController { * @version 1.0 */ @PostMapping("/upload") - public R upload(@RequestParam("file") MultipartFile file, @ModelAttribute GetParamInData inData){ - SysOssEntity ossEntity = sysFileService.upload(file, inData); + public R upload(@RequestParam("file") MultipartFile[] list, @ModelAttribute GetParamInData inData){ + List ossEntity = sysFileService.upload(list, inData); return R.ok().put("ossEntity", ossEntity); } diff --git a/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java b/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java index 4ec55ebc..6b6b3936 100644 --- a/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java +++ b/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java @@ -20,7 +20,7 @@ public interface SysFileService { * @date 2023/3/1 15:57 * @version 1.0 */ - SysOssEntity upload(MultipartFile file, GetParamInData inData); + List upload(MultipartFile[] list, GetParamInData inData); /** * @description: 按照orderRef1查询文件文件参数 diff --git a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java index f11e9771..ff17b97b 100644 --- a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java @@ -15,14 +15,17 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** * @description: 处理文件上传接口实现 @@ -43,57 +46,61 @@ public class SysFileServiceImpl implements SysFileService { private String filePath; @Override - public SysOssEntity upload(MultipartFile file, GetParamInData inData) { - if (file.isEmpty()) { + @Transactional + public List upload(MultipartFile[] list, GetParamInData inData) { + if (Objects.isNull(list) || list.length == 0) { throw new XJException("上传文件不能为空"); } - R r = new R(); - //保存文件信息 - SysOssEntity ossEntity = new SysOssEntity(); - SysUserEntity user = getUser(); - //处理文件后缀 - int chartIndex = file.getOriginalFilename().lastIndexOf("."); - String suffix = ""; - String fileName = ""; - //判断是否存在 - if(chartIndex > 0){ - suffix = file.getOriginalFilename().substring(chartIndex); - fileName = file.getOriginalFilename().substring(0, chartIndex); - } - String newFileName = RandomUtil.getOrderNoByAtomic1("file") + suffix; - String basePath = filePath; - String baseDatePath = DateUtils.format(new Date()); - File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder()); - if (!baseFilePath.exists()) { - baseFilePath.mkdirs(); - } - // 最终的目录 - String finalFileName = baseFilePath.getPath()+"\\" + newFileName; - try { - baseFilePath = multipartFileToFile(file, finalFileName); - }catch (Exception e){ - throw new XJException(e.getMessage()); - } - ossEntity.setUrl(baseFilePath.getPath()); - ossEntity.setCreatedBy(user.getUsername()); - ossEntity.setFileType(suffix.substring(1)); - ossEntity.setFileName(fileName+suffix); - ossEntity.setNewFileName(newFileName); - ossEntity.setCreateDate(new Date()); - ossEntity.setOrderRef1(inData.getSite()); - ossEntity.setOrderRef2(inData.getObjectID()); - if ("reportFault".equals(inData.getFolder()) || "reportSparPart".equals(inData.getFolder())) { - ossEntity.setOrderRef3(inData.getFolder()); - } else if ("DJItemImageFile".equals(inData.getFolder()) || "WBItemImageFile".equals(inData.getFolder()) || "IQCItemImageFile".equals(inData.getFolder()) || "IPQCItemImageFile".equals(inData.getFolder()) || "FAIItemImageFile".equals(inData.getFolder()) || "FQCItemImageFile".equals(inData.getFolder())) { // 点检和维保的项目图片上传 - ossEntity.setOrderRef3(inData.getOrderRef1()); - } else if ("eamObject".equals(inData.getFolder())) { - ossEntity.setOrderRef3(inData.getOrderRef3()); - } else { - ossEntity.setOrderRef3(inData.getRemark()); + List ossEntityList = new ArrayList<>(); + for (MultipartFile file : list) { + //保存文件信息 + SysOssEntity ossEntity = new SysOssEntity(); + SysUserEntity user = getUser(); + //处理文件后缀 + int chartIndex = file.getOriginalFilename().lastIndexOf("."); + String suffix = ""; + String fileName = ""; + //判断是否存在 + if(chartIndex > 0){ + suffix = file.getOriginalFilename().substring(chartIndex); + fileName = file.getOriginalFilename().substring(0, chartIndex); + } + String newFileName = RandomUtil.getOrderNoByAtomic1("file") + suffix; + String basePath = filePath; + String baseDatePath = DateUtils.format(new Date()); + File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder()); + if (!baseFilePath.exists()) { + baseFilePath.mkdirs(); + } + // 最终的目录 + String finalFileName = baseFilePath.getPath()+"\\" + newFileName; + try { + baseFilePath = multipartFileToFile(file, finalFileName); + }catch (Exception e){ + throw new XJException(e.getMessage()); + } + ossEntity.setUrl(baseFilePath.getPath()); + ossEntity.setCreatedBy(user.getUsername()); + ossEntity.setFileType(suffix.substring(1)); + ossEntity.setFileName(fileName+suffix); + ossEntity.setNewFileName(newFileName); + ossEntity.setCreateDate(new Date()); + ossEntity.setOrderRef1(inData.getSite()); + ossEntity.setOrderRef2(inData.getObjectID()); + if ("reportFault".equals(inData.getFolder()) || "reportSparPart".equals(inData.getFolder())) { + ossEntity.setOrderRef3(inData.getFolder()); + } else if ("DJItemImageFile".equals(inData.getFolder()) || "WBItemImageFile".equals(inData.getFolder()) || "IQCItemImageFile".equals(inData.getFolder()) || "IPQCItemImageFile".equals(inData.getFolder()) || "FAIItemImageFile".equals(inData.getFolder()) || "FQCItemImageFile".equals(inData.getFolder())) { // 点检和维保的项目图片上传 + ossEntity.setOrderRef3(inData.getOrderRef1()); + } else if ("eamObject".equals(inData.getFolder())) { + ossEntity.setOrderRef3(inData.getOrderRef3()); + } else { + ossEntity.setOrderRef3(inData.getRemark()); + } + ossEntity.setOrderRef4(inData.getOrderRef4()); + sysOssService.save(ossEntity); + ossEntityList.add(ossEntity); } - ossEntity.setOrderRef4(inData.getOrderRef4()); - sysOssService.save(ossEntity); - return ossEntity; + return ossEntityList; } @Override