20190528---wangling---布控类添加字段

src/main/java/com/founder/interservice/bkxx/controller/BkController.java

@@ -337,10 +337,9 @@ public class BkController {
     //美亚布控服务--查询任务接口
     @RequestMapping(value = "/queryAjBkList",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
-    public ModelAndView queryAjBkList(Ajbk ajbk,
+    public  Map<String,Object> queryAjBkList(Ajbk ajbk,
                                             @RequestParam(value = "page",defaultValue = "0") int page,
                                             @RequestParam(value = "rows",defaultValue = "0") int rows){
-        ModelAndView modelAndView = new ModelAndView("bkxx/ajbkxxList");
         Map<String,Object> objectMap = new HashMap<>();
         try{
             EasyUIPage easyUIPage = new EasyUIPage();
@@ -351,20 +350,18 @@ public class BkController {
             ajbk.setStartNum(begin);
             ajbk.setEndNum(end);
             objectMap = bkService.getAjBkxx(ajbk);
-            modelAndView.addObject("ajbkMap", objectMap);
         }catch (InterServiceException e){
             e.printStackTrace();
         }
-        return modelAndView;
+        return objectMap;
     }
 
     //美亚布控服务--查询布控比中结果接口
     @RequestMapping(value = "/queryBkBzxxList",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
-    public ModelAndView queryBkBzxxList(Bkbzxx bkbzxx,
+    public Map<String,Object> queryBkBzxxList(Bkbzxx bkbzxx,
                                       @RequestParam(value = "page",defaultValue = "0") int page,
                                       @RequestParam(value = "rows",defaultValue = "0") int rows){
-        ModelAndView modelAndView = new ModelAndView();
         Map<String,Object> objectMap = new HashMap<>();
         try{
             EasyUIPage easyUIPage = new EasyUIPage();
@@ -375,11 +372,10 @@ public class BkController {
             bkbzxx.setStartNum(begin);
             bkbzxx.setEndNum(end);
             objectMap = bkService.getBkbzxx(bkbzxx);
-            modelAndView.addObject("bkbzxxMap", objectMap);
         }catch (InterServiceException e){
             e.printStackTrace();
         }
-        return modelAndView;
+        return objectMap;
     }
 
 

src/main/java/com/founder/interservice/bkxx/model/Ajbk.java

@@ -29,6 +29,8 @@ public class Ajbk {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date bkjzsj ;
+    private String bkjzsjStart;
+    private String bkjzsjEnd;
     private String jwdxtx;
     private String bkly;
     private String createuser;
@@ -36,14 +38,20 @@ public class Ajbk {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createtime;
+    private String createtimeStart;
+    private String createtimeEnd;
     private String up_zjhm;
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date up_time;
+    private String upTimeStart;
+    private String upTimeEnd;
     private String sfqxbk;
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date qubksj;
+    private String qubksjStart;
+    private String qubksjEnd;
     private String qxbkr_zjhm;
     private String sourceflag;
     private int startNum;

src/main/java/com/founder/interservice/bkxx/model/Bkbzxx.java

@@ -29,6 +29,8 @@ public class Bkbzxx {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdtime ;
+    private String createdtimeStart;
+    private String createdtimeEnd;
     private int startNum;
     private int endNum;
 }

src/main/resources/mybatis/mapper/gxzxt/AjbkMapper.xml

@@ -173,8 +173,11 @@
         <if test="type != null and type != ''">
             and t2.type  like '%' || #{type , jdbcType=VARCHAR } || '%'
         </if>
-        <if test="createdtime != null and createdtime != ''">
-            and t2.createdtime  like '%' || #{createdtime , jdbcType=VARCHAR } || '%'
+        <if test="createdtimeStart!=null and createdtimeStart!=''">
+            and t2.createdtime  <![CDATA[>=]]> to_date(#{createdtimeStart},'yyyy-MM-dd')
+        </if>
+        <if test="createdtimeEnd!=null and createdtimeEnd!=''">
+            and t2.createdtime  <![CDATA[<=]]> to_date(#{createdtimeEnd},'yyyy-MM-dd')
         </if>
     </sql>
     <select id="selectBkbzxx" parameterType="com.founder.interservice.bkxx.model.Bkbzxx" resultType="com.founder.interservice.bkxx.model.Bkbzxx">