Browse Source

xianfayiban

release_toaliyun_real
xhxu 5 years ago
parent
commit
eb0fbf1a92
4 changed files with 17 additions and 11 deletions
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  2. +2
    -2
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
  4. +7
    -7
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java View File

@@ -165,7 +165,7 @@ public class WxShopController extends BaseController {
wxShop = new WxShop();
}
wxShop.updateTenantInfo(getTenantInfo());
wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC);
wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC);
wxShopService.exportNotRentShop(wxShop, request, response);
}

@@ -181,7 +181,7 @@ public class WxShopController extends BaseController {
wxShop = new WxShop();
}
wxShop.updateTenantInfo(getTenantInfo());
wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC);
wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC);

final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize);
return new ResultData(page);


+ 2
- 2
mallinkAdmin/src/main/resources/application-dev.yml View File

@@ -4,8 +4,8 @@ spring:
#include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
#url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
type: com.alibaba.druid.pool.DruidDataSource


+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java View File

@@ -137,6 +137,12 @@ public class BaseEntity implements Serializable {
CreateDate_ASC("`create_date` ASC"),
CreateDate_DESC("`create_date` DESC"),

SId_ASC("s.`id` ASC"),
SId_DESC("s.`id` DESC"),

SCreateDate_ASC("s.`create_date` ASC"),
SCreateDate_DESC("s.`create_date` DESC"),

UpdateDate_ASC("`update_date` ASC"),
UpdateDate_DESC("`update_date` DESC"),



+ 7
- 7
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml View File

@@ -301,13 +301,13 @@
<select id="findCountHistory" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="com.iformall.domain.vo.UserCountVo">
select count(cub.id) as incCount,
<if test="1 == reportType ">
date_format(create_date, '%Y-%m-%d') as reportTime,
date_format(cub.create_date, '%Y-%m-%d') as reportTime,
</if>
<if test="2 == reportType ">
date_format(create_date, '%Y-%m') as reportTime,
date_format(cub.create_date, '%Y-%m') as reportTime,
</if>
<if test="3 == reportType ">
date_format(create_date, '%Y') as reportTime,
date_format(cub.create_date, '%Y') as reportTime,
</if>

<if test="1 == reportType or 2 == reportType or 3 == reportType">
@@ -315,13 +315,13 @@
inner join wx_c_user cu1 on cu1.id = cubi.id
where 1=1
<if test="1 == reportType ">
and cubi.date_format(cubi.create_date, '%Y-%m-%d') &lt;= cubi.reportTime
and date_format(cubi.create_date, '%Y-%m-%d') &lt;= reportTime
</if>
<if test="2 == reportType ">
and cubi.date_format(cubi.create_date, '%Y-%m') &lt;= cubi.reportTime
and date_format(cubi.create_date, '%Y-%m') &lt;= reportTime
</if>
<if test="3 == reportType ">
and cubi.date_format(cubi.create_date, '%Y') &lt;= cubi.reportTime
and date_format(cubi.create_date, '%Y') &lt;= reportTime
</if>
<if test=" null != tenantId and '' != tenantId">
and cubi.`tenant_id` = #{tenantId}
@@ -348,7 +348,7 @@
and cub.create_date &lt; #{endTime}
</if>
<if test="1 == reportType or 2 == reportType or 3 == reportType">
group by cub.reportTime
group by reportTime
</if>
</select>



Loading…
Cancel
Save