土工试验平台修改

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

@@ -93,6 +93,19 @@ public class SoilPrepareController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "制备详情分页列表", notes = "制备详情分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_prepare_detail")
+    public RestResult<Page<SoilPrepareVO>> getPagePrepareDetail(SoilPrepareVO soilPrepare) {
+        return success(soilPrepareService.pagePrepareVO(getPage(), soilPrepare));
+    }
+
+
 
     @ApiOperation(value = "副样样品分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({

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

@@ -27,6 +27,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>
@@ -110,6 +111,15 @@ public class SoilSamplePhotoController extends ServiceController {
         return success(soilSamplePhotoService.upload(file, entrustId));
     }
 
+
+    @ApiOperation(value = "附件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_bath/{entrustId}")
+    public RestResult<Boolean> uploadBath(@PathVariable("entrustId") Long entrustId, MultipartHttpServletRequest httpServletRequest) {
+        return success(soilSamplePhotoService.uploadBath(httpServletRequest, entrustId,getAccount()));
+    }
+
+
+
     @ApiOperation(value = "下载附件", notes = "下载指定附件")
     @GetMapping("/download/{id}")
     public void downloadFile(@PathVariable("id")Long id) {

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

@@ -13,7 +13,9 @@ import com.patzn.cloud.service.soil.entity.SoilStandard;
 import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
 import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
 import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
+import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
+import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -102,4 +104,12 @@ public class SoilStatisticsController extends ServiceController {
     }
 
 
+
+    @ApiOperation(value = "委托的试验项目量统计", notes = "委托的试验项目量统计")
+    @PostMapping("/list_entrust_item_num")
+    public RestResult<List<SoilEntrustItemNumVO>> listEntrustItemNum(SoilExperimentVO soilEntrust) {
+        return success(soilEntrustService.listEntrustItemNum(soilEntrust));
+    }
+
+
 }

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

@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.soil.mapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.service.soil.entity.SoilExperiment;
+import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -23,6 +24,9 @@ public interface SoilExperimentMapper extends BaseMapper<SoilExperiment> {
 
     List<SoilExperimentVO> selectListBySampleIds(RowBounds rowBounds, @Param("sampleIds") List<Long> sampleIds, @Param("vo") SoilExperimentVO vo);
 
+    List<SoilExperimentVO> selectListBySampleIds(@Param("sampleIds") List<Long> sampleIds, @Param("vo") SoilExperimentVO vo);
+
+
     List<SoilExperimentVO> selectTestByExp(RowBounds rowBounds,@Param("vo") SoilExperimentVO vo);
 
     List<SoilExperimentVO> selectExpRight(RowBounds rowBounds, @Param("vo")SoilExperimentVO vo);
@@ -30,4 +34,6 @@ public interface SoilExperimentMapper extends BaseMapper<SoilExperiment> {
     List<SoilExperimentVO> selectOriginalExpList(RowBounds rowBounds,@Param("vo")SoilExperimentVO vo);
 
     List<SoilExperimentVO> selectListVOByIds(@Param("ids")List<Long> expIds);
+
+    List<SoilEntrustItemNumVO> listEntrustItemNum(@Param("sampleIds") List<Long> sampleIds, @Param("vo") SoilExperimentVO vo);
 }

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

@@ -10,7 +10,9 @@ import com.patzn.cloud.service.soil.entity.SoilEntrust;
 import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
 import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
 import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
+import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
+import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -82,4 +84,6 @@ public interface ISoilEntrustService extends IBaseService<SoilEntrust> {
     boolean editImportEntrust(Long id,MultipartFile file, Account account);
 
     void exportSoilPrepareRecord(Long[] ids, HttpServletResponse response, Account account);
+
+    List<SoilEntrustItemNumVO> listEntrustItemNum(SoilExperimentVO soilEntrust);
 }

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.lims.collect.core.CollectDataType;
 import com.patzn.cloud.service.soil.entity.SoilExperiment;
+import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import jcifs.smb.SmbFile;
 
@@ -50,6 +51,8 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
 
     Page<SoilExperimentVO> pageByByEntrust(Page<SoilExperimentVO> page, SoilExperimentVO vo);
 
+    List<SoilExperimentVO> listByByEntrust( SoilExperimentVO vo);
+
     boolean bathUpdateInfo(Long[] ids, SoilExperiment experiment, Account account);
 
     void uploadCollectPng(SmbFile smbFile, CollectDataType type);
@@ -61,4 +64,6 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
     boolean importExperiments(Long[] ids, Long[] aptitudeIds, Account account);
 
     boolean changeExpAllot(Long[] ids, String user, Long userId, Account account);
+
+    List<SoilEntrustItemNumVO> listEntrustItemNum(SoilExperimentVO soilEntrust);
 }

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

@@ -3,9 +3,11 @@ package com.patzn.cloud.service.lims.soil.service;
 import java.util.List;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.soil.entity.SoilSamplePhoto;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,4 +32,6 @@ public interface ISoilSamplePhotoService extends IBaseService<SoilSamplePhoto> {
     void downloadFile(Long id, HttpServletResponse response);
 
     void view(HttpServletResponse response, String objectKey);
+
+    boolean uploadBath(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java

@@ -32,7 +32,9 @@ import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
 import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
 import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
+import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
+import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import com.patzn.poibox.xwpf.HSSFWorkbookUtil;
@@ -957,6 +959,10 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                    XSSFCell cell1Item= row.getCell(10);
                    cell1Item.setCellValue(sample.getExperimentShortNames());
 
+
+                   XSSFCell cell1Remark= row.getCell(11);
+                   cell1Remark.setCellValue(sample.getRemark());
+
                }
 
              exportService.downloadXlsx(response,entrust.getBoreholeName()+".xlsx",xssfWorkbook);
@@ -964,6 +970,21 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
 
     }
 
+    @Override
+    public List<SoilEntrustItemNumVO> listEntrustItemNum(SoilExperimentVO soilEntrust) {
+        List<SoilEntrustItemNumVO> sampleList = soilExperimentService.listEntrustItemNum(soilEntrust);
+//        int num = 0;
+//        for (SoilEntrustItemNumVO numVO:sampleList) {
+//            num+=numVO.getNum();
+//        }
+//
+//         SoilEntrustItemNumVO entrustItemNumVO = new SoilEntrustItemNumVO();
+//        entrustItemNumVO.setName("总计：");
+//        entrustItemNumVO.setNum(num);
+//        sampleList.add(entrustItemNumVO);
+        return sampleList;
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -3,7 +3,6 @@ package com.patzn.cloud.service.lims.soil.service.impl;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +29,7 @@ import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
+import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import jcifs.smb.SmbFile;
 import org.apache.commons.lang3.StringUtils;
@@ -147,6 +147,17 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         return true;
     }
 
+    @Override
+    public List<SoilEntrustItemNumVO> listEntrustItemNum(SoilExperimentVO soilEntrust) {
+        RestAssert.fail(null == soilEntrust.getEntrustId(),"委托单ID不能为空");
+        List<SoilSample> sampleList = soilSampleService.listByContractId(soilEntrust.getEntrustId());
+        List<Long> sampleIds= sampleList.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+
+        return baseMapper.listEntrustItemNum(sampleIds,soilEntrust);
+    }
+
 
     @Override
     public Page<SoilExperimentVO> pageBySampleIds(Page<SoilExperimentVO> page, Long[] sampleIds, SoilExperimentVO vo) {
@@ -335,6 +346,18 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
 
     @Override
+    public List<SoilExperimentVO> listByByEntrust(SoilExperimentVO vo) {
+        RestAssert.fail(null == vo.getEntrustId(),"委托单ID不能为空");
+        List<SoilSample> sampleList = soilSampleService.listByContractId(vo.getEntrustId());
+        List<Long> sampleIds= sampleList.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+        return baseMapper.selectListBySampleIds(sampleIds,vo);
+    }
+
+
+
+    @Override
     public boolean bathUpdateInfo(Long[] ids, SoilExperiment experiment, Account account) {
          RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要修改的试验项目");
          if (StringHandleUtils.isAllFieldNull(experiment)){
@@ -378,8 +401,6 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             }catch (Exception e){
                 e.printStackTrace();
             }
-
-
         }
         System.out.println(smbFile.getName());
         System.out.println(type.getEntrustCode());

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSamplePhotoServiceImpl.java

 package com.patzn.cloud.service.lims.soil.service.impl;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.oss.starter.OssFileResult;
 import com.patzn.cloud.service.lims.soil.service.ISoilEntrustService;
@@ -18,6 +21,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -103,4 +107,21 @@ public class SoilSamplePhotoServiceImpl extends BaseServiceImpl<SoilSamplePhotoM
     public void view(HttpServletResponse response, String objectKey) {
         ossClient.download(objectKey, response);
     }
+
+    @Override
+    public boolean uploadBath(MultipartHttpServletRequest multipartHttpServletRequest, Long entrustId, Account account) {
+
+        // 先拿到文件名称的迭代器
+        Iterator<String> fileNamesIt = multipartHttpServletRequest.getFileNames();
+        List<String> failedNameList = new ArrayList<>();
+        while (fileNamesIt.hasNext()) {
+            String fileName = fileNamesIt.next();
+            // 获取文件
+            MultipartFile multipartFile = multipartHttpServletRequest.getFile(fileName);
+            upload(multipartFile,entrustId);
+            failedNameList.add(fileName);
+        }
+
+        return true;
+    }
 }

src/main/resources/application-out.yml

+# 开发环境
+server:
+  exception:
+    enable: false
+swagger:
+  enable: true
+service:
+  api-url: http://api.dev.patzn.com:7000
+  url: http://api.dev.patzn.com:7000
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+#    url: jdbc:postgresql://localhost:5432/dev_lims_meter
+    url: jdbc:postgresql://139.9.144.39:5432/test_lims_soil
+    username: dbsoil
+    password: sfdWrE39&d!Pt
+    driver-class-name: org.postgresql.Driver
+    dynamic:
+      enabled: false
+  # 注册中心配置
+  cloud:
+    consul:
+      host: localhost
+      discovery:
+        health-check-interval: 5s
+  #      host: localhost
+  rabbitmq:
+    host: 121.36.130.208
+    port: 5672
+    username: mqbase
+    password: mqb123#@$5
+    publisher-confirms: true
+    virtual-host: /
+    topic:
+      push-msg: dev.topic.push.msg
+      sys-log: dev.topic.sys.log
+      chemical-classify-warning: dev.topic.chemical.classify.warning
+      equip-check-msg: dev.topic.equip.check.msg
+      report-make-msg: dev.topic.report.make.msg
+      soil-work-msg: dev.topic.soil.work.msg
+
+### jobs
+jobs:
+  admin-address: http://api.dev.patzn.com:7000/print
+
+
+# 对象存储配置
+oss:
+  bucket-name: pt-web-sys
+  aliyun:
+    endpoint: http://oss.test.patzn.com
+    folder: dev/soil
+#libreOffice 安装信息
+libreOffice:
+  url: C:/Program Files/LibreOffice
+# ribbon 路由配置
+food.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+print.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+res.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+convert.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule

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

@@ -76,6 +76,23 @@
     </select>
 
 
+
+
+    <select id="listEntrustItemNum" resultType="com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO">
+        SELECT t.short_name AS "name",COUNT(1) AS "num"
+        FROM soil_experiment t
+        JOIN soil_sample s ON t.sample_id = s.id
+        JOIN soil_entrust e ON s.entrust_id = e.id
+        WHERE t.deleted = 0 AND s.deleted = 0 AND e.deleted =0 AND t.short_name IS NOT NULL
+        <if test="null!=sampleIds">
+            AND t.sample_id IN
+            <foreach collection="sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
+                #{sampleId}
+            </foreach>
+        </if>
+        GROUP BY t.short_name
+    </select>
+
     <select id="selectTestByExp" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
        SELECT t.name,t.test_basis,t.test_method FROM soil_experiment t
         JOIN soil_sample s ON t.sample_id = s.id

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

@@ -18,6 +18,7 @@
         s.sample_pack,
         s.sample_describe,
         s.describe_detail,
+        s.remark,
         s.status,
         s.progress
     </sql>

src/test/java/resources/db_sql/v1.0.3/新增样品备注.sql

+ALTER TABLE "public"."soil_sample"
+ALTER TABLE "public"."soil_sample"
+  ADD COLUMN "remark" varchar(255);
+
+COMMENT ON COLUMN "public"."soil_sample"."remark" IS '备注';
\ No newline at end of file

src/test/java/resources/db_sql/v1/0/2/新增字段.sql

-ALTER TABLE "public"."soil_prepare"
-ALTER TABLE "public"."soil_prepare"
-  ADD COLUMN "keep_location" varchar(255);
-
-COMMENT ON COLUMN "public"."soil_prepare"."keep_location" IS '留样位置';
+++ /dev/null
\ No newline at end of file