diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberAnalysisController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberAnalysisController.java
index 727fb20..1f418b1 100644
--- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberAnalysisController.java
+++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberAnalysisController.java
@@ -52,8 +52,8 @@ public class MemberAnalysisController {
                 	gh.unioncode as unionCode,
                 	gh.unionname as unionName,
                 	( SELECT count( 1 ) FROM member_his WHERE `year` = @lastYear AND unionid = gh.id ) AS '往年会员人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE currentUnionId = gh.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动变动到我工会人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE originUnionId = gh.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动我工会减少人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE unitId = gh.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动变动到我工会人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE changeOrigin = gh.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动我工会减少人数',
                 	(
                 	SELECT
                 		count( 1 )
@@ -61,9 +61,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 2, 7 )
+                		mcr.`changeType` IN ( 2, 7 )
                 		AND u.unionid = gh.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '新入职、恢复人数',
                 	(
                 	SELECT
@@ -72,9 +72,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 3, 4, 5, 6, 8 )
+                		mcr.`changeType` IN ( 3, 4, 5, 6, 8 )
                 		AND u.unionid = gh.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '离职、去世、退休、开除、退会人数',
                 	(select count(1) from `user` where member = 1 and unionid = gh.id) as currentYearMemberNum
                 FROM
@@ -123,8 +123,8 @@ public class MemberAnalysisController {
                 	dw.unitcode as unitCode,
                 	dw.`name` as unitName,
                 	( SELECT count( 1 ) FROM member_his WHERE `year` = @lastYear AND unitid = dw.id ) AS '往年会员人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE currentUnitId = dw.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动变动到我单位人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE originUnitId = dw.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动我单位减少人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE unitId = dw.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动变动到我单位人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE changeOrigin = dw.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动我单位减少人数',
                 	(
                 	SELECT
                 		count( 1 )
@@ -132,9 +132,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 2, 7 )
+                		mcr.`changeType` IN ( 2, 7 )
                 		AND u.unitid = dw.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '新入职、恢复人数',
                 	(
                 	SELECT
@@ -143,9 +143,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 3, 4, 5, 6, 8 )
+                		mcr.`changeType` IN ( 3, 4, 5, 6, 8 )
                 		AND u.unitid = dw.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '离职、去世、退休、开除、退会人数',
                 		(select count(1) from `user` where member = 1 and unitid = dw.id) as currentYearMemberNum
                 FROM
@@ -192,8 +192,8 @@ public class MemberAnalysisController {
                 	dw.unitcode as unitCode,
                 	dw.`name` as unitName,
                 	( SELECT count( 1 ) FROM member_his WHERE `year` = @lastYear AND unitid = dw.id ) AS '往年会员人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE currentUnitId = dw.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动变动到我单位人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE originUnitId = dw.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动我单位减少人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE unitId = dw.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动变动到我单位人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE changeOrigin = dw.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动我单位减少人数',
                 	(
                 	SELECT
                 		count( 1 )
@@ -201,9 +201,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 2, 7 )
+                		mcr.`changeType` IN ( 2, 7 )
                 		AND u.unitid = dw.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '新入职、恢复人数',
                 	(
                 	SELECT
@@ -212,9 +212,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 3, 4, 5, 6, 8 )
+                		mcr.`changeType` IN ( 3, 4, 5, 6, 8 )
                 		AND u.unitid = dw.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '离职、去世、退休、开除、退会人数',
                 		(select count(1) from `user` where member = 1 and unitid = dw.id) as currentYearMemberNum
                 FROM
@@ -228,8 +228,8 @@ public class MemberAnalysisController {
                 	gh.unioncode as unionCode,
                 	gh.unionname as unionName,
                 	( SELECT count( 1 ) FROM member_his WHERE `year` = @lastYear AND unionid = gh.id ) AS '往年会员人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE currentUnionId = gh.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动变动到我单位人数',
-                	( SELECT count( 1 ) FROM member_change_record WHERE originUnionId = gh.id AND currentUnitId != originUnitId AND YEAR ( applyTime ) = @currentYear ) AS '校内异动我单位减少人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE unitId = gh.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动变动到我单位人数',
+                	( SELECT count( 1 ) FROM member_change_record WHERE changeOrigin = gh.id AND unitId != changeOrigin AND YEAR ( applyDateTime ) = @currentYear ) AS '校内异动我单位减少人数',
                 	(
                 	SELECT
                 		count( 1 )
@@ -237,9 +237,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 2, 7 )
+                		mcr.`changeType` IN ( 2, 7 )
                 		AND u.unionid = gh.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '新入职、恢复人数',
                 	(
                 	SELECT
@@ -248,9 +248,9 @@ public class MemberAnalysisController {
                 		member_change_record mcr
                 		LEFT JOIN `user` u ON u.id = mcr.userId
                 	WHERE
-                		mcr.`type` IN ( 3, 4, 5, 6, 8 )
+                		mcr.`changeType` IN ( 3, 4, 5, 6, 8 )
                 		AND u.unionid = gh.id
-                		AND YEAR ( mcr.applyTime ) = @currentYear
+                		AND YEAR ( mcr.applyDateTime ) = @currentYear
                 	) AS '离职、去世、退休、开除、退会人数',
                 		(select count(1) from `user` where member = 1 and unionid = gh.id) as currentYearMemberNum
                 FROM