optimize

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

@@ -17,7 +17,10 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 @Service("agmsStatementService")
 public class AgmsStatementServiceImpl implements AgmsStatementService {
@@ -39,7 +42,8 @@ public class AgmsStatementServiceImpl implements AgmsStatementService {
                 inCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inDataSpan[0],"yyyy-MM-dd"),"yyyyMM");
             }else if(inDataSpan.length == 2){
                 inCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inDataSpan[0],"yyyy-MM-dd"),"yyyyMM");
-                inCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inDataSpan[1],"yyyy-MM-dd"),"yyyyMM");
+                inCommissionEndTime = getTime(inDataSpan[1]);
+//                inCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(inDataSpan[1],"yyyy-MM-dd"),"yyyyMM");
             }
         }
         if(!Strings.isNullOrEmpty(outCommissionDateSpan)){
@@ -48,7 +52,8 @@ public class AgmsStatementServiceImpl implements AgmsStatementService {
                 outCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outDataSpan[0],"yyyy-MM-dd"),"yyyyMM");
             }else if(outDataSpan.length == 2){
                 outCommissionStartTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outDataSpan[0],"yyyy-MM-dd"),"yyyyMM");
-                outCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outDataSpan[1],"yyyy-MM-dd"),"yyyyMM");
+                inCommissionEndTime = getTime(outDataSpan[1]);
+//                outCommissionEndTime = CommonUtil.dateParseString(CommonUtil.stringParseDate(outDataSpan[1],"yyyy-MM-dd"),"yyyyMM");
             }
         }
         String insurerBranchId = requestVO.getInsurerBranchId();//分公司
@@ -67,6 +72,15 @@ public class AgmsStatementServiceImpl implements AgmsStatementService {
         return responseVO;
     }
 
+    private String getTime(String time) {
+        Date date = CommonUtil.stringParseDate(time,"yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH,-1);
+        date = calendar.getTime();
+        return CommonUtil.dateParseString(date,"yyyyMM");
+    }
+
     private void createCSV(Integer type, List<statementData> dataList, HttpServletResponse response) {
         String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
         String CSV_ROW_SEPARATOR = "\r\n";//CSV文件行分隔符

yd-api/src/main/resources/mapper/commission/CommissionEGoldenMapper.xml

@@ -44,8 +44,8 @@
         if((pay.MON025_108 = "S02" or pay.MON025_108 = "S01"),convert(receive.incommission,decimal(10,2)),0) as rightReceiveCommission, -- 来佣金额
         pay.paycommission as rightPayCommission, -- 应发佣金
         commissionType.SRA_BS_NAME as commissionType-- 佣奖类型
-        from ins001 policy right join (select MON024_002,MON024_301,MON024_302,MON024_303,sum(MON024_404) as incommission from MON024 group by MON024_002 ,MON024_301) receive on policy.INS_MST_ID = receive.MON024_002
-        right join (select MON025_002,MON025_301,MON025_302,MON025_303,MON025_005,MON025_006,MON025_008,MON025_007,MON025_403,MON025_402,sum(MON025_401) as premium,sum(MON025_405) as paycommission,MON025_108 from MON025 group by mon025_002,mon025_301,MON025_007) pay on policy.INS_MST_ID = pay.MON025_002 and receive.MON024_303 = pay.MON025_303
+        from ins001 policy right join (select MON024_002,MON024_301,MON024_302,MON024_303,sum(MON024_404) as incommission from MON024 where mon024_104 != "5" or mon024_104 != "6"  group by MON024_002 ,MON024_301) receive on policy.INS_MST_ID = receive.MON024_002
+        right join (select MON025_002,MON025_301,MON025_302,MON025_303,MON025_005,MON025_006,MON025_008,MON025_007,MON025_403,MON025_402,sum(MON025_401) as premium,sum(MON025_405) as paycommission,MON025_108 from MON025 where mon025_109 != "5" or mon025_109 != "6" group by mon025_002,mon025_301,MON025_007) pay on policy.INS_MST_ID = pay.MON025_002 and receive.MON024_303 = pay.MON025_303
         left join sal001 practitioner on practitioner.SAL_MST_ID = pay.MON025_007
         left join spc002 dept on dept.SPC_BUS_ID = practitioner.FK_SPC_BUS_ID
         left join spc001 branch on branch.SPC_AREA_ID = dept.FK_AREA_ID