Skip to content

Y
yd-backend
Commit fd9bbd1b by Water Wang
Options

optimzize

parent c46f9e3a
Showing with 65 additions and 31 deletions
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsStatementServiceImpl.java
...@@ -22,16 +22,20 @@ public class AgmsStatementServiceImpl implements AgmsStatementService { ...@@ -22,16 +22,20 @@ public class AgmsStatementServiceImpl implements AgmsStatementService {
public FinancialStatementResponseVO financialPredictStatement(FinancialStatementRequestVO requestVO, HttpServletResponse response) { public FinancialStatementResponseVO financialPredictStatement(FinancialStatementRequestVO requestVO, HttpServletResponse response) {
FinancialStatementResponseVO responseVO = new FinancialStatementResponseVO(); FinancialStatementResponseVO responseVO = new FinancialStatementResponseVO();
PageInfo<statementData> pageInfo = requestVO.getPageInfo(); PageInfo<statementData> pageInfo = requestVO.getPageInfo();
String inCommissionTime = requestVO.getInCommissionTime();//来佣时间 String inCommissionStartTime = requestVO.getInCommissionStartTime();//来佣开始时间
String outCommissionTime = requestVO.getOutCommissionTime();//发佣时间 String outCommissionStartTime = requestVO.getOutCommissionStartTime();//发佣开始时间
inCommissionTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inCommissionTime,"yyyy-MM-dd HH:mm:ss"),"yyyyMM"); String inCommissionEndTime = requestVO.getInCommissionEndTime();//来佣开始时间
outCommissionTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outCommissionTime,"yyyy-MM-dd HH:mm:ss"),"yyyyMM"); String outCommissionEndTime = requestVO.getOutCommissionEndTime();//发佣开始时间
inCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inCommissionStartTime,"yyyy-MM-dd HH:mm:ss"),"yyyyMM");
outCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outCommissionStartTime,"yyyy-MM-dd HH:mm:ss"),"yyyyMM");
inCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inCommissionEndTime,"yyyy-MM-dd HH:mm:ss"),"yyyyMM");
outCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outCommissionEndTime,"yyyy-MM-dd HH:mm:ss"),"yyyyMM");
String insurerBranchId = requestVO.getInsurerBranchId();//分公司 String insurerBranchId = requestVO.getInsurerBranchId();//分公司
String deptId = requestVO.getDeptId();//营业部 String deptId = requestVO.getDeptId();//营业部
String subordinateId = requestVO.getSubordinateId();//体系 String subordinateId = requestVO.getSubordinateId();//体系
Integer type = requestVO.getType(); Integer type = requestVO.getType();
Integer isStatement = requestVO.getIsStatement(); Integer isStatement = requestVO.getIsStatement();
PageInfo<statementData> dataList = commissionService.getStatementDataByPage(pageInfo.getPageNum(),pageInfo.getSize(),isStatement,type, inCommissionTime, outCommissionTime,insurerBranchId,deptId,subordinateId); PageInfo<statementData> dataList = commissionService.getStatementDataByPage(pageInfo.getPageNum(),pageInfo.getSize(),isStatement,type, inCommissionStartTime, outCommissionStartTime,inCommissionEndTime,outCommissionEndTime,insurerBranchId,deptId,subordinateId);
responseVO.setPredictStatementDataList(dataList); responseVO.setPredictStatementDataList(dataList);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000"))); responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO; return responseVO;
......
yd-api/src/main/java/com/yd/api/agms/vo/statement/FinancialStatementRequestVO.java
...@@ -5,8 +5,10 @@ import com.github.pagehelper.PageInfo; ...@@ -5,8 +5,10 @@ import com.github.pagehelper.PageInfo;
public class FinancialStatementRequestVO { public class FinancialStatementRequestVO {
private Integer type ; //2、预测，1、实际 private Integer type ; //2、预测，1、实际
private Integer isStatement;//0=非报表，1=报表 private Integer isStatement;//0=非报表，1=报表
private String inCommissionTime; private String inCommissionStartTime;
private String outCommissionTime; private String outCommissionStartTime;
private String inCommissionEndTime;
private String outCommissionEndTime;
private String insurerBranchId;//分公司ID private String insurerBranchId;//分公司ID
private String deptId;//营业部ID private String deptId;//营业部ID
private String subordinateId;//体系ID private String subordinateId;//体系ID
...@@ -28,20 +30,20 @@ public class FinancialStatementRequestVO { ...@@ -28,20 +30,20 @@ public class FinancialStatementRequestVO {
this.isStatement = isStatement; this.isStatement = isStatement;
} }
public String getInCommissionTime() { public String getInCommissionStartTime() {
return inCommissionTime; return inCommissionStartTime;
} }
public void setInCommissionTime(String inCommissionTime) { public void setInCommissionStartTime(String inCommissionStartTime) {
this.inCommissionTime = inCommissionTime; this.inCommissionStartTime = inCommissionStartTime;
} }
public String getOutCommissionTime() { public String getOutCommissionStartTime() {
return outCommissionTime; return outCommissionStartTime;
} }
public void setOutCommissionTime(String outCommissionTime) { public void setOutCommissionStartTime(String outCommissionStartTime) {
this.outCommissionTime = outCommissionTime; this.outCommissionStartTime = outCommissionStartTime;
} }
public String getInsurerBranchId() { public String getInsurerBranchId() {
...@@ -75,4 +77,20 @@ public class FinancialStatementRequestVO { ...@@ -75,4 +77,20 @@ public class FinancialStatementRequestVO {
public void setPageInfo(PageInfo<statementData> pageInfo) { public void setPageInfo(PageInfo<statementData> pageInfo) {
this.pageInfo = pageInfo; this.pageInfo = pageInfo;
} }
public String getInCommissionEndTime() {
return inCommissionEndTime;
}
public void setInCommissionEndTime(String inCommissionEndTime) {
this.inCommissionEndTime = inCommissionEndTime;
}
public String getOutCommissionEndTime() {
return outCommissionEndTime;
}
public void setOutCommissionEndTime(String outCommissionEndTime) {
this.outCommissionEndTime = outCommissionEndTime;
}
} }
yd-api/src/main/java/com/yd/api/commission/service/CommissionService.java
...@@ -13,5 +13,5 @@ public interface CommissionService { ...@@ -13,5 +13,5 @@ public interface CommissionService {
List<CommissionEGoldenVO> listSalesCommissionfromEGolden(String login); List<CommissionEGoldenVO> listSalesCommissionfromEGolden(String login);
PageInfo<statementData> getStatementDataByPage(int pageNum, int size, Integer isStatement, Integer type, String predictInCommissionTime, String predictOutCommissionTime, String insurerBranchId, String deptId, String subordinateId); PageInfo<statementData> getStatementDataByPage(int pageNum, int size, Integer isStatement, Integer type, String inCommissionStartTime, String outCommissionStartTime,String inCommissionEndTime, String outCommissionEndTime, String insurerBranchId, String deptId, String subordinateId);
} }
yd-api/src/main/java/com/yd/api/commission/service/CommissionServiceImpl.java
...@@ -63,8 +63,8 @@ public class CommissionServiceImpl implements CommissionService{ ...@@ -63,8 +63,8 @@ public class CommissionServiceImpl implements CommissionService{
} }
@Override @Override
public PageInfo<statementData> getStatementDataByPage(int pageNum, int size, Integer isStatement, Integer type, String inCommissionTime, String outCommissionTime, String insurerBranchId, String deptId, String subordinateId) { public PageInfo<statementData> getStatementDataByPage(int pageNum, int size, Integer isStatement, Integer type, String inCommissionStartTime, String outCommissionStartTime,String inCommissionEndTime, String outCommissionEndTime, String insurerBranchId, String deptId, String subordinateId) {
return commissionEGoldenDA.getStatementDataByPage(pageNum,size,isStatement,type,inCommissionTime,outCommissionTime,insurerBranchId,deptId,subordinateId); return commissionEGoldenDA.getStatementDataByPage(pageNum,size,isStatement,type,inCommissionStartTime,outCommissionStartTime,inCommissionEndTime,outCommissionEndTime,insurerBranchId,deptId,subordinateId);
} }
} }
yd-api/src/main/java/com/yd/dal/mapper/commission/CommissionEGoldenMapper.java
...@@ -17,5 +17,5 @@ public interface CommissionEGoldenMapper { ...@@ -17,5 +17,5 @@ public interface CommissionEGoldenMapper {
List<CommissionEGolden> listSalesCommissionfromEGolden(@Param("login")String login); List<CommissionEGolden> listSalesCommissionfromEGolden(@Param("login")String login);
Page<statementData> getStatementDataByPage(@Param("isStatement")Integer isStatement,@Param("type")Integer type, @Param("inCommissionTime")String inCommissionTime, @Param("outCommissionTime")String outCommissionTime, @Param("insurerBranchId")String insurerBranchId, @Param("deptId")String deptId, @Param("subordinateId")String subordinateId); Page<statementData> getStatementDataByPage(@Param("isStatement")Integer isStatement,@Param("type")Integer type, @Param("inCommissionStartTime")String inCommissionStartTime, @Param("outCommissionStartTime")String outCommissionStartTime,@Param("inCommissionEndTime")String inCommissionEndTime, @Param("outCommissionEndTime")String outCommissionEndTime, @Param("insurerBranchId")String insurerBranchId, @Param("deptId")String deptId, @Param("subordinateId")String subordinateId);
} }
yd-api/src/main/java/com/yd/dal/service/commission/CommissionEGoldenDA.java
...@@ -12,7 +12,7 @@ import com.yd.dal.entity.commission.CommissionEGolden; ...@@ -12,7 +12,7 @@ import com.yd.dal.entity.commission.CommissionEGolden;
*/ */
public interface CommissionEGoldenDA { public interface CommissionEGoldenDA {
PageInfo<statementData> getStatementDataByPage(int pageNum, int size,Integer isStatement, Integer type, String inCommissionTime, String outCommissionTime, String insurerBranchId, String deptId, String subordinateId); PageInfo<statementData> getStatementDataByPage(int pageNum, int size,Integer isStatement, Integer type, String inCommissionStartTime, String outCommissionStartTime,String inCommissionEndTime, String outCommissionEndTime, String insurerBranchId, String deptId, String subordinateId);
List<CommissionEGolden> listSalesCommissionfromEGolden(String login); List<CommissionEGolden> listSalesCommissionfromEGolden(String login);
......
yd-api/src/main/java/com/yd/dal/service/commission/CommissionEGoldenDAImpl.java
...@@ -31,10 +31,10 @@ public class CommissionEGoldenDAImpl implements CommissionEGoldenDA { ...@@ -31,10 +31,10 @@ public class CommissionEGoldenDAImpl implements CommissionEGoldenDA {
@Override @Override
@TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN) @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
public PageInfo<statementData> getStatementDataByPage(int pageNum, int size, Integer isStatement,Integer type, String inCommissionTime, String outCommissionTime, String insurerBranchId, String deptId, String subordinateId) { public PageInfo<statementData> getStatementDataByPage(int pageNum, int size, Integer isStatement,Integer type, String inCommissionStartTime, String outCommissionStartTime,String inCommissionEndTime, String outCommissionEndTime, String insurerBranchId, String deptId, String subordinateId) {
PageHelper.startPage(pageNum, size); PageHelper.startPage(pageNum, size);
Page<statementData> statementData = commissionEGoldenMapper.getStatementDataByPage(isStatement,type,inCommissionTime,outCommissionTime,insurerBranchId,deptId,subordinateId); Page<statementData> statementData = commissionEGoldenMapper.getStatementDataByPage(isStatement,type,inCommissionStartTime,outCommissionStartTime,inCommissionEndTime,outCommissionEndTime,insurerBranchId,deptId,subordinateId);
PageInfo<com.yd.api.agms.vo.statement.statementData> pageInfo = new PageInfo<>(statementData); PageInfo<statementData> pageInfo = new PageInfo<>(statementData);
return pageInfo; return pageInfo;
} }
......
yd-api/src/main/resources/mapper/commission/CommissionEGoldenMapper.xml
...@@ -54,19 +54,31 @@ ...@@ -54,19 +54,31 @@
<if test="isStatement == 0"> <if test="isStatement == 0">
<choose> <choose>
<when test="type == 1"> <when test="type == 1">
<if test="inCommissionTime != null"> <if test="inCommissionStartTime != null">
and receive.mon024_302 = #{inCommissionTime,jdbcType=VARCHAR} and CONVERT(receive.mon024_302,signed) &gt;= CONVERT(#{inCommissionStartTime,jdbcType=VARCHAR},signed)
</if> </if>
<if test="outCommissionTime != null"> <if test="inCommissionEndTime != null">
and pay.MON025_302 = #{outCommissionTime,jdbcType=VARCHAR} and CONVERT(receive.mon024_302,signed) &lt;= CONVERT(#{inCommissionEndTime,jdbcType=VARCHAR},signed)
</if>
<if test="outCommissionStartTime != null">
and CONVERT(pay.MON025_302,signed) &gt;= CONVERT(#{outCommissionStartTime,jdbcType=VARCHAR},signed)
</if>
<if test="outCommissionEndTime != null">
and CONVERT(pay.MON025_302,signed) &lt;= CONVERT(#{outCommissionEndTime,jdbcType=VARCHAR},signed)
</if> </if>
</when> </when>
<otherwise> <otherwise>
<if test="inCommissionTime != null"> <if test="inCommissionStartTime != null">
and receive.mon024_301 = #{inCommissionTime,jdbcType=VARCHAR} and CONVERT(receive.mon024_301,signed) &gt;= CONVERT(#{inCommissionStartTime,jdbcType=VARCHAR},signed)
</if>
<if test="inCommissionEndTime != null">
and CONVERT(receive.mon024_301,signed) &lt;= CONVERT(#{inCommissionEndTime,jdbcType=VARCHAR},signed)
</if>
<if test="outCommissionStartTime != null">
and CONVERT(pay.MON025_301,signed) &gt;= CONVERT(#{outCommissionStartTime,jdbcType=VARCHAR},signed)
</if> </if>
<if test="outCommissionTime != null"> <if test="outCommissionEndTime != null">
and pay.MON025_301 = #{outCommissionTime,jdbcType=VARCHAR} and CONVERT(pay.MON025_301,signed) &lt;= CONVERT(#{outCommissionEndTime,jdbcType=VARCHAR},signed)
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
......
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