mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查看销售本人的合同

Browse Source
This commit is contained in:
mx 2024-10-11 14:08:06 +08:00
parent b3bcd2379f
commit 6849120f55
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java
View File

@ -133,7 +133,7 @@ public class PsTaskController extends BaseController {
@GetMapping("/childFinish")
@RepeatSubmit()
public R<Void> childFinish(@NotNull Long id,String desc) {
psTaskMainService.finishChild(id,desc);
psTaskMainService.finishChild(id, desc);
return R.ok();
}

6
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java
View File

@ -84,4 +84,10 @@ public class PsContractBusinessVo implements Serializable {
*/
private String isOld;
/**
* 签约日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date applyDate;
}

6
pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractInfoMapper.java
View File

@ -31,19 +31,19 @@ public interface PsContractInfoMapper extends BaseMapperPlus<PsContractInfo, PsC
@DataPermission({
@DataColumn(key = "deptName", value = "info.create_dept"),
@DataColumn(key = "userName", value = "info.create_by")
@DataColumn(key = "userName", value = "info.custom_manager")
})
Page<PsContractInfoVo> selectPageContractList(@Param("page") Page<PsContractInfo> page, @Param(Constants.WRAPPER) Wrapper<PsContractInfo> queryWrapper);
@DataPermission({
@DataColumn(key = "deptName", value = "info.create_dept"),
@DataColumn(key = "userName", value = "info.create_by")
@DataColumn(key = "userName", value = "info.custom_manager")
})
Page<PsContractInfoVo> selectPageContractListByCustomId(@Param("page") Page<PsContractInfo> page, @Param("customId") Long customId);
@DataPermission({
@DataColumn(key = "deptName", value = "info.create_dept"),
@DataColumn(key = "userName", value = "info.create_by")
@DataColumn(key = "userName", value = "info.custom_manager")
})
List<PsContractInfoVo> selectContractList(@Param(Constants.WRAPPER) Wrapper<PsContractInfo> queryWrapper);

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
View File

@ -387,7 +387,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
* @param id 任务主键id
* @return
*/
public void finishChild(Long id,String desc){
public void finishChild(Long id, String desc){
PsTaskAppoint appoint = appointMapper.selectById(id);
if(StringUtils.equals("3",appoint.getAppointType()) && StringUtils.isBlank(desc)){
throw new ServiceException("请填写特勤备注");

6
pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml
View File

@ -20,9 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
detail.business_project_label detail_business_project_label,
detail.amount detail_amount,
detail.amount_desc detail_amount_desc,
detail.extent_info detail_extent_info
detail.extent_info detail_extent_info,
con.apply_date
from ps_contract_business bus
left join ps_contract_business_detail detail on bus.id = detail.business_id
left join ps_contract_info con on con.contract_code = bus.contract_code
where bus.del_flag = 0
and (detail.del_flag = 0 or detail.del_flag is null)
and bus.contract_code in
@ -30,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{code}
</foreach>
<if test="serviceCompanyId != null">
and company_id = ${serviceCompanyId}
and bus.company_id = ${serviceCompanyId}
</if>
</select>

5
pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml
View File

@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</collection>
<collection property="psTaskAppointVoList" javaType="ArrayList"
column="main_id" ofType="com.pusong.business.domain.vo.PsTaskAppointVo"
column="mainid" ofType="com.pusong.business.domain.vo.PsTaskAppointVo"
select="queryByMainId" fetchType="eager">
</collection>
@ -84,8 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
appo.executor as executors,
appo.*,
main.*,
main.id main_id,
main.id mainid,
main.*,
con.is_proxy con_is_proxy,
con.custom_scene con_custom_scene,
con.custom_manager con_custom_manager,