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

Merge branch 'master' of gitee.com:darlk/ShengTangManage

Browse Source
This commit is contained in:
huangdeliang
2021-01-29 09:20:53 +08:00
parent e1d9d96244 62e72a1ffb
commit a9b52b6b94
11 changed files with 384 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.stdiet.web.controller.custom;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.constant.ContractContants;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
@ -109,11 +110,22 @@ public class SysContractController extends BaseController {
} else {
Map<String, String> data = new HashMap<>();
data.put("id", contract.getId().toString());
data.put("projectId", contract.getProjectId().toString());
data.put("projectName", contract.getProjectName());
data.put("amount", contract.getAmount().toString());
data.put("serveTime", contract.getServeTime() + "");
data.put("tutor", contract.getTutor());
data.put("servePromise", contract.getServePromise());
data.put("remark", contract.getRemark());
data.put("companyName", ContractContants.companyName);
data.put("companyLegalPerson", ContractContants.companyLegalPerson);
data.put("companyAddress", ContractContants.companyAddress);
data.put("companyPhone", ContractContants.companyPhone);
data.put("bankName", ContractContants.bankName);
data.put("bankAccount", ContractContants.bankAccount);
data.put("hourDay", ContractContants.hourDay);
data.put("dayWeek", ContractContants.dayWeek);
data.put("replyIntervalTime", ContractContants.replyIntervalTime);
ajax.put("data", data);
}
return ajax;

15
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java
View File

@ -5,14 +5,7 @@ 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
@ -77,7 +70,11 @@ public class SysCustomerHealthyController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysCustomerHealthyService.selectSysCustomerHealthyById(id));
SysCustomerHealthy sysCustomerHealthy = sysCustomerHealthyService.selectSysCustomerHealthyById(id);
if(sysCustomerHealthy != null && StringUtils.isNotEmpty(sysCustomerHealthy.getPhone())){
sysCustomerHealthy.setPhone(StringUtils.hiddenPhoneNumber(sysCustomerHealthy.getPhone()));
}
return AjaxResult.success(sysCustomerHealthy);
}
/**