Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

食谱计划页面弹窗样式优化、按天提成列表增加一列

Browse Source
This commit is contained in:
xiezhijun
2021-01-20 18:41:14 +08:00
parent 8c4dea035e
commit 8d725bed34
8 changed files with 209 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
View File

@@ -70,7 +70,9 @@ public class SysCustomerController extends BaseController
customerListResponse = ObjectUtils.getObjectByObject(customer.getSign(), CustomerListResponse.class);
customerListResponse.setCreateTime(customer.getCreateTime());
customerListResponse.setName(customer.getName());
customerListResponse.setPhone(customer.getPhone());
if(StringUtils.isNotEmpty(customer.getPhone())){
customerListResponse.setPhone(StringUtils.hiddenPhoneNumber(customer.getPhone()));
}
StringBuilder signStr = new StringBuilder();
if(customer.getSign().getSignList() != null && customer.getSign().getSignList().size() > 0){
int i = 0;

12
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanController.java
View File

@@ -1,6 +1,8 @@
package com.stdiet.web.controller.custom;
import java.util.List;
import com.stdiet.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +37,11 @@ public class SysRecipesPlanController extends BaseController
{
startPage();
List<SysRecipesPlan> list = sysRecipesPlanService.selectPlanListByCondition(sysRecipesPlan);
for(SysRecipesPlan plan : list){
if(StringUtils.isNotEmpty(plan.getPhone())){
plan.setHidePhone(StringUtils.hiddenPhoneNumber(plan.getPhone()));
}
}
return getDataTable(list);
}
@@ -80,6 +87,11 @@ public class SysRecipesPlanController extends BaseController
public AjaxResult export(SysRecipesPlan sysRecipesPlan)
{
List<SysRecipesPlan> list = sysRecipesPlanService.selectPlanListByCondition(sysRecipesPlan);
for(SysRecipesPlan plan : list){
if(StringUtils.isNotEmpty(plan.getPhone())){
plan.setHidePhone(StringUtils.hiddenPhoneNumber(plan.getPhone()));
}
}
ExcelUtil<SysRecipesPlan> util = new ExcelUtil<SysRecipesPlan>(SysRecipesPlan.class);
return util.exportExcel(list, "recipesPlan");
}