1.维修上报

王通
1 parent 4da7d734
Showing 3 changed files with 26 additions and 3 deletions
src/main/java/com/bsth/entity/report/RepairReport.java
src/main/java/com/bsth/repository/RepairReportRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -46,6 +46,8 @@ public class RepairReport {
 	// 格式化的时间字符串
 	@Transient
 	private String reportStateStr;
+	// 上报方式 0自动 1主动
+	private int reportMode;
  
 	public Integer getId() {
 		return id;
@@ -150,4 +152,12 @@ public class RepairReport {
 	public void setReportStateStr(String reportStateStr) {
 		this.reportStateStr = reportStateStr;
 	}
+
+	public int getReportMode() {
+		return reportMode;
+	}
+
+	public void setReportMode(int reportMode) {
+		this.reportMode = reportMode;
+	}
 }
@@ -31,4 +31,7 @@ public interface RepairReportRepository extends BaseRepository&lt;RepairReport, Int
 			+ " RepairReport r where r.lineId = ?1 and r.reportDate between ?2 and "
 			+ "?3 and r.incode like ?4%")
 	List<RepairReport> repairReportList(String lineId,Date start,Date end,String incode);
+	
+	@Query(value="select count(r) from RepairReport r where r.schId = ?1 and r.reportMode = ?2")
+	int repairReportBySch(Long schId, int reportMode);
 }
@@ -1534,6 +1534,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
     private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
  
+    @Transactional
     @Override
     public Map<String, Object> schInfoFineTune(Map<String, String> map) {
         Map<String, Object> rs = new HashMap<>();
@@ -1543,7 +1544,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         	if (StringUtils.isNotBlank(map.get("repairTypes"))) {
         		Map<String, Object> param = new HashMap<String, Object>();
         		param.putAll(map);
-        		repairReport(param, false);
+        		Map<String, Object> rrs = repairReport(param, false);
+        		if (ResponseCode.ERROR.equals(rrs.get("status"))) {
+        			return rrs;
+        		}
         	}
  
             Long id = Long.parseLong(map.get("id"));
@@ -6068,6 +6072,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					res.put("status", ResponseCode.ERROR);
 					res.putAll(response);
 				}
+			} else {
+				res.put("status", ResponseCode.ERROR);
+				res.put("msg", "调用上报接口异常");
 			}
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
@@ -6116,9 +6123,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url." + arr[1]));
 		url.append("?nbbm=").append(incode).append("&bxy=").append(reportUser).append("&bxbm=").append(repairTypes).append("&fgs=").append(arr[0]);
  
+		int count = repairReportRepository.repairReportBySch(id, 0);
+		if (count > 0) return res;
 		RepairReport lrr = dayOfSchedule.getLastestRepairReport(incode);
-		// 非主动上报并且无上报记录或上次已上报或上次上报的同一个班次 则不用上报
-		if (!isActive && (lrr == null || lrr.getReportState() != 0 || lrr.getSchId().equals(id))) {
+		// 非主动上报并且无上报记录或上次已上报 则不用上报
+		if (!isActive && (lrr == null || lrr.getReportState() != 0)) {
 			reportState = 0;
 		} else {
 			res = request(url.toString());
@@ -6136,6 +6145,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		rr.setRepairType(repairTypes);
 		rr.setReportDate(new Date());
 		rr.setReportState(reportState);
+		rr.setReportMode(isActive ? 1 : 0);
 		repairReportRepository.save(rr);
 		dayOfSchedule.setLastestRepairReport(rr);