supervision-spring.git

			@@ -5,102 +5,126 @@
			import javax.persistence.Column
			import javax.persistence.Id
			import javax.persistence.Table
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;

			@JsonInclude(JsonInclude.Include.NON_NULL)
			@Table(name = "tm_t_task")
			@ApiModel(value = "Task")
			public class Task {
			@Id
			@Column(name = "T_GUID")
			@ApiModelProperty(value = "主键16位guid")
			var tguid: String? = null

			/**
			* 月任务为空，日任务为所属月份的T_ID
			*/
			@Column(name = "TS_GUID")
			@ApiModelProperty(value = "月任务为空，日任务为所属月份的T_ID")
			var tsguid: String? = null

			/**
			* 1 直接挂载子任务 2 有下属任务
			*/
			@Column(name = "T_LevelNum")
			@ApiModelProperty(value = "1 直接挂载子任务 2 有下属任务")
			var levelnum: Int? = null

			/**
			* 由年度、月份或跨月份、省份、地市或区县、街道（可选）、场景、任务类型自动生成，允许手工修改便于跨区域任务制定
			*/
			@Column(name = "T_Name")
			@ApiModelProperty(value = "由年度、月份或跨月份、省份、地市或区县、街道（可选）、场景、任务类型自动生成，允许手工修改便于跨区域任务制定")
			var name: String? = null

			/**
			* 从值域表获取
			*/
			@Column(name = "T_TypeNo")
			@ApiModelProperty(value = "任务类型编号，从值域表获取")
			var typeno: Byte? = null

			/**
			* 从值域表获取
			*/
			@Column(name = "T_TypeName")
			@ApiModelProperty(value = "任务类型，从值域表获取")
			var typename: String? = null

			@Column(name = "T_DeadlineType")
			@ApiModelProperty(value = "截止日期类型")
			var deadlinetype: String? = null

			@Column(name = "T_ProvinceCode")
			@ApiModelProperty(value = "省份编号")
			var provincecode: String? = null

			@Column(name = "T_ProvinceName")
			@ApiModelProperty(value = "省份")
			var provincename: String? = null

			@Column(name = "T_CityCode")
			@ApiModelProperty(value = "城市编号")
			var citycode: String? = null

			@Column(name = "T_CityName")
			@ApiModelProperty(value = "城市")
			var cityname: String? = null

			@Column(name = "T_DistrictCode")
			@ApiModelProperty(value = "区县编号")
			var districtcode: String? = null

			@Column(name = "T_DistrictName")
			@ApiModelProperty(value = "区县")
			var districtname: String? = null

			@Column(name = "T_TownCode")
			@ApiModelProperty(value = "街镇编号")
			var towncode: String? = null

			@Column(name = "T_TownName")
			@ApiModelProperty(value = "街镇")
			var townname: String? = null

			/**
			* 月任务时为具体到日，日任务时具体到时
			*/
			@Column(name = "T_StartTime")
			@ApiModelProperty(value = "月任务时为具体到日，日任务时具体到时")
			var starttime: Date? = null

			/**
			* 月任务时为具体到日，日任务时具体到时
			*/
			@Column(name = "T_EndTime")
			@ApiModelProperty(value = "月任务时为具体到日，日任务时具体到时")
			var endtime: Date? = null

			/**
			* 同userinfo关联
			*/
			@Column(name = "T_PlannerGUID")
			@ApiModelProperty(value = "计划制定用户id，同userinfo关联")
			var plannerguid: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_PlannerUserName")
			@ApiModelProperty(value = "计划制定用户名称，从userinfo获取")
			var plannerusername: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_PlannerRealName")
			@ApiModelProperty(value = "计划制定用户昵称，从userinfo获取")
			var plannerrealname: String? = null

			@Column(name = "T_SetTime")
			@ApiModelProperty(value = "计划制定时间")
			var settime: Date? = null

			/**
			@@ -108,119 +132,152 @@
			* 先针对任务安排人员列表，子任务从已定人员列表中选
			*/
			@Column(name = "T_ExecutorGUIDs")
			@ApiModelProperty(value = "任务发布后，从子任务表自动提取插入先针对任务安排人员列表，子任务从已定人员列表中选")
			var executorguids: String? = null

			@Column(name = "T_ExecutorUserNames")
			@ApiModelProperty(value = "发布用户名称")
			var executorusernames: String? = null

			@Column(name = "T_ExecutorRealNames")
			@ApiModelProperty(value = "发布用户昵称")
			var executorrealnames: String? = null

			@Column(name = "T_IsChanged")
			@ApiModelProperty(value = "T_IsChanged")
			var ischanged: Boolean? = null

			@Column(name = "T_1stVerifierGUID")
			@ApiModelProperty(value = "初审用户id")
			var t1stverifierguid: String? = null

			@Column(name = "T_1stVerifierUserName")
			@ApiModelProperty(value = "初审用户名称")
			var t1stverifierusername: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_1stVerifierRealName")
			@ApiModelProperty(value = "初审用户昵称")
			var t1stverifierrealname: String? = null

			@Column(name = "T_1stVerifyTime")
			@ApiModelProperty(value = "初审时间")
			var t1stverifytime: Date? = null

			@Column(name = "T_1stIsVerify")
			@ApiModelProperty(value = "是否初审")
			var t1stisverify: Boolean? = null

			@Column(name = "T_2ndVerifierGUID")
			@ApiModelProperty(value = "复审用户")
			var t2ndverifierguid: String? = null

			@Column(name = "T_2ndVerifierUserName")
			@ApiModelProperty(value = "复审用户名称")
			var t2ndverifierusername: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_2ndVerifierRealName")
			@ApiModelProperty(value = "复审用户昵称")
			var t2ndverifierrealname: String? = null

			@Column(name = "T_2ndVerifyTime")
			@ApiModelProperty(value = "复审时间")
			var t2ndverifytime: Date? = null

			@Column(name = "T_2ndIsVerify")
			@ApiModelProperty(value = "是否复审")
			var t2ndisverify: Boolean? = null

			@Column(name = "T_DeployerGUID")
			@ApiModelProperty(value = "发布用户id")
			var deployerguid: String? = null

			@Column(name = "T_DeployerUserName")
			@ApiModelProperty(value = "发布用户名称")
			var deployerusername: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_DeployerRealName")
			@ApiModelProperty(value = "发布用户昵称")
			var deployerrealname: String? = null

			@Column(name = "T_DeployTime")
			@ApiModelProperty(value = "发布时间")
			var deploytime: Date? = null

			/**
			* 未执行、正在执行、已结束
			*/
			@Column(name = "T_RuningStatus")
			@ApiModelProperty(value = "未执行、正在执行、已结束")
			var runingstatus: String? = null

			@Column(name = "T_AssessorGUID")
			@ApiModelProperty(value = "评估用户id")
			var assessorguid: String? = null

			@Column(name = "T_AssessorUserName")
			@ApiModelProperty(value = "评估用户名称")
			var assessorusername: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_AssessorRealName")
			@ApiModelProperty(value = "评估用户昵称")
			var assessorrealname: String? = null

			@Column(name = "T_AssessTime")
			@ApiModelProperty(value = "评估时间")
			var assesstime: Date? = null

			@Column(name = "T_AssessResult")
			@ApiModelProperty(value = "评估结果")
			var assessresult: String? = null

			@Column(name = "T_ThirdAssessorGUID")
			@ApiModelProperty(value = "再次评估用户")
			var thirdassessorguid: String? = null

			@Column(name = "T_ThirdAssessorUserName")
			@ApiModelProperty(value = "再次评估用户名称")
			var thirdassessorusername: String? = null

			/**
			* 从userinfo获取
			*/
			@Column(name = "T_ThirdAssessorRealName")
			@ApiModelProperty(value = "再次评估用户昵称")
			var thirdassessorrealname: String? = null

			@Column(name = "T_ThirdAssessTime")
			@ApiModelProperty(value = "再次评估时间")
			var thirdassesstime: Date? = null

			@Column(name = "T_ThirdAssessResult")
			@ApiModelProperty(value = "再次评估结果")
			var thirdassessresult: String? = null

			@Column(name = "T_Extension1")
			@ApiModelProperty(value = "任务匹配行政区划颗粒度，1：省份；2：城市；3：区县；4：街镇")
			var extension1: String? = null

			@Column(name = "T_Extension2")
			@ApiModelProperty(value = "是否允许无固定场景巡查")
			var extension2: String? = null

			@Column(name = "T_Extension3")
			@ApiModelProperty(value = "扩展字段三")
			var extension3: String? = null

			@Column(name = "T_Remark")
			@ApiModelProperty(value = "备注")
			var remark: String? = null
			}