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

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -3,6 +3,7 @@ package com.yd.api.practitioner;
 import com.yd.api.practitioner.service.PractitionerBasicInfoService;
 import com.yd.api.practitioner.service.PractitionerService;
 import com.yd.api.practitioner.service.ScheduleTrackService;
+import com.yd.api.practitioner.vo.informed.*;
 import com.yd.api.practitioner.vo.login.CanSeeSalaryListResponseVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
@@ -32,6 +33,8 @@ import com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailRequestVO;
 import com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO;
 import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO;
 import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO;
+import com.yd.api.result.CommonResultIDResponseVO;
+import com.yd.api.result.IDRequestVO;
 import com.yd.api.result.JsonResult;
 import com.yd.rmi.n22.policy.service.N22PolicyService;
 import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody;
@@ -673,4 +676,39 @@ public class PractitionerController {
         return result;
     }
 
+    @RequestMapping("/saveInformedSheet")
+    public Object saveInformedSheet(@RequestBody SaveInformedSheetRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        CommonResultIDResponseVO responseVO = practitionerService.saveInformedSheet(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    @RequestMapping("/queryInformedSheetById")
+    public Object queryInformedSheetById(@RequestBody IDRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        QueryInformedSheetByIdResponseVO responseVO = practitionerService.queryInformedSheetById(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    @RequestMapping("/signInformedSheet")
+    public Object signInformedSheet(@RequestBody SignInformedSheetRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        CommonResultIDResponseVO responseVO = practitionerService.signInformedSheet(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    @RequestMapping("/queryInformedSheetList")
+    public Object queryInformedSheetList(@RequestBody QueryInformedSheetListRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        QueryInformedSheetListResponseVO responseVO = practitionerService.queryInformedSheetList(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
 }

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerService.java

 package com.yd.api.practitioner.service;
 
+import com.yd.api.practitioner.vo.informed.*;
 import com.yd.api.practitioner.vo.login.CanSeeSalaryListResponseVO;
-import com.yd.api.practitioner.vo.practitionerCustomer.*;
-import com.yd.api.practitioner.vo.recruit.PotentialGoalsActionsUpdateResponseVO;
-import com.yd.api.practitioner.vo.recruit.PotentialGoalsQueryResponseVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
 import com.yd.api.practitioner.vo.media.MediaGetReqVO;
 import com.yd.api.practitioner.vo.media.MediaGetRespVO;
 import com.yd.api.practitioner.vo.opportunity.*;
+import com.yd.api.practitioner.vo.practitionerCustomer.*;
 import com.yd.api.practitioner.vo.rank.PractitionerRankRequestVO;
 import com.yd.api.practitioner.vo.rank.PractitionerRankResponseVO;
 import com.yd.api.practitioner.vo.recruit.*;
@@ -16,6 +15,9 @@ import com.yd.api.practitioner.vo.salestarget.*;
 import com.yd.api.practitioner.vo.setting.*;
 import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO;
 import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO;
+import com.yd.api.result.CommonResultIDResponseVO;
+import com.yd.api.result.IDRequestVO;
+import com.yd.dal.entity.customer.AgPoInformed;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -246,4 +248,14 @@ public interface PractitionerService {
      * @return
      */
     List<Long> getPractitionerIdBySidList(Long sId,String systemType,Integer isActive);
+
+    CommonResultIDResponseVO saveInformedSheet(SaveInformedSheetRequestVO requestVO);
+
+    QueryInformedSheetByIdResponseVO queryInformedSheetById(IDRequestVO requestVO);
+
+    CommonResultIDResponseVO updateInformedSheetById(UpdateInformedSheetByIdRequestVO requestVO);
+
+    CommonResultIDResponseVO signInformedSheet(SignInformedSheetRequestVO requestVO);
+
+    QueryInformedSheetListResponseVO queryInformedSheetList(QueryInformedSheetListRequestVO requestVO);
 }

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringContractServiceImpl.java

@@ -546,6 +546,9 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         }
         //获取头像流
         InputStream inputStream = (InputStream) input.get("is");
+        if (null == inputStream) {
+            return null;
+        }
 
         String filePath = localDirectory + filename;
         byte[] data = new byte[1024];

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/QueryInformedSheetByIdResponseVO.java

+package com.yd.api.practitioner.vo.informed;
+
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.customer.AgPoInformed;
+import lombok.Data;
+
+@Data
+public class QueryInformedSheetByIdResponseVO {
+    private AgPoInformed informed;
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/QueryInformedSheetListRequestVO.java

+package com.yd.api.practitioner.vo.informed;
+
+import lombok.Data;
+
+@Data
+public class QueryInformedSheetListRequestVO {
+    private Long practitionerId;
+    private String customerName;
+    private String customerMobile;
+    private String policyNo;
+    private String signDate;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/QueryInformedSheetListResponseVO.java

+package com.yd.api.practitioner.vo.informed;
+
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.customer.AgPoInformed;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QueryInformedSheetListResponseVO {
+    private CommonResult commonResult;
+    private List<AgPoInformed> list;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/SaveInformedSheetRequestVO.java

+package com.yd.api.practitioner.vo.informed;
+
+import lombok.Data;
+
+@Data
+public class SaveInformedSheetRequestVO {
+    private Long loginId;
+    private Long practitionerId;
+    private Long leadsAssignedId;
+    private String customerName;
+    private String customerMobile;
+    private Long customerId;
+
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/SignInformedSheetRequestVO.java

+package com.yd.api.practitioner.vo.informed;
+
+import lombok.Data;
+
+@Data
+public class SignInformedSheetRequestVO {
+    private Long id;
+    private String imgStr;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/UpdateInformedSheetByIdRequestVO.java

+package com.yd.api.practitioner.vo.informed;
+
+import lombok.Data;
+
+@Data
+public class UpdateInformedSheetByIdRequestVO {
+    private Long id;
+    private String imgStr;
+}

yd-api/src/main/java/com/yd/api/result/CommonResultIDResponseVO.java

+package com.yd.api.result;
+
+import lombok.Data;
+
+@Data
+public class CommonResultIDResponseVO {
+    private Long id;
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/result/IDRequestVO.java

+package com.yd.api.result;
+
+import lombok.Data;
+
+@Data
+public class IDRequestVO {
+    private Long id;
+}

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

+package com.yd.dal.mapper.customer;
+
+import com.yd.dal.entity.customer.AgPoInformed;
+
+import java.util.List;
+
+public interface AgPoInformedMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AgPoInformed record);
+
+    int insertSelective(AgPoInformed record);
+
+    AgPoInformed selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AgPoInformed record);
+
+    int updateByPrimaryKey(AgPoInformed record);
+
+    List<AgPoInformed> selectByRecord(AgPoInformed record);
+}
\ No newline at end of file

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

@@ -548,7 +548,7 @@
             <foreach collection="list" item="item" separator="," open="(" close=")">
               #{item}
             </foreach>
-<!--          and w.is_paid != 1-->
+    and w.is_paid != 1
     and (f.payout_batch_id = #{payoutBatchId,jdbcType=BIGINT} or w.withdraw_amount = 0)
     group by w.customer_id
     </select>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yd.dal.mapper.customer.AgPoInformedMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.customer.AgPoInformed">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="leads_id" jdbcType="BIGINT" property="leadsId" />
+    <result column="informed_no" jdbcType="VARCHAR" property="informedNo" />
+    <result column="informed_oss_path" jdbcType="VARCHAR" property="informedOssPath" />
+    <result column="customer_id" jdbcType="BIGINT" property="customerId" />
+    <result column="customer_name" jdbcType="VARCHAR" property="customerName" />
+    <result column="customer_mobile" jdbcType="VARCHAR" property="customerMobile" />
+    <result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
+    <result column="policy_no" jdbcType="VARCHAR" property="policyNo" />
+    <result column="sign_date" jdbcType="VARCHAR" property="signDate" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, leads_id, informed_no, informed_oss_path, customer_id, customer_name, customer_mobile, 
+    practitioner_id, policy_no, sign_date, `status`, is_active, remark, created_at, created_by, 
+    updated_at, updated_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_po_informed
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ag_po_informed
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AgPoInformed" useGeneratedKeys="true">
+    insert into ag_po_informed (leads_id, informed_no, informed_oss_path, 
+      customer_id, customer_name, customer_mobile, 
+      practitioner_id, policy_no, sign_date, 
+      `status`, is_active, remark, 
+      created_at, created_by, updated_at, 
+      updated_by)
+    values (#{leadsId,jdbcType=BIGINT}, #{informedNo,jdbcType=VARCHAR}, #{informedOssPath,jdbcType=VARCHAR}, 
+      #{customerId,jdbcType=BIGINT}, #{customerName,jdbcType=VARCHAR}, #{customerMobile,jdbcType=VARCHAR},
+      #{practitionerId,jdbcType=BIGINT}, #{policyNo,jdbcType=VARCHAR}, #{signDate,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{updatedBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AgPoInformed" useGeneratedKeys="true">
+    insert into ag_po_informed
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="leadsId != null">
+        leads_id,
+      </if>
+      <if test="informedNo != null">
+        informed_no,
+      </if>
+      <if test="informedOssPath != null">
+        informed_oss_path,
+      </if>
+      <if test="customerId != null">
+        customer_id,
+      </if>
+      <if test="customerName != null">
+        customer_name,
+      </if>
+      <if test="customerMobile != null">
+        customer_mobile,
+      </if>
+      <if test="practitionerId != null">
+        practitioner_id,
+      </if>
+      <if test="policyNo != null">
+        policy_no,
+      </if>
+      <if test="signDate != null">
+        sign_date,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="isActive != null">
+        is_active,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="leadsId != null">
+        #{leadsId,jdbcType=BIGINT},
+      </if>
+      <if test="informedNo != null">
+        #{informedNo,jdbcType=VARCHAR},
+      </if>
+      <if test="informedOssPath != null">
+        #{informedOssPath,jdbcType=VARCHAR},
+      </if>
+      <if test="customerId != null">
+        #{customerId,jdbcType=BIGINT},
+      </if>
+      <if test="customerName != null">
+        #{customerName,jdbcType=BIGINT},
+      </if>
+      <if test="customerMobile != null">
+        #{customerMobile,jdbcType=BIGINT},
+      </if>
+      <if test="practitionerId != null">
+        #{practitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="policyNo != null">
+        #{policyNo,jdbcType=VARCHAR},
+      </if>
+      <if test="signDate != null">
+        #{signDate,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="isActive != null">
+        #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AgPoInformed">
+    update ag_po_informed
+    <set>
+      <if test="leadsId != null">
+        leads_id = #{leadsId,jdbcType=BIGINT},
+      </if>
+      <if test="informedNo != null">
+        informed_no = #{informedNo,jdbcType=VARCHAR},
+      </if>
+      <if test="informedOssPath != null">
+        informed_oss_path = #{informedOssPath,jdbcType=VARCHAR},
+      </if>
+      <if test="customerId != null">
+        customer_id = #{customerId,jdbcType=BIGINT},
+      </if>
+      <if test="customerName != null">
+        customer_name = #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerMobile != null">
+        customer_mobile = #{customerMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="practitionerId != null">
+        practitioner_id = #{practitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="policyNo != null">
+        policy_no = #{policyNo,jdbcType=VARCHAR},
+      </if>
+      <if test="signDate != null">
+        sign_date = #{signDate,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="isActive != null">
+        is_active = #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.customer.AgPoInformed">
+    update ag_po_informed
+    set leads_id = #{leadsId,jdbcType=BIGINT},
+      informed_no = #{informedNo,jdbcType=VARCHAR},
+      informed_oss_path = #{informedOssPath,jdbcType=VARCHAR},
+      customer_id = #{customerId,jdbcType=BIGINT},
+      customer_name = #{customerName,jdbcType=VARCHAR},
+      customer_mobile = #{customerMobile,jdbcType=VARCHAR},
+      practitioner_id = #{practitionerId,jdbcType=BIGINT},
+      policy_no = #{policyNo,jdbcType=VARCHAR},
+      sign_date = #{signDate,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=VARCHAR},
+      is_active = #{isActive,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_by = #{updatedBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <select id="selectByRecord" parameterType="com.yd.dal.entity.customer.AgPoInformed" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_po_informed
+    where 1=1
+    <if test="customerName != null">
+      and customer_name = #{customerName,jdbcType=VARCHAR}
+    </if>
+    <if test="customerMobile != null">
+      and customer_mobile = #{customerMobile,jdbcType=VARCHAR}
+    </if>
+    <if test="updatedAt != null">
+      and practitioner_id = #{updatedAt,jdbcType=BIGINT}
+    </if>
+    <if test="policyNo != null">
+      and policy_no = #{policyNo,jdbcType=VARCHAR}
+    </if>
+    <if test="signDate != null">
+      and sign_date = #{signDate,jdbcType=VARCHAR}
+    </if>
+  </select>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/pdfconfiguration.properties

@@ -8,9 +8,13 @@ pdf.uncheck=/opt/tomcat8/conf/ydpdf/pdfres/uncheck.png
 
 pdf.temp.path=/opt/tomcat8/temp/
 
-pdf.firstParty=上海银盾保险经纪有限公司
+pdf.firstParty=\u4E0A\u6D77\u94F6\u76FE\u4FDD\u9669\u7ECF\u7EAA\u6709\u9650\u516C\u53F8
 pdf.firstPartyResponser=Wan Shuang Lian
-pdf.firstPartyAddress=上海市浦东新区张杨路560号中融恒瑞国际西楼1706室
+pdf.firstPartyAddress=\u4E0A\u6D77\u5E02\u6D66\u4E1C\u65B0\u533A\u5F20\u6768\u8DEF560\u53F7\u4E2D\u878D\u6052\u745E\u56FD\u9645\u897F\u697C1706\u5BA4
 
 pdf.position.x=450
 pdf.position.y=150
+
+#\u5BA2\u6237\u544A\u77E5\u4E66\u76EE\u5F55
+informed.pdf.template=/opt/tomcat8/conf/ydpdf/informed/templateInformed.pdf
+informed.pdf.temp.path=/opt/tomcat8/conf/ydpdf/informed