java110 5 lat temu
rodzic
commit
a61aaa6518

+ 1 - 0
java110-bean/src/main/java/com/java110/dto/store/StoreDto.java

@@ -24,6 +24,7 @@ public class StoreDto extends PageDto implements Serializable {
     public static final String STORE_DEV = "400000000000000002";
 
     public static final String STORE_TYPE_ADMIN = "800900000001";
+    public static final String STORE_TYPE_PROPERTY = "800900000003";
 
     private String storeId;
     private String[] storeIds;

+ 1 - 1
java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml

@@ -576,7 +576,7 @@
 
 
     <select id="getStoreStaffs" parameterType="Map" resultType="Map">
-        select t.name storeName,t.address,su.user_id staffId , t.store_id storeId
+        select t.name storeName,t.address,su.user_id staffId , t.store_id storeId,t.create_time createTime
         from s_store t
         inner join s_store_user su on t.store_id = su.store_id and su.status_cd = '0'
         <if test="relCd != null and relCd != ''">

+ 6 - 6
service-store/src/main/java/com/java110/store/api/StoreStaffApi.java

@@ -15,6 +15,7 @@
  */
 package com.java110.store.api;
 
+import com.java110.dto.store.StoreDto;
 import com.java110.dto.store.StoreUserDto;
 import com.java110.store.bmo.store.IGetStoreStaffBMO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,20 +41,19 @@ public class StoreStaffApi {
      *
      * @param
      * @return
-     * @serviceCode /storeStaff/getStoreStaffs
-     * @path /app/storeStaff/getStoreStaffs
+     * @serviceCode /storeStaff/getPropertyStaffs
+     * @path /app/storeStaff/getPropertyStaffs
      */
-    @RequestMapping(value = "/getStoreStaffs", method = RequestMethod.GET)
-    public ResponseEntity<String> getStoreStaffs(@RequestParam(value = "page") int page,
+    @RequestMapping(value = "/getPropertyStaffs", method = RequestMethod.GET)
+    public ResponseEntity<String> getPropertyStaffs(@RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row,
-                                                 @RequestParam(value = "storeTypeCd", required = false) String storeTypeCd,
                                                  @RequestParam(value = "storeId", required = false) String storeId,
                                                  @RequestParam(value = "roleCd", required = false) String roleCd
     ) {
         StoreUserDto storeUserDto = new StoreUserDto();
         storeUserDto.setPage(page);
         storeUserDto.setRow(row);
-        storeUserDto.setStoreTypeCd(storeTypeCd);
+        storeUserDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
         storeUserDto.setStoreId(storeId);
         storeUserDto.setRelCd(roleCd);
         return getStoreStaffBMOImpl.getStoreStaffs(storeUserDto);