java/IgoTravel.git

			@@ -145,12 +145,16 @@
			public Object detail(@PathVariable("tReportLossId") Integer tReportLossId) {
			return tReportLossService.selectById(tReportLossId);
			}



			@RequestMapping(value = "/dispose")
			@ResponseBody
			public Object dispose(Integer id,String info) {
			TReportLoss tReportLoss = tReportLossService.selectById(id);
			tReportLoss.setDisposeInfo(info);
			tReportLoss.setStatus(2);
			tReportLoss.setHandleTime(new Date());
			tReportLoss.setHandleUserId(ShiroKit.getUser().getObjectId());
			boolean b = tReportLossService.updateById(tReportLoss);
			if(b){

			@@ -337,7 +337,7 @@
			if(0 == h){
			usedTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute(s)" : m + "-minute";
			}else{
			usedTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute" : h + "-hour" + m + "-minute";
			usedTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute(s)" : h + "-hour" + m + "-minute";
			}
			orderTimeInfo.setUsedTime(usedTime);
			if(null != orderLogistics.getEndServiceTime()){
			@@ -361,9 +361,9 @@
			m = duration % 60;
			String remainingTime = "";
			if(0 == h){
			remainingTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute" : m + "-minute";
			remainingTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute(s)" : m + "-minute";
			}else{
			remainingTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute" : h + "-hour" + m + "-minute";
			remainingTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute(s)" : h + "-hour" + m + "-minute";
			}
			orderTimeInfo.setRemainingTime(remainingTime);
			}

	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史