Merge branch 'dev'

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilExperimentController.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 /**
  * <p>
@@ -697,4 +698,12 @@ public class SoilExperimentController extends ServiceController  {
         return success(soilExperimentService.uploadGdsFile(file));
     }
 
+
+
+    @ApiOperation(value = "力学采集文件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_dynamics_collect/{entrustId}")
+    public RestResult<Boolean> uploadDynamicsCollect(@PathVariable("entrustId") Long entrustId, MultipartHttpServletRequest httpServletRequest) {
+        return success(soilExperimentService.uploadDynamicsCollect(httpServletRequest, entrustId,getAccount()));
+    }
+
 }

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilExperimentMapper.java

@@ -47,4 +47,6 @@ public interface SoilExperimentMapper extends BaseMapper<SoilExperiment> {
     List<SoilExperimentVO> listExpRightBath(Page<SoilExperimentVO> page,  @Param("vo")SoilExperimentQueryDTO dto);
 
     List<SoilExperimentVO> listGroupVOListByEntrustIds( @Param("entrustIdList")List<Long> entrustIdList);
+
+    List<SoilExperimentVO> selectByEntrustId( @Param("entrustId")Long entrustId);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilExperimentService.java

@@ -15,6 +15,7 @@ import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import jcifs.smb.SmbFile;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import java.util.List;
 
@@ -100,4 +101,6 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
     SoilOpenSoilRecord saveExcelOpenSoilRecord(Long entrustId, Long templateId, Account account);
 
     boolean uploadGdsFile(MultipartFile file);
+
+    boolean uploadDynamicsCollect(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
 }

src/main/resources/mapper/soil/SoilExperimentMapper.xml

@@ -423,4 +423,21 @@
     </select>
 
 
+    <select id="selectByEntrustId" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
+            SELECT i.id,i.name,s.sample_code FROM soil_experiment  i
+
+            JOIN soil_sample s ON i.sample_id = s.id
+            JOIN soil_entrust e ON s.entrust_id = e.id
+
+            WHERE i.deleted = 0
+
+            AND s.deleted = 0
+            AND e.deleted = 0
+            AND e.id = #{entrustId}
+
+    </select>
+
+
+
+
 </mapper>