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

提成加上合计、Excel导出;打卡记录加上姓名、营养师;体征调查加上备注项

Browse Source
This commit is contained in:
xiezhijun
2021-01-13 18:39:17 +08:00
parent c07fddf510
commit cf56395dab
19 changed files with 267 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,5 +198,15 @@ public class SysCommisionController extends BaseController {
return getDataTable(sysCommissionDayService.calculateCommissionByDay(sysCommision));
}
/**
* 导出按天计算提成详细列表
*/
@PreAuthorize("@ss.hasPermi('commisionDay:detail:export')")
@Log(title = "导出按天计算提成详细列表", businessType = BusinessType.EXPORT)
@GetMapping("/exportDetailDay")
public AjaxResult exportDetailDay(SysCommision sysCommision) {
ExcelUtil<SysCommissionDayDetail> util = new ExcelUtil<>(SysCommissionDayDetail.class);
List<SysCommissionDayDetail> list = sysCommissionDayService.calculateCommissionByDay(sysCommision);
return util.exportExcel(list, "commision");
}
}

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

@@ -3,6 +3,7 @@ package com.stdiet.web.controller.custom;
import java.util.ArrayList;
import java.util.List;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.custom.domain.SysPhysicalSigns;
import com.stdiet.common.utils.bean.ObjectUtils;
@@ -49,6 +50,13 @@ public class SysCustomerController extends BaseController
{
startPage();
List<SysCustomer> list = sysCustomerService.selectSysCustomerAndSignList(sysCustomer);
if(list != null && list.size() > 0){
for(SysCustomer sysCus : list){
if(StringUtils.isNotEmpty(sysCus.getPhone())){
sysCus.setPhone(StringUtils.hiddenPhoneNumber(sysCus.getPhone()));
}
}
}
return getDataTable(list);
}

7
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java
View File

@@ -4,6 +4,7 @@ import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysUser;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.controller.OrderBaseController;
import com.stdiet.custom.domain.SysOrder;
@@ -77,9 +78,9 @@ public class SysOrderController extends OrderBaseController {
order.setOperatorAssis(user.getNickName());
}
}
/*if (order.getPhone() != null && !order.getPhone().equals("")) {
order.setPhone(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}*/
if (StringUtils.isNotEmpty(order.getPhone())) {
order.setPhone(StringUtils.hiddenPhoneNumber(order.getPhone()));
}
}
return getOrderDataTable(list, totalAmount);
}

2
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderPauseController.java
View File

@@ -77,8 +77,6 @@ public class SysOrderPauseController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SysOrderPause sysOrderPause)
{
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
System.out.println(simpleDateFormat.format(sysOrderPause.getPauseStartDate()));
return toAjax(sysOrderPauseService.insertSysOrderPause(sysOrderPause));
}

8
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
View File

@@ -47,8 +47,14 @@ public class SysWxUserLogController extends BaseController {
List<SysWxUserLog> list = sysWxUserLogService.selectSysWxUserLogList(sysWxUserLog);
for (SysWxUserLog userLog : list) {
if(userLog.getCustomerMessage() != null){
String[] message = userLog.getCustomerMessage().split(",");
userLog.setCustomer(message[0]);
userLog.setNutritionist(message.length > 1 ? message[1] : "");
}
if (StringUtils.isNotEmpty(userLog.getPhone())) {
userLog.setPhone(userLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
userLog.setPhone(StringUtils.hiddenPhoneNumber(userLog.getPhone()));
//userLog.setPhone(userLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}
}