经纪人名片4.经纪人电子名片由后端返回,支持PDF/png

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

@@ -780,6 +780,15 @@ public class PractitionerController {
         result.setData(responseVO);
         return result;
     }
+    
+    @RequestMapping("/deleteInformedSheetById")
+    public Object deleteInformedSheetById(@RequestBody IDRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        CommonResultResponseVO responseVO = practitionerService.deleteInformedSheetById(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
 
     @RequestMapping("/signInformedSheet")
     public Object signInformedSheet(@RequestBody SignInformedSheetRequestVO requestVO) {

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

@@ -263,6 +263,8 @@ public interface PractitionerService {
     QueryInformedSheetByIdResponseVO queryInformedSheetById(IDRequestVO requestVO);
 
     CommonResultIDResponseVO updateInformedSheetById(UpdateInformedSheetByIdRequestVO requestVO);
+    
+    CommonResultResponseVO deleteInformedSheetById(IDRequestVO requestVO);
 
     CommonResultIDResponseVO signInformedSheet(SignInformedSheetRequestVO requestVO);
 

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

@@ -4153,6 +4153,34 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
     }
 
     @Override
+    public  CommonResultResponseVO deleteInformedSheetById(IDRequestVO requestVO){
+    	CommonResultResponseVO resp = new CommonResultResponseVO();
+    	if (requestVO == null || requestVO.getId() == null) {
+            resp.setCommonResult(new CommonResult(false, "客户告知书ID不能为空"));
+            return resp;
+        }
+	    try {
+            AgPoInformed informed = informedMapper.selectByPrimaryKey(requestVO.getId());
+            if(informed != null){
+            	if(Strings.isNullOrEmpty(informed.getPolicyNo())){
+            		informedMapper.deleteByPrimaryKey(requestVO.getId());
+            	}else{
+                    resp.setCommonResult(new CommonResult(false, "客户告知书已经关联保单号,不能删除"));
+                    return resp;
+            	}
+            }else{
+                resp.setCommonResult(new CommonResult(false, "根据客户告知书ID查询不到数据"));
+                return resp;
+            }
+	        resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        resp.setCommonResult(new CommonResult(false, e.getMessage()));
+	    }
+	    return resp;
+    }
+
+    @Override
     public CommonResultIDResponseVO signInformedSheet(SignInformedSheetRequestVO requestVO) {
         CommonResultIDResponseVO resp = new CommonResultIDResponseVO();
         Long id = requestVO.getId();
@@ -5172,12 +5200,14 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             resp.setInsurerUrl("www.ydinsurance.cn");
             resp.setInsurerAbbre("银盾保险经纪");
             resp.setInsurerUser("全球保险集团BHL成员");
+            resp.setBusinessCardType(requestVO.getBusinessCardType());
+//          if("1".equals(requestVO.getBusinessCardType()) || "2".equals(requestVO.getBusinessCardType()) || "3".equals(requestVO.getBusinessCardType())){
+          		businessCardE(resp);
+//          }
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         }else{
             resp.setCommonResult(new CommonResult(false, "没有查到该经纪人"));
         }
-        
-        businessCardE(resp);
         return resp;
     }
     
@@ -5249,8 +5279,12 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         //按模板填充数据生成结果PDF
         PDFTemplate.generatePDF(templatePDF, templateResultPDF, initDatas, initImages);
         try {
-            resp.setBusinessCardPdfUrl(putContractFileToOSS("businessCardEPDF", templateResultPDF, practitionerId));
-//            getBusinessCardImg(resp, practitionerId, templateResultPDF, tmpPathPDF);
+//            if("1".equals(resp.getBusinessCardType()) || "3".equals(resp.getBusinessCardType())){
+            	resp.setBusinessCardPdfUrl(putContractFileToOSS("businessCardEPDF", templateResultPDF, practitionerId));
+//            }
+            if("2".equals(resp.getBusinessCardType()) || "3".equals(resp.getBusinessCardType())){
+            	getBusinessCardImg(resp, practitionerId, templateResultPDF, tmpPathPDF);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

yd-api/src/main/java/com/yd/api/practitioner/vo/businessCard/PractitionerBusinessCardRequestVO.java

@@ -5,4 +5,5 @@ import lombok.Data;
 @Data
 public class PractitionerBusinessCardRequestVO {
     private Long practitionerId;//经纪人ID
+    private String businessCardType; //获取电子名片类型(0:数据; 1:pdf; 2:png; 3:pdf/png)】不传默认为0
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/businessCard/PractitionerBusinessCardResponseVO.java

@@ -26,6 +26,7 @@ public class PractitionerBusinessCardResponseVO {
     private String mobileNo;//手机号
     private String email;//电子邮件
     private Integer emailIsActive;//经纪人邮箱是否开通(0=No, 1=Yes)
+    private String businessCardType; //获取电子名片类型(0:数据; 1:pdf; 2:png; 3:pdf/png)】不传默认为0
     private String businessCardPdfUrl;//电子名片PDF
     private String businessCardProsImg;//电子名片正面Url
     private String businessCardConsImg;//电子名片反面Url