bug整改

src/main/java/io/v/nutz/zhgh/data/controller/SourceUserController.java

@@ -47,26 +47,27 @@ public class SourceUserController {
                            @Param(value = "importDate", required = false) String importDate) {
         Sql sql = Sqls.create("""
                 SELECT
-                	u.push_time pullTime,
-                	date_format(u.push_time,'%Y-%m-%d') importDate,
-                	u.JBXNY unitid,
-                	u.ZGH loginname,
-                	u.XM username,
-                	u.XB sex,
-                	u.SFZJH idcard,
-                	u.CSRQ birthday,
-                	u.SJH mobile,
-                	u.JZGRYLB personType,
-                	u.DQZT userState,
-                	un.DWMC unitname,
-                	un.DWMCDM unitcode
+                	u.pullTime,
+                	date_format(u.pullTime,'%Y-%m-%d') importDate,
+                	u.id,
+                	u.unitid,
+                	u.loginname,
+                	u.username,
+                	u.sex,
+                	u.idcard,
+                	u.birthday,
+                	u.mobile,
+                	u.personType,
+                	u.userState,
+                	un.`name` unitname,
+                	un.unitcode
                 FROM
-                	`v_user_db` u
-                	LEFT JOIN dep_db un ON u.DWDM = un.DWMCDM
+                	`user_source` u
+                	LEFT JOIN sys_unit un ON u.unitid = un.id
                 $condition
                 """);
 
-        pageForm.defaultSortDesc("u.push_time");
+        pageForm.defaultSortDesc("pullTime");
 
         CndPlus cnd = CndPlus.create();
         cnd.and(pageForm);
@@ -79,7 +80,7 @@ public class SourceUserController {
             cnd.and("DATE(u.pullTime)", "=", importDate);
         }
 
-        cnd.desc("u.push_time");
+        cnd.desc("pullTime");
 
         sql.setCondition(cnd);
 

src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java

@@ -98,7 +98,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
 
 //        List<UserSource> users = SourceData.users();
         Sql sql = Sqls.create("""
-                SELECT * FROM user_db
+                SELECT * FROM v_user_db
                 """);
         List<UserSource> users = sysUserService.listMap(sql).stream().map(o -> {
             UserSource source = new UserSource();
@@ -114,7 +114,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
             source.setPullTime(new DateTime());
             source.setMobile(o.getString("SJH"));
             source.setUserState(o.getString("DQZT"));
-            source.setPolitical(o.getString("ZZMM"));
+            source.setPolitical(o.getString("ZZMMM"));
 //            source.setIdcard(o.getString("SFZJH"));
             source.setPreparedBy(o.getString("JZGRYLB"));
             source.setPersonType(o.getString("LXLX"));

src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java

@@ -78,7 +78,7 @@ public class MemberCommonServiceImpl extends ViServiceImpl<Sys_user> implements
     @Override
     public List<NutMap> memberChangeRecords(String userId) {
         Sql sql = Sqls.create(MEMBER_CHANGE_RECORDS);
-        sql.setCondition(Cnd.where("mcr.userId", "=", userId).desc("mcr.applyTime"));
+        sql.setCondition(Cnd.where("mcr.userId", "=", userId).desc("mcr.applyDateTime"));
         return listMap(sql);
     }
 
@@ -110,13 +110,13 @@ public class MemberCommonServiceImpl extends ViServiceImpl<Sys_user> implements
                 	his.lastHistoryId,
                 	u.unitname,
                 	u.unionname,
-                	mcr.stateId,
+                	mcr.userState,
                 	state.stateName,
                 	state.stateColor
                 FROM
                 	`user_history` his
                 	LEFT JOIN member_change_record mcr ON mcr.id = his.memberChangeRecordId
-                    LEFT JOIN audit_state state ON mcr.stateId = state.stateId
+                    LEFT JOIN audit_state state ON mcr.userState = state.stateId
                     LEFT JOIN `user` u ON u.loginname = his.loginname
                 $condition
                 """);