生成合同

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

 package com.yd.api.practitioner;
 
+import com.yd.api.practitioner.service.PractitionerHiringContractService;
 import com.yd.api.practitioner.service.PractitionerHiringService;
 import com.yd.api.practitioner.vo.hiring.*;
 import com.yd.api.result.JsonResult;
@@ -17,6 +18,8 @@ public class PractitionerHiringController {
 	
 	@Autowired
 	private PractitionerHiringService practitionerHiringService;
+	@Autowired
+	private PractitionerHiringContractService hiringContractService;
 
 	/**
 	 * 保存报聘经纪人组织关系
@@ -233,17 +236,19 @@ public class PractitionerHiringController {
 	 * @param requestVO 请求数据
 	 * @return 响应数据
 	 */
-	@RequestMapping("/hiringApprove")
-	public Object hiringApprove(@RequestBody HiringApproveRequestVO requestVO){
+	@RequestMapping("/hiringPDF")
+	public Object hiringApprove(@RequestBody HiringPDFRequestVO requestVO){
 		JsonResult result = new JsonResult();
 		try {
-			PractitionerPDFTest.main(null);
+//			PractitionerPDFTest.main(null);
+			Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
+			hiringContractService.generatePractitionerContract(hiringBasicInfoId);
+
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		HiringApproveResponseVO responseVO = practitionerHiringService.hiringApprove(requestVO);
-		result.addResult(responseVO);
-		result.setData(responseVO);
+
 		return result;
 	}
 }
\ No newline at end of file

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

+package com.yd.api.practitioner.vo.hiring;
+
+import lombok.Data;
+
+@Data
+public class HiringPDFRequestVO {
+    /**
+     * 经纪人id
+     */
+    private Long practitionerId;
+    /**
+     * 审批经纪人基本资料id
+     */
+    private Long hiringBasicInfoId;
+}

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

@@ -74,4 +74,6 @@ public interface AclPractitionerMapper {
     List<Long> queryMentoredByPractitionerId(Long practitionerId);
 
     PractitionerInfo findPractitionerInfoByPractitionerId(Long practitionerId);
+
+    AclPractitioner selectByMobileNo(String mobileNo);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/util/CommonUtil.java

@@ -1515,6 +1515,7 @@ public class CommonUtil {
 			while((line=bufr.readLine())!=null)
 			{
 				System.out.println(line);
+				break;
 			}
 			bufr.close();//close()中已经包含了flush
 		} catch (IOException e) {

yd-api/src/main/java/com/yd/util/PDFConfiguration.java

@@ -25,7 +25,7 @@ public class PDFConfiguration {
         {
             in = PDFConfiguration.class.getClassLoader().getResourceAsStream("pdfconfiguration.properties");
 
-            props.load(in);
+            props.load(new InputStreamReader(in, "UTF-8"));
         } catch (FileNotFoundException e) {
             logger.error("pdfconfiguration.properties文件未找到");
         } catch (IOException e) {

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

@@ -348,6 +348,7 @@
     select <include refid="Base_Column_List" />
     from  ag_acl_practitioner_hiring_working_experience
     where hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
+    order by working_end desc
   </select>
 
   <delete id="deleteBatchByIds">

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

@@ -966,4 +966,11 @@
     where p.id = #{practitionerId}
   </select>
 
+  <select id="selectByMobileNo" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner
+    where mobile_no = #{mobileNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler}
+  </select>
+
 </mapper>
\ No newline at end of file