Merge remote-tracking branch 'origin/dev_20210330' into dev_20210330

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -81,8 +81,10 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         for (ComeCommissionVO item : list) {
         for (ComeCommissionVO item : list) {
             if ("1".equals(item.getCommissionType())) {
             if ("1".equals(item.getCommissionType())) {
                 dropOption = systemConfigService.getDropOption("Base_Commission_Item", item.getCommissionItem());
                 dropOption = systemConfigService.getDropOption("Base_Commission_Item", item.getCommissionItem());
+                item.setCommissionTypeName("基础来佣");
             } else {
             } else {
                 dropOption = systemConfigService.getDropOption("Special_Commission_Type", item.getCommissionItem());
                 dropOption = systemConfigService.getDropOption("Special_Commission_Type", item.getCommissionItem());
+                item.setCommissionTypeName("特殊激励来佣");
             }
             }
             if (dropOption != null) {
             if (dropOption != null) {
                 item.setCommissionItemName(dropOption.getDropOptionName());
                 item.setCommissionItemName(dropOption.getDropOptionName());

yd-api/src/main/java/com/yd/dal/mapper/customer/AgPoInformedMapper.java

@@ -20,4 +20,9 @@ public interface AgPoInformedMapper {
     List<AgPoInformed> selectByRecord(AgPoInformed record);
     List<AgPoInformed> selectByRecord(AgPoInformed record);
 
 
     String getNextInformedNo();
     String getNextInformedNo();
+
+    void insertInformedSheet(AgPoInformed record);
+
+    void deletePoPolicyOfflineUploadByPolicyNo(String policyNo);
+
 }
 }
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclCustomerMapper.xml

@@ -797,5 +797,11 @@
       and id = #{id,jdbcType=BIGINT}
       and id = #{id,jdbcType=BIGINT}
     </if>
     </if>
 
 
+    <if test="role != null">
+      and `role` = #{role,jdbcType=INTEGER}
+    </if>
+    <if test="isActive != null">
+      and is_active = #{isActive,jdbcType=INTEGER}
+    </if>
   </select>
   </select>
-</mapper>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AgPoInformedMapper.xml

@@ -259,4 +259,21 @@
   <select id="getNextInformedNo" resultType="java.lang.String" statementType="CALLABLE">
   <select id="getNextInformedNo" resultType="java.lang.String" statementType="CALLABLE">
       select f_getNextInformedNo()
       select f_getNextInformedNo()
   </select>
   </select>
+
+  <insert id="insertInformedSheet" parameterType="com.yd.dal.entity.customer.AgPoInformed">
+    INSERT INTO ag_po_policy_offline_upload
+    (`policy_offline_id`,
+    `policy_no`, `file_type`, `file_name`, `file_path`,`file_size`,
+    `uploaded_at`, `uploaded_by`, `attachment_type`)
+    VALUES (
+    (select id from ag_po_policy_offline where policy_no = #{policyNo,jdbcType=VARCHAR}),
+    #{policyNo,jdbcType=VARCHAR}, 'pdf', #{informedNo,jdbcType=VARCHAR}, #{informedOssPath,jdbcType=VARCHAR},'0',
+     now(), -1, 2)
+  </insert>
+
+  <delete id="deletePoPolicyOfflineUploadByPolicyNo" parameterType="java.lang.String">
+      delete from ag_po_policy_offline_upload
+      where policy_no = #{policyNo,jdbcType=VARCHAR} and attachment_type=2
+  </delete>
+
 </mapper>
 </mapper>
\ No newline at end of file