fan zha 0802

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SysCompanyController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +59,18 @@ public class SysCompanyController {
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest request) {
         Page<SmsStatisticsCheckVo> page = new Page<>(pageNo, pageSize);
-        Map<String, Object> sysCompanyListPage = sysCompanyService.getSysCompanyListPage(page);
+        String aname = request.getParameterMap().get("aname")==null?"":
+                Arrays.toString(request.getParameterMap().get("aname")).replace("[", "").replace("]", "").replace("*", "");
+
+        String bname = request.getParameterMap().get("bname")==null?"":
+                Arrays.toString(request.getParameterMap().get("bname")).replace("[", "").replace("]", "").replace("*", "");
+
+        String three_company_id = request.getParameterMap().get("three_company_id")==null?"":
+                Arrays.toString(request.getParameterMap().get("three_company_id")).replace("[", "").replace("]", "").replace("*", "");
+
+
+
+        Map<String, Object> sysCompanyListPage = sysCompanyService.getSysCompanyListPage(page,aname,bname,three_company_id);
         return Result.OK(sysCompanyListPage);
     }
 
@@ -69,7 +81,7 @@ public class SysCompanyController {
                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                        HttpServletRequest request) {
         Page<SmsStatisticsCheckVo> page = new Page<>(pageNo, pageSize);
-        Map<String, Object> sysCompanyListPage = sysCompanyService.getSysCompanyListPage(page);
+        Map<String, Object> sysCompanyListPage = sysCompanyService.getSysCompanyListPage(page,null,null,null);
         return Result.OK(sysCompanyListPage);
     }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SysCompanyMapper.java

@@ -23,7 +23,7 @@ public interface SysCompanyMapper extends BaseMapper<SysCompany> {
      * @param size
      * @return
      */
-    List<Map<String,Object>> getSysCompanyListPage(@Param("size") Long size,@Param("start") Long start);
+    List<Map<String,Object>> getSysCompanyListPage(@Param("size") Long size,@Param("start") Long start,@Param("aname")String aname ,@Param("bname")String bname,@Param("three_company_id")String three_company_id);
 
-    Long selectTotal(@Param("size") Long size,@Param("start") Long start);
+    Long selectTotal(@Param("size") Long size,@Param("start") Long start,@Param("aname")String aname ,@Param("bname")String bname,@Param("three_company_id")String three_company_id);
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/xml/SysCompanyMapper.xml

@@ -7,6 +7,7 @@
         select  a.name aname ,a.id aid,b.id bid,b.name bname , address, coordinate ,three_company_id ,notes from  sys_company  a
        left  JOIN  sys_business_hall b  on a.id=b.company_id
         where   b.del_flag =0
+        <include refid="ifTest"/>
             LIMIT #{start},#{size}
     </select>
 
@@ -14,6 +15,13 @@
     <select id="selectTotal" resultType="java.lang.Long">
         select  count(*)   from  sys_company  a
   left  JOIN  sys_business_hall b  on a.id=b.company_id where   b.del_flag =0
+        <include refid="ifTest"/>
     </select>
 
+
+    <sql id="ifTest">
+        <if test="aname != null and aname != '' "> and  a.name= #{aname} </if>
+        <if test="bname != null and bname != '' "> and  b.name= #{bname} </if>
+        <if test="three_company_id != null and three_company_id != '' "> and   three_company_id= #{three_company_id} </if>
+    </sql>
 </mapper>

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/SysCompanyService.java

@@ -19,7 +19,7 @@ public interface SysCompanyService extends IService<SysCompany> {
 
       List<SysCompany> getSysCompanyList();
 
-      Map<String,Object> getSysCompanyListPage( Page page);
+      Map<String,Object> getSysCompanyListPage( Page page,String aname ,String bname,String three_company_id);
 
       Map<String,Object> getSysCompanyById( String id);
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SysCompanyServiceImpl.java

@@ -31,7 +31,7 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
     }
 
     @Override
-    public Map<String,Object> getSysCompanyListPage( Page page) {
+    public Map<String,Object> getSysCompanyListPage( Page page,String aname ,String bname,String three_company_id) {
         Map<String,Object> mapResult = new HashMap<>();
         //计算page size  第几页
         long current = page.getCurrent();//当前页数
@@ -40,9 +40,9 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
 
         long start = (current - 1) * size;//开始位置
 
-        List<Map<String, Object>> maps = sysCompany.getSysCompanyListPage(size, start);
+        List<Map<String, Object>> maps = sysCompany.getSysCompanyListPage(size, start, aname, bname, three_company_id);
 
-        Long total = sysCompany.selectTotal(size, start);
+        Long total = sysCompany.selectTotal(size, start, aname, bname, three_company_id);
 
         //构建返回对象内容
         mapResult.put("current",current);