Merge branch 'dev_20201208_hiring' of http://139.224.139.2:9091/AGSH/yd-backend…

Merge branch 'dev_20201208_hiring' of http://139.224.139.2:9091/AGSH/yd-backend into dev_20201208_hiring

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

@@ -110,4 +110,30 @@ public class PractitionerHiringController {
 		return result;
 	}
 
+	/**
+	 * 保存报聘经纪人个人声明
+	 *
+	 */
+	@RequestMapping("/savePersonalStatements")
+	public Object savePersonalStatements(@RequestBody SavePersonalStatementsRequestVO requestVO){
+		JsonResult result = new JsonResult();
+		SavePersonalStatementsResponseVO responseVO = practitionerHiringService.savePersonalStatements(requestVO);
+		result.addResult(responseVO);
+		result.setData(responseVO);
+		return result;
+	}
+
+	/**
+	 * 保存报聘经纪人合同文档确认
+	 *
+	 */
+	@RequestMapping("/saveContractTermsConfirms")
+	public Object saveContractTermsConfirms(@RequestBody SaveContractTermsConfirmsRequestVO requestVO){
+		JsonResult result = new JsonResult();
+		SaveContractTermsConfirmsResponseVO responseVO = practitionerHiringService.saveContractTermsConfirms(requestVO);
+		result.addResult(responseVO);
+		result.setData(responseVO);
+		return result;
+	}
+
 }
\ No newline at end of file

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

@@ -19,4 +19,8 @@ public interface PractitionerHiringService {
     SaveIDPictureResponseVO saveIDPicture(SaveIDPictureRequestVO requestVO);
 
     SaveLastGraduateGradeResponseVO saveLastGraduateGrade(SaveLastGraduateGradeRequestVO requestVO);
+
+    SavePersonalStatementsResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO);
+
+    SaveContractTermsConfirmsResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO);
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveContractTermsConfirmsRequestVO.java

+package com.yd.api.practitioner.vo.hiring;
+
+import com.yd.dal.entity.customer.AclPractitionerHiringContractTermsConfirms;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SaveContractTermsConfirmsRequestVO {
+    private Long hiringBasicInfoId;
+    private List<AclPractitionerHiringContractTermsConfirms> contractTermsConfirmsList;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveContractTermsConfirmsResponseVO.java

+package com.yd.api.practitioner.vo.hiring;
+
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+
+@Data
+public class SaveContractTermsConfirmsResponseVO {
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveIDPictureRequestVO.java

@@ -5,6 +5,6 @@ import lombok.Data;
 @Data
 public class SaveIDPictureRequestVO {
     private Long hiringBasicInfoId;
-    private String frontMediaId;
-    private String backMediaId;
+    private String frontVxUrl;
+    private String backVxUrl;
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveLastGraduateGradeRequestVO.java

@@ -7,5 +7,5 @@ public class SaveLastGraduateGradeRequestVO {
     private Long hiringBasicInfoId;
     private String lastGraduateGrade;
     private String lastGraduateSchool;
-    private String certificationMediaId;
+    private String certificationVxUrl;
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePersonPictureRequestVO.java

@@ -5,5 +5,5 @@ import lombok.Data;
 @Data
 public class SavePersonPictureRequestVO {
     private Long hiringBasicInfoId;
-    private String mediaId;
+    private String vxUrl;
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePersonalStatementsRequestVO.java

+package com.yd.api.practitioner.vo.hiring;
+
+import com.yd.dal.entity.customer.AclPractitionerHiringPersonalStatements;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SavePersonalStatementsRequestVO {
+    private Long hiringBasicInfoId;
+    private List<AclPractitionerHiringPersonalStatements> personalStatementList;
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePersonalStatementsResponseVO.java

+package com.yd.api.practitioner.vo.hiring;
+
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+
+@Data
+public class SavePersonalStatementsResponseVO {
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringMembership.java

@@ -71,7 +71,7 @@ public class AclPractitionerHiringMembership {
     /**
     * 分公司id
     */
-    private String branchPractitionerId;
+    private String branchId;
 
     /**
     * 分公司

yd-api/src/main/java/com/yd/rmi/tencent/wechat/service/WechatService.java

@@ -89,7 +89,5 @@ public interface WechatService {
 	 * @return
 	 */
 	WeChatInfoByENV getWeChatInfoByENV(String gzhName, boolean getAccessToken);
-
-	String getImgUrlByMediaId(String dediaId) throws IOException;
 	
 }

yd-api/src/main/java/com/yd/rmi/tencent/wechat/service/impl/WechatServiceImpl.java

@@ -626,31 +626,6 @@ public class WechatServiceImpl implements WechatService {
 		return weChatInfoByENV;
 	}
 
-	@Override
-	public String getImgUrlByMediaId(String mediaId) throws IOException {
-		String accessToken = this.obtainToken(new TokenRequest());
-		System.out.println("accessToken:" + accessToken);
-
-		TicketRequest ticketRequest = new TicketRequest();
-		ticketRequest.setAccessToken(accessToken);
-		String jsapiTicket = this.obtainTicket(ticketRequest);
-		System.out.println("jsapiTicket:" + jsapiTicket);
-
-		String ImgUrl = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=" + accessToken + "&media_id=" + mediaId;
-
-		Map<String, Object> input = HttpUtil.getInput(ImgUrl);
-		if ((boolean) input.get("success")) {
-
-			InputStream inputStream = (InputStream) input.get("is");
-			Image img = ImageIO.read(inputStream);
-
-			if (!(img == null || img.getWidth(null) <= 0 || img.getHeight(null) <= 0)) {
-				return ImgUrl;
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * 在本地开发时，通过dev去获取access_token
 	 * @param accessTokenRequest

yd-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -37,4 +37,5 @@
 830021=请选择发佣日期
 830022=请选择关账记录
 830023=已关账并发放的记录,不能修改
+830024=上传失败，请重新上传！
 900003=保险公司响应报文为空！
\ No newline at end of file

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

@@ -16,7 +16,7 @@
     <result column="subsystem" jdbcType="VARCHAR" property="subsystem" />
     <result column="subsystem_owner_id" jdbcType="VARCHAR" property="subsystemOwnerId" />
     <result column="subsystem_owner" jdbcType="VARCHAR" property="subsystemOwner" />
-    <result column="branch_practitioner_id" jdbcType="VARCHAR" property="branchPractitionerId" />
+    <result column="branch_id" jdbcType="VARCHAR" property="branchId" />
     <result column="branch" jdbcType="VARCHAR" property="branch" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -28,7 +28,7 @@
     <!--@mbg.generated-->
     id, hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id, 
     mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id, 
-    subsystem_owner, branch_practitioner_id, branch, is_active, created_at, created_by, 
+    subsystem_owner, branch_id, branch, is_active, created_at, created_by, 
     updated_at, updated_by
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -58,14 +58,14 @@
       md_drop_option_name, mentor_practitioner_id, 
       mentor, introducer_practitioner_id, introducer, 
       subsystem_id, subsystem, subsystem_owner_id, 
-      subsystem_owner, branch_practitioner_id, branch, 
+      subsystem_owner, branch_id, branch, 
       is_active, created_at, created_by, 
       updated_at, updated_by)
     values (#{hiringBasicInfoId,jdbcType=BIGINT}, #{mdDropOptionId,jdbcType=BIGINT}, 
       #{mdDropOptionName,jdbcType=VARCHAR}, #{mentorPractitionerId,jdbcType=VARCHAR}, 
       #{mentor,jdbcType=VARCHAR}, #{introducerPractitionerId,jdbcType=VARCHAR}, #{introducer,jdbcType=VARCHAR}, 
       #{subsystemId,jdbcType=VARCHAR}, #{subsystem,jdbcType=VARCHAR}, #{subsystemOwnerId,jdbcType=VARCHAR}, 
-      #{subsystemOwner,jdbcType=VARCHAR}, #{branchPractitionerId,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR}, 
+      #{subsystemOwner,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR}, 
       #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, 
       #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT})
   </insert>
@@ -106,8 +106,8 @@
       <if test="subsystemOwner != null">
         subsystem_owner,
       </if>
-      <if test="branchPractitionerId != null">
-        branch_practitioner_id,
+      <if test="branchId != null">
+        branch_id,
       </if>
       <if test="branch != null">
         branch,
@@ -162,8 +162,8 @@
       <if test="subsystemOwner != null">
         #{subsystemOwner,jdbcType=VARCHAR},
       </if>
-      <if test="branchPractitionerId != null">
-        #{branchPractitionerId,jdbcType=VARCHAR},
+      <if test="branchId != null">
+        #{branchId,jdbcType=VARCHAR},
       </if>
       <if test="branch != null">
         #{branch,jdbcType=VARCHAR},
@@ -222,8 +222,8 @@
       <if test="subsystemOwner != null">
         subsystem_owner = #{subsystemOwner,jdbcType=VARCHAR},
       </if>
-      <if test="branchPractitionerId != null">
-        branch_practitioner_id = #{branchPractitionerId,jdbcType=VARCHAR},
+      <if test="branchId != null">
+        branch_id = #{branchId,jdbcType=VARCHAR},
       </if>
       <if test="branch != null">
         branch = #{branch,jdbcType=VARCHAR},
@@ -260,7 +260,7 @@
       subsystem = #{subsystem,jdbcType=VARCHAR},
       subsystem_owner_id = #{subsystemOwnerId,jdbcType=VARCHAR},
       subsystem_owner = #{subsystemOwner,jdbcType=VARCHAR},
-      branch_practitioner_id = #{branchPractitionerId,jdbcType=VARCHAR},
+      branch_id = #{branchId,jdbcType=VARCHAR},
       branch = #{branch,jdbcType=VARCHAR},
       is_active = #{isActive,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -328,9 +328,9 @@
           when id = #{item.id,jdbcType=BIGINT} then #{item.subsystemOwner,jdbcType=VARCHAR}
         </foreach>
       </trim>
-      <trim prefix="branch_practitioner_id = case" suffix="end,">
+      <trim prefix="branch_id = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=BIGINT} then #{item.branchPractitionerId,jdbcType=VARCHAR}
+          when id = #{item.id,jdbcType=BIGINT} then #{item.branchId,jdbcType=VARCHAR}
         </foreach>
       </trim>
       <trim prefix="branch = case" suffix="end,">
@@ -450,10 +450,10 @@
           </if>
         </foreach>
       </trim>
-      <trim prefix="branch_practitioner_id = case" suffix="end,">
+      <trim prefix="branch_id = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          <if test="item.branchPractitionerId != null">
-            when id = #{item.id,jdbcType=BIGINT} then #{item.branchPractitionerId,jdbcType=VARCHAR}
+          <if test="item.branchId != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.branchId,jdbcType=VARCHAR}
           </if>
         </foreach>
       </trim>
@@ -510,7 +510,7 @@
     insert into ag_acl_practitioner_hiring_membership
     (hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id, 
       mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id, 
-      subsystem_owner, branch_practitioner_id, branch, is_active, created_at, created_by, 
+      subsystem_owner, branch_id, branch, is_active, created_at, created_by, 
       updated_at, updated_by)
     values
     <foreach collection="list" item="item" separator=",">
@@ -519,7 +519,7 @@
         #{item.mentor,jdbcType=VARCHAR}, #{item.introducerPractitionerId,jdbcType=VARCHAR}, 
         #{item.introducer,jdbcType=VARCHAR}, #{item.subsystemId,jdbcType=VARCHAR}, #{item.subsystem,jdbcType=VARCHAR}, 
         #{item.subsystemOwnerId,jdbcType=VARCHAR}, #{item.subsystemOwner,jdbcType=VARCHAR}, 
-        #{item.branchPractitionerId,jdbcType=VARCHAR}, #{item.branch,jdbcType=VARCHAR}, 
+        #{item.branchId,jdbcType=VARCHAR}, #{item.branch,jdbcType=VARCHAR}, 
         #{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, #{item.createdBy,jdbcType=BIGINT}, 
         #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT})
     </foreach>