MODIFY-信息采集、链接地址优化

src/com/engine/recruit/service/impl/InductionManageServiceImpl.java

@@ -123,7 +123,8 @@ public class InductionManageServiceImpl extends Service implements InductionMana
                 rs.executeUpdate("update uf_jcl_rzgl set xxcj = ? ,xxcjid = ? where id = ? ", InfoCollectEnum.HAS_SENT.getId(), id, billId);
             }
 
-
+            String smsContent;
+            String emailContent;
             // 发送短信
             String mobile = Util.null2String(dataMap.get("sjh"));
             String email = Util.null2String(dataMap.get("yx"));
@@ -131,13 +132,20 @@ public class InductionManageServiceImpl extends Service implements InductionMana
             String messageLink = RecruitConstant.COLLECT_MESSAGE_LINK;
             //messageLink += "&billId=" + id;
 
-            yjnr = yjnr.replace("{链接地址}", messageLink);
             yjnr = yjnr.replace("{初始密码}", password);
-            String msgContent = RecruitModeUtil.getReplaceContent(yjnr, fieldMapList, mainDataMap);
+
+            smsContent = yjnr.replace("{链接地址}", messageLink);
+            smsContent = RecruitModeUtil.getReplaceContent(smsContent, fieldMapList, mainDataMap);
+
+            if (StringUtils.isNotBlank(messageLink)) {
+                messageLink = "<span><a href='" + messageLink + "'  target='_blank'>链接地址</a></span>";
+            }
+            emailContent = yjnr.replace("{链接地址}", messageLink);
+            emailContent = RecruitModeUtil.getReplaceContent(emailContent, fieldMapList, mainDataMap);
             // 发送邮件
-            boolean sendEmail = RecruitMessageUtils.sendEmail(email, yjzt, msgContent);
+            RecruitMessageUtils.sendEmail(email, yjzt, emailContent);
             // 发送短信
-            boolean sendSMS = RecruitMessageUtils.sendSMS(mobile, msgContent);
+            RecruitMessageUtils.sendSMS(mobile, smsContent);
 
 
             // 记录应聘过程

src/com/engine/recruit/service/impl/RecruitPositionServiceImpl.java

@@ -18,7 +18,7 @@ import com.weaver.rpa.sdk.clients.application.resume.ERPAResumeSDKClient;
 import com.weaver.rpa.sdk.clients.application.resume.common.ResumeJobStatus;
 import com.weaver.rpa.sdk.clients.application.resume.entity.ResumeJobDynamicField;
 import com.weaver.rpa.sdk.clients.application.resume.entity.ResumeJobV2Dto;
-import com.weaver.rpa.sdk.clients.application.resume.exception.RpaResumeException;
+import com.weaver.rpa.sdk.exception.RpaSdkException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -116,7 +116,7 @@ public class RecruitPositionServiceImpl extends Service implements RecruitPositi
             RecordSet rs = new RecordSet();
             rs.executeQuery("select * from uf_jcl_zp_zpzw where id = ?", billId);
             Map<String, Object> map = RecruitRecordSet.getSingleRecordMap(rs);
-            String msg = "";
+            String msg = "发布操作完成";
             boolean enableSdkClient = PositionSdkInstance.enableSdkClient();
             if (enableSdkClient) {
                 long jobId = -1;
@@ -167,10 +167,9 @@ public class RecruitPositionServiceImpl extends Service implements RecruitPositi
                     if (taskResult == TaskResult.SUCCEED) {
                         status = PositionReleaseStatusEnum.PUBLISHED.getValue();
                     } else {
-                        rs.writeLog("发布操作完成，" + result.getFailReason());
+                        msg = "发布操作完成，" + result.getFailReason();
                         status = PositionReleaseStatusEnum.PUBLISHING_FAILED.getValue();
                     }
-                    msg = "发布操作完成";
                     recordPublishingStatus(billId, platformId, status, result.getFailReason());
                 }
             } else {
@@ -183,7 +182,7 @@ public class RecruitPositionServiceImpl extends Service implements RecruitPositi
             Map<String, Object> reportList = getReportList(param);
             reportList.put("msg", msg);
             return reportList;
-        } catch (InterruptedException | RpaResumeException e) {
+        } catch (InterruptedException | RpaSdkException e) {
             throw new CustomizeRunTimeException(e.getMessage(),e);
         }
     }
@@ -257,7 +256,7 @@ public class RecruitPositionServiceImpl extends Service implements RecruitPositi
             Map<String, Object> reportList = getReportList(param);
             reportList.put("msg", msg);
             return reportList;
-        } catch (InterruptedException | RpaResumeException e) {
+        } catch (InterruptedException | RpaSdkException e) {
             throw new CustomizeRunTimeException(e.getMessage(),e);
         }
     }
@@ -303,7 +302,7 @@ public class RecruitPositionServiceImpl extends Service implements RecruitPositi
             Map<String, Object> reportList = getReportList(param);
             reportList.put("msg", msg);
             return reportList;
-        } catch (InterruptedException | RpaResumeException e) {
+        } catch (InterruptedException | RpaSdkException e) {
             throw new CustomizeRunTimeException(e.getMessage(),e);
         }
     }

src/com/engine/recruit/service/impl/ResumeRecognitionServiceImpl.java

@@ -74,6 +74,7 @@ public class ResumeRecognitionServiceImpl extends Service implements ResumeRecog
         }
         List<RecruitDataMap<Object>> studyList = (List<RecruitDataMap<Object>>) resumeData.remove("jyjl");
         List<RecruitDataMap<Object>> workList = (List<RecruitDataMap<Object>>) resumeData.remove("gzjl");
+        List<RecruitDataMap<Object>> projectList = (List<RecruitDataMap<Object>>) resumeData.remove("xmjy");
 
         // 状态
         resumeData.put("zt", ApplicationStatusEnum.DISTRIBUTION.getValue());
@@ -95,6 +96,7 @@ public class ResumeRecognitionServiceImpl extends Service implements ResumeRecog
         returnMap.put("id", StringUtils.isNotBlank(sourceId) ? sourceId : mainId);
         instance.insertResumeDetailTable(studyList, "uf_jcl_yppc_dt1", mainId, sourceId);
         instance.insertResumeDetailTable(workList, "uf_jcl_yppc_dt2", mainId, sourceId);
+        instance.insertResumeDetailTable(projectList, "uf_jcl_yppc_dt3", mainId, sourceId);
         return returnMap;
     }
 
@@ -302,7 +304,6 @@ public class ResumeRecognitionServiceImpl extends Service implements ResumeRecog
      * @return
      */
     private Map<String, Object> parseQllJsonToMapV2(JSONObject obj, boolean isCard) {
-        new BaseBean().writeLog(obj.toJSONString());
         Map<String, Object> dataMap = new HashMap<>(16);
         JSONObject personalInformation = obj.getJSONObject("个人信息");
         // 投递时间
@@ -323,8 +324,14 @@ public class ResumeRecognitionServiceImpl extends Service implements ResumeRecog
         String csrq = personalInformation.getString("出生日期");
         dataMap.put("csrq", parseDateObject(csrq));
         // 性别 默认为男
-        String xb = "女".equals(personalInformation.getString("性别")) ? "1" : "0";
+        String xb = personalInformation.getString("性别");
-        dataMap.put("xb", xb);
+        if ("女".equals(xb)) {
+            dataMap.put("xb", 1);
+        } else if("男".equals(xb)){
+            dataMap.put("xb", 0);
+        }else{
+            dataMap.put("xb", "");
+        }
         // 体重（KG）
         String tz = personalInformation.getString("体重");
         dataMap.put("tzkg", Convert.toDouble(tz));
@@ -459,26 +466,27 @@ public class ResumeRecognitionServiceImpl extends Service implements ResumeRecog
         }
 
         dataMap.put("gzjl", workList);
+
         // 项目经验
-        // 语言能力
+        JSONArray xmjy = obj.getJSONArray("项目经验");
+        List<RecruitDataMap<Object>> projectList = new ArrayList<>();
+        if (null != xmjy && xmjy.size() > 0) {
+            for (int i = 0; i < xmjy.size(); i++) {
+                JSONObject o = (JSONObject) xmjy.get(i);
+                String startDate = getFormatDate(o.getString("开始时间"));
+                String endDate = getFormatDate(o.getString("结束时间"));
+                RecruitDataMap<Object> projectMap = new RecruitDataMap<>();
+                projectMap.put("kssj",startDate);
+                projectMap.put("jssj",endDate);
+                projectMap.put("xmmc", o.getString("项目名称"));
+                projectMap.put("drjs", o.getString("担任角色"));
+                projectMap.put("xmms", o.getString("项目描述"));
+                projectList.add(projectMap);
+            }
+        }
 
+        dataMap.put("xmjy", projectList);
 
-        // 目前表单暂无字段
-        //dataMap.put("wx", parseArray(obj.getJSONArray("微信")));
-        //dataMap.put("qq", parseArray(obj.getJSONArray("QQ")));
-        //dataMap.put("ah", parseArray(obj.getJSONArray("爱好")));
-        //dataMap.put("bysj", parseArray(obj.getJSONArray("毕业时间")));
-        //
-        //
-        //dataMap.put("zyjn", parseArray(obj.getJSONArray("专业技能")));
-        //dataMap.put("sxjl", parseArray(obj.getJSONArray("实习经历")));
-        //dataMap.put("yysp", parseArray(obj.getJSONArray("英语水平")));
-        //dataMap.put("jnzs", parseArray(obj.getJSONArray("技能证书")));
-        //dataMap.put("xyjl", parseArray(obj.getJSONArray("校园经历")));
-        //dataMap.put("qwcsgw", parseArray(obj.getJSONArray("期望从事岗位")));
-        //
-        //dataMap.put("qwgzdd", parseArray(obj.getJSONArray("期望工作地点")));
-        //dataMap.put("xmjl", parseArray(obj.getJSONArray("项目经历")));
 
         return dataMap;
     }