/gov/org/staff/addstaffv2新增工作人员，调用/third/dataSync/update-staff更新staffId，status

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.BlockChainCreateProjectFormDTO;
 import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallbackFactory;
@@ -75,6 +76,9 @@ public interface EpmetThirdOpenFeignClient {
 	@PostMapping("/third/blockchain/project/process")
 	Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input);
 
+	@PostMapping("/third/dataSync/update-staff")
+	Result dataSyncUpdateStaff(@RequestBody YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO);
+
 	class MultipartSupportConfig {
 
 		@Autowired

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.BlockChainCreateProjectFormDTO;
 import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.feign.EpmetThirdOpenFeignClient;
@@ -57,4 +58,8 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "processProject", input);
 	}
 
+	@Override
+	public Result dataSyncUpdateStaff(YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "updateStaff", ytSyncStaffIdFormDTO);
+	}
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java

@@ -2,6 +2,9 @@ package com.epmet.controller.yantai;
 
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO;
 import com.epmet.dto.form.yantai.YtUserPageFormDTO;
 import com.epmet.dto.result.yantai.YtUserPageResDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,4 +58,16 @@ public class DataSyncUserAndOrgController {
 		return new Result<PageData<YtUserPageResDTO>>().ok(dataSyncUserAndOrgService.pageUser(formDTO));
 	}
 
+	/**
+	 * 工作端新增完用户后，需要调用此接口，更新data_sync_user_data
+	 *
+	 * @param formDTO
+	 * @return
+	 */
+	@PostMapping("update-staff")
+	public Result updateStaff(@RequestBody YtSyncStaffIdFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+		dataSyncUserAndOrgService.updateStaff(formDTO.getCustomerId(),formDTO.getOperUserId(),formDTO.getStaffId(),formDTO.getName(),formDTO.getMobile());
+		return new Result();
+	}
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java

@@ -19,4 +19,13 @@ public interface DataSyncUserAndOrgService {
      * @return
      */
     PageData<YtUserPageResDTO> pageUser(YtUserPageFormDTO formDTO);
+
+    /**
+     * 工作端新增完用户后，需要调用此接口，更新data_sync_user_data
+     * @param customerId
+     * @param staffId
+     * @param name
+     * @param mobile
+     */
+    int updateStaff(String customerId,String operUserId, String staffId, String name, String mobile);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java

@@ -54,4 +54,17 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService
         PageInfo<YtUserPageResDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
+
+    /**
+     * 工作端新增完用户后，需要调用此接口，更新data_sync_user_data
+     *
+     * @param customerId
+     * @param staffId
+     * @param name
+     * @param mobile
+     */
+    @Override
+    public int updateStaff(String customerId, String operUserId,String staffId, String name, String mobile) {
+        return dataSyncUserDataDao.updateStaff(customerId,operUserId,staffId,name,mobile);
+    }
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java

@@ -5,6 +5,7 @@ import com.epmet.dto.form.yantai.YtUserPageFormDTO;
 import com.epmet.dto.result.yantai.YtUserPageResDTO;
 import com.epmet.entity.yantai.DataSyncUserDataEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,4 +23,10 @@ public interface DataSyncUserDataDao extends BaseDao<DataSyncUserDataEntity> {
      * @return
      */
     List<YtUserPageResDTO> pageUser(YtUserPageFormDTO formDTO);
+
+    int updateStaff(@Param("customerId") String customerId,
+                    @Param("operUserId")String operUserId,
+                    @Param("staffId")String staffId,
+                    @Param("name")String name,
+                    @Param("mobile")String mobile);
 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml

@@ -73,4 +73,17 @@
         </if>
         order by o.ORDER_NUMBER asc,u.ORDER_NUMBER asc
     </select>
+
+    <update id="updateStaff" parameterType="map">
+        UPDATE data_sync_user_data
+        SET UPDATED_BY = #{operUserId},
+            UPDATED_TIME = NOW(),
+            `STATUS` = '1',
+            STAFF_ID = #{staffId},
+            CUSTOMER_ID = #{customerId}
+        WHERE
+            MOBILE_TELEPHONE_NUMBER = #{mobile}
+          AND USER_NAME = #{name}
+          AND del_flag = '0'
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java

@@ -73,4 +73,6 @@ public class AddStaffV2FromDTO implements Serializable {
 	private String client;
 
 	private List<String> newRoles;
+
+	private String currentStaffId;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -206,6 +206,7 @@ public class StaffController {
 		fromDTO.setCustomerId(tokenDto.getCustomerId());
 		fromDTO.setApp(tokenDto.getApp());
 		fromDTO.setClient(tokenDto.getClient());
+		fromDTO.setCurrentStaffId(tokenDto.getUserId());
 		return staffService.addStaffV2(fromDTO);
 	}
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dao.StaffOrgRelationDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.*;
@@ -46,8 +47,6 @@ public class StaffServiceImpl implements StaffService {
 	@Autowired
 	private EpmetUserFeignClient epmetUserFeignClient;
 	@Autowired
-	private OperCrmFeignClient operCrmFeignClient;
-	@Autowired
 	private CustomerAgencyService customerAgencyService;
 	@Autowired
 	private CustomerStaffAgencyService customerStaffAgencyService;
@@ -76,11 +75,11 @@ public class StaffServiceImpl implements StaffService {
 	@Autowired
 	private StaffOrgRelationService staffOrgRelationService;
 	@Resource
-	private CustomerStaffRedis customerStaffRedis;
-	@Resource
 	private StaffOrgRelationDao staffOrgRelationDao;
 	@Autowired
 	private GovAccessFeignClient govAccessFeignClient;
+	@Autowired
+	private EpmetThirdOpenFeignClient epmetThirdOpenFeignClient;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -613,8 +612,17 @@ public class StaffServiceImpl implements StaffService {
 			}
 		}
 		//如果是烟台的需要更新 根据手机号+姓名 更新data_sync_user_data置为已创建、记录staffId
-		// todo
-
+		// 开发环境默认：45687aa479955f9d06204d415238f7cc
+		// 测试环境：0c41b272ee9ee95ac6f184ad548a30eb
+		// 烟台： 1535072605621841922
+		if ("1535072605621841922".equals(fromDTO.getCustomerId())
+				|| "45687aa479955f9d06204d415238f7cc".equals(fromDTO.getCustomerId())
+				|| "0c41b272ee9ee95ac6f184ad548a30eb".equals(fromDTO.getCustomerId())) {
+			YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO = ConvertUtils.sourceToTarget(fromDTO,YtSyncStaffIdFormDTO.class);
+			ytSyncStaffIdFormDTO.setStaffId(result.getData().getUserId());
+			ytSyncStaffIdFormDTO.setOperUserId(fromDTO.getCurrentStaffId());
+			epmetThirdOpenFeignClient.dataSyncUpdateStaff(ytSyncStaffIdFormDTO);
+		}
 		//2022.10.18加个返参，借用下StaffDetailResultDTO不再新建dto了
 		StaffDetailResultDTO resultDTO=new StaffDetailResultDTO();
 		resultDTO.setStaffId(result.getData().getUserId());