commit

src/main/java/com/budwk/app/base/utils/DistanceUtil.java

@@ -7,7 +7,7 @@ package com.budwk.app.base.utils;
  * @Version 1.0
  * @Description TODO
  */
-public class DistanceUtils {
+public class DistanceUtil {
 
 	private static final double EARTH_RADIUS = 6371000; // 地球半径，单位：米
 

src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityStatisticsServiceImpl.java

@@ -194,7 +194,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
 
 		// 使用Stream API进行降序排序
 		Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
-				.sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
+				.sorted(Map.Entry.comparingByKey(Comparator.naturalOrder()))
 				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 
 		return sortedDataMap;

src/main/java/com/budwk/app/zhgh/activity/fellowship/service/impl/FellowshipActivityStatisticsServiceImpl.java

@@ -101,14 +101,17 @@ public class FellowshipActivityStatisticsServiceImpl extends BaseServiceImpl<Fel
         cnd.andEX("tsuu.courseId", "=", courseId);
         sql.setCondition(cnd);
         List<NutMap> list = listMap(sql);
-        list.forEach(o -> {
+		for (NutMap o : list) {
-            List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
+			if(StrUtil.isBlank(o.getString("mobileColumnsValue"))) {
-            if(Lang.isNotEmpty(mobileColumnsValue)) {
+				continue;
-                mobileColumnsValue.forEach(m -> {
+			}
-                    o.put(m.getString("columnCode"), m.getString("columnValue"));
+			List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
-                });
+			if(Lang.isNotEmpty(mobileColumnsValue)) {
-            }
+				mobileColumnsValue.forEach(m -> {
-        });
+					o.put(m.getString("columnCode"), m.getString("columnValue"));
+				});
+			}
+		}
         return list;
     }
 
@@ -185,7 +188,7 @@ public class FellowshipActivityStatisticsServiceImpl extends BaseServiceImpl<Fel
 
         // 使用Stream API进行降序排序
         Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
-                .sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
+                .sorted(Map.Entry.comparingByKey(Comparator.naturalOrder()))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 
         return sortedDataMap;

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainsignUpMineController.java

@@ -6,9 +6,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.budwk.app.base.annotation.SLog;
-import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
-import com.budwk.app.base.utils.DistanceUtils;
+import com.budwk.app.base.utils.DistanceUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpCourse;
 import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUserCourse;
@@ -27,7 +26,6 @@ import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.Param;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -85,13 +83,13 @@ public class TrainsignUpMineController {
 		}
 
 		TrainSignUpCourse course = dao.fetch(TrainSignUpCourse.class, courseId);
-		List<Double> coordinates = course.getCourseLocationCoordinates();
+		List<Double> coordinates = course.getTransPosition();
 		int minute = course.getSignUnit() != null ? course.getSignUnit() : 0;
 		int radius = course.getRadius() != null ? course.getRadius() : 100;
 
 		boolean flag = true;
 		// 获取现在的日期，并根据设置的数据
-		List<TrainSignUpUserCourse> timeList = dao.query(TrainSignUpUserCourse.class, Cnd.where("courseId", "=", courseId));
+		List<TrainSignUpUserCourse> timeList = dao.query(TrainSignUpUserCourse.class, Cnd.where("courseId", "=", courseId).and("userId", "=", SecurityUtil.getUserId()));
 		for (TrainSignUpUserCourse userCourse : timeList) {
 			DateTime startTime = DateUtil.offsetMinute(userCourse.getCourseStartTime(), -minute);
 			DateTime endTime = DateUtil.offsetMinute(userCourse.getCourseEndTime(), minute);
@@ -105,10 +103,9 @@ public class TrainsignUpMineController {
 			return Result.error(99, "未到签到时间");
 		}
 
-		double distance = DistanceUtils.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
+		double distance = DistanceUtil.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
 		if(distance > radius) {
-			int result = BigDecimal.valueOf(distance).setScale(0, RoundingMode.HALF_UP).intValue();
+			return Result.error(99, "签到失败，您距离签到点还有%.1f米".formatted(distance - radius));
-			return Result.error(99, "签到失败，您距离签到点还有%s米".formatted(result));
 		}
 
 		dao.update(timeList);
@@ -152,7 +149,7 @@ public class TrainsignUpMineController {
 	@SLog(tag = "品牌活动-定位签到", msg = "定位签到")
 	public Result positionSign(String courseId, String timeId, Double lat, Double lng) {
 		TrainSignUpCourse course = dao.fetch(TrainSignUpCourse.class, courseId);
-		List<Double> coordinates = course.getCourseLocationCoordinates();
+		List<Double> coordinates = course.getTransPosition();
 		int minute = course.getSignUnit() != null ? course.getSignUnit() : 0;
 		int radius = course.getRadius() != null ? course.getRadius() : 100;
 
@@ -164,10 +161,9 @@ public class TrainsignUpMineController {
 			return Result.error(99, "未到签到时间");
 		}
 
-		double distance = DistanceUtils.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
+		double distance = DistanceUtil.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
 		if(distance > radius) {
-			int result = BigDecimal.valueOf(distance).setScale(0, RoundingMode.HALF_UP).intValue();
+			return Result.error(99, "签到失败，您距离签到点还有%.1f米".formatted(distance - radius));
-			return Result.error(99, "签到失败，您距离签到点还有%s米".formatted(result));
 		}
 
 		userCourse.setAttend(true);

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java

@@ -16,10 +16,7 @@ import com.budwk.app.sys.models.Sys_file;
 import com.budwk.app.sys.utils.SysFileMinIoUtil;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainMobileSignColumn;
+import com.budwk.app.zhgh.activity.trainSignUp.models.*;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpActivity;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpCourse;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpType;
 import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpActivityService;
 import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpActivityStatisticsService;
 import io.swagger.annotations.Api;
@@ -143,6 +140,14 @@ public class TrainSignUpActivityStatisticsController {
         return Result.success(trainSignUpActivityStatisticsService.getTaleColumnInfo(courseId));
     }
 
+	@At
+	@ApiOperation("获取时间信息")
+	@SaCheckPermission("trainSignUp.statistics")
+	public Result selectTimes(@Param("courseId") String courseId) {
+		List<TrainSignUpActivityCourse> activityCourses = dao.query(TrainSignUpActivityCourse.class, Cnd.where("courseId", "=", courseId).asc("courseStartTime"));
+		return Result.success(activityCourses);
+	}
+
     /**
      * 培训班上课签到信息
      *
@@ -152,8 +157,10 @@ public class TrainSignUpActivityStatisticsController {
     @At
     @ApiOperation("获取签到信息")
     @SaCheckPermission("trainSignUp.statistics")
-    public Result getSignInfo(@Param("courseId") String courseId) {
+    public Result getSignInfo(PageForm pageForm,
-        return Result.success(trainSignUpActivityStatisticsService.getSignInfo(courseId));
+							  @Param("courseId") String courseId,
+							  String timeId) {
+        return Result.success(trainSignUpActivityStatisticsService.getSignInfo(pageForm, courseId, timeId));
     }
 
     @At
@@ -165,6 +172,22 @@ public class TrainSignUpActivityStatisticsController {
         return Result.success();
     }
 
+	@At
+	@ApiOperation("设置签到")
+	@SaCheckPermission("trainSignUp.statistics")
+	public Result adjustSign(@Param("id") String id) {
+		TrainSignUpUserCourse userCourse = dao.fetch(TrainSignUpUserCourse.class, id);
+		if(userCourse.isAttend()) {
+			userCourse.setAttend(false);
+			userCourse.setAttendTime(null);
+		} else {
+			userCourse.setAttend(true);
+			userCourse.setAttendTime(userCourse.getCourseStartTime());
+		}
+		dao.update(userCourse);
+		return Result.success();
+	}
+
     @At
     @Ok("void")
     @ApiOperation("导出签到名单")

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpCourse.java

@@ -58,7 +58,12 @@ public class TrainSignUpCourse extends BaseModel implements Serializable {
     @Comment("课程地点坐标")
     private List<Double> courseLocationCoordinates;
 
-    @Column
+	@Column
+	@ColDefine(type = ColType.MYSQL_JSON)
+	@Comment("转换课程地点坐标")
+	private List<Double> transPosition;
+
+	@Column
     @ColDefine(type = ColType.VARCHAR, width = 20)
     @Comment("课程讲师")
     private String courseInstructor;

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/TrainSignUpActivityStatisticsService.java

@@ -49,7 +49,7 @@ public interface TrainSignUpActivityStatisticsService extends BaseService<TrainS
      * @param courseId
      * @return k->每个培训班每节课的上课时间  v->上课记录list
      */
-    Map<String, List<NutMap>> getSignInfo(String courseId);
+	Pagination getSignInfo(PageForm pageForm, String courseId, String timeId);
 
     /**
      * 报名人员list 导出

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java

@@ -4,12 +4,10 @@ import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.zhgh.activity.family.models.FamilyType;
 import com.budwk.app.zhgh.activity.family.models.FamilyUser;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainMobileSignColumn;
+import com.budwk.app.zhgh.activity.trainSignUp.models.*;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpCourse;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpType;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUser;
 import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpActivityStatisticsService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
@@ -22,10 +20,7 @@ import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 
-import java.util.Comparator;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -103,14 +98,17 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
         cnd.andEX("tsuu.courseId", "=", courseId);
         sql.setCondition(cnd);
         List<NutMap> list = listMap(sql);
-        list.forEach(o -> {
+		for (NutMap o : list) {
-            List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
+			if(StrUtil.isBlank(o.getString("mobileColumnsValue"))) {
-            if(Lang.isNotEmpty(mobileColumnsValue)) {
+				continue;
-                mobileColumnsValue.forEach(m -> {
+			}
-                    o.put(m.getString("columnCode"), m.getString("columnValue"));
+			List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
-                });
+			if(Lang.isNotEmpty(mobileColumnsValue)) {
-            }
+				mobileColumnsValue.forEach(m -> {
-        });
+					o.put(m.getString("columnCode"), m.getString("columnValue"));
+				});
+			}
+		}
         return list;
     }
 
@@ -121,7 +119,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
         dao().fetchLinks(upType, "trainMobileSignColumnList", Cnd.NEW().asc("columnIndex"));
 
         List<TrainMobileSignColumn> columnList = upType.getTrainMobileSignColumnList();
-        List<NutMap> columnTableList = columnList.stream().map(o -> NutMap.NEW().setv("label", o.getColumnName()).setv("prop", o.getColumnCode())).collect(Collectors.toList());
+        List<NutMap> columnTableList = columnList.stream().filter(o -> StrUtil.isNotBlank(o.getColumnCode())).map(o -> NutMap.NEW().setv("label", o.getColumnName()).setv("prop", o.getColumnCode())).collect(Collectors.toList());
         return columnTableList;
     }
 
@@ -159,9 +157,10 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
     }
 
     @Override
-    public Map<String, List<NutMap>> getSignInfo(String courseId) {
+    public Pagination getSignInfo(PageForm pageForm, String courseId, String timeId) {
-        Sql sql = Sqls.create("""
+		Sql sql = Sqls.create("""
                 SELECT
+                	tsuuc.id,
                 	tsuuc.courseStartTime,
                 	tsuuc.courseEndTime,
                 	tsuuc.isAttend,
@@ -173,24 +172,15 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
                 FROM
                 	`train_sign_up_user_course` tsuuc
                 	LEFT JOIN `vw_user` u ON u.id = tsuuc.userId
-                WHERE
+                $condition
-                	tsuuc.courseId = @courseId
                 """);
-        sql.setParam("courseId", courseId);
+		Cnd cnd = Cnd.NEW();
-        List<NutMap> list = listMap(sql);
+		cnd.and("tsuuc.courseId", "=", courseId);
-
+		cnd.and("tsuuc.activityCourseId", "=", timeId);
-        Map<String, List<NutMap>> courseTimeMap = list.stream().map(v -> {
+		cnd.desc("isAttend");
-            String courseTime = v.getString("courseStartTime") + " 至 " + v.getString("courseEndTime");
+		cnd.desc("attendTime");
-            v.put("courseTime", courseTime);
+		sql.setCondition(cnd);
-            return v;
+		return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
-        }).collect(Collectors.groupingBy(v -> v.getString("courseTime")));
-
-        // 使用Stream API进行降序排序
-        Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
-                .sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
-
-        return sortedDataMap;
     }
 
     @Override

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java

@@ -20,6 +20,8 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.controllers.open.commons.service.CommonService;
 import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
 import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpActivity;
+import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUser;
+import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUserCourse;
 import com.budwk.app.zhgh.club.model.ClubUser;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.param.ClubUserPageForm;
@@ -28,6 +30,7 @@ import com.budwk.app.zhgh.club.service.SysClubUserService;
 import com.budwk.app.zhgh.club.vo.ClubCommonPageVo;
 import com.budwk.app.zhgh.club.vo.ClubUserImportVo;
 import io.swagger.annotations.ApiOperation;
+import org.apache.axis.utils.IDKey;
 import org.apache.poi.ss.formula.functions.T;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Chain;
@@ -179,8 +182,12 @@ public class ClubInfoManageController {
 			dao.clear(ActivityUserScope.class, Cnd.where("userId", "=", clubUser.getUserId()).and("groupId", "in", groupList));
 		}
 		/* 根据品牌活动，操作user_scope表 end */
+		List<String> idList = activityList.stream().map(TrainSignUpActivity::getId).toList();
+		dao.clear(TrainSignUpUser.class, Cnd.where("activityId", "in", idList).and("userId", "=", clubUser.getUserId()));
+		dao.clear(TrainSignUpUserCourse.class, Cnd.where("activityId", "in", idList).and("userId", "=", clubUser.getUserId()));
 
-        sysUserService.clearCache();
+
+		sysUserService.clearCache();
         sysRoleService.clearCache();
         return Result.success();
     }

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java

@@ -6,10 +6,11 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.web.controllers.open.commons.service.CommonService;
 import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
-import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpActivity;
+import com.budwk.app.zhgh.activity.trainSignUp.models.*;
 import com.budwk.app.zhgh.club.model.ClubUser;
 import com.budwk.app.zhgh.club.param.ClubUserPageForm;
 import com.budwk.app.zhgh.club.service.SysClubService;
@@ -178,6 +179,58 @@ public class SysClubUserServiceImpl extends BaseServiceImpl<ClubUser> implements
 				}
 			}
 			dao().insert(addScopes);
+
+			// 报名
+			List<TrainSignUpUser> signList = new ArrayList<>();
+			List<TrainSignUpUserCourse> userCourseList = new ArrayList<>();
+
+			List<String> idList = activityList.stream().map(TrainSignUpActivity::getId).toList();
+
+			List<TrainSignUpCourse> courses = dao().query(TrainSignUpCourse.class, Cnd.where("activityId", "in", idList));
+			List<TrainSignUpActivityCourse> activityCourses = dao().query(TrainSignUpActivityCourse.class, Cnd.where("activityId", "in", idList));
+
+			List<View_user> userList = dao().query(View_user.class, Cnd.where("id", "in", users));
+			Map<String, View_user> userMap = userList.stream().collect(Collectors.toMap(View_user::getId, o -> o));
+
+			for (TrainSignUpCourse course : courses) {
+				for (String user : users) {
+					View_user u = userMap.get(user);
+					TrainSignUpUser signUpUser = new TrainSignUpUser();
+					signUpUser.setActivityId(course.getActivityId());
+					signUpUser.setCourseId(course.getId());
+					signUpUser.setUserId(user);
+					signUpUser.setMobile(u.getMobile());
+					signUpUser.setSignUpTime(new Date());
+					signUpUser.setState(1);
+					signUpUser.setUnionId(u.getUnionId());
+					signUpUser.setUnitId(u.getUnitId());
+					signUpUser.setUnionName(u.getUnionName());
+					signUpUser.setUnitName(u.getUnitName());
+					signList.add(signUpUser);
+				}
+			}
+
+			for (TrainSignUpActivityCourse ac : activityCourses) {
+				for (String user : users) {
+					View_user u = userMap.get(user);
+					TrainSignUpUserCourse aCourse = new TrainSignUpUserCourse();
+					aCourse.setActivityId(ac.getActivityId());
+					aCourse.setCourseId(ac.getCourseId());
+					aCourse.setUserId(user);
+					aCourse.setCourseStartTime(ac.getCourseStartTime());
+					aCourse.setCourseEndTime(ac.getCourseEndTime());
+					aCourse.setAttend(false);
+					aCourse.setAttendTime(null);
+					aCourse.setActivityCourseId(ac.getId());
+					userCourseList.add(aCourse);
+				}
+			}
+			if(Lang.isNotEmpty(signList)) {
+				dao().insert(signList);
+			}
+			if(Lang.isNotEmpty(userCourseList)) {
+				dao().insert(userCourseList);
+			}
 		}
 	}
 }

src/main/java/com/budwk/app/zhgh/dayofficework/literacy/service/impl/LiteracyActivityStatisticsServiceImpl.java

@@ -96,14 +96,17 @@ public class LiteracyActivityStatisticsServiceImpl extends BaseServiceImpl<Liter
         cnd.andEX("tsuu.courseId", "=", courseId);
         sql.setCondition(cnd);
         List<NutMap> list = listMap(sql);
-        list.forEach(o -> {
+		for (NutMap o : list) {
-            List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
+			if(StrUtil.isBlank(o.getString("mobileColumnsValue"))) {
-            if(Lang.isNotEmpty(mobileColumnsValue)) {
+				continue;
-                mobileColumnsValue.forEach(m -> {
+			}
-                    o.put(m.getString("columnCode"), m.getString("columnValue"));
+			List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
-                });
+			if(Lang.isNotEmpty(mobileColumnsValue)) {
-            }
+				mobileColumnsValue.forEach(m -> {
-        });
+					o.put(m.getString("columnCode"), m.getString("columnValue"));
+				});
+			}
+		}
         return list;
     }
 
@@ -180,7 +183,7 @@ public class LiteracyActivityStatisticsServiceImpl extends BaseServiceImpl<Liter
 
         // 使用Stream API进行降序排序
         Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
-                .sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
+                .sorted(Map.Entry.comparingByKey(Comparator.naturalOrder()))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 
         return sortedDataMap;

src/main/resources/static/assets/platform/js/util/coordinateUtil.js

@@ -0,0 +1,91 @@
+// =============== 坐标系工具 ===============
+const PI = 3.1415926535897932384626
+const a = 6378245.0 //卫星椭球坐标投影到平面地图坐标系的投影因子。
+const ee = 0.00669342162296594323 //椭球的偏心率。
+const coordinateUtil = {
+    // 判断是否在中国范围（仅中国加密）
+    outOfChina(lon, lat) {
+        if (lon < 72.004 || lon > 137.8347) {
+            return true;
+        }
+        if (lat < 0.8293 || lat > 55.8271) {
+            return true;
+        }
+        return false;
+    },
+
+    // 基础偏移计算
+    transformLat(lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0
+        ret += ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) / 3.0
+        ret += ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) * 2.0) / 3.0
+        return ret
+    },
+
+    transformLng(lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0
+        ret += ((20.0 * Math.sin(lng * PI) + 40.0 * Math.sin((lng / 3.0) * PI)) * 2.0) / 3.0
+        ret += ((150.0 * Math.sin((lng / 12.0) * PI) + 300.0 * Math.sin((lng / 30.0) * PI)) * 2.0) / 3.0
+        return ret
+    },
+
+    // WGS-84 → GCJ-02（用于地图展示）
+    wgs84ToGcj02(lng, lat) {
+        let dlat = this.transformLat(lng - 105.0, lat - 35.0);
+        let dlng = this.transformLng(lng - 105.0, lat - 35.0);
+        let radlat = (lat / 180.0) * PI;
+        let magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        let sqrtmagic = Math.sqrt(magic);
+        dlat =
+            (dlat * 180.0) /
+            (((a * (1 - ee)) / (magic * sqrtmagic)) * PI);
+        dlng =
+            (dlng * 180.0) / ((a / sqrtmagic) * Math.cos(radlat) * PI);
+        let mglat = lat + dlat;
+        let mglng = lng + dlng;
+
+        return [mglat, mglng];
+    },
+
+    // GCJ-02 → WGS-84（用于存储签到点）
+    gcj02ToWgs84(lng, lat) {
+        const originalLngSign = Math.sign(lng);
+        const originalLatSign = Math.sign(lat);
+        lat = Math.abs(lat);
+        lng = Math.abs(lng);
+        let dlat = this.transformLat(lng - 105.0, lat - 35.0)
+        let dlng = this.transformLng(lng - 105.0, lat - 35.0)
+        let radlat = lat / 180.0 * PI
+        let magic = Math.sin(radlat)
+        magic = 1 - ee * magic * magic
+        let sqrtmagic = Math.sqrt(magic)
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI)
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI)
+        let mglat = lat + dlat
+        let mglng = lng + dlng
+        let lngs = lng * 2 - mglng
+        let lats = lat * 2 - mglat
+        let finalLng = originalLngSign * lngs;
+        let finalLat = originalLatSign * lats;
+
+        return [finalLat, finalLng];
+    },
+
+    // 计算两点间距离（米），输入 WGS-84 坐标
+    getDistance(lat1, lng1, lat2, lng2) {
+        const R = 6371000; // 地球半径（米）
+        const φ1 = lat1 * Math.PI / 180;
+        const φ2 = lat2 * Math.PI / 180;
+        const Δφ = (lat2 - lat1) * Math.PI / 180;
+        const Δλ = (lng2 - lng1) * Math.PI / 180;
+
+        const a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
+            Math.cos(φ1) * Math.cos(φ2) *
+            Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
+        const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        return R * c;
+    },
+};

src/main/resources/views/layouts/platform_h5.html

@@ -55,6 +55,7 @@
 
     <script src="${base!}/components/plugins/sysDict/DictData.js"></script>
     <script src="${base!}/assets/platform/js/util/commonUtil.js"></script>
+    <script src="${base!}/assets/platform/js/util/coordinateUtil.js"></script>
     <script src="${base!}/assets/platform/js/main.js"></script>
     <script src="${base!}/assets/platform/js/mixin/styleMixin.js"></script>
     <script src="${base!}/assets/platform/js/tool/businessTool.js"></script>
@@ -375,6 +376,7 @@
         Vue.prototype.$moment = moment
         Vue.prototype.$businessTool = businessTool
         Vue.prototype.$commonUtil = commonUtil
+        Vue.prototype.$coordinateUtil = coordinateUtil
         Vue.prototype.$auth = commonUtil.authService()
         Vue.prototype.$axios = commonUtil.axiosService()
         Vue.prototype.$downLoad = commonUtil.downLoadService.bind(commonUtil)

src/main/resources/views/layouts/v4/baseLayout.html

@@ -11,7 +11,6 @@
         <link rel="stylesheet" href="${base!}/assets/platform/css/root.css" />
         <link rel="stylesheet" href="${base!}/assets/platform/fonts/themify-icons.css" />
         <link rel="stylesheet" href="${base!}/assets/platform/fonts/font-awesome.min.css" />
-<!--        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/qweather-icons@1.3.0/font/qweather-icons.css">-->
 
         <!-- import Vue before Element -->
         <script src="${base!}/assets/platform/plugins/vue/vue.js"></script>
@@ -72,7 +71,7 @@
         <script src="https://vxeui.com/umd/xe-utils@3.5.30/dist/xe-utils.umd.min.js"></script>
         <script src="https://vxeui.com/umd/vxe-pc-ui@3.1.25/lib/index.umd.min.js"></script>
         <script src="https://vxeui.com/umd/vxe-table@3.9.0/lib/index.umd.min.js"></script>
-l
+        l
         <!-- 引入 form-create 和 designer -->
         <script src="${base!}/assets/platform/plugins/form-create/form-create.min.js"></script>
         <script src="${base!}/assets/platform/plugins/form-create/index.umd.js"></script>
@@ -85,6 +84,7 @@ l
 
         <script src="${base!}/components/plugins/sysDict/DictData.js"></script>
         <script src="${base!}/assets/platform/js/util/commonUtil.js"></script>
+        <script src="${base!}/assets/platform/js/util/coordinateUtil.js"></script>
         <script src="${base!}/assets/platform/js/main.js"></script>
         <script src="${base!}/assets/platform/js/mixin/initTableMixins.js"></script>
         <script src="${base!}/assets/platform/js/mixin/styleMixin.js"></script>
@@ -98,7 +98,7 @@ l
             src="https://webapi.amap.com/maps?v=2.0&key=b4fa2e2bc10a725ab007b98a3aa447cc&plugin=AMap.PolyEditor,AMap.Geolocation"
         ></script>-->
 
-<!--        <script src="https://map.qq.com/api/gljs?v=2.exp&key=MLLBZ-GQECI-ASXG7-5GNOZ-XW2OF-H5BVH"></script>-->
+        <script src="https://map.qq.com/api/gljs?v=2.exp&key=MLLBZ-GQECI-ASXG7-5GNOZ-XW2OF-H5BVH"></script>
 
         <script type="text/javascript">
             window._AMapSecurityConfig = {
@@ -327,6 +327,7 @@ l
             Vue.prototype.$moment = moment
             Vue.prototype.$businessTool = businessTool
             Vue.prototype.$commonUtil = commonUtil
+            Vue.prototype.$coordinateUtil = coordinateUtil
             Vue.prototype.$auth = commonUtil.authService()
             Vue.prototype.$axios = commonUtil.axiosService()
             Vue.prototype.$downLoad = commonUtil.downLoadService
@@ -703,7 +704,7 @@ l
                     })
                 }
 
-               // 页面加载时设置active状态和页脚显示
+                // 页面加载时设置active状态和页脚显示
                 setActiveNavItem()
                 toggleFooter()
 

src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/customForm.js

@@ -179,10 +179,10 @@ const customForm = {
 
             <el-dialog :close-on-click-modal="false" :visible.sync="mapDialog" title="位置信息" :append-to-body="true">
                 <map-container v-if="mapDialog" 
-                               :radius="formData.courseList[moreInfoIndex].radius"
+                               :radius="formData.courseList[moreInfoIndex].radius ? Number(formData.courseList[moreInfoIndex].radius) : 100"
                                :position.sync="formData.courseList[mapIndex].courseLocationCoordinates"></map-container>
                 <span slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="mapDialog = false">确 定</el-button>
+                    <el-button type="primary" @click="onMap">确 定</el-button>
                 </span>
             </el-dialog>
             
@@ -221,6 +221,13 @@ const customForm = {
             this.unionList = await this.$businessTool.listUnion()
             this.moreInfoDrawer = true
         },
+        onMap() {
+            const posi = this.formData.courseList[this.mapIndex].courseLocationCoordinates
+            if(posi && posi.length > 1) {
+                this.formData.courseList[this.mapIndex].transPosition = this.$coordinateUtil.gcj02ToWgs84(posi[1], posi[0])
+            }
+            this.mapDialog = false
+        }
     },
     created() {
         if(!this.formData.courseList) {

src/main/resources/views/platform/zhgh/activity/trainSignUp/statistics/info.js

@@ -23,14 +23,14 @@ const info = {
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
-                <el-tab-pane label="签到情况" v-if="clickRow.isMobileSign === true && Object.keys(userSignInfo).length > 0">
+                <el-tab-pane label="签到情况" v-if="clickRow.isMobileSign === true && timeList.length > 0">
-                    <el-tabs style="height: 600px" tab-position="left" class="mt20">
+                    <el-tabs style="height: 660px" tab-position="left" class="mt20" @tab-click="tabClick">
-                        <el-tab-pane v-for="(item, key) in userSignInfo" :key="key">
+                        <el-tab-pane v-for="item,index in timeList" :key="index">
                             <span slot="label">
                                 <i class="el-icon-date"></i>
-                                {{key}}
+                                {{item.courseStartTime + ' 至 ' + item.courseEndTime}}
                             </span>
-                            <el-table :data="item" style="max-height: 600px; overflow-y: auto">
+                            <el-table :data="signUserList" style="max-height: 600px; overflow-y: auto">
                                 <el-table-column label="姓名" prop="username"></el-table-column>
                                 <el-table-column label="工号" prop="loginname"></el-table-column>
                                 <el-table-column label="是否签到" prop="isAttend">
@@ -45,7 +45,14 @@ const info = {
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="签到时间" prop="attendTime"></el-table-column>
+                                <el-table-column label="操作" prop="attendTime">
+                                    <template v-slot="{ row }">
+                                        <el-button v-if="row.isAttend" @click="onSign(row)" size="mini" type="danger">设置未签到</el-button>
+                                        <el-button v-if="!row.isAttend" @click="onSign(row)" size="mini" type="primary">设置签到</el-button>
+                                    </template>
+                                </el-table-column>
                             </el-table>
+                            <!--#include("/layouts/pagination.html"){}#-->
                         </el-tab-pane>
                     </el-tabs>
                 </el-tab-pane>
@@ -53,6 +60,7 @@ const info = {
         </div>
     `,
     dicts: ["TRAIN_SIGNUP_TYPE"],
+    mixins: [initTableMixins],
     data() {
         return {
             registerUserTableData: [],
@@ -74,23 +82,77 @@ const info = {
                 {label: '报名时间', prop: 'signUpTime'},
                 {label: '报名状态', prop: 'state'},
             ],
-            userSignInfo: {},
+            clickRow: {},
-            clickRow: {}
+            timeList: [],
+            signUserList: [],
+            timeId: '',
+            pageForm: {},
         }
     },
     methods: {
         async onOpen(row) {
             this.clickRow = row
-            const resp_register = await this.$axios.post(loc() + "/registerUserList", {courseId: row.id})
+            await this.registerUserList()
-            this.registerUserTableData = resp_register.data
+            await this.selectTimes()
-            const resp_signInfo = await this.$axios.post(loc() + "/getSignInfo", {courseId: row.id})
+            await this.getTaleColumnInfo()
-            this.userSignInfo = resp_signInfo.data
+        },
-            const resp_columnInfo = await $.get(loc() + '/getTaleColumnInfo', {courseId: row.id})
+        async doSearch() {
-            if (resp_columnInfo.data) {
+            this.pageForm.pageNumber = 1
-                this.registerUserTableColumns = []
+            await this.selectSignUsers(this.timeId)
-                this.registerUserTableColumns = this.cloneTableColumns.concat(resp_columnInfo.data)
+        },
+        async pageNumberChange(val) {
+            this.pageForm.pageNumber = val
+            await this.selectSignUsers(this.timeId)
+        },
+        async pageSizeChange(val) {
+            this.pageForm.pageSize = val
+            await this.selectSignUsers(this.timeId)
+        },
+        onSign(row) {
+            this.$confirm("您确定要设置吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "info"
+            }).then(() => {
+                this.$axios.post("/platform/trainSignUp/statistics/adjustSign", { id: row.id }).then(async (res) => {
+                    if (res.code === 0) {
+                        this.$message.success(res.msg)
+                        await this.selectSignUsers(this.timeId)
+                    }
+                })
+            })
+        },
+        async tabClick(val) {
+            await this.selectSignUsers(this.timeList[val.index].id)
+        },
+        async registerUserList() {
+            const res = await this.$axios.post(loc() + "/registerUserList", { courseId: this.clickRow.id })
+            this.registerUserTableData = res.data
+        },
+        async selectTimes() {
+            const res = await this.$axios.post(loc() + "/selectTimes", { courseId: this.clickRow.id })
+            this.timeList = res.data
+            if(this.timeList.length > 0) {
+                await this.selectSignUsers(this.timeList[0].id)
             }
-        }
+        },
+        async selectSignUsers(timeId) {
+            this.timeId = timeId
+            this.$set(this.pageForm, 'courseId', this.clickRow.id)
+            this.$set(this.pageForm, 'timeId', timeId)
+            const res = await this.$axios.post(loc() + "/getSignInfo", this.pageForm)
+            if (res.code === 0) {
+                this.signUserList = res.data.list
+                this.pageForm.totalCount = res.data.totalCount
+            }
+        },
+        async getTaleColumnInfo() {
+            const res = await $.get(loc() + '/getTaleColumnInfo', { courseId: this.clickRow.id })
+            if (res.data) {
+                this.registerUserTableColumns = []
+                this.registerUserTableColumns = this.cloneTableColumns.concat(res.data)
+            }
+        },
     },
     style: /*language=CSS*/ `
         

src/main/resources/views/platform/zhghh5/activity/trainSignUp/scan/index.html

@@ -89,72 +89,51 @@ layout("/layouts/platform_h5.html"){
                     }],
                 });
             },
-            getLocation(callback) {
+            getUserLocation() {
-                if (typeof callback !== 'function') {
+                return new Promise((resolve) => {
-                    callback = () => {};
+                    if (!navigator.geolocation) {
-                }
+                        vant.Toast('浏览器不支持定位');
-                if (!navigator.geolocation) {
+                        return resolve(null);
-                    this.$toast('当前浏览器不支持定位功能');
-                    callback(null);
-                    return;
-                }
-                const loading = vant.Toast.loading({
-                    message: "获取定位中...",
-                    forbidClick: false,
-                    loadingType: "spinner",
-                    duration: 0,
-                })
-                navigator.geolocation.getCurrentPosition(
-                    (position) => {
-                        callback({
-                            lat: position.coords.latitude,
-                            lng: position.coords.longitude
-                        });
-                        loading.close()
-                    },
-                    (error) => {
-                        let msg = '定位失败，请稍后重试';
-                        switch (error.code) {
-                            case error.PERMISSION_DENIED:
-                                msg = '请允许浏览器获取位置信息';
-                                break;
-                            case error.POSITION_UNAVAILABLE:
-                                msg = '无法获取当前位置';
-                                break;
-                            case error.TIMEOUT:
-                                msg = '定位超时，请重试';
-                                break;
-                        }
-                        this.$toast(msg);
-                        callback(null);
-                        loading.close()
-                    },
-                    {
-                        enableHighAccuracy: true,
-                        timeout: 10000,
-                        maximumAge: 60000
                     }
-                );
+                    const loading = vant.Toast.loading({ message: '定位中...', duration: 0 });
+                    navigator.geolocation.getCurrentPosition(
+                        (pos) => {
+                            loading.close();
+                            resolve({
+                                lat: pos.coords.latitude,
+                                lng: pos.coords.longitude
+                            });
+                            if (this.markerLayer) {
+                                this.markerLayer.remove(["current"])
+                            }
+                            const transPosi = this.$coordinateUtil.wgs84ToGcj02(pos.coords.longitude, pos.coords.latitude)
+                            console.log(transPosi)
+                            const center = new TMap.LatLng(transPosi[0], transPosi[1])
+                            this.createMarker(center, 'current', 'current')
+                        },
+                        (err) => {
+                            console.log(err)
+                            loading.close();
+                            vant.Toast('定位失败，请重试');
+                            resolve(null);
+                        },
+                        { enableHighAccuracy: true, timeout: 3000 }
+                    );
+                });
             },
             async fetchCourse() {
                 const res = await this.$axios.post('/platform/trainSignUp/mine/fetchCourse', {courseId: this.courseId})
                 this.row = res.data
             },
-            onSign() {
+            async onSign() {
-                if(this.markerLayer) {
+                const coords = await this.getUserLocation()
-                    this.markerLayer.remove(["current"])
+                if (coords) {
+                    this.res = await this.$axios.post('/platform/trainSignUp/mine/drivingScan', {
+                        courseId: this.row.id,
+                        lat: coords.lat,
+                        lng: coords.lng
+                    })
                 }
-                this.getLocation(async (coords) => {
-                    if (coords) {
-                        const center = new TMap.LatLng(coords.lat, coords.lng)
-                        this.createMarker(center, 'current', 'current')
-                        this.res = await this.$axios.post('/platform/trainSignUp/mine/drivingScan', {
-                            courseId: this.row.id,
-                            lat: coords.lat,
-                            lng: coords.lng
-                        })
-                    }
-                })
             }
         },
         async created() {