Commit 9937a6ba by zhangxingmin

push

parent 1589fd35
...@@ -290,6 +290,8 @@ public class ApiCommissionExpectedController { ...@@ -290,6 +290,8 @@ public class ApiCommissionExpectedController {
@PostMapping("/receivable_report") @PostMapping("/receivable_report")
@Operation(summary = "应收款报表") @Operation(summary = "应收款报表")
public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) { public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
//保單持有人(中/英)、签单人、转介人名称(主)查询保单号列表
// 构建查询条件 // 构建查询条件
QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest); QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
...@@ -315,6 +317,17 @@ public class ApiCommissionExpectedController { ...@@ -315,6 +317,17 @@ public class ApiCommissionExpectedController {
return Result.success(response); return Result.success(response);
} }
// /**
// * 保單持有人(中/英)/签单人/转介人名称(主)查询
// * @param policyHolder
// * @param signer
// * @param brokerName
// * @return
// */
// public List<String> getPolicyNoList(String policyHolder,String signer,String brokerName) {
//
// }
public IPage<ReceivableReportVO> convertProductName(IPage<ReceivableReportVO> receivableReportPage) { public IPage<ReceivableReportVO> convertProductName(IPage<ReceivableReportVO> receivableReportPage) {
if (!org.springframework.util.CollectionUtils.isEmpty(receivableReportPage.getRecords())) { if (!org.springframework.util.CollectionUtils.isEmpty(receivableReportPage.getRecords())) {
List<String> policyNoList = receivableReportPage.getRecords().stream().map(ReceivableReportVO::getPolicyNo).collect(Collectors.toList()); List<String> policyNoList = receivableReportPage.getRecords().stream().map(ReceivableReportVO::getPolicyNo).collect(Collectors.toList());
......
...@@ -5,6 +5,8 @@ import com.yd.csf.service.dto.PolicyReportData; ...@@ -5,6 +5,8 @@ import com.yd.csf.service.dto.PolicyReportData;
import com.yd.csf.service.model.PolicyFollow; import com.yd.csf.service.model.PolicyFollow;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @author Zhang Jianan * @author Zhang Jianan
* @description 针对表【policy_follow(新单跟进表)】的数据库操作Mapper * @description 针对表【policy_follow(新单跟进表)】的数据库操作Mapper
...@@ -14,6 +16,8 @@ import org.apache.ibatis.annotations.Param; ...@@ -14,6 +16,8 @@ import org.apache.ibatis.annotations.Param;
public interface PolicyFollowMapper extends BaseMapper<PolicyFollow> { public interface PolicyFollowMapper extends BaseMapper<PolicyFollow> {
PolicyReportData queryPolicyReportData(@Param("policyBizId") String policyBizId); PolicyReportData queryPolicyReportData(@Param("policyBizId") String policyBizId);
// List<String> queryPolicyNoList(@Param("policyHolder") String policyHolder, @Param("signer") String signer, @Param("brokerName") String brokerName);
} }
......
...@@ -28,6 +28,12 @@ public class FortuneAccount implements Serializable { ...@@ -28,6 +28,12 @@ public class FortuneAccount implements Serializable {
private String fortuneAccountBizId; private String fortuneAccountBizId;
/** /**
* 出账业务编号(出账年月 + 转介人内部编号(后6位)(如无,用0补齐)+流水号(6位))
*/
@TableField("business_no")
private String businessNo;
/**
* 转介人 * 转介人
*/ */
private String broker; private String broker;
......
...@@ -183,4 +183,6 @@ public interface PolicyFollowService extends IService<PolicyFollow> { ...@@ -183,4 +183,6 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
Boolean updatePolicySecondHolder(PolicySecondHolderUpdateRequest policySecondHolderUpdateRequest); Boolean updatePolicySecondHolder(PolicySecondHolderUpdateRequest policySecondHolderUpdateRequest);
Result<ApiPolicyFollowDetailResponse> detail(String policyNo); Result<ApiPolicyFollowDetailResponse> detail(String policyNo);
List<String> queryPolicyNoList(String policyHolder,String signer,String brokerName);
} }
...@@ -1224,5 +1224,11 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -1224,5 +1224,11 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
BeanUtils.copyProperties(policyFollow,response); BeanUtils.copyProperties(policyFollow,response);
return Result.success(response); return Result.success(response);
} }
@Override
public List<String> queryPolicyNoList(String policyHolder, String signer, String brokerName) {
return null;
// return this.baseMapper.queryPolicyNoList(policyHolder,signer,brokerName);
}
} }
...@@ -130,4 +130,6 @@ ...@@ -130,4 +130,6 @@
left join policy_insurant i on t.policy_biz_id = i.policy_biz_id left join policy_insurant i on t.policy_biz_id = i.policy_biz_id
where t.policy_biz_id = #{policyBizId} where t.policy_biz_id = #{policyBizId}
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment