jfpt-BladeX.git

			@@ -678,7 +678,7 @@
			Date date = new Date();// 获取当前时间
			//System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）

			Operation operation = null;
			Operation operation = new Operation();
			operation.setJid(alarmVO.getId().toString());
			operation.setSnumber(alarmVO.getSecurityId());
			operation.setZc("接受任务");

			@@ -404,7 +404,11 @@


			<update id="updateJtype">
			update sys_alarm SET jtype=#{jtype},bz=#{bz}
			update sys_alarm SET jtype=#{jtype}

			<if test="bz!=null and bz!=''">
			,bz=#{bz}
			</if>

			<if test="securityArr!=null and id!=''">
			,securityArr =#{securityArr}

			@@ -274,7 +274,7 @@
			Date date = new Date();// 获取当前时间
			//System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）

			Operation operation = null;
			Operation operation = new Operation();
			operation.setJid(feedback.getJid());
			operation.setSnumber(feedback.getSnumber());
			operation.setZc("任务反馈提交,警情结束");
			@@ -298,8 +298,7 @@
			wj.setAddress(string3);
			iWjService.insertfeed(wj);
			}

			alarmService.updatePoliceStatus(feedback.getJid(),"2");
			alarmService.updateJtype(operation.getJid(),"2",null,null);

			return R.success("新增成功");
			}

	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java	2 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml	6 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java	5 ●●●●● patch \| view \| raw \| blame \| history