设计区爆破量修改

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignHoleController.java

@@ -3,14 +3,12 @@ package cn.wise.sc.acquisition.business.controller;
 
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
-import cn.wise.sc.acquisition.business.util.DateUtil;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.extension.api.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -103,5 +101,11 @@ public class TProcessesBlastdesignHoleController {
         param.setUid(uid);
         return itProcessesBlastdesignHoleService.getByUid(param);
     }
+
+    @ApiOperation(value = "根据采区名称、爆区名称、平台名称计算设计区爆破量")
+    @RequestMapping(value = "getBlastVolume", method = RequestMethod.POST)
+    public R getBlastVolume(TProcessesBlastdesignHoleQuery query) {
+        return itProcessesBlastdesignHoleService.getBlastVolume(query);
+    }
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java

@@ -98,6 +98,7 @@ public class TSampleListController {
     }
 
 
+
     /**
      * 保存图片
      *

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java

@@ -26,4 +26,6 @@ public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBl
 
     Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
     List<String> getBalestHoleId();
+
+    List<TProcessesBlastdesignHoleVo> getBalestVolume(@Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml

@@ -82,5 +82,11 @@
     <select id="getBalestHoleId" resultType="java.lang.String">
         select BlastHoleID from T_Processes_BlastDesign_Hole
     </select>
+    <select id="getBalestVolume" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
+        select sum(HoleBlastVolume) BlastVolume from T_Processes_BlastDesign_Hole
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java

@@ -31,4 +31,6 @@ public interface ITProcessesBlastdesignHoleService extends IService<TProcessesBl
     R getByBlastHoleID(TProcessesBlastdesignHoleQuery query);
 
     R getBalstHoleId();
+
+    R getBlastVolume(TProcessesBlastdesignHoleQuery query);
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java

@@ -14,7 +14,6 @@ import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesProductVo;
 import cn.wise.sc.acquisition.business.service.*;
 import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
-import cn.wise.sc.acquisition.business.util.DateUtil;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -269,14 +267,12 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         if (r.getData() == null) {
             return R.failed("炮孔设计中->设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
         }
-        //判断爆区是否存在
+        //根据炮孔编号判断炮孔是否存在
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel()).toString(), query.getStepName());
-        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel()).toString(), query.getStopeName());
-        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel()).toString(), query.getBlastAreaName());
+        queryWrapper.eq(StringUtils.isNotBlank(query.getBlastHoleID()), "BlastHoleID", query.getBlastHoleID());
         List<TProcessesBlastdesignHoleVo> holeVo = baseMapper.getByQuery(queryWrapper);
         if (CollectionUtils.isNotEmpty(holeVo)) {
-            return R.failed("炮孔设计中->泡孔设计中爆区已存在，StopeName,StepName,BlastAreaName");
+            return R.failed("炮孔设计中->泡孔设计中该炮孔已存在，BlastHoleID" + query.getBlastHoleID());
         }
         //条件封装
         TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole();
@@ -376,6 +372,17 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         return R.ok(balestHoleId);
     }
 
+    @Override
+    public R getBlastVolume(TProcessesBlastdesignHoleQuery query) {
+        QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(query.getStopeName()),"StopeName",query.getStopeName())
+                .eq(StringUtils.isNotBlank(query.getStepName()),"StepName",query.getStepName())
+                .eq(StringUtils.isNotBlank(query.getBlastAreaName()),"BlastAreaName",query.getBlastAreaName());
+        List<TProcessesBlastdesignHoleVo> balestVolume = baseMapper.getBalestVolume(queryWrapper);
+
+        return R.ok(balestVolume);
+    }
+
     /**
      * 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
      */

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TMineStopeMapper">
-
+    <select id="getStopeName" resultType="cn.wise.sc.acquisition.business.entity.TMineStope">
+        select StopeName,StepName,BlastAreaName from T_Mine_Stope
+    </select>
 </mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TSampleLaboratorysheetMapper">
 
+    <select id="getList" resultType="cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet">
+        select * from T_Sample_LaboratorySheet
+    </select>
 </mapper>