经纪人合同签字日期调整2

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

@@ -257,6 +257,21 @@ public class PractitionerHiringController {
 	}
 
 	/**
+	 * 手工生成报聘合同
+	 *
+	 * @param requestVO
+	 * @return
+	 */
+	@RequestMapping("/handGeneratePDF")
+	public Object handGeneratePDF(@RequestBody GeneratePDFRequestVO requestVO){
+		JsonResult result = new JsonResult();
+		GeneratePDFResponseVO responseVO = practitionerHiringService.handGeneratePDF(requestVO);
+		result.addResult(responseVO);
+		result.setData(responseVO);
+		return result;
+	}
+
+	/**
 	 * 报聘成功后查看经纪人信息
 	 * @param requestVO 请求数据
 	 * @return 响应数据

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

@@ -60,4 +60,6 @@ public interface PractitionerHiringService {
     CommonResultResponseVO hiringSubmit(HiringBasicInfoIdRequestVO requestVO);
 
     SaveWeChatQRcodeResponseVO saveWeChatQRcode(SaveWeChatQRcodeRequestVO requestVO);
+
+    GeneratePDFResponseVO handGeneratePDF(GeneratePDFRequestVO requestVO);
 }

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

@@ -217,14 +217,6 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         data.put("firstPartyAddress", firstPartyAddress);
         // 设置一些地址
         this.setSomeAddress(data, hiringBasicInfoId);
-
-        Calendar secondBirthday = Calendar.getInstance();
-        Date practitionerBirthdate = CommonUtil.stringParseDate(basicInfo.getPractitionerBirthdate(), "yyyy-MM-dd");
-        secondBirthday.setTime(practitionerBirthdate);
-        data.put("contactYear", secondBirthday.get(Calendar.YEAR) + "");
-        data.put("contactMonth", (secondBirthday.get(Calendar.MONTH) + 1) + "");
-        data.put("contactDay", secondBirthday.get(Calendar.DAY_OF_MONTH) + "");
-        
 //        Calendar now = Calendar.getInstance();
 //        data.put("contactYear", now.get(Calendar.YEAR) + "");
 //        data.put("contactMonth", (now.get(Calendar.MONTH) + 1) + "");
@@ -233,6 +225,9 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         data.put("secondParty801", basicInfo.getName());
 
 
+        Calendar secondBirthday = Calendar.getInstance();
+        Date practitionerBirthdate = CommonUtil.stringParseDate(basicInfo.getPractitionerBirthdate(), "yyyy-MM-dd");
+        secondBirthday.setTime(practitionerBirthdate);
         data.put("secondBirthYear801", secondBirthday.get(Calendar.YEAR) + "");
         data.put("secondBirthMonth801", (secondBirthday.get(Calendar.MONTH) + 1) + "");
         data.put("secondBirthDay801", secondBirthday.get(Calendar.DAY_OF_MONTH) + "");
@@ -262,6 +257,11 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         data.put("secondMentor801", mentorName);
         data.put("secondSubsystem", subsystemName);
         data.put("secondSubsystemNo", "");
+
+        data.put("contactYear", applyDate.get(Calendar.YEAR) + "");
+        data.put("contactMonth", (applyDate.get(Calendar.MONTH) + 1) + "");
+        data.put("contactDay", applyDate.get(Calendar.DAY_OF_MONTH) + "");
+
         // 签核人员
         this.setApprovepeople(data, hiringBasicInfoId);
 
@@ -439,6 +439,8 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         images.put("secondSignature1401", signature);
         images.put("secondSignature1601", signature);
         images.put("secondSignature1701", signature);
+        images.put("secondParty", signature);
+        images.put("secondParty802", signature);
         // 证件照
         String IDFront = this.getImgTolocal(localDirectory,"IDFront.png", basicInfo.getIdFrontPageOssPath());
         String IDBack = this.getImgTolocal(localDirectory,"IDBack.png", basicInfo.getIdBackPageOssPath());

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

@@ -1025,6 +1025,57 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         return resp;
     }
 
+    @Override
+    public GeneratePDFResponseVO handGeneratePDF(GeneratePDFRequestVO requestVO) {
+        GeneratePDFResponseVO resp = new GeneratePDFResponseVO();
+        try {
+            Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
+            Long practitionerId = requestVO.getPractitionerId();
+            if (hiringBasicInfoId == null) {
+                resp.setCommonResult(new CommonResult(false, "此经纪人无电子合同"));
+                return resp;
+            }
+
+            AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
+            String practitionerCode = practitioner == null ? null : practitioner.getPractitionerCode().trim();
+            String practitionerRegNo = practitioner == null ? null : practitioner.getPractitionerRegNo();
+
+            if (StringUtils.isBlank(practitionerRegNo)) {
+                resp.setCommonResult(new CommonResult(false, "执业编号不能为空，请保存后再生成合同"));
+                return resp;
+            }
+            if (StringUtils.isBlank(practitionerCode)) {
+                resp.setCommonResult(new CommonResult(false, "内部编号不能为空，请保存后再生成合同"));
+                return resp;
+            }
+
+            // 合同编号已存在就不生成新的
+            String contractNo = practitioner.getContractNo();
+
+            if (StringUtils.isEmpty(contractNo)) {
+                contractNo = hiringContractService.getNextContractNo();
+                practitioner.setContractNo(contractNo);
+            }
+            String contractOssPath = hiringContractService.generatePractitionerContract(practitioner);
+
+            //4、经纪人表生成经纪人记录ag_acl_practitioner，ag_acl_practitioner.contract_oss_path
+            //   经纪人经纪人类型级别定义表ag_acl_practitioner_setting
+            AclPractitioner updateObj = new AclPractitioner();
+            updateObj.setId(practitionerId);
+            updateObj.setContractNo(contractNo);
+            updateObj.setContractOssPath(contractOssPath);
+            aclPractitionerMapper.updateByPrimaryKeySelective(updateObj);
+
+            resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+            resp.setContractOssPath(contractOssPath);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            resp.setCommonResult(new CommonResult(false, e.getMessage()));
+        }
+        return resp;
+    }
+
     private void distributeToSubsystemOwner(AclPractitionerHiringMembership hiringMemberShip) {
 
         String mdDropOptionName = hiringMemberShip.getMdDropOptionName();