productDev/dmvisit.git

			@@ -114,6 +114,7 @@
			public static final Integer THREE =3 ;
			public static final Integer FOUR =4 ;
			public static final Integer FIVE =5 ;
			public static final Integer SIX =6 ;
			public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
			public static final String VIRTUAL_CARD_INDEX = "02098469790";
			public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
			@@ -150,6 +151,8 @@
			public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE";
			public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE";
			public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
			public static final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT";
			public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;

			public static boolean DEALING_HK_SYNCPRIVILEGE= false;
			public static boolean DEALING_HK_SYNCDEVICE = false;
			@@ -410,15 +413,44 @@
			int invalid =9;
			}

			/**
			* 0=访客车辆-访客车辆
			* 1=wms推送的物流车辆（非自有车）：货运车辆-外协运输车辆
			* 2= 市公司的预约入园车辆：货运车辆-市公司卸货车辆
			* 3= 安泰的预约入园车辆：货运车辆-加工烟卸货车辆
			* 4= 安泰公务车：公务车-安泰物流公务用车
			* 5= 安泰自有车：货运车辆-安泰物流货运车辆
			*/
			public interface RetentionCarType{
			//车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车
			int internal = 0;
			int relation = 1;
			int visitor = 2;
			int selfTruck = 3;
			int outTruck = 4;
			int cityComTruck = 5;
			int unknown = 6;
			//作业类型 0自有车卸货 1自有车装货 2外协车卸货 3外协车装货 4市公司外协车卸货
			// int internal = 0;
			// int relation = 1;
			// int visitor = 2;
			// int selfTruck = 3;
			// int outTruck = 4;
			// int cityComTruck = 5;
			// int unknown = 6;
			int fkCar = 0;//访客车辆-访客车辆
			int wxysCar = 1;//推送的物流车辆（非自有车）：货运车辆-外协运输车辆
			int sgsxhCar = 2;//市公司的预约入园车辆：货运车辆-市公司卸货车辆
			int jgyxhCar = 3;//安泰的预约入园车辆：货运车辆-加工烟卸货车辆
			int atwlgwCar = 4;//安泰公务车：公务车-安泰物流公务用车
			int atwlzyCar = 5;//安泰自有车：货运车辆-安泰物流货运车辆
			int other = 6;//未知车辆
			}

			/**
			* 在场人员类型
			*/
			public interface RetentionMemberType{
			//类型 0劳务访客 1普通访客 2内部员工 3车辆信息 4相关方人员 5货运司机
			int lwfk = 0;//0劳务访客
			int fk = 1;//1普通访客
			int internalMember = 2;//内部员工
			int car = 3;//车辆信息
			int relMember = 4;//相关方人员
			int driver = 5;//货运司机
			}


			@@ -565,6 +597,16 @@
			int reason = 6;//入园原因
			}

			public interface noticesObjectType{
			int visit = 0;//访客申请
			int visitReporting = 1;//访客报备
			int useCar = 2;//用车申请
			int dangerDeal = 3;//隐患处理
			int logisticsCarUse = 4;//物流车审批
			int system = 5;//系统消息
			int reason = 6;//入园原因
			int hknotice = 7;//海康考勤代办
			}


			public static Integer approveTypeToNoticeType(Integer approveType){
			@@ -588,16 +630,6 @@



			public interface noticesObjectType{
			int visit = 0;//访客申请
			int visitReporting = 1;//访客报备
			int useCar = 2;//用车申请
			int dangerDeal = 3;//隐患处理
			int logisticsCarUse = 4;//物流车审批
			int system = 5;//系统消息
			int reason = 6;//入园原因
			int hknotice = 7;//海康考勤代办
			}


			public interface approveStatus{
			@@ -726,7 +758,7 @@
			"meeting_user_rel ur\n" +
			"LEFT JOIN `SYSTEM_USER` su ON ur.USER_ID = su.id \n" +
			"LEFT JOIN meeting_book b ON ur.OBJ_ID = b.id \n" +
			"WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS = 0" +
			"WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS in(0,2) and b.isdeleted=0" +
			"<if test='userId != null'>"+
			"and ur.USER_ID = #{userId}\n" +
			"</if>"+
			@@ -1395,6 +1427,7 @@
			HIDDEN_DANGER_SUBMIT(0, "隐患随手拍提报", "隐患随手拍提报"),
			HIDDEN_DANGER_DEAL_BEFORE(1, "隐患随手拍处理前", "隐患随手拍处理前"),
			HIDDEN_DANGER_DEAL_AFTER(2, "隐患随手拍处理后 ", "隐患随手拍处理后 "),
			MEETING_BOOKS(4, "会议文件 ", "会议文件 "),
			;
			// 成员变量
			private String name;