crud

src/main/java/com/ygj/yuemum/controller/admin/ImageUploadController.java

@@ -212,12 +212,12 @@ public class ImageUploadController {
                 str = str.replace("$seniority",jlServiceUser.getSeniority());
                 str = str.replace("$babynumber",jlServiceUser.getBabynumber());
                 str = str.replace("$education",jlServiceUser.getEducation());
-                str = str.replace("$weight",jlServiceUser.getWeight()+"Kg");
+                str = str.replace("$weight",jlServiceUser.getWeight());
                 str = str.replace("$marriage",jlServiceUser.getMarriage());
                 str = str.replace("$highlight",jlServiceUser.getHighlight());
                 str = str.replace("$resumecomment",photo.getComment());
                 str = str.replace("$zodiac","属"+jlServiceUser.getZodiac());
-                str = str.replace("$height",jlServiceUser.getHeight()+"cm");
+                str = str.replace("$height",jlServiceUser.getHeight());
                 str = str.replace("$starts",jlServiceUser.getGender());
                 str = str.replace("$display",photoDisplay);
                 str = str.replace("$credentials",certificate);

src/main/java/com/ygj/yuemum/controller/maternitymatron/MmStockController.java

@@ -22,11 +22,21 @@ public class MmStockController {
     @Autowired
     private MmStockService mmStockService;
 
+    @GetMapping("/lockMmStocks")
+    public int LockMmStocks(@RequestParam("id") Integer id,@RequestParam("user") String user) {
+        return mmStockService.LockMmStocks(id,user);
+    }
+
     @GetMapping("/getMmStocks")
     public List<MmStock> getMmStocks() {
         return mmStockService.getMmStocks();
     }
 
+    @PostMapping("/checkStockDate")
+    public int checkStockDate(@ModelAttribute MmStock mmStock) throws ParseException {
+        return mmStockService.checkStockDate(mmStock);
+    }
+
     @PostMapping("/addMmStock")
     public int add(@ModelAttribute MmStock mmStock) throws ParseException {
         return mmStockService.addMmStock(mmStock);

src/main/java/com/ygj/yuemum/controller/order/OrderTempController.java

@@ -23,6 +23,13 @@ public class OrderTempController {
         return jso;
     }
 
+    @PostMapping("/queryOrderTemp")
+    public String queryOrderTemp(@ModelAttribute OrderTemp orderTemp) {
+        Map<String, Object> orderTemps = orderTempService.queryOrderTemp(orderTemp);
+        String jso = JSONObject.toJSONString(orderTemps);
+        return jso;
+    }
+
     @GetMapping("/getAllOrderTemps")
     public List<OrderTemp> getAllOrderTemps() {
             return orderTempService.getAll();

src/main/java/com/ygj/yuemum/dao/admin/JlServiceUserLogDao.java

@@ -0,0 +1,14 @@
+package com.ygj.yuemum.dao.admin;
+
+import com.ygj.yuemum.domain.admin.JlServiceUserLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface JlServiceUserLogDao {
+
+    List<JlServiceUserLog> getJlServiceUserLog(int js_sucode);
+
+    int insertJlServiceUserLog(JlServiceUserLog jlServiceUserLog);
+}

src/main/java/com/ygj/yuemum/dao/maternitymatron/MmStockDao.java

@@ -22,5 +22,6 @@ public interface MmStockDao {
 
     int getStockCount(Integer id);
 
+
     int updateByPrimaryKeySelective(MmStock record);
 }

src/main/java/com/ygj/yuemum/dao/order/OrderTempDao.java

@@ -10,6 +10,8 @@ public interface OrderTempDao {
 
     List<OrderTemp> getAll();
 
+    List<OrderTemp> queryOrderTemp(OrderTemp orderTemp);
+
     int deleteByPrimaryKey(Integer id);
 
     int insertSelective(OrderTemp record);

src/main/java/com/ygj/yuemum/domain/admin/JlServiceUserLog.java

@@ -0,0 +1,49 @@
+package com.ygj.yuemum.domain.admin;
+
+public class JlServiceUserLog {
+    private Integer id;
+    private String js_sucode;
+    private String jl_usercode;
+    private String jl_date;
+    private Integer jl_logtype;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getJs_sucode() {
+        return js_sucode;
+    }
+
+    public void setJs_sucode(String js_sucode) {
+        this.js_sucode = js_sucode;
+    }
+
+    public String getJl_usercode() {
+        return jl_usercode;
+    }
+
+    public void setJl_usercode(String jl_usercode) {
+        this.jl_usercode = jl_usercode;
+    }
+
+    public String getJl_date() {
+        return jl_date;
+    }
+
+    public void setJl_date(String jl_date) {
+        this.jl_date = jl_date;
+    }
+
+    public Integer getJl_logtype() {
+        return jl_logtype;
+    }
+
+    public void setJl_logtype(Integer jl_logtype) {
+        this.jl_logtype = jl_logtype;
+    }
+}

src/main/java/com/ygj/yuemum/domain/order/OrderTemp.java

@@ -7,7 +7,28 @@ public class OrderTemp {
     private String cm_phone;
     private String ot_startdate;
     private String ot_enddate;
-    private Integer jl_mmid;
+    private String jl_mmid;
+    private String packageid;
+    private String cityid;
+    private Integer page;
+    private Integer limit;
+
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
 
     public Integer getId() {
         return id;
@@ -49,11 +70,27 @@ public class OrderTemp {
         this.ot_enddate = ot_enddate;
     }
 
-    public Integer getJl_mmid() {
+    public String getJl_mmid() {
         return jl_mmid;
     }
 
-    public void setJl_mmid(Integer jl_mmid) {
+    public void setJl_mmid(String jl_mmid) {
         this.jl_mmid = jl_mmid;
     }
+
+    public String getPackageid() {
+        return packageid;
+    }
+
+    public void setPackageid(String packageid) {
+        this.packageid = packageid;
+    }
+
+    public String getCityid() {
+        return cityid;
+    }
+
+    public void setCityid(String cityid) {
+        this.cityid = cityid;
+    }
 }

src/main/java/com/ygj/yuemum/service/admin/JlServiceUserLogService.java

@@ -0,0 +1,35 @@
+package com.ygj.yuemum.service.admin;
+
+import com.github.pagehelper.PageHelper;
+import com.ygj.yuemum.dao.admin.JlServiceUserLogDao;
+import com.ygj.yuemum.domain.admin.JlServiceUserLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class JlServiceUserLogService {
+
+    @Autowired
+
+    private JlServiceUserLogDao jlServiceUserLogDao;
+
+    public int insertJlServiceUserLog(JlServiceUserLog jlServiceUserLog ){
+        return jlServiceUserLogDao.insertJlServiceUserLog(jlServiceUserLog);
+    }
+
+    public Map<String, Object> getJlServiceUserLog(int page, int limit,int js_sucode) {
+        PageHelper.startPage(page, limit);
+        List<JlServiceUserLog> couponBatches = jlServiceUserLogDao.getJlServiceUserLog(js_sucode);
+        Map<String, Object> tableData = new HashMap<>();
+        Integer count  = couponBatches.size();
+        tableData.put("items", couponBatches);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+
+}

src/main/java/com/ygj/yuemum/service/coupon/CouponService.java

@@ -94,17 +94,17 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051297451");
+            checkCustomer.setCb_code("PVP2018051717019");
             if (customerCouponService.checkCustomerCoupon(checkCustomer) > 0) {
                 return 62;
             }
-            String cp_code = couponDao.getCoupon("PVP2018051297451");
+            String cp_code = couponDao.getCoupon("PVP2018051717019");
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051297451");
+            customerCoupon.setCb_code("PVP2018051717019");
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -117,7 +117,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051297451");
+            couponLog.setCb_code("PVP2018051717019");
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -138,7 +138,7 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051273883");
+            checkCustomer.setCb_code("PVP2018051739929");
             int coupons = customerCouponService.checkCustomerCoupon(checkCustomer);
             Coupon getCouponAmount = new Coupon();
             if (coupons >= 3) {
@@ -150,14 +150,14 @@ public class CouponService {
             } else if (coupons == 0) {
                 getCouponAmount.setCp_amount(20);
             }
-            getCouponAmount.setCb_code("PVP2018051273883");
+            getCouponAmount.setCb_code("PVP2018051739929");
             String cp_code = couponDao.getCouponAmount(getCouponAmount);
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051273883");
+            customerCoupon.setCb_code("PVP2018051739929");
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -170,7 +170,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051273883");
+            couponLog.setCb_code("PVP2018051739929");
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -191,7 +191,7 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051211608");
+            checkCustomer.setCb_code("PVP2018051713733");
             int coupons = customerCouponService.checkCustomerCoupon(checkCustomer);
             Coupon getCouponAmount = new Coupon();
             if (coupons >= 3) {
@@ -202,14 +202,14 @@ public class CouponService {
             } else if (coupons == 0) {
                 getCouponAmount.setCp_amount(20);
             }
-            getCouponAmount.setCb_code("PVP2018051211608");
+            getCouponAmount.setCb_code("PVP2018051713733");
             String cp_code = couponDao.getCouponAmount(getCouponAmount);
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051211608");
+            customerCoupon.setCb_code("PVP2018051713733");
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -222,7 +222,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051211608");
+            couponLog.setCb_code("PVP2018051713733");
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -243,17 +243,17 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051263016");
+            checkCustomer.setCb_code("PVP2018051714111");
             if (customerCouponService.checkCustomerCoupon(checkCustomer) > 0) {
                 return 62;
             }
-            String cp_code = couponDao.getCoupon("PVP2018051263016");
+            String cp_code = couponDao.getCoupon("PVP2018051714111");
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051263016");
+            customerCoupon.setCb_code("PVP2018051714111");
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -266,7 +266,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051263016");
+            couponLog.setCb_code("PVP2018051714111");
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/ygj/yuemum/service/maternitymatron/JlServiceUserService.java

@@ -111,7 +111,7 @@ public class JlServiceUserService {
         Map<String, Object> tableData = new HashMap<>();
         Integer count = jlServiceUserDao.getStock(queryServiceUserStock);
         tableData.put("items", stockLists);
-        tableData.put("total", count);
+        tableData.put("total", stockLists.size());
         return tableData;
     }
 

src/main/java/com/ygj/yuemum/service/maternitymatron/MmStockService.java

@@ -1,12 +1,15 @@
 package com.ygj.yuemum.service.maternitymatron;
 
 import com.github.pagehelper.PageHelper;
+import com.ygj.yuemum.dao.admin.JlServiceUserLogDao;
 import com.ygj.yuemum.dao.maternitymatron.MmStockDao;
+import com.ygj.yuemum.domain.admin.JlServiceUserLog;
 import com.ygj.yuemum.domain.maternitymatron.MmStock;
 import com.ygj.yuemum.domain.maternitymatron.QueryListMMStock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -15,15 +18,44 @@ import java.util.*;
 public class MmStockService {
 
     @Autowired
-
     private MmStockDao mmStockDao;
+    @Autowired
+    private JlServiceUserLogDao jlServiceUserLogDao;
 
 
     public List<MmStock> getMmStocks() {
         List<MmStock> mmStocks = mmStockDao.getAll();
         return mmStocks;
     }
-
+    public int checkStockDate(MmStock mmStock) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        List<MmStock> stocks = mmStockDao.selectByPrimaryKey(mmStock.getServant_code());
+        Date startDate = sdf.parse(mmStock.getStart_date());
+        Date endDate = sdf.parse(mmStock.getEnd_date());
+        Calendar cal = Calendar.getInstance();
+        List<Date> lDate = new ArrayList<Date>();
+        int errorMessage = 1;
+        lDate.add(startDate);
+        cal.setTime(startDate);
+        while (true) {
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            if (endDate.after(cal.getTime())) {
+                lDate.add(cal.getTime());
+            } else {
+                break;
+            }
+        }
+        lDate.add(endDate);
+        outer: for (Date day : lDate) {
+            for(MmStock res : stocks){
+                if (day.getTime() >= sdf.parse(res.getStart_date()).getTime() && day.getTime() <= sdf.parse(res.getEnd_date()).getTime() ) {
+                    errorMessage = 0;
+                    break outer;
+                }
+            }
+        }
+        return errorMessage;
+    }
     public int addMmStock(MmStock mmStock) throws ParseException {
         // 1.根据月嫂id获取月嫂近一年的所有数据 id,status,start_date,end_date
         // 2.通过用户输入的开始和结束日期 生成每天的日期
@@ -89,4 +121,30 @@ public class MmStockService {
     public List<MmStock> getAll(){
         return mmStockDao.getAll();
     }
+
+    public int LockMmStocks(int id,String user){
+        try{
+            JlServiceUserLog jlServiceUserLog  = new JlServiceUserLog();
+            MmStock mmStock  = new MmStock();
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            String dd = df.format(new Date());
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.add(Calendar.DAY_OF_MONTH, 2);
+            mmStock.setServant_code(id);
+            mmStock.setStock_status(3);
+            mmStock.setStart_date(dd);
+            mmStock.setEnd_date(df.format(calendar.getTime()));
+            mmStockDao.insertSelective(mmStock);
+            jlServiceUserLog.setJs_sucode(String.valueOf(id));
+            jlServiceUserLog.setJl_date(String.valueOf(dd));
+            jlServiceUserLog.setJl_usercode(user);
+            jlServiceUserLog.setJl_logtype(3);
+            jlServiceUserLogDao.insertJlServiceUserLog(jlServiceUserLog);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
 }

src/main/java/com/ygj/yuemum/service/order/OrderTempService.java

@@ -6,6 +6,8 @@ import com.ygj.yuemum.domain.order.OrderTemp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,12 +29,25 @@ public class OrderTempService {
         return tableData;
     }
 
+    public Map<String, Object> queryOrderTemp(OrderTemp orderTemp) {
+        PageHelper.startPage(orderTemp.getPage(),orderTemp.getLimit());
+        List<OrderTemp> orderTemps = orderTempDao.queryOrderTemp(orderTemp);
+        Map<String, Object> tableData = new HashMap<>();
+        Integer count = orderTemps.size();
+        tableData.put("items", orderTemps);
+        tableData.put("total", count);
+        return tableData;
+    }
+
     public List<OrderTemp> getAll() {
         List<OrderTemp> orderTemps = orderTempDao.getAll();
         return orderTemps;
     }
 
     public int addOrderTemp(OrderTemp orderTemp) {
+        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyyMMdd");
+        Date date = new Date();
+        orderTemp.setOt_code("ON"+dateFormat.format(date)+(int)((Math.random()*9+1)*10000));
         return orderTempDao.insertSelective(orderTemp);
     }
 

src/main/resources/mybatis/mapper/admin/JlServiceUserLog.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.admin.JlServiceUserLogDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.admin.JlServiceUserLog" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="js_sucode" property="js_sucode" jdbcType="VARCHAR" />
+        <result column="jl_usercode" property="jl_usercode" jdbcType="INTEGER" />
+        <result column="jl_date" property="jl_date" jdbcType="DATE" />
+        <result column="jl_logtype" property="jl_logtype" jdbcType="INTEGER" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getJlServiceUserLog" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        id,js_sucode,jl_usercode,jl_date,jl_logtype
+        from jl_service_user_log
+        where
+        jl_date &gt;=  DATE_SUB(CURDATE(), INTERVAL 1 YEAR)
+        and js_sucode = #{js_sucode,jdbcType=INTEGER}
+        order by id desc
+    </select>
+
+    <insert id="insertJlServiceUserLog" parameterType="com.ygj.yuemum.domain.admin.JlServiceUserLog" >
+        insert into jl_service_user_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="js_sucode != null" >
+                js_sucode,
+            </if>
+            <if test="jl_usercode != null" >
+                jl_usercode,
+            </if>
+            <if test="jl_date != null" >
+                jl_date,
+            </if>
+            <if test="jl_logtype != null" >
+                jl_logtype
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="js_sucode != null" >
+                #{js_sucode,jdbcType=INTEGER},
+            </if>
+            <if test="jl_usercode != null" >
+                #{jl_usercode,jdbcType=INTEGER},
+            </if>
+            <if test="jl_date != null" >
+                #{jl_date,jdbcType=DATE},
+            </if>
+            <if test="jl_logtype != null" >
+                #{jl_logtype,jdbcType=DATE}
+            </if>
+        </trim>
+    </insert>
+
+</mapper>

src/main/resources/mybatis/mapper/maternitymatron/MmStockMapper.xml

@@ -8,6 +8,7 @@
         <result column="stock_status" property="stock_status" jdbcType="INTEGER" />
         <result column="start_date" property="start_date" jdbcType="VARCHAR" />
         <result column="end_date" property="end_date" jdbcType="VARCHAR" />
+        <result column="adminuser" property="adminuser" jdbcType="VARCHAR" />
     </resultMap>
 
     <sql id="Base_Column_List" >

src/main/resources/mybatis/mapper/order/OrderTemp.xml

@@ -8,11 +8,13 @@
         <result column="cm_phone" property="cm_phone" jdbcType="VARCHAR" />
         <result column="ot_startdate" property="ot_startdate" jdbcType="DATE" />
         <result column="ot_enddate" property="ot_enddate" jdbcType="DATE" />
-        <result column="jl_mmid" property="jl_mmid" jdbcType="INTEGER" />
+        <result column="jl_mmid" property="jl_mmid" jdbcType="VARCHAR" />
+        <result column="packageid" property="packageid" jdbcType="VARCHAR" />
+        <result column="cityid" property="cityid" jdbcType="VARCHAR" />
     </resultMap>
 
     <sql id="Base_Column_List" >
-        id,ot_code, cm_phone,ot_startdate,ot_enddate,jl_mmid
+        id,ot_code, cm_phone,ot_startdate,ot_enddate,jl_mmid,packageid,cityid
     </sql>
 
     <!--获取所有数据-->
@@ -32,18 +34,45 @@
         <if test="_parameter != null" >
             and cm_phone = #{cm_phone,jdbcType=VARCHAR}
         </if>
-        AND DATE_FORMAT(now(), '%Y-%m-%d') &gt;= ot_startdate
-        AND DATE_FORMAT(now(), '%Y-%m-%d') &lt;= ot_enddate
+        AND DATE_FORMAT(now(), '%Y-%m-%d')  &gt;=  ot_startdate
+        AND DATE_FORMAT(now(), '%Y-%m-%d')  &lt;=  ot_enddate
     </select>
 
 
     <select id="getAll" resultMap="BaseResultMap" >
         select
-        id,ot_code, cm_phone,ot_startdate,ot_enddate,jl_mmid
+        id,ot_code, cm_phone,ot_startdate,ot_enddate,fgetmmname(jl_mmid) jl_mmid, fgetpackagename(packageid) packageid,fgetcityname(cityid) cityid
         from order_temp
         order by id desc
     </select>
 
+    <select id="queryOrderTemp" resultMap="BaseResultMap" parameterType="com.ygj.yuemum.domain.order.OrderTemp">
+        select
+        id,ot_code, cm_phone,ot_startdate,ot_enddate,fgetmmname(jl_mmid) jl_mmid, fgetpackagename(packageid) packageid,fgetcityname(cityid) cityid
+        from order_temp
+        where 1=1
+        <if test="ot_code != null and ot_code != ''">
+            and ot_code = #{ot_code,jdbcType=VARCHAR}
+        </if>
+        <if test="cm_phone != null and cm_phone != ''">
+            and cm_phone = #{cm_phone,jdbcType=VARCHAR}
+        </if>
+        <if test="ot_startdate != null and ot_startdate != ''">
+            and ot_startdate &gt;= #{ot_startdate,jdbcType=DATE}
+        </if>
+        <if test="ot_enddate != null and ot_enddate != ''">
+            andot_enddate &lt;= #{andot_enddate,jdbcType=DATE}
+        </if>
+        <if test="jl_mmid != null and jl_mmid != ''">
+            and jl_mmid = #{jl_mmid,jdbcType=VARCHAR}
+        </if>
+        <if test="packageid != null and packageid != ''">
+            and packageid = #{packageid,jdbcType=VARCHAR}
+        </if>
+        <if test="cityid != null and cityid != ''">
+            and cityid = #{cityid,jdbcType=VARCHAR}
+        </if>
+    </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
         select
@@ -74,7 +103,13 @@
                 ot_enddate,
             </if>
             <if test="jl_mmid != null" >
-                jl_mmid
+                jl_mmid,
+            </if>
+            <if test="packageid != null" >
+                packageid,
+            </if>
+            <if test="cityid != null" >
+                cityid
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -91,7 +126,13 @@
                 #{ot_enddate,jdbcType=DATE},
             </if>
             <if test="jl_mmid != null" >
-                #{jl_mmid,jdbcType=VARCHAR}
+                #{jl_mmid,jdbcType=VARCHAR},
+            </if>
+            <if test="packageid != null" >
+                #{packageid,jdbcType=VARCHAR},
+            </if>
+            <if test="cityid != null" >
+                #{cityid,jdbcType=VARCHAR}
             </if>
         </trim>
     </insert>