旧版实值计算

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java

@@ -59,14 +59,14 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                     for(ProjectInfo projInfo : projectInfo){
                         values = serProjValueMapper.selectValue(projectType,(Integer)enumInfo.get("value"),
                                 projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue(),orgCode);
-                        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)
                             projInfo.setProjectValues(resultValues);
@@ -126,14 +126,14 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                         List<SerProjValueResp> values = serProjValueMapper.selectValue((Integer)enumInfo.get("value"),null,
                                 null,summary.getDeptCode(),date,budgetType,orgCode);
                         if(values != 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;
-                                }
-                            }
+//                            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);

bsoft-api/src/main/resources/mapper/SerProjMapper.xml

@@ -80,7 +80,7 @@
       join SER_PROJ p on p.ID =v.PROJ_ID and p.STATE = 1
       where 1=1
           <if test="date!=null">
-              and v."DATE"=TO_NUMBER(SUBSTR(#{date,jdbcType=DECIMAL},1,4))
+              and v."DATE"=#{date,jdbcType=DECIMAL}
           </if>
           <if test="budgetType!=null">
               and BitAnd(IS_BUDGET,#{budgetType})>0

bsoft-api/src/main/resources/mapper/SerProjValueMapper.xml

@@ -107,7 +107,7 @@
                 AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
             </if>
             <if test="date!=null">
-                AND v."DATE" = TO_NUMBER(SUBSTR(#{date,jdbcType=DECIMAL},1,4))
+                AND v."DATE" = #{date,jdbcType=DECIMAL}
             </if>
             <if test="hosCode!=null">
                 AND v.HOSCODE = #{hosCode,jdbcType=VARCHAR}
@@ -119,7 +119,7 @@
                 AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
             </if>
             <if test="date!=null">
-                AND v."DATE" = TO_NUMBER(SUBSTR(#{date,jdbcType=DECIMAL},1,4))
+                AND v."DATE" = #{date,jdbcType=DECIMAL}
             </if>
             <if test="hosCode!=null">
                 AND v.HOSCODE = #{hosCode,jdbcType=VARCHAR}