crud

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

@@ -31,6 +31,13 @@ public class ImageUploadController {
     @Autowired
     private ResumeService resumeService;
     private ResourceLoader resourceLoader;
+//    public static final String ROOT = "/usr/local/apache-tomcat-8.5.30/webapps/resume/img/";
+//    public static final String ResumeFile = "/usr/local/apache-tomcat-8.5.30/webapps/resume/";
+//    public static final String httpRoot = "http://192.168.1.24/resume/img/";
+//    public static final String httphtmlRoot = "http://192.168.1.24/resume/";
+//    public static final String modulePath = "/usr/local/apache-tomcat-8.5.30/webapps/resume/resume.html";
+
+
 //    public static final String ROOT = "/usr/local/tomcat/tomcat7/webapps/resume/img/";
 //    public static final String ResumeFile = "/usr/local/tomcat/tomcat7/webapps/resume/";
 //    public static final String httpRoot = "http://yuesuo.yueguanjia.com/resume/img/";

src/main/java/com/ygj/yuemum/controller/customer/CustomerBookingController.java

@@ -0,0 +1,33 @@
+package com.ygj.yuemum.controller.customer;
+
+
+import com.ygj.yuemum.domain.customer.CustomerBooking;
+import com.ygj.yuemum.service.customer.CustomerBookingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+public class CustomerBookingController {
+
+    @Autowired
+    private CustomerBookingService customerBookingService;
+    @GetMapping("/selectcustomerBookings")
+    public List<CustomerBooking> selectcustomerBookings() {
+        List<CustomerBooking> customerBookings = customerBookingService.selectAll();
+        return customerBookings;
+    }
+
+    @GetMapping("/selectCustomerBooking")
+    public List<CustomerBooking> selectCustomerBooking(@RequestParam("bk_phone") String bk_phone) {
+        List<CustomerBooking> customerBookings = customerBookingService.selectCustomerBooking(bk_phone);
+        return customerBookings;
+    }
+
+    @PostMapping("/insertCustomerBooking")
+    public int insertCustomerPay(@ModelAttribute CustomerBooking customerBooking) {
+        return  customerBookingService.insertCustomerBooking(customerBooking);
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/customer/CustomerCouponController.java

@@ -18,12 +18,12 @@ public class CustomerCouponController {
     @Autowired
     private CustomerCouponService customerCouponService;
 
-    @GetMapping("/getCustomerCoupons")
-    public String getCustomerCoupons(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit) {
-        Map<String, Object> customerCoupons = customerCouponService.getCustomerCoupons(page,limit);
-        String jso = JSONObject.toJSONString(customerCoupons);
-        return jso;
-    }
+//    @GetMapping("/getCustomerCoupons")
+//    public String getCustomerCoupons(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit) {
+//        Map<String, Object> customerCoupons = customerCouponService.getCustomerCoupons(page,limit);
+//        String jso = JSONObject.toJSONString(customerCoupons);
+//        return jso;
+//    }
 
     @GetMapping("/getAllCustomerCoupons")
     public List<CustomerCoupon> getAllCoupons() {
@@ -45,7 +45,7 @@ public class CustomerCouponController {
         return customerCouponService.updateCustomerCoupon(customerCoupon);
     }
 
-    @PostMapping("/getModooCustomerCoupons")
+    @PostMapping("/getCustomerCoupons")
     public String getCustomerCoupons(@ModelAttribute CustomerCouponQuery customerCouponQuery) {
         Map<String, Object> customerCoupons = customerCouponService.getCustomerCoupons(customerCouponQuery);
         String jso = JSONObject.toJSONString(customerCoupons);

src/main/java/com/ygj/yuemum/controller/equipment/EquipmenteHireHeadController.java

@@ -28,6 +28,11 @@ public class EquipmenteHireHeadController {
         return equipmenteHireHeadService.addEquipmenteHireHead(equipmenteHireHead);
     }
 
+    @PostMapping("/addEquipmenteHireHeadOnline")
+    public int addEquipmenteHireHeadOnline(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.addEquipmenteHireHeadOnline(equipmenteHireHead);
+    }
+
     @GetMapping("/deleteEquipmenteHireHead")
     public int deleteEquipmenteHireHead(@RequestParam("eh_code") String eh_code) {
         return equipmenteHireHeadService.deleteEquipmenteHireHead(eh_code);

src/main/java/com/ygj/yuemum/dao/customer/CustomerBookingDao.java

@@ -0,0 +1,14 @@
+package com.ygj.yuemum.dao.customer;
+
+import com.ygj.yuemum.domain.customer.CustomerBooking;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CustomerBookingDao {
+
+    List<CustomerBooking> selectCustomerBooking(String bk_phone);
+    List<CustomerBooking> selectAll();
+    int insertCustomerBooking(CustomerBooking customerBooking);
+}

src/main/java/com/ygj/yuemum/dao/equipment/EquipmentInfoDao.java

@@ -19,6 +19,8 @@ public interface EquipmentInfoDao {
 
     EquipmentInfo getEquipmentInfoEicode(String ei_code);
 
+    EquipmentInfo getAutoDisEquipment();
+
     int updateByPrimaryKeySelective(EquipmentInfo record);
 
     int checkEquipmentInfo(String ei_code);

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

@@ -21,6 +21,24 @@ public class JlAdminUser {
     private String district;
     private Integer enabled;
     private Date update_time;
+    private String npwd;
+    private String npwd2;
+
+    public String getNpwd() {
+        return npwd;
+    }
+
+    public void setNpwd(String npwd) {
+        this.npwd = npwd;
+    }
+
+    public String getNpwd2() {
+        return npwd2;
+    }
+
+    public void setNpwd2(String npwd2) {
+        this.npwd2 = npwd2;
+    }
 
     public JlAdminUser() {
         super();

src/main/java/com/ygj/yuemum/domain/customer/CustomerBooking.java

@@ -0,0 +1,59 @@
+package com.ygj.yuemum.domain.customer;
+
+public class CustomerBooking {
+
+    private Integer id;
+    private String bk_phone;
+    private String bk_duedate;
+    private String bk_date;
+    private Integer bk_type;
+    private String bk_desc;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getBk_phone() {
+        return bk_phone;
+    }
+
+    public void setBk_phone(String bk_phone) {
+        this.bk_phone = bk_phone;
+    }
+
+    public String getBk_duedate() {
+        return bk_duedate;
+    }
+
+    public void setBk_duedate(String bk_duedate) {
+        this.bk_duedate = bk_duedate;
+    }
+
+    public String getBk_date() {
+        return bk_date;
+    }
+
+    public void setBk_date(String bk_date) {
+        this.bk_date = bk_date;
+    }
+
+    public Integer getBk_type() {
+        return bk_type;
+    }
+
+    public void setBk_type(Integer bk_type) {
+        this.bk_type = bk_type;
+    }
+
+    public String getBk_desc() {
+        return bk_desc;
+    }
+
+    public void setBk_desc(String bk_desc) {
+        this.bk_desc = bk_desc;
+    }
+}

src/main/java/com/ygj/yuemum/domain/equipment/EquipmenteHireHead.java

@@ -20,6 +20,15 @@ public class EquipmenteHireHead {
     private String ed_emcode;
     private String ed_startdate;
     private String ed_enddate;
+    private Integer eh_source;
+
+    public Integer getEh_source() {
+        return eh_source;
+    }
+
+    public void setEh_source(Integer eh_source) {
+        this.eh_source = eh_source;
+    }
 
     public String getEt_type() {
         return et_type;

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

@@ -31,8 +31,23 @@ public class JlAdminUserService {
         return jladminuserdao.logIN(jladminuser);
     }
 
-    public int updateUser(JlAdminUser jladminusers) {
-        return jladminuserdao.updateByPrimaryKeySelective(jladminusers);
+        public int updateUser(JlAdminUser jladminusers) {
+        try{
+            JlAdminUser jlAdminUser = new JlAdminUser();
+            jlAdminUser.setPassword(jladminusers.getPassword());
+            jlAdminUser.setUsername(jladminusers.getUsername());
+            int check = jladminuserdao.logIN(jlAdminUser);
+            if(check != 1) {
+                return 2;
+            } else {
+                jladminusers.setPassword(jladminusers.getNpwd());
+                jladminuserdao.updateByPrimaryKeySelective(jladminusers);
+            }
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
     }
 
     public JlAdminUser getUser(Integer id) {

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

@@ -29,6 +29,15 @@ public class CouponService {
     @Autowired
     private CouponLogService couponLogService;
 
+    String couponNewUserCoupon = "PVP2018051297451";
+    String couponConsultTaskCoupon = "PVP2018051273883";
+    String couponDetectionTaskCoupon = "PVP2018051211608";
+    String couponRechargeTaskCoupon = "PVP2018051263016";
+
+//    String couponNewUserCoupon = "PVP2018051717019";
+//    String couponConsultTaskCoupon = "PVP2018051739929";
+//    String couponDetectionTaskCoupon = "PVP2018051713733";
+//    String couponRechargeTaskCoupon = "PVP2018051714111";
     //分页
     public Map<String, Object> getCoupons(int page, int limit) {
         PageHelper.startPage(page, limit);
@@ -96,17 +105,17 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051717019");
+            checkCustomer.setCb_code(couponNewUserCoupon);
             if (customerCouponService.checkCustomerCoupon(checkCustomer) > 0) {
                 return 62;
             }
-            String cp_code = couponDao.getCoupon("PVP2018051717019");
+            String cp_code = couponDao.getCoupon(couponNewUserCoupon);
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051717019");
+            customerCoupon.setCb_code(couponNewUserCoupon);
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -119,7 +128,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051717019");
+            couponLog.setCb_code(couponNewUserCoupon);
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -130,6 +139,7 @@ public class CouponService {
     }
 
     public int getConsultTaskCoupon(String phone, int channel) {//咨询任务
+
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (customerCouponService.checkSumCustomerCoupon(phone) > 500) {
@@ -140,7 +150,7 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051739929");
+            checkCustomer.setCb_code(couponConsultTaskCoupon);
             int coupons = customerCouponService.checkCustomerCoupon(checkCustomer);
             Coupon getCouponAmount = new Coupon();
             if (coupons >= 3) {
@@ -152,14 +162,14 @@ public class CouponService {
             } else if (coupons == 0) {
                 getCouponAmount.setCp_amount(20);
             }
-            getCouponAmount.setCb_code("PVP2018051739929");
+            getCouponAmount.setCb_code(couponConsultTaskCoupon);
             String cp_code = couponDao.getCouponAmount(getCouponAmount);
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051739929");
+            customerCoupon.setCb_code(couponConsultTaskCoupon);
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -172,7 +182,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051739929");
+            couponLog.setCb_code(couponConsultTaskCoupon);
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -183,6 +193,7 @@ public class CouponService {
     }
 
     public int getDetectionTaskCoupon(String phone, int channel) {//测胎心任务
+
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (customerCouponService.checkSumCustomerCoupon(phone) > 500) {
@@ -193,7 +204,7 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051713733");
+            checkCustomer.setCb_code(couponDetectionTaskCoupon);
             int coupons = customerCouponService.checkCustomerCoupon(checkCustomer);
             Coupon getCouponAmount = new Coupon();
             if (coupons >= 3) {
@@ -204,14 +215,14 @@ public class CouponService {
             } else if (coupons == 0) {
                 getCouponAmount.setCp_amount(20);
             }
-            getCouponAmount.setCb_code("PVP2018051713733");
+            getCouponAmount.setCb_code(couponDetectionTaskCoupon);
             String cp_code = couponDao.getCouponAmount(getCouponAmount);
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051713733");
+            customerCoupon.setCb_code(couponDetectionTaskCoupon);
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -224,7 +235,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051713733");
+            couponLog.setCb_code(couponDetectionTaskCoupon);
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -235,6 +246,7 @@ public class CouponService {
     }
 
     public int getRechargeTaskCoupon(String phone, int channel) {//充值任务
+
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (customerCouponService.checkSumCustomerCoupon(phone) > 500) {
@@ -245,17 +257,17 @@ public class CouponService {
             }
             CustomerCoupon checkCustomer = new CustomerCoupon();
             checkCustomer.setCm_phone(phone);
-            checkCustomer.setCb_code("PVP2018051714111");
+            checkCustomer.setCb_code(couponRechargeTaskCoupon);
             if (customerCouponService.checkCustomerCoupon(checkCustomer) > 0) {
                 return 62;
             }
-            String cp_code = couponDao.getCoupon("PVP2018051714111");
+            String cp_code = couponDao.getCoupon(couponRechargeTaskCoupon);
             if (cp_code.equals(null)) {
                 return 98;
             }
             CustomerCoupon customerCoupon = new CustomerCoupon();
             customerCoupon.setCm_phone(phone);
-            customerCoupon.setCb_code("PVP2018051714111");
+            customerCoupon.setCb_code(couponRechargeTaskCoupon);
             customerCoupon.setCc_code(cp_code);
             customerCoupon.setCp_status(2);
             customerCoupon.setCc_getdate(sdf.format(new Date()));
@@ -268,7 +280,7 @@ public class CouponService {
             couponLog.setCl_mp(phone);
             couponLog.setCl_user(9527);
             couponLog.setCl_date(sdf.format(new Date()));
-            couponLog.setCb_code("PVP2018051714111");
+            couponLog.setCb_code(couponRechargeTaskCoupon);
             couponLogService.addCouponLog(couponLog);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/ygj/yuemum/service/customer/CustomerBookingService.java

@@ -0,0 +1,28 @@
+package com.ygj.yuemum.service.customer;
+
+import com.ygj.yuemum.dao.customer.CustomerBookingDao;
+import com.ygj.yuemum.domain.customer.CustomerBooking;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CustomerBookingService {
+
+    @Autowired
+    private CustomerBookingDao customerBookingDao;
+
+
+    public List<CustomerBooking> selectAll() {
+        return customerBookingDao.selectAll();
+    }
+
+    public List<CustomerBooking> selectCustomerBooking(String bk_phone) {
+        return customerBookingDao.selectCustomerBooking(bk_phone);
+    }
+
+    public int insertCustomerBooking(CustomerBooking customerBooking){
+        return customerBookingDao.insertCustomerBooking(customerBooking);
+    }
+}

src/main/java/com/ygj/yuemum/service/equipment/EquipmentInfoService.java

@@ -108,4 +108,7 @@ public class EquipmentInfoService {
         return equipmentInfoDao.updateEIStatus(equipmentInfo);
     }
 
+    public EquipmentInfo getAutoDisEquipment() {
+        return equipmentInfoDao.getAutoDisEquipment();
+    }
 }

src/main/java/com/ygj/yuemum/service/equipment/EquipmenteHireHeadService.java

@@ -71,6 +71,7 @@ public class EquipmenteHireHeadService {
             //add Head
             equipmenteHireHead.setEh_code(orderno);
             equipmenteHireHead.setEh_status(1);
+            equipmenteHireHead.setEh_source(2);
             Date date = sdfdate.parse(equipmenteHireHead.getEh_date());
             equipmenteHireHead.setEh_date(sdfdate.format(date));
             equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
@@ -153,7 +154,7 @@ public class EquipmenteHireHeadService {
             List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailService.selectByPrimaryKey(equipmenteHireHead.getEh_code());
             for (EquipmenteHireDetail ed : equipmenteHireDetails) {
                 // update updateEIStatus
-                if(ed.getEt_type().equals("1")){
+                if (ed.getEt_type().equals("1")) {
                     //modoo active
                     modooApiService.equipmentActive(ed.getEd_emcode());
                 }
@@ -187,5 +188,44 @@ public class EquipmenteHireHeadService {
         return 1;
     }
 
+    public int addEquipmenteHireHeadOnline(EquipmenteHireHead equipmenteHireHead) {
+        try {
+            DecimalFormat df = new DecimalFormat("000");
+            int seq = equipmenteHireHeadDao.getSeq() + 1;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
+            String orderno = "EH" + sdf.format(new Date()) + df.format(seq);
+            //add Head
+            equipmenteHireHead.setEh_code(orderno);
+            equipmenteHireHead.setEh_status(1);
+            equipmenteHireHead.setEh_source(1);
+            Date date = sdfdate.parse(equipmenteHireHead.getEh_date());
+            equipmenteHireHead.setEh_date(sdfdate.format(date));
+            equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
+            //add Detail auto distribution
+            EquipmentInfo equipmentInfo =  equipmentInfoService.getAutoDisEquipment();
+            if (equipmentInfo == null) {
+                return 2;//无可租设备
+            } else {
+                // insert into Detail
+                EquipmenteHireDetail ed = new EquipmenteHireDetail();
+                ed.setEt_type(equipmentInfo.getEt_code());
+                ed.setEd_emcode(equipmentInfo.getEi_code());
+                ed.setEh_code(orderno);
+//                Date datestart = sdfdate.parse(ed.getEd_startdate());
+//                Date dateend = sdfdate.parse(ed.getEd_enddate().replace('/', '-'));
+//                ed.setEd_startdate(sdfdate.format(datestart));
+//                ed.setEd_enddate(sdfdate.format(dateend));
+//                equipmenteHireDetailService.addEquipmenteHireDetail(ed);
+                // lock EquipmentInfo
+                equipmentInfo.setEi_status(2);
+                equipmentInfoService.updateEIStatus(equipmentInfo);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
 
 }

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

@@ -233,7 +233,7 @@
                 update_time = #{update_time,jdbcType=DATE}
             </if>
         </set>
-        where id = #{id,jdbcType=INTEGER}
+        where username = #{username,jdbcType=INTEGER}
     </update>
 
 </mapper>

src/main/resources/mybatis/mapper/customer/CustomerBookingMapper.xml

@@ -0,0 +1,70 @@
+<?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.customer.CustomerBookingDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.customer.CustomerBooking" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="bk_phone" property="bk_phone" jdbcType="VARCHAR" />
+        <result column="bk_duedate" property="bk_duedate" jdbcType="DATE" />
+        <result column="bk_date" property="bk_date" jdbcType="DATE" />
+        <result column="bk_type" property="bk_type" jdbcType="INTEGER" />
+        <result column="bk_desc" property="bk_desc" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id, bk_phone,bk_duedate,bk_date,bk_type,bk_desc
+    </sql>
+    <!-- 此处添加查询信息-->
+    <select id="selectCustomerBooking" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        id, bk_phone,bk_duedate,bk_date,bk_type,bk_desc
+        from customer_booking
+        where bk_phone = #{bk_phone,jdbcType=VARCHAR}
+        order by bk_date desc
+    </select>
+
+    <select id="selectAll" resultMap="BaseResultMap" >
+        select
+        id, bk_phone,bk_duedate,bk_date,bk_type,bk_desc
+        from customer_booking
+    </select>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertCustomerBooking" parameterType="com.ygj.yuemum.domain.customer.CustomerBooking" >
+        insert into customer_booking
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="bk_phone != null" >
+                bk_phone,
+            </if>
+            <if test="bk_duedate != null" >
+                bk_duedate,
+            </if>
+            <if test="bk_date != null" >
+                bk_date,
+            </if>
+            <if test="bk_type != null" >
+                bk_type,
+            </if>
+            <if test="bk_desc != null" >
+                bk_desc
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="bk_phone != null" >
+                #{bk_phone,jdbcType=VARCHAR},
+            </if>
+            <if test="bk_duedate != null" >
+                #{bk_duedate,jdbcType=DATE},
+            </if>
+            <if test="bk_date != null" >
+                #{bk_date,jdbcType=DATE},
+            </if>
+            <if test="bk_type != null" >
+                #{bk_type,jdbcType=INTEGER},
+            </if>
+            <if test="bk_desc != null" >
+                #{bk_desc,jdbcType=VARCHAR}
+            </if>
+        </trim>
+    </insert>
+</mapper>

src/main/resources/mybatis/mapper/equipment/EquipmentInfoMapper.xml

@@ -23,6 +23,14 @@
         from equipment_info
     </select>
 
+    <select id="getAutoDisEquipment" resultMap="BaseResultMap" >
+        select
+        <include refid="Base_Column_List" />
+        from equipment_info
+        where ei_status  = 1
+        order by 1 desc limit 1
+    </select>
+
     <select id="getAll" resultMap="BaseResultMap" >
         SELECT
             equipment_info.id,

src/main/resources/mybatis/mapper/equipment/EquipmentLogMapper.xml

@@ -17,6 +17,7 @@
         id,ei_code,el_status,el_user,el_date,el_billno
         from equipment_log
         where ei_code = #{ei_code,jdbcType=VARCHAR}
+        order by 1 desc
     </select>
 
     <!-- 插入一条培训信息 -->

src/main/resources/mybatis/mapper/equipment/EquipmenteHireHeadMapper.xml

@@ -14,10 +14,11 @@
         <result column="eh_usercode" property="eh_usercode" jdbcType="VARCHAR" />
         <result column="eh_date" property="eh_date" jdbcType="DATE" />
         <result column="eh_status" property="eh_status" jdbcType="INTEGER" />
+        <result column="eh_source" property="eh_source" jdbcType="INTEGER" />
     </resultMap>
 
     <sql id="Base_Column_List" >
-        id,eh_code,eh_mortagage,eh_rental,eh_cmname,eh_cmphone,eh_cmidcard,eh_cmaddress,eh_usercode,eh_date,eh_status
+        id,eh_code,eh_mortagage,eh_rental,eh_cmname,eh_cmphone,eh_cmidcard,eh_cmaddress,eh_usercode,eh_date,eh_status,eh_source
     </sql>
 
     <select id="getAll" resultMap="BaseResultMap" >
@@ -28,10 +29,13 @@
             eh_rental,
             eh_mortagage,
             eh_status,
-            eh_date
+            eh_date,
+            eh_source
         FROM
             equipment_hire_head
-        order by eh_date desc , eh_status asc
+        order by eh_date desc ,
+        eh_status asc,
+        eh_code desc
     </select>
 
     <select id="getSeq" resultType="java.lang.Integer" >
@@ -49,7 +53,8 @@
             equipment_hire_head.eh_rental,
             equipment_hire_head.eh_mortagage,
             equipment_hire_head.eh_status,
-            equipment_hire_head.eh_date
+            equipment_hire_head.eh_date,
+            equipment_hire_head.eh_source
         from equipment_hire_head
         where eh_code in (
             SELECT
@@ -63,6 +68,9 @@
                 <if test="eh_status != null and eh_status != ''">
                     and equipment_hire_head.eh_status = #{eh_status,jdbcType=INTEGER}
                 </if>
+                <if test="eh_source != null and eh_source != ''">
+                    and equipment_hire_head.eh_source = #{eh_source,jdbcType=INTEGER}
+                </if>
                 <if test="eh_date != null and eh_date != ''">
                     and equipment_hire_head.eh_date = #{eh_date,jdbcType=DATE}
                 </if>
@@ -102,7 +110,8 @@
         )
         ORDER BY
         equipment_hire_head.eh_date desc,
-        equipment_hire_head.eh_status ASC
+        equipment_hire_head.eh_status ASC,
+        equipment_hire_head.eh_code desc
     </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -156,7 +165,10 @@
                 eh_date,
             </if>
             <if test="eh_status != null" >
-                eh_status
+                eh_status,
+            </if>
+            <if test="eh_source != null" >
+                eh_source
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -188,7 +200,10 @@
                 #{eh_date,jdbcType=DATE},
             </if>
             <if test="eh_status != null" >
-                #{eh_status,jdbcType=DATE}
+                #{eh_status,jdbcType=DATE},
+            </if>
+            <if test="eh_source != null" >
+                #{eh_source,jdbcType=DATE}
             </if>
         </trim>
     </insert>
@@ -222,7 +237,10 @@
                 eh_date = #{eh_date,jdbcType=DATE},
             </if>
             <if test="eh_status != null" >
-                eh_status = #{eh_status,jdbcType=DATE}
+                eh_status = #{eh_status,jdbcType=DATE},
+            </if>
+            <if test="eh_source != null" >
+                eh_status = #{eh_source,jdbcType=DATE}
             </if>
         </set>
         where eh_code = #{eh_code,jdbcType=INTEGER}