optimize

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsStatementServiceImpl.java

@@ -22,14 +22,18 @@ 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 inCommissionStartTime = requestVO.getInCommissionStartTime();//来佣开始时间
-        String outCommissionStartTime = requestVO.getOutCommissionStartTime();//发佣开始时间
-        String inCommissionEndTime = requestVO.getInCommissionEndTime();//来佣开始时间
-        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 inCommissionDateSpan = requestVO.getInCommissionDateSpan();//来佣开始时间
+        String outCommissionDateSpan = requestVO.getOutCommissionDateSpan();//发佣开始时间
+        String[] inDataSpan = inCommissionDateSpan.split(":");
+        String[] outDataSpan = outCommissionDateSpan.split(":");
+        String inCommissionStartTime = inDataSpan[0];//来佣开始时间
+        String inCommissionEndTime = inDataSpan[1];//发佣开始时间
+        String outCommissionStartTime = outDataSpan[0];//来佣开始时间
+        String outCommissionEndTime = outDataSpan[1];//发佣开始时间
+        inCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inCommissionStartTime,"yyyy-MM-dd"),"yyyyMM");
+        outCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outCommissionStartTime,"yyyy-MM-dd"),"yyyyMM");
+        inCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inCommissionEndTime,"yyyy-MM-dd"),"yyyyMM");
+        outCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outCommissionEndTime,"yyyy-MM-dd"),"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();//体系

yd-api/src/main/java/com/yd/api/agms/vo/statement/FinancialStatementRequestVO.java

@@ -5,10 +5,8 @@ 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 inCommissionStartTime;
-    private String outCommissionStartTime;
-    private String inCommissionEndTime;
-    private String outCommissionEndTime;
+    private String inCommissionDateSpan;
+    private String outCommissionDateSpan;
     private String insurerBranchId;//分公司ID
     private String insurerBranchId;//分公司ID
     private String deptId;//营业部ID
     private String deptId;//营业部ID
     private String subordinateId;//体系ID
     private String subordinateId;//体系ID
@@ -30,20 +28,20 @@ public class FinancialStatementRequestVO {
         this.isStatement = isStatement;
         this.isStatement = isStatement;
     }
     }
 
 
-    public String getInCommissionStartTime() {
-        return inCommissionStartTime;
+    public String getInCommissionDateSpan() {
+        return inCommissionDateSpan;
     }
     }
 
 
-    public void setInCommissionStartTime(String inCommissionStartTime) {
-        this.inCommissionStartTime = inCommissionStartTime;
+    public void setInCommissionDateSpan(String inCommissionDateSpan) {
+        this.inCommissionDateSpan = inCommissionDateSpan;
     }
     }
 
 
-    public String getOutCommissionStartTime() {
-        return outCommissionStartTime;
+    public String getOutCommissionDateSpan() {
+        return outCommissionDateSpan;
     }
     }
 
 
-    public void setOutCommissionStartTime(String outCommissionStartTime) {
-        this.outCommissionStartTime = outCommissionStartTime;
+    public void setOutCommissionDateSpan(String outCommissionDateSpan) {
+        this.outCommissionDateSpan = outCommissionDateSpan;
     }
     }
 
 
     public String getInsurerBranchId() {
     public String getInsurerBranchId() {
@@ -77,20 +75,4 @@ 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;
-    }
 }
 }