生产工序业务修改

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

@@ -15,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITSysDictService extends IService<TSysDict> {
 
-    R getTagDate(TSysDictQuery tSysDictQuery);
+    R<String> getTagDate(TSysDictQuery tSysDictQuery);
+
+    R<String> getNameByQuery(TSysDictQuery tSysDictQuery);
 
 }

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

@@ -112,11 +112,11 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
             equipmentRunMapper.updateById(run);
         } else {
             //设置tag
-            com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+            com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
             if (r.getCode() != 0) {
                 return R.fail(ResponseEnum.FAIL, r.getMsg());
             }
-            run.setTag((String) r.getData());
+            run.setTag(r.getData());
             equipmentRunMapper.insert(run);
         }
         return R.ok();

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

@@ -78,11 +78,11 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
         TMaterialOut out = new TMaterialOut();
         BeanUtils.copyProperties(query, out);
         //设置标注日期
-        com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+        com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
         if (r.getCode() != 0) {
             return R.fail(ResponseEnum.FAIL, r.getMsg());
         }
-        out.setTag((String) r.getData());
+        out.setTag(r.getData());
         materialOutMapper.insert(out);
         return R.ok();
     }

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

@@ -100,11 +100,11 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
         TMineWorkemployees tMineWorkemployees = new TMineWorkemployees();
         BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, tMineWorkemployees);
         //设置tag
-        R r1 = itSysDictService.getTagDate(null);
+        R<String> r1 = itSysDictService.getTagDate(null);
         if (r1.getCode() != 0) {
             return R.failed(r1.getMsg());
         }
-        tMineWorkemployees.setTag((String) r1.getData());
+        tMineWorkemployees.setTag(r1.getData());
         //计算上班总人数
         tMineWorkemployees.setZrs(calculateZrs(tMineWorkemployees));
         //保存

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

@@ -130,11 +130,11 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         TProcessesAuxiliary tProcessesAuxiliary = new TProcessesAuxiliary();
         BeanUtils.copyProperties(query, tProcessesAuxiliary);
         //设置tag
-        R r1 = itSysDictService.getTagDate(null);
+        R<String> r1 = itSysDictService.getTagDate(null);
         if (r1.getCode() != 0) {
             return R.failed(r1.getMsg());
         }
-        tProcessesAuxiliary.setTag((String) r1.getData());
+        tProcessesAuxiliary.setTag(r1.getData());
         //设置单耗
         if (query.getLjyl() == 0) {
             tProcessesAuxiliary.setDh(0D);

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

@@ -154,11 +154,11 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         TProcessesBlast tProcessesDrilling = new TProcessesBlast();
         BeanUtils.copyProperties(query, tProcessesDrilling);
         //设置tag
-        R r1 = itSysDictService.getTagDate(null);
+        R<String> r1 = itSysDictService.getTagDate(null);
         if (r1.getCode() != 0) {
             return R.failed(r1.getMsg());
         }
-        tProcessesDrilling.setTag((String) r1.getData());
+        tProcessesDrilling.setTag(r1.getData());
         //增加
         int insert = baseMapper.insert(tProcessesDrilling);
         if (insert > 0) {

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

@@ -155,7 +155,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //计算单孔爆破量
             calculateHoleBlastVolume(temp);
         }
-        //如果修改了台阶高度，需要通知爆破设计重新计算设计区爆破量
+        //如果修改了台阶高度，需要通知穿孔工序重新计算设计区爆破量
         if (query.getStepHeight() != null) {
             TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
             tProcessesDrillingQuery.setUid(temp.getUid());
@@ -283,11 +283,11 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         //单孔爆破量(m3)=孔距*排距*台阶高度
         calculateHoleBlastVolume(tProcessesBlastdesignHole);
         //设置tag
-        R tagDate = itSysDictService.getTagDate(null);
+        R<String> tagDate = itSysDictService.getTagDate(null);
         if (tagDate.getCode() != 0) {
             return R.failed(tagDate.getMsg());
         }
-        tProcessesBlastdesignHole.setTag((String) tagDate.getData());
+        tProcessesBlastdesignHole.setTag(tagDate.getData());
         //增加
         log.info(JSON.toJSONString(tProcessesBlastdesignHole));
         int insert = baseMapper.insert(tProcessesBlastdesignHole);

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

@@ -113,11 +113,11 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
         TProcessesCrusher tProcessesCrusher = new TProcessesCrusher();
         BeanUtils.copyProperties(query, tProcessesCrusher);
         //设置标注日期
-        R r1 = itSysDictService.getTagDate(null);
+        R<String> r1 = itSysDictService.getTagDate(null);
         if (r1.getCode() != 0) {
             return R.failed(r1.getMsg());
         }
-        tProcessesCrusher.setTag((String) r1.getData());
+        tProcessesCrusher.setTag(r1.getData());
         //增加
         log.info(JSON.toJSONString(tProcessesCrusher));
         int insert = baseMapper.insert(tProcessesCrusher);

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

@@ -117,11 +117,11 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
         TProcessesDigging digging = new TProcessesDigging();
         BeanUtils.copyProperties(query, digging);
         //设置tag
-        com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+        com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
         if (r.getCode() != 0) {
             return R.fail(ResponseEnum.FAIL, r.getMsg());
         }
-        digging.setTag((String) r.getData());
+        digging.setTag(r.getData());
         processesDiggingMapper.insert(digging);
         return R.ok();
     }

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

@@ -93,11 +93,29 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         Double todayDepthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
 
 
-        //查询，本月合计孔深 上月26日到当前日期的实测孔深相加
+        //查询，本月合计孔深
+        //本字段需要查询字典表SysDict的id为6的数据的name字段，
+        //例如查询出来name字段是26：上月26日到当前日期的实测孔深相加
+        //查询字典id为6的name字段
+        TSysDictQuery tSysDictQuery = new TSysDictQuery();
+        tSysDictQuery.setId(ProjectEnum.TSysDict.SIX.getValue());
+        R<String> name = itSysDictService.getNameByQuery(tSysDictQuery);
+        if (name.getCode() != 0) {
+            log.error("穿孔工序中->获取字典SysDict的id为6数据的name字段失败");
+            return R.failed(name.getMsg());
+        }
+        //将name转化为integer
+        Integer date;
+        try {
+            date = Integer.valueOf(name.getData());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.failed("穿孔工序中->name字段转化为integer失败,name不为数字");
+        }
         //初始化QueryWrapper
         queryWrapper = new QueryWrapper<>();
         queryWrapper
-                .ge(drillingDate.toString(), DateUtil.getBeginTimeStr(LocalDateTime.now().minusMonths(1).withDayOfMonth(26)))
+                .ge(drillingDate.toString(), DateUtil.getBeginTimeStr(LocalDateTime.now().minusMonths(1).withDayOfMonth(date)))
                 .le(drillingDate.toString(), DateUtil.getEndTimeStr(LocalDateTime.now()));
 
         Double monthDepthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
@@ -117,11 +135,11 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         TProcessesDrilling tProcessesDrilling = new TProcessesDrilling();
         BeanUtils.copyProperties(query, tProcessesDrilling);
         //设置tag
-        R r1 = itSysDictService.getTagDate(null);
+        R<String> r1 = itSysDictService.getTagDate(null);
         if (r1.getCode() != 0) {
             return R.failed(r1.getMsg());
         }
-        tProcessesDrilling.setTag((String) r1.getData());
+        tProcessesDrilling.setTag(r1.getData());
         //增加
         int insert = baseMapper.insert(tProcessesDrilling);
         if (insert > 0) {

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

@@ -111,11 +111,11 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 		}
 		TProcessesTruck truck = new TProcessesTruck();
 		BeanUtils.copyProperties(query, truck);
-		com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+		com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
 		if (r.getCode()!=0){
 			return R.fail(ResponseEnum.FAIL,r.getMsg());
 		}
-		truck.setTag((String) r.getData());
+		truck.setTag(r.getData());
 		processesTruckMapper.insert(truck);
 		return R.ok();
 	}

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

@@ -6,8 +6,11 @@ import cn.wise.sc.acquisition.business.mapper.TSysDictMapper;
 import cn.wise.sc.acquisition.business.model.query.TSysDictQuery;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
 import cn.wise.sc.acquisition.business.util.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +25,7 @@ import java.time.LocalDateTime;
  * @since 2021-04-23
  */
 @Service
+@Slf4j
 public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> implements ITSysDictService {
 
     /**
@@ -32,7 +36,8 @@ public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> i
      * @return
      */
     @Override
-    public R getTagDate(TSysDictQuery tSysDictQuery) {
+    public R<String> getTagDate(TSysDictQuery tSysDictQuery) {
+        log.info(JSON.toJSONString(tSysDictQuery));
         //获取标注日期，将字典中id为6的数据的name字段做比较
         //大于name字段记录下一个月，小于该字段记录本月
         //获取id为6的字典
@@ -63,4 +68,24 @@ public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> i
         }
     }
 
+    @Override
+    public R<String> getNameByQuery(TSysDictQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        //封装
+        QueryWrapper<TSysDict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(query.getId() != null, ProjectEnum.TSysDict.ID.getLabel(), query.getId());
+        //查询
+        TSysDict tSysDict = baseMapper.selectOne(queryWrapper);
+        if (tSysDict == null) {
+            log.error("数据字典中->根据条件获取数据，数据为空:{}", JSON.toJSONString(query));
+            return R.failed("数据字典中->根据条件获取数据，数据为空");
+        }
+        if (StringUtils.isBlank(tSysDict.getName())) {
+            log.error("数据字典中->根据条件获取数据，name字段为空:{}", JSON.toJSONString(query));
+            return R.failed("数据字典中->根据条件获取数据，name字段为空");
+        }
+        return R.ok(tSysDict.getName());
+    }
+
 }