客户概览年缴保费计算完善

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -136,6 +136,10 @@ public class CustomerApiController {
                 builder.append("{\"wildcard\":{\"pmphone\":\"*"+mobile+"*\"}},");
             }
 
+            //投保年份
+            if(StringUtils.isNotEmpty(fadate)){
+                builder.append("{\"wildcard\":{\"fadate\":\"*"+fadate+"*\"}},");
+            }
 
             if(StringUtils.isNotEmpty(gender)){
                 builder.append("{\"prefix\":{\"gender\":"+gender+"}},");
@@ -243,7 +247,7 @@ public class CustomerApiController {
                     || (StringUtils.isNotEmpty(lp) && "0".equals(lp)) || StringUtils.isNotEmpty(deptCode) ||
                     StringUtils.isNotEmpty(participantsDateS) || StringUtils.isNotEmpty(participantsDateE) ||
                     StringUtils.isNotEmpty(policybelong) || StringUtils.isNotEmpty(name) || StringUtils.isNotEmpty(mobile)
-                    ){
+                    || StringUtils.isNotEmpty(fadate)){
                 builder.delete(builder.length()-1,builder.length());
             }
 
@@ -648,13 +652,16 @@ public class CustomerApiController {
 
 
                     if(_source.containsKey("prem")){
-                        prem+=_source.getDouble("prem");
-                        String m = DateUtils.parseDateToStr("M", padate);
-                        String currentPadateStr = DateUtils.parseDateToStr(currentYear+"-MM-dd",padate);
-                        if(currentDateTime.compareTo(currentPadateStr)>0){
-                            handedinprem+=_source.getDouble("prem");
+                        //计算年缴保费过滤掉缴费方式趸缴的
+                        if(!"趸缴".equals(_source.getString("payment"))){
+                            prem+=_source.getDouble("prem");
+                            String currentPadateStr = DateUtils.parseDateToStr(currentYear+"-MM-dd",padate);
+                            if(currentDateTime.compareTo(currentPadateStr)>0){
+                                handedinprem+=_source.getDouble("prem");
+                            }
                         }
 
+                        String m = DateUtils.parseDateToStr("M", padate);
 
                         if(mpremMap.containsKey(m)){
                             double tprem = Double.parseDouble(mpremMap.get(m).toString());
@@ -824,6 +831,10 @@ public class CustomerApiController {
                 builder.append("{\"wildcard\":{\"pmphone\":\"*"+mobile+"*\"}},");
             }
 
+            //投保年份
+            if(StringUtils.isNotEmpty(fadate)){
+                builder.append("{\"wildcard\":{\"fadate\":\"*"+fadate+"*\"}},");
+            }
 
             if(StringUtils.isNotEmpty(gender)){
                 builder.append("{\"prefix\":{\"gender\":"+gender+"}},");
@@ -931,7 +942,7 @@ public class CustomerApiController {
                     || (StringUtils.isNotEmpty(lp) && "0".equals(lp)) || StringUtils.isNotEmpty(deptCode) ||
                     StringUtils.isNotEmpty(participantsDateS) || StringUtils.isNotEmpty(participantsDateE) ||
                     StringUtils.isNotEmpty(policybelong) || StringUtils.isNotEmpty(name) || StringUtils.isNotEmpty(mobile)
-                    ){
+                    || StringUtils.isNotEmpty(fadate)){
                 builder.delete(builder.length()-1,builder.length());
             }