查询整体全部信息接口

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

@@ -192,7 +192,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
                 dataObjList.add(dataObj);
             });
 
-            if (workingExperienceList.size() > 0) {
+            if (dataObjList.size() > 0) {
                 workingExperienceMapper.batchInsert(dataObjList);
             }
 
@@ -319,7 +319,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
                 dataObjList.add(dataObj);
             });
 
-            if (personalStatementList.size() > 0) {
+            if (dataObjList.size() > 0) {
                 personalStatementsMapper.batchInsert(dataObjList);
             }
 
@@ -356,7 +356,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
                 dataObjList.add(dataObj);
             });
 
-            if (contractTermsConfirmsList.size() > 0) {
+            if (dataObjList.size() > 0) {
                 contractTermsConfirmsMapper.batchInsert(dataObjList);
             }
 
@@ -537,16 +537,16 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         try {
             //报聘的经纪人基本资料id
             Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
-            //经纪人审批基本信息
-            HiringBasicInfo hiringBasicInfo = practitionerHiringDalService.findHiringBasicInfo(hiringBasicInfoId);
-            //审批经纪人关系
-            HiringMemberShip hiringMemberShip = practitionerHiringDalService.findHiringMemberShip(hiringBasicInfoId);
-            //审批经纪人工作经历
-            List<HiringWorkingExperience> hiringWorkingExperienceList = practitionerHiringDalService.findHiringWorkingExperienceList(hiringBasicInfoId);
-            //经纪人申请名目
-            List<HiringPersonalStatements> hiringPersonalStatementsList = practitionerHiringDalService.findHiringPersonalStatementsList(hiringBasicInfoId);
-            //经纪人合同条款是否同意
-            List<HiringContractTermsConfirms> hiringContractTermsConfirmsList = practitionerHiringDalService.findHiringContractTermsConfirmsList(hiringBasicInfoId);
+            //基本信息
+            AclPractitionerHiringBasicInfo hiringBasicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
+            //组织关系
+            AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+            //工作经历
+            List<AclPractitionerHiringWorkingExperience> hiringWorkingExperienceList = workingExperienceMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+            //申请名目
+            List<AclPractitionerHiringPersonalStatements> hiringPersonalStatementsList = personalStatementsMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+            //合同条款是否同意
+            List<AclPractitionerHiringContractTermsConfirms> hiringContractTermsConfirmsList = contractTermsConfirmsMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
 
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setHiringBasicInfoId(hiringBasicInfoId);

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

 package com.yd.api.practitioner.vo.hiring;
 
 import com.yd.api.result.CommonResult;
-import com.yd.dal.entity.practitioner.hiring.*;
+import com.yd.dal.entity.customer.*;
 import lombok.Data;
 
 import java.util.List;
@@ -15,23 +15,23 @@ public class QueryWholeInfoResponseVO {
     /**
      * 经纪人审批基本信息
      */
-    private HiringBasicInfo hiringBasicInfo;
+    private AclPractitionerHiringBasicInfo hiringBasicInfo;
     /**
      * 审批经纪人关系
      */
-    private HiringMemberShip hiringMemberShip;
+    private AclPractitionerHiringMembership hiringMemberShip;
     /**
      * 审批经纪人工作经历
      */
-    private List<HiringWorkingExperience> hiringWorkingExperienceList;
+    private List<AclPractitionerHiringWorkingExperience> hiringWorkingExperienceList;
     /**
      * 经纪人申请名目
      */
-    private List<HiringPersonalStatements> hiringPersonalStatementsList;
+    private List<AclPractitionerHiringPersonalStatements> hiringPersonalStatementsList;
     /**
      * 经纪人合同条款是否同意
      */
-    private List<HiringContractTermsConfirms> hiringContractTermsConfirmsList;
+    private List<AclPractitionerHiringContractTermsConfirms> hiringContractTermsConfirmsList;
 
     private CommonResult commonResult;
 }

yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringPersonalStatements.java

@@ -15,9 +15,14 @@ public class PractitionerHiringPersonalStatements {
     private String personalStatements;
 
     /**
+     * 个人申明条目,用户补充输入
+     */
+    private String userInput;
+
+    /**
      * 申明1：有，0：无
      */
-    private String status;
+    private Long status;
 
 
     /**
@@ -43,7 +48,7 @@ public class PractitionerHiringPersonalStatements {
      *
      * @return status 申明1：有，0：无
      */
-    public String getStatus() {
+    public Long getStatus() {
         return this.status;
     }
 
@@ -52,7 +57,7 @@ public class PractitionerHiringPersonalStatements {
      *
      * @param status 申明1：有，0：无
      */
-    public void setStatus(String status) {
+    public void setStatus(Long status) {
         this.status = status;
     }
 
@@ -71,4 +76,12 @@ public class PractitionerHiringPersonalStatements {
     public void setHiringBasicInfoId(Long hiringBasicInfoId) {
         this.hiringBasicInfoId = hiringBasicInfoId;
     }
+
+    public String getUserInput() {
+        return userInput;
+    }
+
+    public void setUserInput(String userInput) {
+        this.userInput = userInput;
+    }
 }

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

@@ -29,6 +29,11 @@ public class AclPractitionerHiringPersonalStatements {
     private String mdDropOptionName;
 
     /**
+     * 个人申明条目,用户补充输入
+     */
+    private String userInput;
+
+    /**
     * 申明1：有，0：无
     */
     private Long status;

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

@@ -22,4 +22,6 @@ public interface AclPractitionerHiringContractTermsConfirmsMapper {
     int updateBatchSelective(List<AclPractitionerHiringContractTermsConfirms> list);
 
     int batchInsert(@Param("list") List<AclPractitionerHiringContractTermsConfirms> list);
+
+    List<AclPractitionerHiringContractTermsConfirms> selectByHiringBasicInfoId(Long hiringBasicInfoId);
 }
\ No newline at end of file

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

@@ -22,4 +22,6 @@ public interface AclPractitionerHiringPersonalStatementsMapper {
     int updateBatchSelective(List<AclPractitionerHiringPersonalStatements> list);
 
     int batchInsert(@Param("list") List<AclPractitionerHiringPersonalStatements> list);
+
+    List<AclPractitionerHiringPersonalStatements> selectByHiringBasicInfoId(Long hiringBasicInfoId);
 }
\ No newline at end of file

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

@@ -22,4 +22,6 @@ public interface AclPractitionerHiringWorkingExperienceMapper {
     int updateBatchSelective(List<AclPractitionerHiringWorkingExperience> list);
 
     int batchInsert(@Param("list") List<AclPractitionerHiringWorkingExperience> list);
+
+    List<AclPractitionerHiringWorkingExperience> selectByHiringBasicInfoId(Long hiringBasicInfoId);
 }
\ No newline at end of file

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

@@ -271,4 +271,11 @@
         )
     </foreach>
   </insert>
+
+  <select id="selectByHiringBasicInfoId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_hiring_contract_terms_confirms
+    where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -294,4 +294,10 @@
         #{item.updatedBy,jdbcType=BIGINT})
     </foreach>
   </insert>
+
+  <select id="selectByHiringBasicInfoId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List" />
+    from  ag_acl_practitioner_hiring_personal_statements
+    where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -343,4 +343,10 @@
         )
     </foreach>
   </insert>
+
+  <select id="selectByHiringBasicInfoId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List" />
+    from  ag_acl_practitioner_hiring_working_experience
+    where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
+  </select>
 </mapper>
\ No newline at end of file