导购角色

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkPositionMapper.java

@@ -64,4 +64,6 @@ public interface TabClerkPositionMapper {
     Double getMaxSort(@Param("enterpriseId") Integer enterpriseId);
 
     List<TabClerkPosition> listTwoElementExceptId(@Param("enterpriseId") Integer enterpriseId, @Param("start") int start, @Param("size") int size, @Param("clerkPositionId") Integer clerkPositionId);
+
+    TabClerkPosition getByName(@Param("enterpriseId") Integer enterpriseId, @Param("positionName") String positionName);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/ClerkPositionService.java

@@ -33,4 +33,6 @@ public interface ClerkPositionService {
     void sortTopping(Integer enterpriseId, Integer clerkPositionId);
 
     void sortBottom(Integer enterpriseId, Integer clerkPositionId);
+
+    TabClerkPosition getByName(Integer enterpriseId, String positionName);
 }

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkPositionServiceImpl.java

@@ -132,4 +132,9 @@ public class ClerkPositionServiceImpl implements ClerkPositionService {
             tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
         }
     }
+
+    @Override
+    public TabClerkPosition getByName(Integer enterpriseId, String positionName) {
+        return tabClerkPositionMapper.getByName(enterpriseId, positionName);
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkPositionApiServiceImpl.java

@@ -83,7 +83,8 @@ public class ClerkPositionApiServiceImpl implements ClerkPositionApiService {
 
     @Override
     public ServiceResponse<ClerkPositionDTO> getByName(Integer enterpriseId, String positionName) {
-        return null;
+        TabClerkPosition position = clerkPositionService.getByName(enterpriseId, positionName);
+        return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(ClerkPositionDTO.class, position));
     }
 
     @Override

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkTaskServiceImpl.java

@@ -6,11 +6,9 @@ import com.gic.store.constant.*;
 import com.gic.store.dto.ClerkDTO;
 import com.gic.store.dto.ClerkTmpDTO;
 import com.gic.store.dto.StoreDTO;
+import com.gic.store.entity.TabClerkPosition;
 import com.gic.store.entity.TabClerkTmp;
-import com.gic.store.service.ClerkApiService;
-import com.gic.store.service.ClerkImportService;
-import com.gic.store.service.ClerkTaskApiService;
-import com.gic.store.service.StoreService;
+import com.gic.store.service.*;
 import com.task.allocation.api.AbstractTaskAllocationOperation;
 import com.task.allocation.exception.TaskAllocationException;
 import com.task.allocation.qo.InitTaskQO;
@@ -39,6 +37,8 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
 
     @Autowired
     private StoreService storeService;
+    @Autowired
+    private ClerkPositionService clerkPositionService;
 
     @Override
     public String importDataToClerk(Integer enterpriseId, String userId, String uuId) {
@@ -96,6 +96,12 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
             clerkImportService.updateData(t);
             return;
         }
+        TabClerkPosition position = clerkPositionService.getByName(t.getEnterpriseId(), t.getPositionName());
+        if (position == null) {
+            t.setErrorMessage("角色不存在");
+            clerkImportService.updateData(t);
+            return;
+        }
 
         ClerkDTO clerkDTO = new ClerkDTO();
         clerkDTO.setEnterpriseId(t.getEnterpriseId());
@@ -105,9 +111,9 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
         clerkDTO.setClerkGender(GenderEnum.parseMessage(t.getClerkGender().trim()).getCode());
         clerkDTO.setNationcode(t.getNationcode().trim());
         clerkDTO.setPhoneNumber(t.getPhoneNumber().trim());
+
+        clerkDTO.setPositionId(position.getClerkPositionId());
         clerkDTO.setPositionName(t.getPositionName().trim());
-        // todo
-//        clerkDTO.setClerkType(StringUtils.equals(t.getClerkType(), "是")? 1 : 0);
 
         clerkDTO.setReason(ClerkLogReasonEnum.WEB.getCode());
         clerkDTO.setRemark("批量导入");

gic-store-service/src/main/resources/mapper/TabClerkPositionMapper.xml

@@ -169,4 +169,11 @@
     order by sort
     limit #{start}, #{size}
   </select>
+  <select id="getByName" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_clerk_position where
+    (enterprise_id = #{enterpriseId} or enterprise_id is null )
+    and position_name = #{positionName}
+  </select>
 </mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -138,8 +138,6 @@ public class ClerkController extends DownloadUtils {
                         for (ClerkDTO clerkDTO : clerkList) {
                             clerkDTO.setStoreName(clerkStoreListDTO.getStoreName());
                             clerkDTO.setHaobanStatusName(clerkDTO.getHaobanStatus() == null ? null : (clerkDTO.getHaobanStatus() == 1 ? "已绑定" : "未绑定"));
-                            // todo
-//                            clerkDTO.setClerkTypeName(clerkDTO.getClerkType() == null ? null : (clerkDTO.getClerkType() == 1 ? "是" : "否"));
                         }
                         clerkDTOS.addAll(clerkList);
                     }