添加两个接口

1.查询除第一个月以外的每月投保单列表
1.每月投保单详情

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

@@ -19,12 +19,16 @@ public interface ApplicationPolicyDAO {
 
     ApplicationPolicy get(String id);
 
+    ApplicationPolicy getDetail(String applicationId,String policyId);
+
     int delete(String id);
 
     List<ApplicationPolicy> list();
 
     List<ApplicationPolicy> search(Map<String, Object> searchParams, List<Sort> sortList);
 
+    List<InsurancePolicy> otherSearch(Map<String, Object> searchParams, List<Sort> sortList);
+
     List<ApplicationPolicy> findByApplicationId(String applicationId);
 
     List<InsurancePolicy> findPolicyByApplicationId(String applicationId);

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/ApplicationPolicy.java

@@ -12,6 +12,7 @@ public class ApplicationPolicy {
     private String applicationId;
     private String policyId;
     private InsurancePolicy policy;
+    private InsuranceApplication application;
 
     /**
      * 获取ID
@@ -65,4 +66,12 @@ public class ApplicationPolicy {
     public void setPolicy(InsurancePolicy policy) {
         this.policy = policy;
     }
+
+
+    public InsuranceApplication getApplication() {
+        return application;
+    }
+    public void setApplication(InsuranceApplication application) {
+        this.application = application;
+    }
 }

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

@@ -12,6 +12,8 @@ import java.util.Map;
 public interface ApplicationPolicyService {
     ApplicationPolicy get(String id);
 
+    ApplicationPolicy getDetail(String applicationId,String policyId);
+
     boolean exist(String id);
 
     int insert(ApplicationPolicy model);
@@ -24,6 +26,8 @@ public interface ApplicationPolicyService {
 
     Page<ApplicationPolicy> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 
+    Page<ApplicationPolicy> otherSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
+
     List<ApplicationPolicy> findByApplicationId(String applicationId);
 
     Page<InsurancePolicy> findPolicyByApplicationId(String applicationId, int pageIndex, int pageSize);

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

@@ -27,6 +27,11 @@ public class ApplicationPolicyServiceImpl implements ApplicationPolicyService {
         return applicationPolicyDAO.get(id);
     }
 
+    @Override
+    public ApplicationPolicy getDetail(String applicationId,String policyId){
+        return applicationPolicyDAO.getDetail(applicationId,policyId);
+    }
+
     @Override
     public int insert(ApplicationPolicy model) {
         // TODO Auto-generated method stub
@@ -70,6 +75,15 @@ public class ApplicationPolicyServiceImpl implements ApplicationPolicyService {
         return page;
     }
 
+    @Override
+    public Page<ApplicationPolicy> otherSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<ApplicationPolicy> page = PageHelper.startPage(pageNumber, pageSize).doSelectPage(() -> {
+            applicationPolicyDAO.otherSearch(searchParams, sortList);
+        });
+
+        return page;
+    }
+
     @Override
     public List<ApplicationPolicy> findByApplicationId(String applicationId) {
         return applicationPolicyDAO.findByApplicationId(applicationId);

picc-common/src/main/resources/mapper/base/InsuranceAgent.xml

@@ -81,8 +81,8 @@ id_,name_,status_,del_flag,create_by,create_time,update_by,update_time		from bas
 		]]>
 		<where>
 			and del_flag = false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -8,6 +8,7 @@
 			<result property="applicationId" column="application_id" />
 			<result property="policyId" column="policy_id" />
 			<association property="policy" column="policy_id" select="com.jpsoft.picc.modules.business.dao.InsurancePolicyDAO.get"></association>
+			<association property="application" column="application_id" select="com.jpsoft.picc.modules.business.dao.InsuranceApplicationDAO.get"></association>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.business.entity.ApplicationPolicy">
 	<!--
@@ -44,6 +45,9 @@
 	<select id="get" parameterType="string" resultMap="ApplicationPolicyMap">
 		select * from business_application_policy where id_=#{0}
 	</select>
+	<select id="getDetail" parameterType="string" resultMap="ApplicationPolicyMap">
+		select * from business_application_policy where application_id=#{applicationId} and policy_id=#{policyId}
+	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from business_application_policy where id_=#{0}
 	</select>
@@ -66,6 +70,20 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="otherSearch" parameterType="hashmap" resultMap="ApplicationPolicyMap">
+		<![CDATA[
+			SELECT a.* FROM business_application_policy a LEFT JOIN business_insurance_policy b ON a.policy_id = b.id_
+		]]>
+		<where>
+			and b.del_flag = false and b.no_ > 1
+			<if test="searchParams.applicationId != null">
+				and a.application_id = #{searchParams.applicationId}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
     <select id="findByApplicationId" resultMap="ApplicationPolicyMap">
 		SELECT a.* FROM business_application_policy a LEFT JOIN business_insurance_policy b ON a.policy_id = b.id_
 		where a.application_id=#{0}