预算编制保存

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

@@ -95,6 +95,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
             SerProjValue info = null;
             long version = System.currentTimeMillis();
             for(BudgetValue budgetValue : request.getBudgetValues()){
+                if(budgetValue.getProjId() != null){
                     info = new SerProjValue(budgetValue);
                     info.setDate(request.getDate());
                     info.setDeptCode(request.getDeptCode());
@@ -104,6 +105,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                     info.setHoscode(orgCode);
                     serProjValueMapper.insert(info);
                 }
+            }
             //调用计算数值存储过程
             serProjValueMapper.updateValue(request.getDate(),orgCode);
         }

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

@@ -52,11 +52,7 @@
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
         from SER_DISEASE d,SER_DISEASE_DOC_RS rs
         where d.STATE=1
-      and rs.MDC_CODE=d.MDC_CODE and rs.MDC_CODE = #{code,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
-      and d.`DATE` =#{date,jdbcType=VARCHAR}
-      <if test="docCode!=null">
-          and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
-      </if>
+        and rs.MDC_CODE=d.MDC_CODE and rs.MDC_CODE = #{code,jdbcType=VARCHAR}
         <if test="deptCode!=null">
             and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
         </if>
@@ -66,12 +62,6 @@
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
         from SER_DISEASE d,SER_DISEASE_DOC_RS rs
         where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
-      <if test="date!=null">
-          and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
-      </if>
-      <if test="docCode!=null">
-          and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
-      </if>
         <if test="deptCode!=null">
             and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
         </if>
@@ -85,15 +75,9 @@
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
         from SER_DISEASE d,SER_DISEASE_DOC_RS rs
         where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
-      <if test="date!=null">
-          and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
-      </if>
         <if test="level!=null">
             and d.`LEVEL` = #{level,jdbcType=DECIMAL}
         </if>
-      <if test="docCode!=null">
-          and rs.DOC_CODE = #{docCode,jdbcType=DECIMAL}
-      </if>
         <if test="deptCode!=null">
             and rs.DEPT_CODE = #{deptCode,jdbcType=VARCHAR}
         </if>
@@ -113,15 +97,9 @@
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
         from SER_DISEASE d,SER_DISEASE_DOC_RS rs
         where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
-      <if test="date!=null">
-          and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
-      </if>
         <if test="parentId!=null">
             and d.PARENT_ID = #{parentId,jdbcType=DECIMAL}
         </if>
-      <if test="docCode!=null">
-          and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
-      </if>
         <if test="deptCode!=null">
             and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
         </if>
@@ -131,9 +109,6 @@
         select *
         from SER_DISEASE
         where 1 = 1 and STATE=1
-      <if test="date!=null">
-          and `DATE` = #{date,jdbcType=VARCHAR}
-      </if>
         <if test="diseaseId!=null">
             and id=(select PARENT_ID from SER_DISEASE where id = #{diseaseId,jdbcType=DECIMAL} )
         </if>
@@ -143,15 +118,9 @@
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
         from SER_DISEASE d,SER_DISEASE_DOC_RS rs
         where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
-      <if test="date!=null">
-          and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
-      </if>
         <if test="diseaseId!=null">
             and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}
         </if>
-      <if test="docCode!=null">
-          and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
-      </if>
         <if test="deptCode!=null">
             and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
         </if>

bsoft-common/src/main/java/com/bsoft/common/utils/StringUtil.java

 package com.bsoft.common.utils;
 
 public class StringUtil {
-    public static boolean isNullOrEmpty(String str){
+    public static boolean isNullOrEmpty(String str) {
         return str == null || str.isEmpty();
     }
 
-    public static boolean isNullOrBlank(String str){
+    public static boolean isNullOrBlank(String str) {
         return str == null || str.trim().isEmpty();
     }
 }