Ver Fonte

沟通邀请问题修改

yanliming há 4 anos atrás
pai
commit
4f9abb5d10

+ 1 - 0
common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverRecordDTO.java

@@ -13,5 +13,6 @@ public class ResumeDeliverRecordDTO {
     private Date chatDate;
     private String chatTime;
     private String remark;
+    private String resumeDeliverId;
 
 }

+ 17 - 0
common/src/main/java/com/jpsoft/employment/modules/sys/entity/User.java

@@ -24,6 +24,21 @@ public class User {
 	private String companyId;
 	private String companyName;
 
+
+
+	//只做显示作用不保存数据库
+	private String resumeDeliverId;
+
+
+	public String getResumeDeliverId() {
+		return resumeDeliverId;
+	}
+
+	public void setResumeDeliverId(String resumeDeliverId) {
+		this.resumeDeliverId = resumeDeliverId;
+	}
+
+
 		/**
 	 *获取用户编号
 	 */
@@ -178,4 +193,6 @@ public class User {
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
+
+
 }

+ 6 - 4
web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeDeliverController.java

@@ -90,7 +90,7 @@ public class ResumeDeliverController {
             resumeDeliverRecord.setCreateTime(now);
 
             resumeDeliverRecord.setDelFlag(false);
-            resumeDeliverRecord.setResumeDeliverId(resumeDeliverRecordDTO.getId());
+            resumeDeliverRecord.setResumeDeliverId(resumeDeliverRecordDTO.getResumeDeliverId());
 
             String chatStatusN = dataDictionaryService.findNameByCatalogNameAndValue("沟通状态",resumeDeliverRecordDTO.getChatType());
 
@@ -128,7 +128,7 @@ public class ResumeDeliverController {
             }
             else if(resumeDeliverRecordDTO.getChatType().equals("4")){
                 //邀请入职
-                ResumeDeliver resumeDeliver = resumeDeliverService.get(resumeDeliverRecordDTO.getId());
+                ResumeDeliver resumeDeliver = resumeDeliverService.get(resumeDeliverRecordDTO.getResumeDeliverId());
 
                 if (resumeDeliver != null) {
                     JobUser jobUser = jobUserService.get(resumeDeliver.getJobUserId());
@@ -157,7 +157,7 @@ public class ResumeDeliverController {
             int affectCount = resumeDeliverRecordService.insert(resumeDeliverRecord);
 
             if (affectCount > 0) {
-                ResumeDeliver resumeDeliver = resumeDeliverService.get(resumeDeliverRecordDTO.getId());
+                ResumeDeliver resumeDeliver = resumeDeliverService.get(resumeDeliverRecordDTO.getResumeDeliverId());
 
                 if(resumeDeliver!=null){
                     resumeDeliver.setChatStatus(resumeDeliverRecordDTO.getChatType());
@@ -208,6 +208,8 @@ public class ResumeDeliverController {
                 if(company!=null){
                     user.setCompanyName(company.getName());
                 }
+
+                user.setResumeDeliverId(id);
                 msgResult.setResult(true);
                 msgResult.setData(user);
             }
@@ -382,7 +384,7 @@ public class ResumeDeliverController {
             JobUser jobUser = jobUserService.get(resumeDeliver.getJobUserId());
 
             if(jobUser!=null){
-                dto.setId(jobUser.getId());
+                dto.setJobUserId(jobUser.getId());
                 dto.setName(jobUser.getRealName());
 
                 if(StringUtils.isNotEmpty(jobUser.getJobStatus())) {