From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 2 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java | 1 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html | 2 +-
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 4 ++--
cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml | 18 ++++++++++++++----
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js | 5 +++--
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 4 ++--
7 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 3f310a3..210bd96 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -89,8 +89,8 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "查询时间yyyy-MM-dd", name = "time", required = true, dataType = "string"),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "用户经度", name = "longitude", required = true, dataType = "string"),
- @ApiImplicitParam(value = "用户纬度", name = "latitude", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "用户经度", name = "longitude", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "用户纬度", name = "latitude", required = false, dataType = "string"),
})
public ResultUtil<List<CourseVenue>> queryWeeksOfClassInfo(String time,Integer stuId, String longitude, String latitude){
try {
diff --git a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
index 61bb70a..ddc2650 100644
--- a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
@@ -4,7 +4,17 @@
<select id="queryCompetitionList" resultType="com.dsh.competition.model.CompetitionListVo">
- select * from (
+ select
+ aa.id,
+ aa.name,
+ aa.coverDrawing,
+ aa.cityName,
+ aa.registerCondition,
+ aa.introduction,
+ aa.registerEndTime,
+ aa.age,
+ aa.heat
+ from (
select
a.id,
a.`name`,
@@ -12,9 +22,9 @@
a.city as cityName,
a.registerCondition,
a.introduction,
- DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') as registerEndTime,
- CONCAT(a.startAge, '-', a.endAge) as `age`,
- (a.baseNumber + a.applicantsNumber) as `heat`
+ DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') registerEndTime,
+ CONCAT(a.startAge, '-', a.endAge) age,
+ (a.baseNumber + a.applicantsNumber) heat
from t_competition a
where a.auditStatus = 2 and a.`status` = 2 and a.state = 1
<if test="null != cityCode and '' != cityCode">
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index d26a70f..fe56759 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -101,7 +101,7 @@
}
if (ToolUtil.isNotEmpty(cityId)){
Region cityRegion = regiService.getById(cityId);
- provinceCode = cityRegion.getCode();
+ cityCode = cityRegion.getCode();
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceCode,cityCode,cityManagerId,storeName,page);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
index 5cab86e..ba3e006 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
@@ -13,6 +13,7 @@
public class TStore {
@TableId(type = IdType.AUTO)
private Integer id;
+ @TableField("name")
private String name;
@TableField("storeStaffId")
private Integer storeStaffId;
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 0dd0a94..2db3c8d 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -42,7 +42,7 @@
) as aa order by aa.code
</select>
<select id="queryListOfpage" resultType="java.util.Map">
- SELECT id, cityManagerId, province, city, `name`
+ SELECT `id`, `cityManagerId`, `province`, `city`, `name`
from t_store
where 1=1
<if test="provinceCode != null">
@@ -54,7 +54,7 @@
<if test="cityManagerId != null">
and cityManagerId = #{cityManagerId}
</if>
- <if test="storeName != null and storeName != ' '">
+ <if test="storeName != null and storeName != ''">
and `name` like CONCAT('%',#{storeName},'%')
</if>
</select>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
index ece9320..ff2714a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
@@ -11,7 +11,7 @@
}
.avatar-uploader .el-upload:hover {
- border-color: #409EFF;
+ border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
index 1757922..e8f1904 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
@@ -5,7 +5,8 @@
id: "TStoreProvinceTable", //表格id
seItem: null, //选中的条目
table: null,
- layerIndex: -1
+ layerIndex: -1,
+ storeList: []
};
/**
@@ -13,7 +14,7 @@
*/
TStoreProvince.initColumn = function () {
return [
- {field: 'selectItem', radio: true},
+ {field: 'selectItem', checkbox: true},
{title: '选择', field: '', visible: true, align: 'center', valign: 'middle'},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '所属账号', field: 'accountName', visible: true, align: 'center', valign: 'middle'},
--
Gitblit v1.7.1