yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2024-07-04 11:25:39 +08:00
parent 633d51731e a4569c0936
commit e68b0de455
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java
View File

@ -23,6 +23,7 @@ import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@ -163,10 +164,20 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
public Result selectMaterialArtificer(Integer page, Integer limit, MaterialArtificer materialArtificer) { public Result selectMaterialArtificer(Integer page, Integer limit, MaterialArtificer materialArtificer) {
if(ObjectUtil.isEmpty(page) || ObjectUtil.isEmpty(limit)){ if(ObjectUtil.isEmpty(page) || ObjectUtil.isEmpty(limit)){
List<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificerList(materialArtificer); List<MaterialArtificerResult> 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); return Result.success().put("data", materialIPage);
}else { }else {
IPage<MaterialArtificerResult> page1 = new Page(page, limit); IPage<MaterialArtificerResult> page1 = new Page(page, limit);
IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer); IPage<MaterialArtificerResult> 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); return Result.success().put("data", materialIPage);
} }
} }