修复问题

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

@@ -74,6 +74,16 @@ public class TSampleListController {
         return itSampleListService.insertSampleList(tSampleListQuery);
     }
 
+    /**
+     * 获取炮孔编号
+     * @return
+     */
+    @ApiOperation(value = "获取炮孔编号")
+    @RequestMapping(value = "/getBlastHoleId",method = RequestMethod.GET)
+    public R getHoleId(){
+        return itSampleListService.getHoleId();
+    }
+
 
     /**
      * 根据样号删除送验单

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

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

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

@@ -80,5 +80,8 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getBalestHoleId" resultType="java.lang.String">
+        select BlastHoleID from T_Processes_BlastDesign_Hole
+    </select>
 
 </mapper>

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

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

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

@@ -33,4 +33,6 @@ public interface ITSampleListService extends IService<TSampleList> {
     R getImage(TSampleListQuery query, final HttpServletResponse response);
 
     R getByYh(TSampleListQuery query);
+
+    R getHoleId();
 }

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

@@ -59,9 +59,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
     @Autowired
     private ITSysUserService itSysUserService;
 
-    @Resource
-    private TProcessesBlastdesignHoleMapper processesBlastdesignHoleMapper;
-
     @Override
     public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
         log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
@@ -109,7 +106,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
 
         }
         //判断是否添加了穿孔日期，如果已添加那么久不能修改，未添加则可以修改
-        if (temp.getDrillingDate() != null) {
+        if (query.getDrillingDate() != null && temp.getDrillingDate() != null) {
             return R.failed("炮孔设计中->穿孔日期已存在不能修改: DrillingDate:" + temp.getDrillingDate());
         }
         //判断是否需要修改关联的 设计爆区爆破量
@@ -366,6 +363,12 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         return R.ok(baseMapper.selectOne(queryWrapper));
     }
 
+    @Override
+    public R getBalstHoleId() {
+        List<String> balestHoleId = baseMapper.getBalestHoleId();
+        return R.ok(balestHoleId);
+    }
+
     /**
      * 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
      */

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

@@ -5,6 +5,7 @@ import cn.wise.sc.acquisition.business.entity.TSampleList;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TSampleListMapper;
 import cn.wise.sc.acquisition.business.model.query.TSampleListQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
 import cn.wise.sc.acquisition.business.service.ITSampleListService;
 import cn.wise.sc.acquisition.business.util.ImageUtil;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
@@ -16,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -36,6 +38,9 @@ import java.util.Optional;
 @Slf4j
 public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSampleList> implements ITSampleListService {
 
+    @Autowired
+    private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService;
+
     @Override
     public R getPage(TSampleListQuery tSampleListQuery, Query query) {
         log.info(JSON.toJSONString(tSampleListQuery));
@@ -73,6 +78,12 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         return R.ok(baseMapper.selectById(query.getYh()));
     }
 
+    @Override
+    public R getHoleId() {
+        R balstHoleId = itProcessesBlastdesignHoleService.getBalstHoleId();
+        return R.ok(balstHoleId);
+    }
+
 
     @Override
     @Transactional