土工平台修改

src/main/java/com/patzn/cloud/service/lims/SoilServiceApplication.java

 package com.patzn.cloud.service.lims;
-
-import com.patzn.cloud.commons.lock.EnableRedisDistributedLock;
 import com.patzn.cloud.commons.spring.SpringHelper;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
@@ -22,7 +20,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableCaching
 @EnableSwagger2
 @EnableDiscoveryClient
-@EnableRedisDistributedLock
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableFeignClients(basePackages = {"com.patzn.cloud.feign"})

src/main/java/com/patzn/cloud/service/lims/config/ReportConfig.java

-package com.patzn.cloud.service.lims.config;
-
-
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-
-import com.patzn.report.console.ReportServlet;
-
-/**
- * <p>
- * 报表配置
- * </p>
- *
- * @author hubin
- * @since 2018-12-03
- */
-//@Configuration
-//@ImportResource("classpath:report-context.xml")
-public class ReportConfig {
-
-//    @Bean
-    public ServletRegistrationBean initUReport() {
-        return new ServletRegistrationBean(new ReportServlet(), "/report/*");
-    }
-}
\ No newline at end of file

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

@@ -5,7 +5,6 @@ import com.patzn.cloud.service.lims.soil.mapper.SoilDataGdsDetailMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilDataGdsDetailService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.SoilDataGdsDetail;
-import lombok.ToString;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;

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

@@ -4,7 +4,7 @@
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilAloneSampleVO">
         SELECT
-            s.id,s.receiver,s.receive_time,s.project_name,s.project_leader,s.borehole_name,s.cases_num,s.registrant,s.regist_time,
+            s.id,s.receiver,s.receive_time,s.project_name,s.project_leader,s.borehole_name,s.cases_num,s.registrant,s.regist_time,s.outstock_code,
         o.instore_object_key,o.outstock_object_key,o.storehouse,o.shelf_code,o.instock_time,o.keep_limit_time,o.in_stocker
         FROM
             soil_alone_sample s