diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java index bba63cc68f49c36a60d51a59f7b243bca180e293..29930ebbfaaa2d1f76a6022c6250281a561c1440 100644 --- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java +++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java @@ -7,6 +7,7 @@ import cn.wise.sc.acquisition.business.mapper.TProcessesAuxiliaryMapper; import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery; import cn.wise.sc.acquisition.business.service.ITProcessesAuxiliaryService; import cn.wise.sc.acquisition.business.service.ITSysDictService; +import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy; import cn.wise.sc.acquisition.business.wrapper.page.Query; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -76,12 +77,21 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili if (StringUtils.isNotBlank(query.getTag())) { return R.failed("辅助工åºä¸->tag为自动生æˆå—段,ä¸èƒ½ä¿®æ”¹"); } + //当月累计油é‡ä¸ä¸ºç©ºæ—¶ï¼Œéœ€è¦åˆ¤æ–。当月累计油é‡ä¸ä¸º0时,当月累计产é‡ä¸èƒ½ä¸º0 å› ä¸ºdh 由当月累计油é‡/å½“æœˆç´¯è®¡äº§é‡ è®¡ç®—è€Œæ¥ï¼Œåˆ†æ¯ä¸èƒ½ä¸º0 + if ((query.getLjyl() != null && query.getLjyl() != 0) + && query.getDyljcl() != null + && query.getDyljcl() == 0) { + return R.failed("辅助工åºä¸->当è¦åŒæ—¶ä¿®æ”¹å½“月累计油é‡å’Œå½“æœˆç´¯è®¡æ²¹é‡æ—¶, 当月累计油é‡Ljyl ä¸ä¸º0时,当月累计产é‡Dyljclä¸èƒ½ä¸º0,å› ä¸ºdh 由当月累计油é‡/å½“æœˆç´¯è®¡äº§é‡ è®¡ç®—è€Œæ¥ï¼Œåˆ†æ¯ä¸èƒ½ä¸º0"); + } //æ¡ä»¶å°è£… TProcessesAuxiliary tSampleList = new TProcessesAuxiliary(); - BeanUtils.copyProperties(query, tSampleList); + BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, tSampleList); QueryWrapper<TProcessesAuxiliary> queryWrapper = new QueryWrapper<>(); queryWrapper.eq(ProjectEnum.TProcessesAuxiliary.UID.getLabel(), query.getUid()); + //计算å•耗 防æ¢å¤±åŽ»ç²¾åº¦ï¼Œå…ˆè½¬æˆå—符串 + float dh = tSampleList.getLjyl() / tSampleList.getDyljcl(); + tSampleList.setDh(Double.valueOf(String.valueOf(dh))); //修改 int update = baseMapper.update(tSampleList, queryWrapper); if (update > 0) {