追加

src/main/java/com/corp/cyyy/dubget/web/BudgetDeclaratioController.java

@@ -94,6 +94,8 @@ public class BudgetDeclaratioController{
     @Autowired private  BudgetService budgtService;
     @Autowired private ReOrgService reService;
     @Autowired private OaOrgService oaOrgService;
+    
+    @Autowired private BudgetService budgetService;
     @Autowired
     FileService fileService;
     /* 页面 */
@@ -511,9 +513,19 @@ public class BudgetDeclaratioController{
 
 		}
     	if (budgetDeclaratio.getState().equals("3")) {
+    		
+    		BudgetDeclaratio vi = budgetDeclaratioService.queryById(budgetDeclaratio.getId());
+    		
+    		Budget bu = budgetService.queryByNumer(vi.getNumber());
      		BudgetDeclaratio budget = budgetDeclaratioService.queryById(budgetDeclaratio.getId());
+     		BudgtType ty = budgtTypeService.queryById(budget.getType());
+ 	    	
+    		//根据项目类型和名称获取项目信息
+    		BudgtBase	budgtBase=budgtBaseService.getBase(ty.getId(),budgetDeclaratio.getName());
+    		boolean fa=true;
+    		if (bu==null) {
+    			 bu=new Budget();
 
-    		Budget bu=new Budget();
      			bu.setBudget(budget.getBudget());
  	    		bu.setCreateTime(new Date());
  	    		bu.setDeclareId(budget.getId());
@@ -523,9 +535,7 @@ public class BudgetDeclaratioController{
  	    		bu.setName(budget.getName());
  	    		bu.setNumber(budget.getNumber());
  	    		bu.setQuantity(budget.getQuantity());
-    		BudgtType ty = budgtTypeService.queryById(budget.getType());
-    		//根据项目类型和名称获取项目信息
-    		BudgtBase	budgtBase=budgtBaseService.getBase(ty.getId(),budgetDeclaratio.getName());
+
  	    		bu.setRange(budgtBase.getRange());//这个是把项目的预算范围放入预算种
  	    		
  	    	//	bu.setRange(ty.getOrgName());//这个是预算类型的预算范围放入预算种后期儿童的用这个
@@ -533,6 +543,30 @@ public class BudgetDeclaratioController{
  	    		bu.setTypeId(ty.getId());
  	    		bu.setTypeName(ty.getName());
  				budgtService.save(bu);
+     		
+    	    		
+			}
+    		else {
+    			bu.setBudget(budget.getBudget());
+	    		bu.setCreateTime(new Date());
+	    		bu.setDeclareId(budget.getId());
+	    		bu.setDeptId(budget.getDeptId());
+	    		bu.setDeptName(budget.getDeptName());
+	    		bu.setEstimate(budget.getEstimate());
+	    		bu.setName(budget.getName());
+	    		bu.setNumber(budget.getNumber());
+	    		bu.setQuantity(budget.getQuantity());
+
+	    		bu.setRange(budgtBase.getRange());//这个是把项目的预算范围放入预算种
+	    		
+	    	//	bu.setRange(ty.getOrgName());//这个是预算类型的预算范围放入预算种后期儿童的用这个
+	    		bu.setReplyQuota(budget.getBudget());
+	    		bu.setTypeId(ty.getId());
+	    		bu.setTypeName(ty.getName());
+				budgtService.updateTemplate(bu);
+    		}
+    		
+
 			OaOrg oaorg = oaOrgService.queryByOrgId(bu.getDeptId());
 			String oa=XstreamTest.beanToXml(bu,ty,budgetDeclaratio,oaorg);
     		//保存记录