单位列表

src/main/java/com/chinaitop/depot/system/controller/UnitInfoController.java

@@ -13,11 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.chinaitop.depot.system.model.BizUnitInfo;
-import com.chinaitop.depot.system.model.UserRole;
-import com.chinaitop.depot.system.model.UserRoleExample;
-import com.chinaitop.depot.system.model.UserRoleExample.Criteria;
 import com.chinaitop.depot.system.service.UnitInfoService;
-import com.chinaitop.depot.system.service.UserRoleService;
 import com.github.pagehelper.PageInfo;
 
 import io.swagger.annotations.Api;
@@ -27,8 +23,6 @@ import io.swagger.annotations.ApiOperation;
 
 /**
  * 单位信息控制类
- * @author shine
- * 
  * 查询省平台数据库
  *
  */
@@ -63,7 +57,7 @@ public class UnitInfoController {
     }
 
     /**
-     * 单位信息下拉
+     * 单位信息下拉 查询单位类型
 
      * @return
 
@@ -112,6 +106,17 @@ public class UnitInfoController {
 
     }
 	
+    /**
+     * 
+     * 获取所有单位信息
+     * @return
+     */
+    @RequestMapping(value="/getAllUnitInfo",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="单位列表", notes = "查询数据无分页")
+    public List<BizUnitInfo> getAllUnitInfo() {
+
+        return unitInfoService.getAllUnitInfo();
+    }
 	
 
 }

src/main/java/com/chinaitop/depot/system/mapper/BizUnitInfoMapper.java

@@ -31,4 +31,6 @@ public interface BizUnitInfoMapper {
     int updateByPrimaryKeySelective(BizUnitInfo record);
 
     int updateByPrimaryKey(BizUnitInfo record);
+
+	List<BizUnitInfo> selectByExampleOriginal(BizUnitInfoExample example);
 }

src/main/java/com/chinaitop/depot/system/mapper/BizUnitInfoMapper.xml

@@ -125,6 +125,21 @@
     </if>
   </select>
 
+ <select id="selectByExampleOriginal" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.BizUnitInfoExample" >
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from province_all.biz_unit_info bui
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  
   <select id="TreeList" resultMap="BaseResultMap">
     select
     <if test="distinct" >

src/main/java/com/chinaitop/depot/system/service/UnitInfoService.java

@@ -13,6 +13,8 @@ public interface UnitInfoService {
 	BizUnitInfo getById(String id);
 
 	BizUnitInfo getOrg(String dwdm);
+
+	List<BizUnitInfo> getAllUnitInfo();
 	
 	
 

src/main/java/com/chinaitop/depot/system/service/impl/UnitInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.chinaitop.depot.system.model.BizUnitInfoExample;
 import com.chinaitop.depot.system.model.BizUnitInfoExample.Criteria;
 import com.chinaitop.depot.system.service.UnitInfoService;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,8 @@ public class UnitInfoServiceImpl implements UnitInfoService {
 		    BizUnitInfoExample example = new BizUnitInfoExample();
 	        Criteria createCriteria = example.createCriteria();
 	        
+	        createCriteria.andDeleteFlagEqualTo("NOT_DELETE");
+	        
 	        if(StringUtils.isNotBlank(unitInfoId)){
 	        	createCriteria.andIdEqualTo(unitInfoId);
 	        }
@@ -40,8 +43,11 @@ public class UnitInfoServiceImpl implements UnitInfoService {
 	        }
 	        
 	        example.setOrderByClause("create_time desc");
-	      
-	        PageHelper.startPage(pageNum, pageSize);
+	        
+	       if(pageNum != null && pageSize != null){
+		        PageHelper.startPage(pageNum, pageSize);
+
+	       }
 	        
 	        List<BizUnitInfo> selectByExample = unitInfoMapper.selectByExample(example);
 	        return selectByExample;
@@ -67,6 +73,16 @@ public class UnitInfoServiceImpl implements UnitInfoService {
 		return unitInfoMapper.getOrg(dwdm);
 	}
 
+	
+	@Override
+	public List<BizUnitInfo> getAllUnitInfo() {
+		// TODO Auto-generated method stub
+		BizUnitInfoExample example = new BizUnitInfoExample();
+        Criteria createCriteria = example.createCriteria();
+        createCriteria.andDeleteFlagEqualTo("NOT_DELETE");
+		return unitInfoMapper.selectByExampleOriginal(example);
+	}
+
 
 
 }