更改

src/main/java/io/v/nutz/web/commons/base/Globals.java

@@ -53,7 +53,7 @@ public class Globals {
     //项目短名称
     public static String AppShrotName = "";
     //项目域名 (设置一个默认的 为优先级考虑)
-    public static String AppDomain = "http://zhgh.zjitc.edu.cn";
+    public static String AppDomain = "https://zhgh.zjitc.edu.cn";
     //cas地址
     public static String CasAddress = "https://sso.zjitc.edu.cn";
     //文件访问域名

src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java

@@ -448,7 +448,7 @@ public class FitnessWalkCommonServiceImpl extends ViServiceImpl implements Fitne
                         userId
                 ) AS over3k ON u.id = over3k.userId
                 $condition
-                """).setParam("activityId",activityId).setParam("step",4000);
+                """).setParam("activityId",activityId).setParam("step",0);
 
         if ("today".equals(mode)) {
             sql.setVar("dateSql",new Static("DATE(applyDate) = '"+DateUtil.today()+"'"));
@@ -474,7 +474,8 @@ public class FitnessWalkCommonServiceImpl extends ViServiceImpl implements Fitne
 //        cnd.and("u.id","in",Sqls.create("select userId from activity_user_scope where groupId = @groupId").setParam("groupId",activity.getGroupId()));
         cnd.groupBy("u.id","u.username","u.loginname","u.unionname","u.unitname","over3k.standardsDays");
         cnd.desc("total_steps");
-        cnd.having(Cnd.NEW().and("COALESCE(SUM(sub.step), 0)",">",0));
+        //cnd.having(Cnd.NEW().and("COALESCE(SUM(sub.step), 0)",">",0));
+        cnd.having(Cnd.NEW().and("SUM(sub.step)",">=",0));
         sql.setCondition(cnd);
         return sql;
     }

src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java

@@ -347,7 +347,8 @@ public class TheRapyRecuperationLineStatisticsController {
                     line.lineName,
                     lxs.travelAgencyName,
                     u.remark,
-                    lot.activityCost as money,
+                    lineu.estimatedCost,
+                    lot.activityCost,
                     lot.lotValue as playDay,
                     if(enroll.moneyType = 2, '是' , '否') as useNextMoney,
                     CONCAT(DATE_FORMAT(lineu.playStartTime, '%m月%d日'), '-', DATE_FORMAT(lineu.playEndTime, '%m月%d日')) as specificTime
@@ -376,6 +377,15 @@ public class TheRapyRecuperationLineStatisticsController {
         sql.setCondition(cnd);
 
         List<NutMap> list = enrollService.listMap(sql);
+
+        for (NutMap nutMap : list) {
+            if(nutMap.getInt("estimatedCost") > 3000) {
+                nutMap.put("money", "是".equals(nutMap.getString("useNextMoney")) ? nutMap.getInt("activityCost") : 3000 );
+            } else {
+                nutMap.put("money", nutMap.getInt("activityCost"));
+            }
+        }
+
         ArrayList<ExcelExportEntity> exportEntities = new ArrayList<>();
         exportEntities.add(new ExcelExportEntity("部门", "unitName", 40));
         exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));

src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java

@@ -730,6 +730,19 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl<TheRapyR
 	}
 
 	public Map<Boolean, String> validBaseManagementCount(String loginName, TheRapyRecuperationEnroll currentEnroll) {
+		if(StrUtil.isBlank(currentEnroll.getId())) {
+			int count = dao().count(TheRapyRecuperationEnroll.class,
+					Cnd.where("takePartInBaseManagementId", "=", currentEnroll.getTakePartInBaseManagementId())
+							.and("loginName", "=", loginName)
+							.and("isNormal", "=", 2750)
+							.and("YEAR(signingUptime)", "=", DateUtil.thisYear())
+							.and("specificTime", "=", currentEnroll.getSpecificTime())
+							//.and("playDay", "=", currentEnroll.getPlayDay())
+			);
+			if(count > 0) {
+				return Map.of(false, "您已报名该酒店相同出行时间！");
+			}
+		}
 		//看有没有报线路
 		int count = dao().count(TheRapyRecuperationEnroll.class, Cnd.where("takePartInLineId", "is not", null)
 				.and("isNormal", "=", true)