生产工序业务修改

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

@@ -85,6 +85,10 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
         if (StringUtils.isNotBlank(query.getTag())) {
             return R.failed("员工上班统计中->tag自动生成不能添加");
         }
+        //上班总人数不能修改
+        if (query.getZrs() != null) {
+            return R.failed("员工上班统计中->上班总人数自动计算");
+        }
         //上班日期不能重复
         if (query.getGzsj() != null) {
             R r1 = getByQuery(query);
@@ -101,6 +105,8 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
             return R.failed(r1.getMsg());
         }
         tMineWorkemployees.setTag((String) r1.getData());
+        //计算上班总人数
+        tMineWorkemployees.setZrs(calculateZrs(tMineWorkemployees));
         //保存
         int insert = baseMapper.insert(tMineWorkemployees);
         if (insert > 0) {
@@ -125,10 +131,15 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
         if (StringUtils.isNotBlank(query.getTag())) {
             return R.failed("员工上班统计中->tag自动生成不能修改");
         }
+        //上班总人数不能修改
+        if (query.getZrs() != null) {
+            return R.failed("员工上班统计中->上班总人数自动计算不能修改");
+        }
         //封装
         TMineWorkemployees tMineWorkemployees = new TMineWorkemployees();
         BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, tMineWorkemployees);
-
+        //重新计算上班总人数
+        tMineWorkemployees.setZrs(calculateZrs(tMineWorkemployees));
         QueryWrapper<TMineWorkemployees> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid());
         //修改
@@ -140,4 +151,26 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
             return R.failed("员工上班统计中->修改失败");
         }
     }
+
+    /**
+     * 计算上班总人数 私有方法
+     *
+     * @param tMineWorkemployees
+     * @return
+     */
+    private int calculateZrs(TMineWorkemployees tMineWorkemployees) {
+        int zrs = 0;
+        if (tMineWorkemployees != null) {
+            if (tMineWorkemployees.getBprs() != null) zrs += tMineWorkemployees.getBprs();
+            if (tMineWorkemployees.getCkrs() != null) zrs += tMineWorkemployees.getCkrs();
+            if (tMineWorkemployees.getFzrs() != null) zrs += tMineWorkemployees.getFzrs();
+            if (tMineWorkemployees.getPsrs() != null) zrs += tMineWorkemployees.getPsrs();
+            if (tMineWorkemployees.getZcrs() != null) zrs += tMineWorkemployees.getZcrs();
+            if (tMineWorkemployees.getYsrs() != null) zrs += tMineWorkemployees.getYsrs();
+            return zrs;
+        } else {
+            log.error("员工上班统计中->计算上班总人数时 对象为空");
+            return zrs;
+        }
+    }
 }

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

@@ -279,7 +279,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //增加一条穿孔工序
             TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
             tProcessesBlastdesignHole.setUid(hole.getUid());
-            tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
+            //tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r1 = itProcessesDrillingService.insertTProcessesDrilling(tProcessesDrillingQuery);
             if (r1.getCode() != 0) {
                 log.error("炮孔设计中->增加一条穿孔工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
@@ -289,7 +289,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //增加一条爆破工序
             TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
             tProcessesBlastQuery.setUid(hole.getUid());
-            tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
+            //tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r2 = itProcessesBlastService.insertTProcessesBlast(tProcessesBlastQuery);
             if (r2.getCode() != 0) {
                 log.error("炮孔设计中->增加一条爆破工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));