Browse Source

科德系统修改档案面谈新增客户基本修改

anderx 9 months ago
parent
commit
c6a45057b5

+ 16 - 2
src/main/java/com/goafanti/Interview/controller/UserArchivesInterviewController.java

@@ -6,6 +6,8 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.UserArchivesInterview;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.customer.bo.InputUserData;
+import com.goafanti.customer.service.CustomerService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +30,9 @@ public class UserArchivesInterviewController extends BaseController {
     @Resource
     private UserArchivesInterviewService userArchivesInterviewService;
 
+    @Resource
+    private CustomerService customerService;
+
 
     /**
      * 新增数据
@@ -91,9 +96,18 @@ public class UserArchivesInterviewController extends BaseController {
      * @return
      */
     @PostMapping("/updateUser")
-    public Result updateUser(UpdateUserBo in) {
+    public Result updateUser(UpdateUserBo in, InputUserData in2 ) {
+        Result res = new Result<>();
         in.setAid(TokenManager.getAdminId());
-        return new Result<>().data(this.userArchivesInterviewService.updateUser(in));
+        if (in2.getOrgCode()!=null){
+            in2.setOrgCode(in2.getOrgCode().trim());
+            if (customerService.checkOrgCode(in2.getOrgCode(),in.getUid())){
+                res.getError().add(buildError("","统一信用代码已存在"));
+                return res;
+            }
+        }
+        customerService.updateUserDate(in2);
+        return res.data(this.userArchivesInterviewService.updateUser(in));
     }
 
 }

+ 1 - 0
src/main/java/com/goafanti/Interview/service/impl/UserArchivesInterviewServiceImpl.java

@@ -101,6 +101,7 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
         if (!myUserDetailsBos.isEmpty()){
             MyUserDetailsBo myUserDetailsBo = myUserDetailsBos.get(0);
             in.setFirstInterviewDate(myUserDetailsBo.getReleaseStart());
+
         }
         //添加客户档案面谈记录表
         if (in.getType()==1){

+ 35 - 32
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -142,7 +142,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		addPRD(in, users, str, prdList);
 		addPublicReleaseDateClock(in);
-		if (in.getType()==0){
+		if (in.getType()==0&&in.getUids()!=null){
 			pushUserArchivesInterview(in);
 		}
 		String userNames=str.substring(0,str.length()-1);
@@ -158,38 +158,41 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private void pushUserArchivesInterview(InputPublicRelease in) {
 		String[] split1 = in.getUais().split(",");
-		List<UserArchivesInterview> userArchivesInterviews = userArchivesInterviewMapper.selectByIds(split1);
-		List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(in.getId());
-		//根据不同客户,绑定不同公出
-		for (OutPublicReleaseDetails e : outPublicReleaseDetails) {
-			for (UserArchivesInterview uai : userArchivesInterviews) {
-				if (e.getUid().equals(uai.getUid())){
-					uai.setPrdid(e.getId());
-					userArchivesInterviewMapper.update(uai);
-				}
-			}
-			//根据客户判定出来本次公出,如果有则标记有效
-			List<UserInterviewProjectBo> userInterviewProjectBos = userInterviewProjectMapper.selectByAid(null, e.getUid());
-			List<UserInterviewProjectBo> collect = userInterviewProjectBos.stream().filter(e2 -> e2.getType() == 0).collect(Collectors.toList());
-			if (!collect.isEmpty()){
-				OutPublicReleaseDetails newPRD=new OutPublicReleaseDetails();
-				newPRD.setId(e.getId());
-				newPRD.setInterviewStatus(1);
-				publicReleaseDetailsMapper.update(newPRD);
-				//需要添加首次面谈表
-				UserFirstInterview userFirstInterview=new UserFirstInterview();
-				userFirstInterview.setUid(e.getUid());
-				userFirstInterview.setAid(TokenManager.getAdminId());
-				userFirstInterview.setPrdid(e.getId());
-				userFirstInterview.setFirstTime(in.getReleaseStart());
-				userFirstInterviewMapper.insert(userFirstInterview);
-				//将首次面谈项目状态改为非本次项目
-				for (UserInterviewProjectBo userInterviewProjectBo : collect) {
-					UserInterviewProject userInterviewProject=new UserInterviewProject();
-					userInterviewProject.setId(userInterviewProjectBo.getId());
-					userInterviewProject.setType(1);
-					userInterviewProjectMapper.update(userInterviewProject);
+		if (split1.length>0&&StringUtils.isNotBlank(split1[0])){
+			List<UserArchivesInterview> userArchivesInterviews = userArchivesInterviewMapper.selectByIds(split1);
+			List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(in.getId());
+			//根据不同客户,绑定不同公出
+			for (OutPublicReleaseDetails e : outPublicReleaseDetails) {
+				for (UserArchivesInterview uai : userArchivesInterviews) {
+					if (e.getUid().equals(uai.getUid())){
+						uai.setPrdid(e.getId());
+						userArchivesInterviewMapper.update(uai);
+					}
 				}
+				//根据客户判定出来本次公出,如果有则标记有效
+				List<UserInterviewProjectBo> userInterviewProjectBos = userInterviewProjectMapper.selectByAid(null, e.getUid());
+				List<UserInterviewProjectBo> collect = userInterviewProjectBos.stream().filter(e2 -> e2.getType() == 0).collect(Collectors.toList());
+				if (!collect.isEmpty()){
+					OutPublicReleaseDetails newPRD=new OutPublicReleaseDetails();
+					newPRD.setId(e.getId());
+					newPRD.setInterviewStatus(1);
+					publicReleaseDetailsMapper.update(newPRD);
+					//需要添加首次面谈表
+					UserFirstInterview userFirstInterview=new UserFirstInterview();
+					userFirstInterview.setUid(e.getUid());
+					userFirstInterview.setAid(TokenManager.getAdminId());
+					userFirstInterview.setPrdid(e.getId());
+					userFirstInterview.setFirstTime(in.getReleaseStart());
+					userFirstInterviewMapper.insert(userFirstInterview);
+					//将首次面谈项目状态改为非本次项目
+					for (UserInterviewProjectBo userInterviewProjectBo : collect) {
+						UserInterviewProject userInterviewProject=new UserInterviewProject();
+						userInterviewProject.setId(userInterviewProjectBo.getId());
+						userInterviewProject.setType(1);
+						userInterviewProjectMapper.update(userInterviewProject);
+					}
+				}
+
 			}
 
 		}