Browse Source

档案与面谈修改接口修改

anderx 8 months ago
parent
commit
e252332453

+ 7 - 5
src/main/java/com/goafanti/Interview/controller/UserArchivesInterviewController.java

@@ -119,11 +119,13 @@ public class UserArchivesInterviewController extends BaseController {
                 return res;
             }
         }
-        in2.setProvince(in.getLocationProvince());
-        in2.setCity(in.getLocationCity());
-        in2.setArea(in.getLocationArea());
-        in2.setUid(in.getUid());
-        customerService.updateUserDate(in2);
+        if (in.getType()!=2){
+            in2.setProvince(in.getLocationProvince());
+            in2.setCity(in.getLocationCity());
+            in2.setArea(in.getLocationArea());
+            in2.setUid(in.getUid());
+            customerService.updateUserDate(in2);
+        }
         return res.data(this.userArchivesInterviewService.updateUser(in));
     }
 

+ 17 - 15
src/main/java/com/goafanti/Interview/service/impl/UserArchivesInterviewServiceImpl.java

@@ -103,23 +103,25 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
             in.setFirstInterviewDate(myUserDetailsBo.getReleaseStart());
         }
         //添加客户档案面谈记录表
-        if (in.getType()==1){
+        if (in.getType()>0){
             addUserArchivesInterview(in);
         }
-        //读取是否有档案存在
-        UserArchives userArchives = userArchivesMapper.queryByUid(in.getUid());
-        if (userArchives !=null){
-            in.setId(userArchives.getId());
-        }
-        if (in.getId()!=null){
-            addUserDataLog(userArchives,in);
-            in.setUpdateTime(new Date());
-            userArchivesMapper.update(in);
-        }else {
-            in.setEarlyCommunication(null);
-            in.setInterviewIdeas(null);
-            in.setCreateTime(new Date());
-            userArchivesMapper.insert(in);
+        if (in.getType()!=2){
+            //读取是否有档案存在
+            UserArchives userArchives = userArchivesMapper.queryByUid(in.getUid());
+            if (userArchives !=null){
+                in.setId(userArchives.getId());
+            }
+            if (in.getId()!=null){
+                addUserDataLog(userArchives,in);
+                in.setUpdateTime(new Date());
+                userArchivesMapper.update(in);
+            }else {
+                in.setEarlyCommunication(null);
+                in.setInterviewIdeas(null);
+                in.setCreateTime(new Date());
+                userArchivesMapper.insert(in);
+            }
         }
         return in;
     }

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -6,13 +6,13 @@ static.host=//static.jishutao.com/${kede.version}
 #static.host=//172.16.1.187/${kede.version}
 #avatar.host=//172.16.1.199:3000
 
-jdbc.url=jdbc\:mysql://localhost:3306/aft20250313?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20250313?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20