Skip to content

S
sv-springboot
Commit 7a7cb86d by Suvalue
Options

实值版本合并

parent 32dd121d
Showing with 16 additions and 16 deletions
bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java
......@@ -60,14 +60,14 @@ public class SerProjValueServiceImpl implements SerProjValueService {
values = serProjValueMapper.selectValue(projectType,(Integer)enumInfo.get("value"),
projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue(),orgCode);
if(values != null && values.size() > 0){
// for(SerProjValueResp value : values){
// valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,deptCode,orgCode);
// if(valueSz != null){
// value.setSz(valueSz.getSz());
// value.setZxpl(valueSz.getZxpl());
// valueSz = null;
// }
// }
for(SerProjValueResp value : values){
valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,deptCode,orgCode);
if(valueSz != null){
value.setSz(valueSz.getSz());
value.setZxpl(valueSz.getZxpl());
valueSz = null;
}
}
}
resultValues = getLevelData(values,BigDecimal.valueOf(PROJ_TOP_PARENT_ID));
if(resultValues != null && resultValues.size() > 0)
......@@ -129,14 +129,14 @@ public class SerProjValueServiceImpl implements SerProjValueService {
values = serProjValueMapper.selectValue((Integer)enumInfo.get("value"),null,
null,summary.getDeptCode(),date,budgetType,orgCode);
if(values != null && values.size() > 0){
// for(SerProjValueResp value : values){
// valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,summary.getDeptCode(),orgCode);
// if(valueSz != null){
// value.setSz(valueSz.getSz());
// value.setZxpl(valueSz.getZxpl());
// valueSz = null;
// }
// }
for(SerProjValueResp value : values){
valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,summary.getDeptCode(),orgCode);
if(valueSz != null){
value.setSz(valueSz.getSz());
value.setZxpl(valueSz.getZxpl());
valueSz = null;
}
}
projType.setProject(values);
}
summary.getProjTypeList().add(projType);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment