-------退款和发票：不要数据权限
-------任务派单时增加一个备注字段 子任务列表增加展示（工作内容说明） -------任务列表加这两个字段的筛选 客户是否到达现场 是否代账
This commit is contained in:
1073413548
parent
12c07f1e8a
commit
9d2ea10f61
@ -136,12 +136,12 @@ public class PsCustomController extends BaseController {
|
||||
|
||||
|
||||
/**
|
||||
* 客户档案
|
||||
* 已完成客户
|
||||
* @param queryBo 查询
|
||||
* @return
|
||||
*/
|
||||
@SaCheckPermission("business:customInfo:record")
|
||||
@Log(title = "客户档案" )
|
||||
@Log(title = "已完成客户" )
|
||||
@GetMapping("/record")
|
||||
public TableDataInfo<PsCustomerRecordVo> record(PsCustomRecordQueryBo queryBo, PageQuery pageQuery) {
|
||||
return psCustomInfoService.getCustomerRecordList(queryBo,pageQuery);
|
||||
|
||||
@ -66,6 +66,9 @@ public class PsTaskAppoint extends TenantEntity {
|
||||
* 任务完成时间
|
||||
*/
|
||||
private Date finishDate;
|
||||
|
||||
/**
|
||||
* 工作内容描述
|
||||
*/
|
||||
private String taskContentDesc;
|
||||
|
||||
}
|
||||
|
||||
@ -28,4 +28,9 @@ public class AppointBo {
|
||||
*/
|
||||
@NotBlank
|
||||
private String appointType;
|
||||
|
||||
/**
|
||||
* 任务委派类型（1内勤,2外勤,3特勤）
|
||||
*/
|
||||
private String taskContentDesc;
|
||||
}
|
||||
|
||||
@ -88,5 +88,13 @@ public class PsTaskQueryBo {
|
||||
* 客户电话
|
||||
*/
|
||||
private String customMobile;
|
||||
/**
|
||||
* 客户是否到达现场1是0否
|
||||
*/
|
||||
private String customScene;
|
||||
/**
|
||||
* 是否代账1是0否
|
||||
*/
|
||||
private String isProxy;
|
||||
|
||||
}
|
||||
|
||||
@ -133,5 +133,10 @@ public class PsTaskMainVo implements Serializable {
|
||||
* 任务备注
|
||||
*/
|
||||
private String taskDesc;
|
||||
|
||||
/**
|
||||
* 任务备注
|
||||
*/
|
||||
private String taskContentDesc;
|
||||
}
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ public interface IPsCustomInfoService {
|
||||
Boolean insertCallbackByBo(List<PsCustomCallbackBo> bos);
|
||||
|
||||
/**
|
||||
* 客户档案查询列表
|
||||
* 已完成客户
|
||||
* @param queryBo
|
||||
* @return
|
||||
*/
|
||||
|
||||
@ -126,6 +126,7 @@ public class PsApproverRecordServiceImpl implements IPsApproverRecordService {
|
||||
*/
|
||||
public String getLastFail(String businessId,String contractCode,List<String> businessTypes){
|
||||
PsApproverRecord record = baseMapper.selectOne(Wrappers.<PsApproverRecord>lambdaQuery()
|
||||
.select(PsApproverRecord::getApproverStatus,PsApproverRecord::getApproverDesc)
|
||||
.eq(StringUtils.isNotBlank(businessId), PsApproverRecord::getBusinessId, businessId)
|
||||
.eq(StringUtils.isNotBlank(contractCode), PsApproverRecord::getContractCode, contractCode)
|
||||
.in(CollectionUtils.isNotEmpty(businessTypes), PsApproverRecord::getBusinessType, businessTypes)
|
||||
|
||||
@ -362,7 +362,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
|
||||
|
||||
|
||||
/**
|
||||
* 客户档案查询列表
|
||||
* 已完成客户（最开始 客户档案和已完成客户是一个接口，后续分开了，此接口只用来查已完成客户列表）
|
||||
* @param queryBo
|
||||
* @return
|
||||
*/
|
||||
@ -384,7 +384,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
|
||||
//已完成合同列表：客户下不存在未完成的合同信息（不包括作废和暂存的合同）
|
||||
qw.notExists("select 1 from ps_contract_info pscon where pscon.custom_id = custom.id and pscon.contract_status not in ('" + ContractStatusEnum.SUCCESS.getCode() + "','"
|
||||
+ ContractStatusEnum.INIT.getCode() + "' and pscon.is_cancel != '03')");
|
||||
} else if (queryBo.getType() != null && queryBo.getType() == 1) {
|
||||
} /*else if (queryBo.getType() != null && queryBo.getType() == 1) {
|
||||
//托管类服务类型编码集合
|
||||
qw.exists(queryBo.getServiceType() != null && queryBo.getServiceType() == 1, "select 1 from ps_contract_business bus " +
|
||||
"where bus.contract_code = con.contract_code and bus.business_type = 2");
|
||||
@ -394,7 +394,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
|
||||
//服务项目编码集合
|
||||
qw.exists(CollectionUtils.isNotEmpty(queryBo.getServiceProjects()), "select 1 from ps_contract_business detail " +
|
||||
"where detail.contract_code = con.contract_code and detail.business_type in (" + StringUtils.join(queryBo.getServiceProjects(), ",") + ")");//服务项目编码集合
|
||||
}
|
||||
}*/
|
||||
Page<PsCustomerRecordVo> list = baseMapper.selectPageCustomerRecordList(pageQuery.build(), qw);
|
||||
if (CollectionUtils.isEmpty(list.getRecords())) {
|
||||
return TableDataInfo.build(list);
|
||||
|
||||
@ -312,6 +312,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
|
||||
psTaskAppoint.setContractCode(mainTask.getContractCode());
|
||||
psTaskAppoint.setTaskId(mainTask.getId());
|
||||
psTaskAppoint.setExecutor(bo.getUserId());
|
||||
psTaskAppoint.setTaskContentDesc(bo.getTaskContentDesc());
|
||||
appointMapper.insert(psTaskAppoint);
|
||||
}
|
||||
/**
|
||||
@ -427,6 +428,8 @@ public class PsTaskServiceImpl implements IPsTaskService {
|
||||
lqw.like(StringUtils.isNotBlank(bo.getName()), "com.legal_person_name", bo.getName());//法人姓名
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCustomName()), "cus.custom_name", bo.getCustomName());//客户姓名
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCustomMobile()), "cus.custom_mobile", bo.getCustomMobile());//客户电话
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCustomScene()), "con.custom_scene", bo.getCustomScene());//是否到达现场
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getIsProxy()), "con.is_proxy", bo.getIsProxy());//是否代账
|
||||
//服务项目编码集合
|
||||
lqw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjectCode()), "select 1 from ps_contract_business detail " +
|
||||
"where detail.contract_code = con.contract_code and detail.business_type in ("+StringUtils.join(bo.getServiceProjectCode(),",")+")");//服务项目编码集合
|
||||
|
||||
@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
appo.appoint_status,
|
||||
appo.id,
|
||||
appo.task_desc,
|
||||
appo.task_content_desc,
|
||||
(select GROUP_CONCAT(business.business_type SEPARATOR ',')
|
||||
from ps_contract_business business where business.contract_code = con.contract_code and business.del_flag = '0') as business_type_name
|
||||
from ps_task_appoint appo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user