Commit 03e4246d by fudahua

门店信息

parent 077df184
...@@ -8,7 +8,8 @@ import com.gic.clerk.api.dto.ClerkDTO; ...@@ -8,7 +8,8 @@ import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkNewService; import com.gic.clerk.api.service.ClerkNewService;
import com.gic.clerk.api.service.ClerkService; import com.gic.clerk.api.service.ClerkService;
import com.gic.enterprise.api.dto.StoreDTO; import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.*;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.PageResult; import com.gic.haoban.base.api.common.PageResult;
import com.gic.haoban.base.api.common.ServiceResponse; import com.gic.haoban.base.api.common.ServiceResponse;
...@@ -65,6 +66,13 @@ public class StaffController extends WebBaseController{ ...@@ -65,6 +66,13 @@ public class StaffController extends WebBaseController{
@Autowired @Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService; private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private StoreService storeService;
@RequestMapping("staff-add") @RequestMapping("staff-add")
public HaobanResponse staffAdd(StaffDTO staffDTO,String departmentIds){ public HaobanResponse staffAdd(StaffDTO staffDTO,String departmentIds){
...@@ -328,6 +336,10 @@ public class StaffController extends WebBaseController{ ...@@ -328,6 +336,10 @@ public class StaffController extends WebBaseController{
if (hasRelationClerkIds.contains(clerkInfoVo.getClerkId())) { if (hasRelationClerkIds.contains(clerkInfoVo.getClerkId())) {
clerkInfoVo.setRelationStatus(1); clerkInfoVo.setRelationStatus(1);
} }
StoreDTO store = storeService.getStore(clerkInfoVo.getStoreId());
if (null != store) {
clerkInfoVo.setStoreName(store.getStoreName());
}
}); });
} }
......
...@@ -11,8 +11,44 @@ public class ClerkInfoVo implements Serializable { ...@@ -11,8 +11,44 @@ public class ClerkInfoVo implements Serializable {
private String clerkName; private String clerkName;
private String clerkCode; private String clerkCode;
private String clerkId; private String clerkId;
private String enterpriseName;
private String enterpriseId;
private String storeId;
private String storeName;
private Integer relationStatus=0; private Integer relationStatus=0;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getClerkName() { public String getClerkName() {
return clerkName; return clerkName;
} }
......
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