修改月份统计

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -580,17 +580,14 @@ public class InsurancePolicyController {
 
         List<InsurancePolicyMember> list = insurancePolicyMemberService.findByPolicyId(policyId);
 
-
-
-            ItextPDFUtil.createPdf(insuranceApplication,mapList,list,logoUrl,downloadFilePath);
-            msgResult.setMessage("pdf文档生成成功");
-            msgResult.setResult(true);
+        ItextPDFUtil.createPdf(insuranceApplication,mapList,list,logoUrl,downloadFilePath);
+        msgResult.setMessage("pdf文档生成成功");
+        msgResult.setResult(true);
 
         }catch (Exception ex){
             logger.error(ex.getMessage(),ex);
             msgResult.setMessage(ex.getMessage());
             msgResult.setResult(false);
-
         }
 
         return msgResult;
@@ -663,7 +660,7 @@ public class InsurancePolicyController {
 
         PojoUtils.map(srcPolicy,destPolicy);
 
-        DateTime startTime = new DateTime(srcPolicy.getEndTime()).plusDays(1);
+        DateTime startTime = new DateTime(srcPolicy.getEndTime());
 
         destPolicy.setStartTime(startTime.toDate());
         destPolicy.setEndTime(startTime.plusMonths(1).toDate());

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsuranceApplicationController.java

@@ -338,10 +338,8 @@ public class InsuranceApplicationController {
             DateTime endTime = new DateTime(insuranceApplication.getEndTime());
             DateTime startTime = new DateTime(insuranceApplication.getStartTime());
 
-            Interval interval = new Interval(startTime, endTime);
-
             //投保总月份
-            int months = interval.toPeriod().getMonths();
+            int months = Months.monthsBetween(startTime, endTime).getMonths();
 
             BigDecimal totalAmount = new BigDecimal(0);
             int totalNumber = 0;

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyController.java

@@ -479,7 +479,7 @@ public class InsurancePolicyController {
 
         PojoUtils.map(srcPolicy,destPolicy);
 
-        DateTime startTime = new DateTime(srcPolicy.getEndTime()).plusDays(1);
+        DateTime startTime = new DateTime(srcPolicy.getEndTime());
 
         destPolicy.setStartTime(startTime.toDate());
         destPolicy.setEndTime(startTime.plusMonths(1).toDate());

picc-enterprise-server/src/main/resources/application-remote.yml

@@ -9,7 +9,7 @@ spring:
 
 logger:
   level: WARN
-  dir: C:\\picc\\logs\\picc-enterprise-server\\
+  dir: C:\\picc\\logs\\picc-enterprise-remote\\
 
 nginx:
   port: 7070

picc-enterprise-server/src/main/resources/application-test.yml

@@ -9,7 +9,7 @@ spring:
 
 logger:
   level: WARN
-  dir: C:\\picc\\logs\\picc-enterprise-test\\
+  dir: C:\\picc\\logs\\picc-enterprise-server\\
 
 nginx:
   port: 7070