Skip to content

H
haoban-manage3.0
Commit 134e0bfd by huangZW
Options

Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

parents 0d47c35e 213430f2
Showing with 51 additions and 33 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
...@@ -390,10 +390,9 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -390,10 +390,9 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
} }
@Override private void staffEditDeal(StaffDTO staffDTO, String departmentIds, boolean syncGic) {
public void staffEdit(StaffDTO staffDTO, String departmentIds) { TabHaobanStaff oldStaff = staffMapper.selectByPrimaryKey(staffDTO.getStaffId());
TabHaobanStaff oldStaff = staffMapper.selectByPrimaryKey(staffDTO.getStaffId()); logger.info("【员工修改】oldStaff={}",JSON.toJSONString(oldStaff));
logger.info("【员工修改】oldStaff={}",JSON.toJSONString(oldStaff));
//1、先更新staff //1、先更新staff
logger.info("【员工修改】staffDTO={}",JSON.toJSONString(staffDTO)); logger.info("【员工修改】staffDTO={}",JSON.toJSONString(staffDTO));
TabHaobanStaff tab = EntityUtil.changeEntityByJSON(TabHaobanStaff.class, staffDTO); TabHaobanStaff tab = EntityUtil.changeEntityByJSON(TabHaobanStaff.class, staffDTO);
...@@ -459,28 +458,33 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -459,28 +458,33 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
enterpriseId = store.getEnterpriseId(); enterpriseId = store.getEnterpriseId();
} }
ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,related.getClerkCode()); if (!syncGic) {
//if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){ ClerkDTO clerkDTO = clerkService.getClerkByCodeNoStatus(enterpriseId, related.getClerkCode());
logger.info("clerkDto:{}", JSONObject.toJSONString(clerkDTO)); //if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){
String headPic = staffDTO.getHeadImg(); logger.info("clerkDto:{}", JSONObject.toJSONString(clerkDTO));
if (StringUtils.isBlank(staffDTO.getPhoneNumber())) { String headPic = staffDTO.getHeadImg();
staffDTO.setPhoneNumber(""); if (StringUtils.isBlank(staffDTO.getPhoneNumber())) {
} staffDTO.setPhoneNumber("");
if (StringUtils.isBlank(clerkDTO.getPhoneNumber())) { }
clerkDTO.setPhoneNumber(""); if (StringUtils.isBlank(clerkDTO.getPhoneNumber())) {
clerkDTO.setPhoneNumber("");
}
if (clerkDTO != null && (StringUtils.isNotBlank(staffName) && !clerkDTO.getClerkName().equals(staffName)
|| !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))
|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getHeadImgUrl()))
|| !staffDTO.getSex().equals(Integer.valueOf(clerkDTO.getClerkGender()))) {
logger.info("【员工修改】clerkDTO={}", JSON.toJSONString(clerkDTO));
logger.info("【员工修改】{},修改地方：name:{},{};num:{},{};pic:{},{};sex:{},{}", clerkDTO.getClerkId(), staffName
, clerkDTO.getClerkName(), staffDTO.getPhoneNumber(), clerkDTO.getPhoneNumber(), headPic, clerkDTO.getHeadImgUrl()
, staffDTO.getSex(), clerkDTO.getClerkGender());
clerkDTO.setClerkName(staffDTO.getStaffName());
clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
clerkDTO.setClerkGender(staffDTO.getSex().toString());
clerkService.updateClerk(clerkDTO);
}
} }
if (clerkDTO != null && (StringUtils.isNotBlank(staffName) && !clerkDTO.getClerkName().equals(staffName) //}
|| !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))
|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getHeadImgUrl()))
|| !staffDTO.getSex().equals(Integer.valueOf(clerkDTO.getClerkGender()))) {
logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
clerkDTO.setClerkName(staffDTO.getStaffName());
clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
clerkDTO.setClerkGender(staffDTO.getSex().toString());
clerkService.updateClerk(clerkDTO);
}
//}
} }
} }
...@@ -534,6 +538,11 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -534,6 +538,11 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
} }
@Override
public void staffEdit(StaffDTO staffDTO, String departmentIds) {
staffEditDeal(staffDTO, departmentIds, false);
}
@Override @Override
public void syscGicClerk(String fieldListString) { public void syscGicClerk(String fieldListString) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
...@@ -652,7 +661,13 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -652,7 +661,13 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
if(wxEnterpriseRelatedApiService.enterpriseUseNew(clerkMid.getEnterpriseId())){ if(wxEnterpriseRelatedApiService.enterpriseUseNew(clerkMid.getEnterpriseId())){
addClerkByGic(clerkMid); try {
addClerkByGic(clerkMid);
} catch (Exception e) {
e.printStackTrace();
}
} else {
throw new RuntimeException("使用好办2.0");
} }
} }
...@@ -754,9 +769,9 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -754,9 +769,9 @@ public class StaffApiServiceImpl implements StaffApiService {
departmentIds = departmentIds.substring(1,departmentIds.length()); departmentIds = departmentIds.substring(1,departmentIds.length());
} }
if(map.get(departmentId) == null){ if(map.get(departmentId) == null){
this.staffEdit(staff, departmentIds); this.staffEditDeal(staff, departmentIds, true);
} }
StaffDepartmentRelatedDTO staffRelated = this.getDepartmentIdAndStaffId(departmentId, staffId); StaffDepartmentRelatedDTO staffRelated = this.getDepartmentIdAndStaffId(departmentId, staffId);
StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code); StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
//如果这个人已经绑定了 先解绑 //如果这个人已经绑定了 先解绑
if(isCodeExist != null){ if(isCodeExist != null){
...@@ -779,9 +794,9 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -779,9 +794,9 @@ public class StaffApiServiceImpl implements StaffApiService {
// clerkService.updateClerk(clerkDTO); // clerkService.updateClerk(clerkDTO);
// } // }
//} //}
this.staffEdit(staff, departmentIds); this.staffEditDeal(staff, departmentIds, true);
} }
} }
} }
private StaffDTO geCcheckAndInitUser(String wxEnterpriseId, String nationcode, String phoneNumber) { private StaffDTO geCcheckAndInitUser(String wxEnterpriseId, String nationcode, String phoneNumber) {
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
...@@ -60,11 +61,13 @@ public class SyncDealContoller extends WebBaseController { ...@@ -60,11 +61,13 @@ public class SyncDealContoller extends WebBaseController {
LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser(); LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
String wxEnterpriseId = login.getWxEnterpriseId(); String wxEnterpriseId = login.getWxEnterpriseId();
logger.info("login:{}", JSONObject.toJSONString(login));
String taskLock = dealSyncOperationApiService.getTaskLock(wxEnterpriseId); String taskLock = dealSyncOperationApiService.getTaskLock(wxEnterpriseId);
if (null != taskLock) { if (null != taskLock) {
return resultResponse(HaoBanErrCode.ERR_10011); return resultResponse(HaoBanErrCode.ERR_10011);
} }
task = dealSyncOperationApiService.createTask(wxEnterpriseId, "门店同步", login.getStaffDTO().getStaffId(), "部门同步"); task = dealSyncOperationApiService.createTask(wxEnterpriseId, "门店同步", "admin", "部门同步");
if (task == null) { if (task == null) {
return resultResponse(HaoBanErrCode.ERR_10011); return resultResponse(HaoBanErrCode.ERR_10011);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment