土工平台修改

build.gradle

@@ -97,6 +97,7 @@ dependencies {
     compile("com.cronutils:cron-utils:9.0.2")
     compile("com.caucho:hessian:4.0.62")
     compile("com.patzn.cloud:patzn-entitys:2.0")
+    compile("com.patzn.cloud:patzn-entity-project:2.0")
     compile("com.patzn.cloud:patzn-feign-base:2.0")
     compile("com.patzn.cloud:patzn-feign-lims:2.0")
     compile("com.patzn.cloud:patzn-feign-standard:2.0")

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

@@ -9,11 +9,14 @@ import com.patzn.cloud.commons.controller.ServiceController;
 import com.patzn.cloud.service.lims.soil.service.ISoilEntrustService;
 import com.patzn.cloud.service.lims.soil.service.ISoilStandardService;
 import com.patzn.cloud.service.soil.entity.SoilEntrust;
+import com.patzn.cloud.service.soil.entity.SoilExperiment;
 import com.patzn.cloud.service.soil.entity.SoilStandard;
 import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
+import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 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.statistics.SoilGroupExpVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import io.swagger.annotations.Api;
@@ -112,4 +115,37 @@ public class SoilStatisticsController 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_personal_exp_statistics")
+    public RestResult<Page<SoilExperimentVO>> getPagePersonalExpStatistics(SoilExperimentVO expVO) {
+        expVO.setTesterId(getAccount().getUserId());
+        expVO.setStatus(SoilExpStatusEnum.TEST);
+        return success(soilEntrustService.pagePersonalExpVO(getPage(), expVO , getAccount()));
+    }
+
+
+
+
+    @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_group_exp_statistics")
+    public RestResult<Page<SoilGroupExpVO>> getPageGroupExpStatistics(SoilGroupExpVO expVO) {
+        expVO.setStatus(SoilExpStatusEnum.END);
+        return success(soilEntrustService.pageGroupExpStatistics(getPage(), expVO));
+    }
+
+
 }

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

@@ -2,12 +2,15 @@ package com.patzn.cloud.service.lims.soil.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.soil.dto.SoilSampleDTO;
 import com.patzn.cloud.service.soil.entity.SoilEntrust;
 import com.patzn.cloud.service.soil.entity.SoilSample;
 import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
 import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
+import com.patzn.cloud.service.soil.statistics.SoilGroupExpVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
+import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 
@@ -38,4 +41,8 @@ public interface SoilEntrustMapper extends BaseMapper<SoilEntrust> {
     List<SoilAnnualEntrustVO> selectAnnualEntrustStatistics(@Param("vo")SoilAnnualEntrustVO annualEntrustVO);
 
     List<SoilCustomerEntrustVO> selectCustomerEntrustStatistics(@Param("vo")SoilCustomerEntrustVO customerEntrustVO);
+
+    List<SoilExperimentVO> selectPersonalExpVOList(RowBounds rowBounds, @Param("vo")SoilExperimentVO expVO, @Param("acount")Account account);
+
+    List<SoilGroupExpVO> selectGroupExpList(RowBounds rowBounds, @Param("vo") SoilGroupExpVO expVO);
 }

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

@@ -11,6 +11,7 @@ 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.statistics.SoilGroupExpVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import org.springframework.web.multipart.MultipartFile;
@@ -88,4 +89,8 @@ public interface ISoilEntrustService extends IBaseService<SoilEntrust> {
     List<SoilEntrustItemNumVO> listEntrustItemNum(SoilExperimentVO soilEntrust);
 
     Page<SoilEntrustVO> pageReceiveLocationEntrust(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust);
+
+    Page<SoilExperimentVO> pagePersonalExpVO(Page<SoilExperimentVO> page, SoilExperimentVO expVO, Account account);
+
+    Page<SoilGroupExpVO> pageGroupExpStatistics(Page<SoilGroupExpVO> page, SoilGroupExpVO expVO);
 }

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

@@ -33,6 +33,7 @@ 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.statistics.SoilGroupExpVO;
 import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
@@ -1062,6 +1063,19 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
     }
 
 
+
+    @Override
+    public Page<SoilExperimentVO> pagePersonalExpVO(Page<SoilExperimentVO> page, SoilExperimentVO expVO, Account account) {
+        return page.setRecords(baseMapper.selectPersonalExpVOList(page,expVO,account));
+    }
+
+
+    @Override
+    public Page<SoilGroupExpVO> pageGroupExpStatistics(Page<SoilGroupExpVO> page, SoilGroupExpVO expVO) {
+        return page.setRecords(baseMapper.selectGroupExpList(page,expVO));
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean importEntrust(MultipartFile file, Account account) {

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

@@ -171,4 +171,35 @@
         GROUP BY e.client ORDER BY e.client
     </select>
 
+
+    <select id="selectPersonalExpVOList" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
+        SELECT t.id,t.name,t.short_name,t.test_basis,s.sample_code,e.entrust_code FROM soil_experiment t
+        JOIN soil_sample s ON t.sample_id = s.id
+        JOIN soil_entrust e ON e.id = s.entrust_id
+        WHERE s.deleted = 0 AND t.deleted =0 AND e.deleted =0
+        AND t.tester_id = #{vo.testerId}
+    </select>
+
+
+    <select id="selectGroupExpList" resultType="com.patzn.cloud.service.soil.statistics.SoilGroupExpVO">
+        SELECT group_id,group_name,TO_CHAR(o.test_end_time, 'yyyy-MM') AS "testMonth",count(*) AS "testCount" FROM soil_experiment t JOIN
+
+        soil_experiment_operation o ON t.id = o.experiment_id
+
+        WHERE t.status = #{vo.status}
+
+        <if test="null!=vo.groupName">
+            AND t.group_name = #{vo.groupName}
+        </if>
+
+        <if test="null!=vo.year">
+            AND TO_CHAR(o.test_end_time, 'yyyy') = #{vo.year}
+        </if>
+
+        GROUP BY t.group_id,t.group_name,TO_CHAR(o.test_end_time, 'yyyy-MM')
+    </select>
+
+
+
+
 </mapper>