Skip to content

S
sv-springboot
Commit e8d7e33a by Suvalue
Options

mysql旧版实值

parent 2a76f08e
Showing with 21 additions and 18 deletions
bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java
...@@ -59,13 +59,15 @@ public class SerProjValueServiceImpl implements SerProjValueService { ...@@ -59,13 +59,15 @@ public class SerProjValueServiceImpl implements SerProjValueService {
for(ProjectInfo projInfo : projectInfo){ for(ProjectInfo projInfo : projectInfo){
values = serProjValueMapper.selectValue(projectType,(Integer)enumInfo.get("value"), values = serProjValueMapper.selectValue(projectType,(Integer)enumInfo.get("value"),
projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue(),orgCode); projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue(),orgCode);
for(SerProjValueResp value : values){ if(values != null && values.size() > 0){
valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,deptCode,orgCode); // for(SerProjValueResp value : values){
if(valueSz != null){ // valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,deptCode,orgCode);
value.setSz(valueSz.getSz()); // if(valueSz != null){
value.setZxpl(valueSz.getZxpl()); // value.setSz(valueSz.getSz());
valueSz = null; // value.setZxpl(valueSz.getZxpl());
} // valueSz = null;
// }
// }
} }
resultValues = getLevelData(values,BigDecimal.valueOf(PROJ_TOP_PARENT_ID)); resultValues = getLevelData(values,BigDecimal.valueOf(PROJ_TOP_PARENT_ID));
if(resultValues != null && resultValues.size() > 0) if(resultValues != null && resultValues.size() > 0)
...@@ -119,21 +121,22 @@ public class SerProjValueServiceImpl implements SerProjValueService { ...@@ -119,21 +121,22 @@ public class SerProjValueServiceImpl implements SerProjValueService {
SummaryProjType projType = null; SummaryProjType projType = null;
List<ProjectInfo> projectInfo = null; List<ProjectInfo> projectInfo = null;
SerProjValueSz valueSz = null; SerProjValueSz valueSz = null;
List<SerProjValueResp> values = null;
if(enumList != null && enumList.size() > 0){ if(enumList != null && enumList.size() > 0){
for(Map<String,Object> enumInfo : enumList){ for(Map<String,Object> enumInfo : enumList){
projType = new SummaryProjType(); projType = new SummaryProjType();
projType.setProjTypeName(String.valueOf(enumInfo.get("description"))); projType.setProjTypeName(String.valueOf(enumInfo.get("description")));
List<SerProjValueResp> values = serProjValueMapper.selectValue((Integer)enumInfo.get("value"),null, values = serProjValueMapper.selectValue((Integer)enumInfo.get("value"),null,
null,summary.getDeptCode(),date,budgetType,orgCode); null,summary.getDeptCode(),date,budgetType,orgCode);
if(values != null){ if(values != null && values.size() > 0){
for(SerProjValueResp value : values){ // for(SerProjValueResp value : values){
valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,summary.getDeptCode(),orgCode); // valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,summary.getDeptCode(),orgCode);
if(valueSz != null){ // if(valueSz != null){
value.setSz(valueSz.getSz()); // value.setSz(valueSz.getSz());
value.setZxpl(valueSz.getZxpl()); // value.setZxpl(valueSz.getZxpl());
valueSz = null; // valueSz = null;
} // }
} // }
projType.setProject(values); projType.setProject(values);
} }
summary.getProjTypeList().add(projType); summary.getProjTypeList().add(projType);
......
bsoft-api/src/main/resources/mapper/SerProjMapper.xml
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
and v.`DATE`= LEFT(#{date,jdbcType=DECIMAL},4) and v.`DATE`= LEFT(#{date,jdbcType=DECIMAL},4)
</if> </if>
<if test="budgetType!=null"> <if test="budgetType!=null">
and IS_BUDGET&amp;#{budgetType,jdbcType=DECIMAL})>0 and IS_BUDGET&amp;#{budgetType,jdbcType=DECIMAL}>0
</if> </if>
GROUP BY v.DEPT_CODE,v.SORT GROUP BY v.DEPT_CODE,v.SORT
order by v.SORT order by v.SORT
......
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