2024-07-25

更新优化

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;
     }

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) {
+        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) {
+        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) {
+        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) {
+        if ("1".equals(data.getType())) { // 应用
+            data.setState("待检验");
+        } else { // 保存
             data.setState("待审核");
+        }
         qcMapper.updateIQCMasterRecord(data);
         // 修改明细记录信息
         for (int i = 0; i < data.getItemList().size(); i++) {

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<SysOssEntity> ossEntity = sysFileService.upload(list, inData);
 		return R.ok().put("ossEntity", ossEntity);
 	}
 

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<SysOssEntity> upload(MultipartFile[] list, GetParamInData inData);
 
     /**
     * @description: 按照orderRef1查询文件文件参数

src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java

@@ -21,8 +21,10 @@ 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,11 +45,12 @@ public class SysFileServiceImpl implements SysFileService {
     private String filePath;
 
     @Override
-    public SysOssEntity upload(MultipartFile file, GetParamInData inData) {
-        if (file.isEmpty()) {
+    public List<SysOssEntity> upload(MultipartFile[] list, GetParamInData inData) {
+        if (Objects.isNull(list) || list.length == 0) {
             throw new XJException("上传文件不能为空");
         }
-        R r = new R();
+        List<SysOssEntity> ossEntityList = new ArrayList<>();
+        for (MultipartFile file : list) {
             //保存文件信息
             SysOssEntity ossEntity = new SysOssEntity();
             SysUserEntity user = getUser();
@@ -93,7 +96,9 @@ public class SysFileServiceImpl implements SysFileService {
             }
             ossEntity.setOrderRef4(inData.getOrderRef4());
             sysOssService.save(ossEntity);
-        return ossEntity;
+            ossEntityList.add(ossEntity);
+        }
+        return ossEntityList;
     }
 
     @Override