Commit 361cdebc by Water Wang

optimize

parent da32937a
package com.yd.api.agms;
import com.yd.api.agms.service.AgmsStatementService;
import com.yd.api.agms.vo.statement.FinancialPredictStatementRequestVO;
import com.yd.api.agms.vo.statement.FinancialPredictStatementResponseVO;
import com.yd.api.result.JsonResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
@Controller
@RestController
@RequestMapping("/agms")
public class AgmsController {
@Autowired
private AgmsStatementService agmsStatementService;
/**
* AGMS -- 财务管理报表
* @param requestVO 请求数据
* @return 响应数据
*/
@RequestMapping("/financialPredictStatement")
public Object financialPredictStatement(@RequestBody FinancialPredictStatementRequestVO requestVO, HttpServletResponse response){
JsonResult result = new JsonResult();
FinancialPredictStatementResponseVO responseVO = agmsStatementService.financialPredictStatement(requestVO,response);
result.addResult(responseVO);
result.setData(responseVO);
return result;
}
}
package com.yd.api.agms.service;
import com.yd.api.agms.vo.statement.FinancialPredictStatementRequestVO;
import com.yd.api.agms.vo.statement.FinancialPredictStatementResponseVO;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
@Service("agmsStatementService")
public interface AgmsStatementService {
/**
* 线下寿险预估数据管理报表
* @param requestVO 请求报文
* @return 响应报文
*/
FinancialPredictStatementResponseVO financialPredictStatement(FinancialPredictStatementRequestVO requestVO, HttpServletResponse response);
}
package com.yd.api.agms.service.impl;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.service.AgmsStatementService;
import com.yd.api.agms.vo.statement.FinancialPredictStatementRequestVO;
import com.yd.api.agms.vo.statement.FinancialPredictStatementResponseVO;
import com.yd.api.agms.vo.statement.PredictStatementData;
import com.yd.api.commission.service.CommissionService;
import com.yd.api.result.CommonResult;
import com.yd.util.config.ZHBErrorConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
@Service("agmsStatementService")
public class AgmsStatementServiceImpl implements AgmsStatementService {
@Autowired
private CommissionService commissionService;
@Override
public FinancialPredictStatementResponseVO financialPredictStatement(FinancialPredictStatementRequestVO requestVO, HttpServletResponse response) {
FinancialPredictStatementResponseVO responseVO = new FinancialPredictStatementResponseVO();
PageInfo<PredictStatementData> pageInfo = requestVO.getPageInfo();
String predictInCommissionTime = requestVO.getPredictInCommissionTime();//预估来佣时间
String predictOutCommissionTime = requestVO.getPredictOutCommissionTime();//预估发佣时间
String insurerBranchId = requestVO.getInsurerBranchId();//分公司
String deptId = requestVO.getDeptId();//营业部
String subordinateId = requestVO.getSubordinateId();//体系
PageInfo<PredictStatementData> dataList = commissionService.getPredictStatementDataByPage(pageInfo.getPageNum(),pageInfo.getSize(),predictInCommissionTime,predictOutCommissionTime,insurerBranchId,deptId,subordinateId);
responseVO.setPredictStatementDataList(dataList);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
}
}
package com.yd.api.agms.vo.statement;
import com.github.pagehelper.PageInfo;
public class FinancialPredictStatementRequestVO {
private boolean isStatement;
private String predictInCommissionTime;
private String predictOutCommissionTime;
private String insurerBranchId;//分公司ID
private String deptId;//营业部ID
private String subordinateId;//体系ID
private PageInfo<PredictStatementData> pageInfo;
public boolean isStatement() {
return isStatement;
}
public void setStatement(boolean statement) {
isStatement = statement;
}
public String getPredictInCommissionTime() {
return predictInCommissionTime;
}
public void setPredictInCommissionTime(String predictInCommissionTime) {
this.predictInCommissionTime = predictInCommissionTime;
}
public String getPredictOutCommissionTime() {
return predictOutCommissionTime;
}
public void setPredictOutCommissionTime(String predictOutCommissionTime) {
this.predictOutCommissionTime = predictOutCommissionTime;
}
public String getInsurerBranchId() {
return insurerBranchId;
}
public void setInsurerBranchId(String insurerBranchId) {
this.insurerBranchId = insurerBranchId;
}
public String getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
this.deptId = deptId;
}
public String getSubordinateId() {
return subordinateId;
}
public void setSubordinateId(String subordinateId) {
this.subordinateId = subordinateId;
}
public PageInfo<PredictStatementData> getPageInfo() {
return pageInfo;
}
public void setPageInfo(PageInfo<PredictStatementData> pageInfo) {
this.pageInfo = pageInfo;
}
}
package com.yd.api.agms.vo.statement;
import com.github.pagehelper.PageInfo;
import com.yd.api.result.CommonResult;
import java.util.List;
public class FinancialPredictStatementResponseVO {
private PageInfo<PredictStatementData> predictStatementDataList;
private CommonResult commonResult;
public PageInfo<PredictStatementData> getPredictStatementDataList() {
return predictStatementDataList;
}
public void setPredictStatementDataList(PageInfo<PredictStatementData> predictStatementDataList) {
this.predictStatementDataList = predictStatementDataList;
}
public CommonResult getCommonResult() {
return commonResult;
}
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
}
package com.yd.api.agms.vo.statement;
public class PredictStatementData {
private String predictInCommissionTime;
private String predictOutCommissionTime;
private String policyNo;
private String insurerBranchName;
private String deptName;
private String subordinateName;
private String practitionerName;
private String practitionerIdEG;
private String title;
private Double titleRate;
private Double premium;
private Double FYC;
private Double RYC;
private Double rightReceiveCommission;
private Double rightPayCommission;
private String commissionType;
public String getPredictInCommissionTime() {
return predictInCommissionTime;
}
public void setPredictInCommissionTime(String predictInCommissionTime) {
this.predictInCommissionTime = predictInCommissionTime;
}
public String getPredictOutCommissionTime() {
return predictOutCommissionTime;
}
public void setPredictOutCommissionTime(String predictOutCommissionTime) {
this.predictOutCommissionTime = predictOutCommissionTime;
}
public String getPolicyNo() {
return policyNo;
}
public void setPolicyNo(String policyNo) {
this.policyNo = policyNo;
}
public String getInsurerBranchName() {
return insurerBranchName;
}
public void setInsurerBranchName(String insurerBranchName) {
this.insurerBranchName = insurerBranchName;
}
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
public String getSubordinateName() {
return subordinateName;
}
public void setSubordinateName(String subordinateName) {
this.subordinateName = subordinateName;
}
public String getPractitionerName() {
return practitionerName;
}
public void setPractitionerName(String practitionerName) {
this.practitionerName = practitionerName;
}
public String getPractitionerIdEG() {
return practitionerIdEG;
}
public void setPractitionerIdEG(String practitionerIdEG) {
this.practitionerIdEG = practitionerIdEG;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Double getTitleRate() {
return titleRate;
}
public void setTitleRate(Double titleRate) {
this.titleRate = titleRate;
}
public Double getPremium() {
return premium;
}
public void setPremium(Double premium) {
this.premium = premium;
}
public Double getFYC() {
return FYC;
}
public void setFYC(Double FYC) {
this.FYC = FYC;
}
public Double getRYC() {
return RYC;
}
public void setRYC(Double RYC) {
this.RYC = RYC;
}
public Double getRightReceiveCommission() {
return rightReceiveCommission;
}
public void setRightReceiveCommission(Double rightReceiveCommission) {
this.rightReceiveCommission = rightReceiveCommission;
}
public Double getRightPayCommission() {
return rightPayCommission;
}
public void setRightPayCommission(Double rightPayCommission) {
this.rightPayCommission = rightPayCommission;
}
public String getCommissionType() {
return commissionType;
}
public void setCommissionType(String commissionType) {
this.commissionType = commissionType;
}
}
......@@ -2,6 +2,8 @@ package com.yd.api.commission.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.statement.PredictStatementData;
import com.yd.api.commission.vo.CommissionEGoldenVO;
import com.yd.api.commission.vo.CommissionVO;
......@@ -10,4 +12,6 @@ public interface CommissionService {
List<CommissionVO> queryCommissionByLogin(String login);
List<CommissionEGoldenVO> listSalesCommissionfromEGolden(String login);
PageInfo<PredictStatementData> getPredictStatementDataByPage(int pageNum, int size, String predictInCommissionTime, String predictOutCommissionTime, String insurerBranchId, String deptId, String subordinateId);
}
......@@ -3,6 +3,9 @@ package com.yd.api.commission.service;
import java.util.ArrayList;
import java.util.List;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.statement.PredictStatementData;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -59,5 +62,10 @@ public class CommissionServiceImpl implements CommissionService{
}
return listTo;
}
@Override
public PageInfo<PredictStatementData> getPredictStatementDataByPage(int pageNum, int size, String predictInCommissionTime, String predictOutCommissionTime, String insurerBranchId, String deptId, String subordinateId) {
return CommissionEGoldenDA.getPredictStatementDataByPage(pageNum,size,predictInCommissionTime,predictOutCommissionTime,insurerBranchId,deptId,subordinateId);
}
}
......@@ -2,6 +2,8 @@ package com.yd.dal.mapper.commission;
import java.util.List;
import com.github.pagehelper.Page;
import com.yd.api.agms.vo.statement.PredictStatementData;
import org.apache.ibatis.annotations.Param;
import com.yd.dal.entity.commission.CommissionEGolden;
......@@ -14,4 +16,6 @@ import com.yd.dal.entity.commission.CommissionEGolden;
public interface CommissionEGoldenMapper {
List<CommissionEGolden> listSalesCommissionfromEGolden(@Param("login")String login);
Page<PredictStatementData> getPredictStatementDataByPage(@Param("predictInCommissionTime")String predictInCommissionTime, @Param("predictOutCommissionTime")String predictOutCommissionTime, @Param("insurerBranchId")String insurerBranchId, @Param("deptId")String deptId, @Param("subordinateId")String subordinateId);
}
......@@ -2,6 +2,8 @@ package com.yd.dal.service.commission;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.statement.PredictStatementData;
import com.yd.dal.entity.commission.CommissionEGolden;
/**
......@@ -9,7 +11,9 @@ import com.yd.dal.entity.commission.CommissionEGolden;
* @version 1.0
*/
public interface CommissionEGoldenDA {
PageInfo<PredictStatementData> getPredictStatementDataByPage(int pageNum, int size, String predictInCommissionTime, String predictOutCommissionTime, String insurerBranchId, String deptId, String subordinateId);
List<CommissionEGolden> listSalesCommissionfromEGolden(String login);
}
package com.yd.dal.service.commission;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.statement.PredictStatementData;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Service;
......@@ -25,6 +29,14 @@ public class CommissionEGoldenDAImpl implements CommissionEGoldenDA {
@Resource
private CommissionEGoldenMapper commissionEGoldenMapper;
@Override
public PageInfo<PredictStatementData> getPredictStatementDataByPage(int pageNum, int size, String predictInCommissionTime, String predictOutCommissionTime, String insurerBranchId, String deptId, String subordinateId) {
PageHelper.startPage(pageNum, size);
Page<PredictStatementData> statementData = commissionEGoldenMapper.getPredictStatementDataByPage(predictInCommissionTime,predictOutCommissionTime,insurerBranchId,deptId,subordinateId);
PageInfo<PredictStatementData> pageInfo = new PageInfo<>(statementData);
return pageInfo;
}
/*
* 按照手机号从EGolden DB中查询用户保单列表
* 通过标签指定数据源:dataSourceKey = DataSourceKey.DB_EGOLDEN
......
......@@ -26,4 +26,9 @@
LEFT JOIN ins017 p_insed on policy.INS_MST_ID = p_insed.FK_INS_MST_ID
WHERE policy.INS_MST_REPEAL != 1 AND sales.SAL_MST_MOBILE = #{login}
</select>
<select id="getPredictStatementDataByPage" resultType="com.yd.api.agms.vo.statement.PredictStatementData">
</select>
</mapper>
\ No newline at end of file
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