报表修改

src/main/java/com/chinaitop/depot/business/controller/ReportMonthlyController.java

@@ -102,18 +102,25 @@ public class ReportMonthlyController {
 	})
 	public Map<String,String> edit(String reportMonthlyJson,Integer orgId){
 		ObjectMapper mapper = new ObjectMapper();
+		Map<String,String> map = new HashMap<String, String>();
 		try {
 			ReportMonthly reportMonthly = (ReportMonthly) mapper.readValue(reportMonthlyJson, ReportMonthly.class);
 			reportMonthly.setOrgId(orgId);
 
 			if(ParameterUtil.isnotnull(reportMonthly.getId())){
 				reportMonthlyService.update(reportMonthly);
+				map.put("status","success");
+				map.put("infoCode","200");
 			}else{
 				reportMonthly.setStatus("0");
 				reportMonthlyService.add(reportMonthly);
+				map.put("status","success");
+				map.put("infoCode","200");
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			map.put("status","error");
+			map.put("infoCode","500");
+
 		}
 		return null;
 	}
@@ -161,12 +168,18 @@ public class ReportMonthlyController {
 			System.out.println("上报月报表请求地址以及参数:--"+url+"?monthlyReport="+jsonObject);
 			if(count.contains("Success") || count.contains("200")){
 				modelMap.put("status", "success");
+				modelMap.put("infoCode", 200);
 				modelMap.put("msg", "成功！");
+			}else if(count.contains("Success") || count.contains("303")){
+				modelMap.put("status", "error");
+				modelMap.put("infoCode", 303);
+				modelMap.put("msg", "重复提交该报表！");
 			}
 		} catch (Exception e){
 			// req.append("?data=");
 			e.printStackTrace();
 			modelMap.put("status", "error");
+			modelMap.put("infoCode", 500);
 			modelMap.put("msg", "保存失败！");
 		}
 
@@ -194,6 +207,7 @@ public class ReportMonthlyController {
 				mon.setStatus(String.valueOf(status));
 				reportMonthlyService.updateMonthlyStatus(mon);
 				modelMap.put("mon", mon);
+				modelMap.put("infoCode", 200);
 				modelMap.put("status", "success");
 			}else{
 				throw new RuntimeException("id或status无值");
@@ -202,6 +216,7 @@ public class ReportMonthlyController {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			modelMap.put("status", "error");
+			modelMap.put("infoCode", 500);
 			modelMap.put("msg", "保存失败！");
 		}
 

src/main/java/com/chinaitop/depot/business/controller/ReportWeeklyController.java

@@ -101,18 +101,24 @@ public class ReportWeeklyController {
 	})
 	public Map<String,String> edit(String reportWeeklyJson,Integer orgId){
 		ObjectMapper mapper = new ObjectMapper();
+		Map<String,String> map = new HashMap<String, String>();
 		try {
 			ReportWeekly reportWeekly = (ReportWeekly) mapper.readValue(reportWeeklyJson, ReportWeekly.class);
 			reportWeekly.setOrgId(orgId);
 
 			if(ParameterUtil.isnotnull(reportWeekly.getId())){
 				reportWeeklyService.update(reportWeekly);
+				map.put("status","success");
+				map.put("infoCode","200");
 			}else{
 				reportWeekly.setStatus("0");
 				reportWeeklyService.add(reportWeekly);
+				map.put("status","success");
+				map.put("infoCode","200");
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			map.put("status","error");
+			map.put("infoCode","500");
 		}
 		return null;
 	}
@@ -129,8 +135,16 @@ public class ReportWeeklyController {
 	})
 	public Map<String,String> remove(Integer id){
 		Map<String,String> map = new HashMap<String, String>();
-		reportWeeklyService.remove(id);
-		map.put("status","success");
+		try {
+			reportWeeklyService.remove(id);
+			map.put("status","success");
+			map.put("infoCode","200");
+		}catch (Exception e){
+			map.put("status","error");
+			map.put("infoCode","500");
+		}
+
+
 		return map;
 	}
 
@@ -160,12 +174,18 @@ public class ReportWeeklyController {
 			System.out.println("上报周报表请求地址以及参数:--"+url+jsonObject);
 			if(count.contains("Success") || count.contains("200")){
 				modelMap.put("status", "success");
+				modelMap.put("infoCode", 200);
 				modelMap.put("msg", "成功！");
+			}else if(count.contains("Success") || count.contains("303")){
+				modelMap.put("status", "error");
+				modelMap.put("infoCode", 303);
+				modelMap.put("msg", "重复提交该报表！");
 			}
 		} catch (Exception e){
 			// req.append("?data=");
 			e.printStackTrace();
 			modelMap.put("status", "error");
+			modelMap.put("infoCode", 500);
 			modelMap.put("msg", "保存失败！");
 		}
 
@@ -193,6 +213,7 @@ public class ReportWeeklyController {
 				week.setStatus(String.valueOf(status));
 				reportWeeklyService.updateWeeklyStatus(week);
 				modelMap.put("week", week);
+				modelMap.put("infoCode", 200);
 				modelMap.put("status", "success");
 			}else{
 				throw new RuntimeException("id或status无值");
@@ -201,6 +222,7 @@ public class ReportWeeklyController {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			modelMap.put("status", "error");
+			modelMap.put("infoCode", 500);
 			modelMap.put("msg", "保存失败！");
 		}