电子报聘保存薪资单图片接口

2c5cab57 · jianan · 2ce1a0ff · 2c5cab57 · 2c5cab57 · 2c5cab57
Commit 2c5cab57 authored Jan 19, 2021 by jianan
11 changed files
--- a/yd-api/src/main/java/com/yd/api/practitioner/PractitionerHiringController.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/PractitionerHiringController.java
@@ -84,6 +84,19 @@ public class PractitionerHiringController {
 	}
 	/**
+	 * 保存报聘经纪人薪资单图片
+	 *
+	 */
+	@RequestMapping("/savePayrollPicture")
+	public Object savePayrollPicture(@RequestBody SavePayRollPictureRequestVO requestVO){
+		JsonResult result = new JsonResult();
+		SavePayrollPictureResponseVO responseVO = practitionerHiringService.savePayrollPicture(requestVO);
+		result.addResult(responseVO);
+		result.setData(responseVO);
+		return result;
+	}
+	/**
 	 * 保存报聘经纪人身份证正反面图片
 	 *
 	 */

--- a/yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringService.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringService.java
@@ -50,4 +50,6 @@ public interface PractitionerHiringService {
    QueryWholeInfoResponseVO queryWholeInfo(HiringBasicInfoIdRequestVO requestVO);
    CommonResultResponseVO saveDigitalSignatures(SaveDigitalSignaturesRequestVO requestVO);
+    SavePayrollPictureResponseVO savePayrollPicture(SavePayRollPictureRequestVO requestVO);
 }
--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
@@ -9,7 +9,6 @@ import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
 import com.yd.dal.entity.practitioner.hiring.*;
 import com.yd.dal.mapper.customer.*;
 import com.yd.dal.service.customer.AclPractitionerHiringApproveRecordsDALService;
-import com.yd.dal.service.meta.MdPractitionerHiringApproveStepsDALService;
 import com.yd.dal.service.practitioner.PractitionerHiringDALService;
 import com.yd.rmi.ali.oss.service.OssService;
 import com.yd.rmi.cache.SystemConfigService;
@@ -659,6 +658,32 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService 
        return resp;
    }
+    @Override
+    public SavePayrollPictureResponseVO savePayrollPicture(SavePayRollPictureRequestVO requestVO) {
+        SavePayrollPictureResponseVO resp = new SavePayrollPictureResponseVO();
+        try {
+            String mediaId = requestVO.getVxUrl();
+            Long basicInfoId = requestVO.getHiringBasicInfoId();
+            String imgUrl = this.uploadImageToOss(mediaId, basicInfoId, 2);
+            if (imgUrl == null) {
+                resp.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("830024")));
+            } else {
+                AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
+                basicInfo.setId(basicInfoId);
+                basicInfo.setPayrollOssPath(imgUrl);
+                basicInfoMapper.updateByPrimaryKeySelective(basicInfo);
+                resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+                resp.setImgUrl(imgUrl);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resp.setCommonResult(new CommonResult(false, e.getMessage()));
+        }
+        return resp;
+    }
    @SuppressWarnings("unchecked")
    private boolean addStepToList(HiringApproveRequestVO requestVO,
                                  int stepSeq,

--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePayRollPictureRequestVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePayRollPictureRequestVO.java
+package com.yd.api.practitioner.vo.hiring;
+import lombok.Data;
+@Data
+public class SavePayRollPictureRequestVO {
+    private Long hiringBasicInfoId;
+    private String vxUrl;
+}
--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePayrollPictureResponseVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePayrollPictureResponseVO.java
+package com.yd.api.practitioner.vo.hiring;
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+@Data
+public class SavePayrollPictureResponseVO {
+    private CommonResult commonResult;
+    private String imgUrl;
+}
--- a/yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringBasicInfo.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringBasicInfo.java
@@ -71,6 +71,11 @@ public class PractitionerHiringBasicInfo {
    private String personerPictureOssPath;
    /**
+     * 个人薪资单图片
+     */
+    private String payrollOssPath;
+    /**
     * Id 正面照片
     */
    private String idFrontPageOssPath;
@@ -488,22 +493,31 @@ public class PractitionerHiringBasicInfo {
        this.personalSignOssPath = personalSignOssPath;
    }
+    public String getPayrollOssPath() {
+        return payrollOssPath;
+    }
+    public void setPayrollOssPath(String payrollOssPath) {
+        this.payrollOssPath = payrollOssPath;
+    }
    @Override
    public String toString() {
        return "PractitionerHiringBasicInfo{" +
-                " inviteePractitionerName='" + inviteePractitionerName + '\'' +
+                "inviteePractitionerName='" + inviteePractitionerName + '\'' +
                ", name='" + name + '\'' +
                ", mobileNo='" + mobileNo + '\'' +
                ", idType='" + idType + '\'' +
                ", idNo='" + idNo + '\'' +
-                ", gender=" + gender +
+                ", gender='" + gender + '\'' +
-                ", practitionerBirthdate=" + practitionerBirthdate +
+                ", practitionerBirthdate='" + practitionerBirthdate + '\'' +
                ", provinceName='" + provinceName + '\'' +
                ", cityName='" + cityName + '\'' +
                ", residentAddress='" + residentAddress + '\'' +
                ", wechatId='" + wechatId + '\'' +
                ", email='" + email + '\'' +
                ", personerPictureOssPath='" + personerPictureOssPath + '\'' +
+                ", payrollOssPath='" + payrollOssPath + '\'' +
                ", idFrontPageOssPath='" + idFrontPageOssPath + '\'' +
                ", idBackPageOssPath='" + idBackPageOssPath + '\'' +
                ", lastGraduateGrade='" + lastGraduateGrade + '\'' +

--- a/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringBasicInfo.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringBasicInfo.java
@@ -104,6 +104,11 @@ public class AclPractitionerHiringBasicInfo {
    private String personerPictureOssPath;
    /**
+     * 个人照片
+     */
+    private String payrollOssPath;
+    /**
    * Id 正面照片
    */
    private String idFrontPageOssPath;

--- a/yd-api/src/main/java/com/yd/dal/entity/practitioner/hiring/HiringBasicInfo.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/practitioner/hiring/HiringBasicInfo.java
@@ -71,6 +71,11 @@ public class HiringBasicInfo {
    private String personerPictureOssPath;
    /**
+     * 个人薪资单图片
+     */
+    private String payrollOssPath;
+    /**
     * Id 正面照片
     */
    private String idFrontPageOssPath;
@@ -488,22 +493,31 @@ public class HiringBasicInfo {
        this.personalSignOssPath = personalSignOssPath;
    }
+    public String getPayrollOssPath() {
+        return payrollOssPath;
+    }
+    public void setPayrollOssPath(String payrollOssPath) {
+        this.payrollOssPath = payrollOssPath;
+    }
    @Override
    public String toString() {
-        return "PractitionerHiringBasicInfo{" +
+        return "HiringBasicInfo{" +
-                " inviteePractitionerName='" + inviteePractitionerName + '\'' +
+                "inviteePractitionerName='" + inviteePractitionerName + '\'' +
                ", name='" + name + '\'' +
                ", mobileNo='" + mobileNo + '\'' +
                ", idType='" + idType + '\'' +
                ", idNo='" + idNo + '\'' +
-                ", gender=" + gender +
+                ", gender='" + gender + '\'' +
-                ", practitionerBirthdate=" + practitionerBirthdate +
+                ", practitionerBirthdate='" + practitionerBirthdate + '\'' +
                ", provinceName='" + provinceName + '\'' +
                ", cityName='" + cityName + '\'' +
                ", residentAddress='" + residentAddress + '\'' +
                ", wechatId='" + wechatId + '\'' +
                ", email='" + email + '\'' +
                ", personerPictureOssPath='" + personerPictureOssPath + '\'' +
+                ", payrollOssPath='" + payrollOssPath + '\'' +
                ", idFrontPageOssPath='" + idFrontPageOssPath + '\'' +
                ", idBackPageOssPath='" + idBackPageOssPath + '\'' +
                ", lastGraduateGrade='" + lastGraduateGrade + '\'' +

--- a/yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
+++ b/yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
@@ -25,6 +25,7 @@
        <result column="bankAccountOpening" jdbcType="VARCHAR" property="bankAccountOpening"/>
        <result column="bankAccountId" jdbcType="VARCHAR" property="bankAccountId"/>
        <result column="personalSignOssPath" jdbcType="VARCHAR" property="personalSignOssPath"/>
+        <result column="payroll_oss_path" jdbcType="VARCHAR" property="payrollOssPath" />
    </resultMap>
    <select id="findPractitionerHiringBasicInfo" resultMap="practitionerHiringBasicInfo">
        select p.name                                                 inviteePractitionerName,
@@ -47,6 +48,7 @@
               b.last_graduate_certification_oss_path                 lastGraduateCertificationOssPath,
               b.bank_account_opening                                 bankAccountOpening,
               b.bank_account_id                                      bankAccountId,
+               b.payroll_oss_path                                     payrollOssPath,
               b.personal_sign_oss_path                               personalSignOssPath
        from ag_acl_practitioner_hiring_basic_info b
                     left join ag_acl_practitioner p on b.invitee_practitioner_id = p.id

--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml
@@ -23,6 +23,7 @@
    <result column="wechat_id" jdbcType="VARCHAR" property="wechatId" />
    <result column="email" jdbcType="VARCHAR" property="email" />
    <result column="personer_picture_oss_path" jdbcType="VARCHAR" property="personerPictureOssPath" />
+    <result column="payroll_oss_path" jdbcType="VARCHAR" property="payrollOssPath" />
    <result column="id_front_page_oss_path" jdbcType="VARCHAR" property="idFrontPageOssPath" />
    <result column="id_back_page_oss_path" jdbcType="VARCHAR" property="idBackPageOssPath" />
    <result column="last_graduate_code" jdbcType="VARCHAR" property="lastGraduateCode" />
@@ -42,7 +43,7 @@
    <!--@mbg.generated-->
    id, practitioner_potential_id, invitee_practitioner_id, `name`, mobile_no, id_type_id, 
    id_type, id_no, gender, practitioner_birthdate, province_id, province_name, city_id, 
-    city_name, resident_address, wechat_id, email, personer_picture_oss_path, id_front_page_oss_path, 
+    city_name, resident_address, wechat_id, email, personer_picture_oss_path, payroll_oss_path, id_front_page_oss_path,
    id_back_page_oss_path, last_graduate_code, last_graduate_grade, last_graduate_school, last_graduate_certification_oss_path,
    bank_account_opening, bank_account_id, personal_sign_oss_path, is_active, created_at, 
    created_by, updated_at, updated_by, approve_status
@@ -329,6 +330,9 @@
      <if test="personerPictureOssPath != null">
        personer_picture_oss_path = #{personerPictureOssPath,jdbcType=VARCHAR},
      </if>
+      <if test="payrollOssPath != null">
+        payroll_oss_path = #{payrollOssPath,jdbcType=VARCHAR},
+      </if>
      <if test="idFrontPageOssPath != null">
        id_front_page_oss_path = #{idFrontPageOssPath,jdbcType=VARCHAR},
      </if>
@@ -394,6 +398,7 @@
      wechat_id = #{wechatId,jdbcType=VARCHAR},
      email = #{email,jdbcType=VARCHAR},
      personer_picture_oss_path = #{personerPictureOssPath,jdbcType=VARCHAR},
+      payroll_oss_path = #{payrollOssPath,jdbcType=VARCHAR},
      id_front_page_oss_path = #{idFrontPageOssPath,jdbcType=VARCHAR},
      id_back_page_oss_path = #{idBackPageOssPath,jdbcType=VARCHAR},
      last_graduate_code = #{lastGraduateCode,jdbcType=VARCHAR},

--- a/yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
+++ b/yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
@@ -86,6 +86,7 @@
        <result column="bankAccountOpening" jdbcType="VARCHAR" property="bankAccountOpening"/>
        <result column="bankAccountId" jdbcType="VARCHAR" property="bankAccountId"/>
        <result column="personalSignOssPath" jdbcType="VARCHAR" property="personalSignOssPath"/>
+        <result column="payroll_oss_path" jdbcType="VARCHAR" property="payrollOssPath" />
    </resultMap>
    <select id="findHiringBasicInfo" resultMap="hiringBasicInfo">
        select p.name                                                 inviteePractitionerName,
@@ -108,6 +109,7 @@
               b.last_graduate_certification_oss_path                 lastGraduateCertificationOssPath,
               b.bank_account_opening                                 bankAccountOpening,
               b.bank_account_id                                      bankAccountId,
+               b.payroll_oss_path                                     payrollOssPath,
               b.personal_sign_oss_path                               personalSignOssPath
        from ag_acl_practitioner_hiring_basic_info b
                     left join ag_acl_practitioner p on b.invitee_practitioner_id = p.id