修改接口

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

@@ -5,12 +5,13 @@ import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
 import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper;
+import cn.wise.sc.acquisition.business.model.LoginUser;
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesDrillingQuery;
-import cn.wise.sc.acquisition.business.model.vo.TProcessesProductVo;
 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;
@@ -52,6 +53,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
     @Autowired
     private ITSysDictService itSysDictService;
 
+    @Autowired
+    private ITSysUserService itSysUserService;
+
     @Override
     public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
         log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
@@ -288,6 +292,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             return R.failed(tagDate.getMsg());
         }
         tProcessesBlastdesignHole.setTag(tagDate.getData());
+
         //增加
         log.info(JSON.toJSONString(tProcessesBlastdesignHole));
         int insert = baseMapper.insert(tProcessesBlastdesignHole);
@@ -297,6 +302,15 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //增加一条穿孔工序
             TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
             tProcessesDrillingQuery.setUid(hole.getUid());
+            //设置当前登录人（穿孔的制表人）
+            cn.wise.im.common.http.R str = itSysUserService.getLoginUser();
+            if (str.getCode()!=0) {
+                log.error("炮孔设计中->获取当前登录人错误:{}",JSON.toJSONString(str));
+                return R.failed(str.getMessage());
+            }
+            LoginUser loginUser = (LoginUser)str.getData();
+            String name = loginUser.getName();
+            tProcessesDrillingQuery.setTabulator(name);
             //tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r1 = itProcessesDrillingService.insertTProcessesDrilling(tProcessesDrillingQuery);
             if (r1.getCode() != 0) {
@@ -306,6 +320,10 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
 
             //增加一条爆破工序
             TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
+            if (tProcessesBlastQuery.getUid().equals(hole.getUid())){
+                log.error("炮孔设计中->增加一条爆破工序失败:" + JSON.toJSONString(hole.getUid()));
+                return R.failed("炮孔设计中->增加失败：该爆破工序已存在！");
+            }
             tProcessesBlastQuery.setUid(hole.getUid());
             //tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r2 = itProcessesBlastService.insertTProcessesBlast(tProcessesBlastQuery);