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

!51 客户档案的体征、合同展示

Browse Source 
Merge pull request !51 from 德仔/xzj
This commit is contained in:
德仔
2021-01-30 19:41:56 +08:00
committed by Gitee
parent ebb37a4810 9470aa6b5e
commit f067b96170
18 changed files with 754 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,10 @@ import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.domain.SysContract;
import com.stdiet.custom.domain.SysCustomer;
import com.stdiet.custom.page.PdfProcessInfo;
import com.stdiet.custom.service.ISysContractService;
import org.springframework.beans.factory.annotation.Autowired;
@ -67,7 +69,13 @@ public class SysContractController extends BaseController {
@PreAuthorize("@ss.hasPermi('custom:contract:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(sysContractService.selectSysContractById(id));
SysContract contract = sysContractService.selectSysContractById(id);
if(contract != null){
if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().trim().equals(contract.getSignName())) {
contract.setName(contract.getName() + "（" + contract.getSignName() + "）");
}
}
return AjaxResult.success(contract);
}
/**

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

@ -8,14 +8,19 @@ import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.domain.SysCustomer;
import com.stdiet.custom.domain.SysCustomerHealthy;
import com.stdiet.custom.domain.SysCustomerPhysicalSigns;
import com.stdiet.custom.service.ISysCustomerHealthyService;
import com.stdiet.custom.service.ISysCustomerPhysicalSignsService;
import com.stdiet.custom.service.ISysCustomerService;
import com.stdiet.framework.web.domain.server.Sys;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 客户体征信息Controller
@ -32,6 +37,9 @@ public class SysCustomerController extends BaseController {
@Autowired
private ISysCustomerPhysicalSignsService sysCustomerPhysicalSignsService;
@Autowired
private ISysCustomerHealthyService sysCustomerHealthyService;
/**
* 查询客户信息列表
*/
@ -115,8 +123,33 @@ public class SysCustomerController extends BaseController {
return AjaxResult.success(sysCustomer);
}
/**
* 根据客户ID获取体征或健康评估信息，优先健康评估信息
* @param id 客户ID
* @return
*/
@GetMapping("/physicalSigns/{id}")
public AjaxResult getPhysicalSignsById(@PathVariable("id") Long id) {
return AjaxResult.success(sysCustomerPhysicalSignsService.selectSysCustomerPhysicalSignsByCusId(id));
Map<String, Object> result = new HashMap<>();
result.put("type", 0);
//查询健康评估信息
SysCustomerHealthy sysCustomerHealthy = sysCustomerHealthyService.selectSysCustomerHealthyByCustomerId(id);
if(sysCustomerHealthy != null){
if (StringUtils.isNotEmpty(sysCustomerHealthy.getPhone())) {
sysCustomerHealthy.setPhone(StringUtils.hiddenPhoneNumber(sysCustomerHealthy.getPhone()));
}
result.put("customerHealthy", sysCustomerHealthy);
}else{
//查询体征信息
SysCustomerPhysicalSigns sysCustomerPhysicalSigns = sysCustomerPhysicalSignsService.selectSysCustomerPhysicalSignsByCusId(id);
if(sysCustomerPhysicalSigns != null){
if (StringUtils.isNotEmpty(sysCustomerPhysicalSigns.getPhone())) {
sysCustomerPhysicalSigns.setPhone(StringUtils.hiddenPhoneNumber(sysCustomerPhysicalSigns.getPhone()));
}
result.put("type", 1);
}
result.put("customerHealthy", sysCustomerPhysicalSigns);
}
return AjaxResult.success(result);
}
}