From b63785e94f5777080fc8cba1c7b6e112cca01617 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 13 十月 2023 11:05:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 37 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/EvaluateStudentService.java | 22 ++
cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java | 73 ++++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html | 1
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 2
cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js | 18 +
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 10
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html | 65 +++++
cloud-server-other/src/main/resources/redis.properties | 3
cloud-server-management/src/main/java/com/dsh/course/mapper/EvaluateStudentMapper.java | 16 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 3
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 3
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 5
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluateStudentServiceImpl.java | 35 +++
.idea/workspace.xml | 48 +++-
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 1
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 40 +++
cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java | 3
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 5
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html | 42 +++
cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java | 7
cloud-server-account/src/main/resources/mapper/TStudentMapper.xml | 18 +
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 28 ++
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java | 5
cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent_commite.js | 144 +++++++++++++
cloud-server-management/src/main/resources/redis.properties | 17 -
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 2
28 files changed, 614 insertions(+), 45 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0a1b284..6590132 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,20 +25,12 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.12">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.13">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -143,6 +135,19 @@
</option>
</component>
<component name="RunManager" selected="Spring Boot.ManagementApplication">
+ <configuration name="AccountApplicationTests" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
+ <module name="mb-cloud-account" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
<configuration name="BigDecimalToChineseWords" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.util.BigDecimalToChineseWords" />
<module name="mb-cloud-management" />
@@ -266,10 +271,12 @@
<item itemvalue="Spring Boot.AuthApplication" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
+ <item itemvalue="应用程序.AccountApplicationTests" />
<item itemvalue="应用程序.BigDecimalToChineseWords" />
</list>
<recent_temporary>
<list>
+ <item itemvalue="应用程序.AccountApplicationTests" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
</list>
</recent_temporary>
@@ -366,7 +373,10 @@
<workItem from="1697008680148" duration="240000" />
<workItem from="1697009049694" duration="7913000" />
<workItem from="1697017354280" duration="2337000" />
- <workItem from="1697020450777" duration="4036000" />
+ <workItem from="1697020450777" duration="4953000" />
+ <workItem from="1697072437579" duration="8289000" />
+ <workItem from="1697092527442" duration="204000" />
+ <workItem from="1697092830953" duration="1837000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -731,7 +741,15 @@
<option name="project" value="LOCAL" />
<updated>1697011234286</updated>
</task>
- <option name="localTasksCounter" value="48" />
+ <task id="LOCAL-00048" summary="10.13">
+ <option name="closed" value="true" />
+ <created>1697024509448</created>
+ <option name="number" value="00048" />
+ <option name="presentableId" value="LOCAL-00048" />
+ <option name="project" value="LOCAL" />
+ <updated>1697024509448</updated>
+ </task>
+ <option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -749,7 +767,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="9.15" />
<MESSAGE value="学员" />
<MESSAGE value="学员2" />
<MESSAGE value="学员4" />
@@ -774,7 +791,8 @@
<MESSAGE value="10.8。1" />
<MESSAGE value="10.11" />
<MESSAGE value="10.12" />
- <option name="LAST_COMMIT_MESSAGE" value="10.12" />
+ <MESSAGE value="10.13" />
+ <option name="LAST_COMMIT_MESSAGE" value="10.13" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 86f2515..607a5da 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -282,6 +282,7 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat){
+
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 1399212..2dc8968 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -81,6 +81,16 @@
}
}
+ @ResponseBody
+ @PostMapping("/student/queryStudentCom")
+ public List<Map<String, Object>> queryStudentCom(@RequestBody Integer id){
+
+ List<Map<String, Object>> list = studentService.queryCom(id);
+ return list;
+
+ }
+
+
@ResponseBody
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index bc36b4a..b0f28e2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -94,7 +94,10 @@
detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
}
- detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
+ System.out.println("============="+tAppUser);
+
+ if (tAppUser.getBirthday()!=null){
+ detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));}
detailsVo.setAddress(tAppUser.getProvince()+tAppUser.getCity());
if(tAppUser.getVipEndTime()!=null){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
index f3bc468..e8da2ae 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
@@ -32,4 +33,6 @@
Integer getGiftSelect(@Param("giftSearchDto")GiftSearchDto giftSearchDto);
+
+ List<Map<String, Object>> queryCom(@Param("id") Integer id);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
index 668232d..9fce2ad 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -23,6 +23,7 @@
import com.dsh.account.util.ResultUtil;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -113,4 +114,6 @@
Integer getGiftSelect(GiftSearchDto giftSearchDto);
+
+ List<Map<String, Object>> queryCom(Integer id);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index ec78a66..687d62b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -616,7 +616,7 @@
for (Store store : stores) {
Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
Double wgs84 = distance.get("WGS84");
- if(s == null || d.compareTo(wgs84) < 0){
+ if(s == null || d>wgs84){
s = store;
d = wgs84;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index ed84781..0e0d9d9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -844,7 +844,10 @@
return this.baseMapper.getGiftSelect(giftSearchDto);
}
-
+ @Override
+ public List<Map<String, Object>> queryCom(Integer id) {
+ return this.baseMapper.queryCom(id);
+ }
}
diff --git a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
index c37cace..5c1992e 100644
--- a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
@@ -77,4 +77,22 @@
WHERE name = #{giftSearchDto.name}
AND phone = #{giftSearchDto.phone}
</select>
+
+
+ <select id="queryCom" resultType="java.util.Map">
+ SELECT
+ es.id as id ,tc.name,es.content,es.insertTime
+ FROM
+
+ t_evaluate_student es
+
+ left JOIN t_student ts on es.studentId = ts.id
+ LEFT JOIN t_coach tc on es.coachId = tc.id
+
+ where es.studentId = #{id}
+
+
+
+
+ </select>
</mapper>
diff --git a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
index 455dcdd..e9dcbde 100644
--- a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
+++ b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
@@ -14,9 +14,14 @@
@Autowired
private CoachTypeController controller;
+
@Test
void contextLoads() {
- System.out.println("==============="+controller.list());
+ System.out.println(System.getProperty("java.version"));
+ System.out.println(System.getProperty("java.compiler"));
+ System.out.println(System.getProperty("java.vm.specification.version"));
+ System.out.println(System.getProperty("java.specification.version"));
+
}
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 8731163..97c2790 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -1475,7 +1475,7 @@
String time1 = courseDetailReq.getTime();
// 找出门店的所有课程 排出体验
- List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3).like(TCoursePackage::getClassWeeks,week));
+ List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3).eq(TCoursePackage::getState,1).like(TCoursePackage::getClassWeeks,week));
List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
if(collect.size()==0){
collect.add(-1);
diff --git a/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java b/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java
new file mode 100644
index 0000000..3f40191
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/entity/EvaluateStudent.java
@@ -0,0 +1,73 @@
+package com.dsh.course.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 评价学员记录
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_evaluate_student")
+public class EvaluateStudent extends Model<EvaluateStudent> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 教练id
+ */
+ @TableField("coachId")
+ private Integer coachId;
+ /**
+ * 学员id
+ */
+ @TableField("studentId")
+ private Integer studentId;
+ /**
+ * 评语
+ */
+ @TableField("content")
+ private String content;
+ /**
+ * 图片
+ */
+ @TableField("imgs")
+ private String imgs;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
index d9093f3..83afe6a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
@FeignClient("mb-cloud-account")
public interface StudentClient {
@@ -33,4 +34,8 @@
*/
@RequestMapping("/base/student/addStudent")
Object addStudent(@RequestBody TStudent student);
+
+
+ @PostMapping("/student/queryStudentCom")
+ List<Map<String, Object>> listCom(@RequestBody Integer id);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/EvaluateStudentMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/EvaluateStudentMapper.java
new file mode 100644
index 0000000..d7076b0
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/EvaluateStudentMapper.java
@@ -0,0 +1,16 @@
+package com.dsh.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.course.entity.EvaluateStudent;
+
+/**
+ * <p>
+ * 评价学员记录 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-03
+ */
+public interface EvaluateStudentMapper extends BaseMapper<EvaluateStudent> {
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index ee74721..dbdbffd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -317,9 +317,12 @@
@ResponseBody
public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
+
+
if(yyId==null){
yyId=0;
}
+
if(yyId!=0) {
List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
if(list1.size()>0){
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 7b0eccb..8d27bb2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -3,6 +3,7 @@
import com.dsh.course.dto.*;
import com.dsh.course.feignClient.account.AppUserClient;
+import com.dsh.course.feignClient.account.StudentClient;
import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.course.CoursePackageClient;
import com.dsh.course.feignClient.course.CourseStuddentClient;
@@ -20,6 +21,7 @@
import com.dsh.guns.modular.system.model.TStudent;
import com.dsh.guns.modular.system.model.User;
import com.dsh.guns.modular.system.model.dto.*;
+import com.dsh.guns.modular.system.service.EvaluateStudentService;
import com.dsh.guns.modular.system.service.ITStudentService;
import com.dsh.guns.modular.system.util.BigDecimalToChineseAmountUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
@@ -302,6 +304,18 @@
}
+ @Autowired
+ private EvaluateStudentService evalstuService;
+
+ @RequestMapping("/tStudent_commite/{tStudentId}")
+ public String tStudent_commite(@PathVariable("tStudentId") Integer tStudentId, Model model) {
+
+ model.addAttribute("id",tStudentId);
+
+ return PREFIX + "tStudent_commite.html";
+ }
+
+
//
@@ -330,6 +344,29 @@
return itStudentService.listAll(search);
}
+
+
+
+ @Autowired
+ private EvaluateStudentService evaluateStudentService;
+
+ @Resource
+ private StudentClient studentClient;
+ /**
+ * 获取列表
+ */
+ @RequestMapping("/listcom/{id}")
+ @ResponseBody
+ public List<Map<String,Object>> listcom(@PathVariable("id") Integer id) {
+
+ List<Map<String,Object>> maps = studentClient.listCom(id);
+
+
+
+ return maps;
+ }
+
+
/**
* 获取列表
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/EvaluateStudentService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/EvaluateStudentService.java
new file mode 100644
index 0000000..34a664b
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/EvaluateStudentService.java
@@ -0,0 +1,22 @@
+package com.dsh.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.course.entity.EvaluateStudent;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 评价学员记录 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-03
+ */
+public interface EvaluateStudentService extends IService<EvaluateStudent> {
+
+
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluateStudentServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluateStudentServiceImpl.java
new file mode 100644
index 0000000..3f6cf77
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/EvaluateStudentServiceImpl.java
@@ -0,0 +1,35 @@
+package com.dsh.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.dsh.course.entity.EvaluateStudent;
+import com.dsh.course.mapper.EvaluateStudentMapper;
+import com.dsh.course.mapper.TStudentMapper;
+import com.dsh.guns.modular.system.service.EvaluateStudentService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 评价学员记录 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-03
+ */
+@Service
+public class EvaluateStudentServiceImpl extends ServiceImpl<EvaluateStudentMapper, EvaluateStudent> implements EvaluateStudentService {
+
+ @Resource
+ private TStudentMapper tstuMapper;
+
+ private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+
+}
diff --git a/cloud-server-management/src/main/resources/redis.properties b/cloud-server-management/src/main/resources/redis.properties
index d5506fd..c9ed9de 100644
--- a/cloud-server-management/src/main/resources/redis.properties
+++ b/cloud-server-management/src/main/resources/redis.properties
@@ -1,21 +1,16 @@
-#redis���ÿ�ʼ
-# Redis���ݿ�������Ĭ��Ϊ0��
+
spring.redis.database=0
-# Redis��������ַ
spring.redis.host=@redis.addr@
-# Redis���������Ӷ˿�
spring.redis.port=@redis.port@
-# Redis�������������루Ĭ��Ϊ�գ�
+
spring.redis.password=@redis.password@
-# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
+
spring.redis.jedis.pool.max-active=1024
-# ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�
+
spring.redis.jedis.pool.max-wait=10000
-# ���ӳ��е�����������
+
spring.redis.jedis.pool.max-idle=200
-# ���ӳ��е���С��������
+
spring.redis.jedis.pool.min-idle=50
-# ���ӳ�ʱʱ�䣨���룩
spring.redis.timeout=10000
-#redis���ý���
spring.redis.block-when-exhausted=true
\ No newline at end of file
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
index 39319cd..86bccdf 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
@@ -35,6 +35,9 @@
.col-sm-12 select {
height: 33px;
}
+
+
+
</style>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
@@ -189,11 +192,40 @@
- laydate.render({
- elem: '#time'
- ,type: 'time',format: "HH:mm"
- ,range: true
- });
+
+ layui.use('laydate', function(){
+ var laydate = layui.laydate;
+ //时间范围
+ laydate.render({
+ elem: '#time'
+ , type: 'time'
+ , range: true
+ , format: 'HH:mm'
+ , theme: '#368ee0'
+ , ready: function (date) {
+ var dom = $(".laydate-time-list").children("li");
+ for (var i = 0; i < dom.length; i++) {
+ if (i == 2 || i == 5) {
+ $(dom[i]).remove();
+ } else if(i==1||i==4) {
+ var li = $(dom[i]).children("ol").children("li")
+ //console.log(li.length);
+ for (var j = 0; j < li.length; j++) {
+ //console.log($(li[j]).text())
+ if ($(li[j]).text() != 00 && $(li[j]).text()!=30) {
+ $(li[j]).remove();
+ }
+ }
+ }
+ }
+ }
+ });
+ })
+
+
+
+
+
var vue2 = new Vue({
el: '#app1',
props: {
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index 362ff1b..50e6fb4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -152,11 +152,41 @@
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
- laydate.render({
- elem: '#time'
- ,type: 'time',format: "HH:mm"
- ,range: true
- });
+ layui.use('laydate', function(){
+ var laydate = layui.laydate;
+ //时间范围
+ laydate.render({
+ elem: '#time'
+ , type: 'time'
+ , range: true
+ , format: 'HH:mm'
+ , theme: '#368ee0'
+ , ready: function (date) {
+ var dom = $(".laydate-time-list").children("li");
+ for (var i = 0; i < dom.length; i++) {
+ if (i == 2 || i == 5) {
+ $(dom[i]).remove();
+ } else if(i==1||i==4) {
+ var li = $(dom[i]).children("ol").children("li")
+ //console.log(li.length);
+ for (var j = 0; j < li.length; j++) {
+ //console.log($(li[j]).text())
+ if ($(li[j]).text() != 00 && $(li[j]).text()!=30) {
+ $(li[j]).remove();
+ }
+ }
+ }
+ }
+ }
+ });
+ })
+
+
+
+
+
+
+
let id = "${item.realPicture}"
let obj = []
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
index 7e17084..9fe851c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
@@ -35,6 +35,7 @@
<#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
<#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
+ <#button name="学员评语" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
@if(shiro.hasPermission("/tStudent/delete")){
<#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html
new file mode 100644
index 0000000..418e59b
--- /dev/null
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent_commite.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="row" id = "ttt">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <input type="hidden" id="id" value="${id}">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="province" name="省份" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="city" name="城市" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="所属用户" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TStudent.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TStudentTableToolbar" role="group">
+ @if(shiro.hasPermission("/tStudent/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TStudent.openAddTStudent()"/>
+ @}
+
+ <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
+ <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
+ <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
+
+ @if(shiro.hasPermission("/tStudent/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/>
+ @}
+<!-- <button id="exportButton">TTTTTTTTTT</button>-->
+ </div>
+ <#table id="TStudentTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/modular/system/tStudent/tStudent_commite.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.4.0/jspdf.umd.min.js">
+</script>
+<script>
+ document.getElementById('exportButton').addEventListener('click', function() {
+ console.log("==============>")
+ var doc = new jsPDF();
+ var content = document.getElementById('ttt').innerHTML;
+ doc.text(content, 10, 10);
+ doc.save('export.pdf');
+ });
+</script>
+@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index dc85985..9ddafc4 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -203,6 +203,12 @@
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -232,7 +238,15 @@
Feng.info("请输入店长姓名")
return;
}
+
+
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+
+ Feng.info("请输入正确手机号")
+ return false;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
@@ -446,6 +460,13 @@
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -477,6 +498,11 @@
}
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
return;
@@ -498,6 +524,8 @@
}
}
+
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tShop/update", function(data){
if(data=="5001"){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
index bd1eca8..30ab531 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
@@ -129,6 +129,24 @@
};
+/**
+ * 学员管理
+ */
+TStudent.openTStudentDetail2 = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tStudent/tStudent_commite/' + TStudent.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+
/**
* 删除
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent_commite.js b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent_commite.js
new file mode 100644
index 0000000..1508f18
--- /dev/null
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent_commite.js
@@ -0,0 +1,144 @@
+/**
+ * 管理初始化
+ */
+var TStudent = {
+ id: "TStudentTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1
+};
+
+/**
+ * 初始化表格的列
+ */
+TStudent.initColumn = function () {
+ return [
+ {field: 'selectItem', radio: true},
+ {title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '评论老师', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ {title: '评价内容', field: 'content', visible: true, align: 'center', valign: 'middle'}
+ ];
+};
+
+/**
+ * 检查是否选中
+ */
+TStudent.check = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length == 0){
+ Feng.info("请先选中表格中的某一记录！");
+ return false;
+ }else{
+ TStudent.seItem = selected[0];
+ return true;
+ }
+};
+
+/**
+ * 点击添加
+ */
+TStudent.openAddTStudent = function () {
+ var index = layer.open({
+ type: 2,
+ title: '添加',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tStudent/tStudent_add'
+ });
+ this.layerIndex = index;
+};
+
+/**
+ * 打开修改
+ */
+TStudent.openTStudentDetail = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tStudent/tStudent_update/' + TStudent.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+
+/**
+ * 打开详情
+ */
+TStudent.openTStudentDetail1 = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tStudent/tStudent_info/' + TStudent.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+
+/**
+ * 学员管理
+ */
+TStudent.openTStudentDetail2 = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tStudent/tStudent_commite/' + TStudent.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+
+
+/**
+ * 删除
+ */
+TStudent.delete = function () {
+ if (this.check()) {
+ var ajax = new $ax(Feng.ctxPath + "/tStudent/delete", function (data) {
+ Feng.success("删除成功!");
+ TStudent.table.refresh();
+ }, function (data) {
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("tStudentId",this.seItem.id);
+ ajax.start();
+ }
+};
+
+/**
+ * 查询列表
+ */
+TStudent.search = function () {
+ var queryData = {};
+ queryData['province'] = $("#province").val();
+ queryData['city'] = $("#city").val();
+ queryData['name'] = $("#name").val();
+ queryData['userName'] = $("#userName").val();
+ queryData['phone'] = $("#phone").val();
+
+
+ TStudent.table.refresh({query: queryData});
+};
+
+$(function () {
+ var defaultColunms = TStudent.initColumn();
+ var table = new BSTable(TStudent.id, "/tStudent/listcom/"+$("#id").val(), defaultColunms);
+ table.setPaginationType("client");
+ TStudent.table = table.init();
+});
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 87454da..4a9f884 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -128,7 +128,11 @@
and t1.name like concat('%',#{query.name},'%')
</if>
and t1.state != 3
- and t1.insuranceEndTime <= DATE_ADD(CURDATE(), INTERVAL 2 MONTH);
+ and t1.insuranceEndTime <= DATE_ADD(CURDATE(), INTERVAL 2 MONTH)
+
+
</where>
+
+ ORDER BY insertTime desc
</select>
</mapper>
diff --git a/cloud-server-other/src/main/resources/redis.properties b/cloud-server-other/src/main/resources/redis.properties
index 0e934d1..c8cd188 100644
--- a/cloud-server-other/src/main/resources/redis.properties
+++ b/cloud-server-other/src/main/resources/redis.properties
@@ -1,9 +1,6 @@
spring.redis.database=0
-# Redis��������ַ
spring.redis.host=@redis.addr@
-# Redis���������Ӷ˿�
spring.redis.port=@redis.port@
-# Redis�������������루Ĭ��Ϊ�գ�
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024
spring.redis.jedis.pool.max-wait=10000
--
Gitblit v1.7.1