java/zhihuishenqu.git

			@@ -103,7 +103,7 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date dellDate;

			@ApiModelProperty(value = "解决人针对解决事件的处理描述")
			@ApiModelProperty(value = "异常描述")
			private String dellDesc;

			@ApiModelProperty(value = "是否有效")
			@@ -119,7 +119,7 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date submitDate;

			@ApiModelProperty(value = "是否异常行为")
			@ApiModelProperty(value = "是否异常行为:0否，1是")
			private Boolean exception;

			@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
			@@ -151,5 +151,22 @@
			@ApiModelProperty(value = "视频列表")
			List<EventResourceDTO> videoList;

			@ApiModelProperty(value = "家庭联系方式")
			private String familyPhone;

			@ApiModelProperty(value = "生活来源")
			private String familySource;

			@ApiModelProperty(value = "地址备注")
			private String addressRemark;

			@ApiModelProperty(value = "备注")
			private String remark;

			@ApiModelProperty("异常选择")
			private String option;

			@ApiModelProperty("走访后的经纬度（,隔开）")
			private String latLng;

			}

			@@ -1,6 +1,5 @@
			package com.panzhihua.common.model.vos.visit;

			import com.alibaba.excel.annotation.ExcelIgnore;
			import com.alibaba.excel.annotation.ExcelProperty;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.panzhihua.common.enums.EventTasksStatusEnum;
			@@ -77,7 +76,6 @@



			@ExcelIgnore
			@ApiModelProperty(value = "需走访人ID")
			private Long visiterId;

			@@ -105,7 +103,6 @@
			private String visiterTele;


			@ExcelIgnore
			private Integer visiterType;

			@ApiModelProperty(value = "事件标题")
			@@ -129,8 +126,6 @@

			@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
			private String happentLatLng;
			//
			@ExcelIgnore
			private Integer eventStatus;

			public String getEventStatusName() {

			@@ -215,7 +215,9 @@
			if(eventVisitingTasksDO!=null) {
			EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
			BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
			JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
			eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
			eventVisitingTasksDetailsVO.setOption(jsonObject.get("check") == null ?null:jsonObject.get("check").toString());
			return R.ok(eventVisitingTasksDetailsVO);
			}
			return R.fail();

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史