Browse Source

检查客户填写信息修改

anderx 10 months ago
parent
commit
d2281c1bcc

+ 4 - 7
src/main/java/com/goafanti/common/enums/OfficialPatentType.java

@@ -1,17 +1,13 @@
 package com.goafanti.common.enums;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.*;
+
 public enum OfficialPatentType {
-	/* 专利分类 0申请 1变更 2复审 3优先权 4恢复请求权 5无效宣告请求费 6强制许可请求费 7 强制许可使用裁决请求费 8登录、印刷费、印花税 */
 	SQ(0,"申请"),
 	BG(1,"变更"),
+	ZR(14,"转让"),
 	FS(2,"复审"),
 	YXQ(3,"优先权"),
 	HFQQQ(4,"恢复请求权"),
@@ -24,6 +20,7 @@ public enum OfficialPatentType {
 	FJF301(11,"从第 301 页起每页增收"),
 	ZZF(12,"中止费"),
 	JSBGF(13,"检索报告费"),
+
 	NOT(99,"未知");
 	
 	private OfficialPatentType(Integer code, String desc) {

+ 18 - 0
src/main/java/com/goafanti/customer/bo/InputUserData.java

@@ -11,6 +11,24 @@ public class InputUserData {
    private Integer channelType;
    private String orgCode;
    private Integer industry;
+   private Integer nature;
+   private String natureOther;
+
+    public Integer getNature() {
+        return nature;
+    }
+
+    public void setNature(Integer nature) {
+        this.nature = nature;
+    }
+
+    public String getNatureOther() {
+        return natureOther;
+    }
+
+    public void setNatureOther(String natureOther) {
+        this.natureOther = natureOther;
+    }
 
     public String getUid() {
         return uid;

+ 4 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2809,10 +2809,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			if(in.getIntendedProject()!=null)oi.setIntendedProject(in.getIntendedProject());
 			organizationIdentityMapper.updateServiceByUid(oi);
 		}
-		if (in.getIntroduction()!=null){
+		if (in.getIntroduction()!=null||in.getNature()!=null){
 			User user=new User();
 			user.setId(in.getUid());
-			user.setIntroduction(in.getIntroduction());
+			if(in.getIntroduction()!=null)user.setIntroduction(in.getIntroduction());
+			if (in.getNature()!=null)user.setNature(in.getNature());
+			if (in.getNatureOther()!=null)user.setNatureOther(in.getNatureOther());
 			userMapper.update(user);
 		}
 		if (in.getChannelType() !=null){