代码提交

common/src/main/resources/mapper/base/Company.xml

@@ -156,9 +156,22 @@ Url,jdbcType=VARCHAR}
 			select * from base_company
 		]]>
 		<where>
+			del_flag = 0
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+			<if test="searchParams.scale != null">
+				and scale_ = #{searchParams.scale}
+			</if>
+			<if test="searchParams.industry != null">
+				and industry_ = #{searchParams.industry}
+			</if>
+			<if test="searchParams.isCertification != null">
+				and is_certification = #{searchParams.isCertification}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -197,6 +197,10 @@ public class CompanyController {
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String id,
+            String name,
+            String scale,
+            String industry,
+            String isCertification,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -209,10 +213,23 @@ public class CompanyController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("sort_no","asc"));
+        sortList.add(new Sort("create_time","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
+        }
+
+        if (StringUtils.isNotEmpty(scale)) {
+            searchParams.put("scale",scale);
+        }
+
+        if (StringUtils.isNotEmpty(industry)) {
+            searchParams.put("industry",industry);
+        }
+
+        if (StringUtils.isNotEmpty(isCertification)) {
+            searchParams.put("isCertification",isCertification);
         }
 
         Page<Company> page = companyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);