diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java index 247d1b0..ae42e81 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java @@ -23,6 +23,7 @@ import jodd.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -163,10 +164,20 @@ public class MaterialServiceImpl extends ServiceImpl i public Result selectMaterialArtificer(Integer page, Integer limit, MaterialArtificer materialArtificer) { if(ObjectUtil.isEmpty(page) || ObjectUtil.isEmpty(limit)){ List materialIPage = materialMapper.selectMaterialArtificerList(materialArtificer); + for(MaterialArtificerResult par:materialIPage){ + if(par.getResidue().compareTo(BigDecimal.ZERO)<0){ + par.setResidue(BigDecimal.ZERO); + } + } return Result.success().put("data", materialIPage); }else { IPage page1 = new Page(page, limit); IPage materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer); + for(MaterialArtificerResult par:materialIPage.getRecords()){ + if(par.getResidue().compareTo(BigDecimal.ZERO)<0){ + par.setResidue(BigDecimal.ZERO); + } + } return Result.success().put("data", materialIPage); } }