1.下月投保增加截止时间判断。

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

@@ -724,9 +724,11 @@ public class InsurancePolicyController {
 
         destPolicy.setEffectiveDate(startTime.toString("yyyyMM"));
 
-        //todo 相同企业、相同险种是否已经有下月参保记录(状态为草稿)
-        InsurancePolicy nextMonthPolicy = insurancePolicyService.findNextMonthPolicy(insuranceApplication.getCompanyId(),
+        //todo 相同企业、相同险种、截止时间相同 是否已经有下月参保记录(状态为草稿)
+        InsurancePolicy nextMonthPolicy = insurancePolicyService.findNextMonthPolicy(
+                insuranceApplication.getCompanyId(),
                 destPolicy.getDefinitionId(),
+                insuranceApplication.getEndTime(),
                 destPolicy.getEffectiveDate(),
                 PolicyStatus.Draft.getValue() + "");
 

picc-admin-server/src/test/java/com/jpsoft/picc/test/PolicyTest.java

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.lang.reflect.Executable;
+import java.util.Date;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -26,7 +27,7 @@ public class PolicyTest {
         policy.setStatus("70");
         insurancePolicyService.update(policy);
 
-        insurancePolicyService.findNextMonthPolicy("1","2","3","4");
+        insurancePolicyService.findNextMonthPolicy("1", "2", new Date(), "3", "4");
     }
 
     @Test

picc-common/src/main/java/com/jpsoft/picc/modules/business/dao/InsurancePolicyDAO.java

@@ -1,9 +1,11 @@
 package com.jpsoft.picc.modules.business.dao;
 
+import cn.hutool.core.date.DateTime;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -27,5 +29,5 @@ public interface InsurancePolicyDAO {
 
     List<InsurancePolicy> nextMonthPageList(Map<String, Object> searchParams, List<Sort> sortList);
 
-    InsurancePolicy findNextMonthPolicy(String companyId, String definitionId, String effectiveDate, String status);
+    InsurancePolicy findNextMonthPolicy(String companyId, String definitionId, Date endTime, String effectiveDate, String status);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/service/InsurancePolicyService.java

@@ -1,9 +1,11 @@
 package com.jpsoft.picc.modules.business.service;
 
+import cn.hutool.core.date.DateTime;
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.common.dto.Sort;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,5 +28,5 @@ public interface InsurancePolicyService {
 
     Page<InsurancePolicy> nextMonthPageList(Map<String, Object> searchParams, int pageIndex, int pageSize, List<Sort> sortList);
 
-    InsurancePolicy findNextMonthPolicy(String companyId, String definitionId, String effectiveDate, String status);
+    InsurancePolicy findNextMonthPolicy(String companyId, String definitionId, Date endTime, String effectiveDate, String status);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/service/impl/InsurancePolicyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jpsoft.picc.modules.business.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.jpsoft.picc.modules.business.dao.InsurancePolicyDAO;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -85,7 +87,7 @@ public class InsurancePolicyServiceImpl implements InsurancePolicyService {
     }
 
     @Override
-    public InsurancePolicy findNextMonthPolicy(String companyId, String definitionId, String effectiveDate, String status) {
-        return insurancePolicyDAO.findNextMonthPolicy(companyId,definitionId,effectiveDate,status);
+    public InsurancePolicy findNextMonthPolicy(String companyId, String definitionId, Date endTime, String effectiveDate, String status) {
+        return insurancePolicyDAO.findNextMonthPolicy(companyId,definitionId,endTime, effectiveDate,status);
     }
 }

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -220,6 +220,7 @@
         inner join business_insurance_application d on c.application_id = d.id_
         where d.definition_id = #{definitionId}
         and d.company_id = #{companyId}
+        and d.end_time = #{endTime}
         and a.effective_date=#{effectiveDate}
         and a.status_ = #{status}
         order by a.create_time asc