【编辑】 PC端化学品小数位后多余0去除

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -6,6 +6,7 @@ import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.*;
 import com.zd.chemical.service.IActAuditconfigService;
 import com.zd.chemical.service.IActHxpapplyService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SaveUtil;
@@ -85,8 +86,6 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                     actRestStockVo.setSubId(actHxpapplyInfoVo.getSubId());
                     actRestStockVo.setCabinetId(b.getCabinetId());
                     actRestStockVo.setChemicalId(b.getChemicalId());
-//                    Map <String, String> restStock = iActHxpapplyService.getRestStock(actRestStockVo);
-//                    b.setRemainingStorage(restStock.get("restStock"));
                     if(pre.test(actApplytasks)){
                         getRestStockClassif(actRestStockVo,b,actHxpapplyInfoVo.getUserId(),apply.getApprovalStatus().intValue());
                     }else{
@@ -95,6 +94,13 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                 });
         List <ActHxpapplyDetailVo> actHxpapplyDetailVos = actHxpapplyDetailMapper.selectApplyDetailList(actHxpapplyDetail);
         consumer.accept(actHxpapplyDetailVos);
+        //小数点后无效0去除
+        if (actHxpapplyDetailVos != null && actHxpapplyDetailVos.size() > 0) {
+            actHxpapplyDetailVos.stream().forEach(vo -> {
+                vo.setApplyNum(ChemicalUtils.removeZeroForAfterPoint(vo.getApplyNum()));
+                vo.setRemainingStorage(ChemicalUtils.removeZeroForAfterPoint(vo.getRemainingStorage()));
+            });
+        }
         actHxpapplyInfoVo.setActHxpapplyDetailList(actHxpapplyDetailVos);
 
         // 查出工作流子节点