crud

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

@@ -237,9 +237,9 @@ public class ImageUploadController {
                                     + "<image class=\"zturn-item-image\" src='" + onePhoto.getPhoto_path() + "'></image>" + "\r\n"
                                     + "</li>" + "\r\n";
                             if (stepmeal == 0) {
-                                mealhref = mealhref + " <a href=\"javascript:void(0);\" value='" + stepmeal + "' class=\"indicator-list-item-service selected\"></a>" + "\r\n";
+                                mealhref = mealhref + " <a href=\"javascript:void(0);\" value='" + stepmeal + "' class=\"indicator-list-item-yzfood selected\"></a>" + "\r\n";
                             } else {
-                                mealhref = mealhref + " <a href=\"javascript:void(0);\" value='" + stepmeal + "' class=\"indicator-list-item-service\"></a>" + "\r\n";
+                                mealhref = mealhref + " <a href=\"javascript:void(0);\" value='" + stepmeal + "' class=\"indicator-list-item-yzfood\"></a>" + "\r\n";
                             }
                             stepmeal++;
                         }

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

@@ -54,4 +54,13 @@ public class EquipmentInfoController {
     public EquipmentInfo getOne(@RequestParam("id") Integer id) {
         return equipmentInfoService.getEquipmentInfo(id);
     }
+    @GetMapping("/getEquipmentInfoEicode")
+    public EquipmentInfo getEquipmentInfoEicode(@RequestParam("ei_code") String ei_code) {
+        return equipmentInfoService.getEquipmentInfoEicode(ei_code);
+    }
+
+    @GetMapping("/checkEquipmentInfo")
+    public int checkEquipmentInfo(@RequestParam("ei_code") String ei_code) {
+        return equipmentInfoService.checkEquipmentInfo(ei_code);
+    }
 }

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

@@ -0,0 +1,25 @@
+package com.ygj.yuemum.controller.equipment;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.domain.equipment.EquipmentLog;
+import com.ygj.yuemum.service.equipment.EquipmentLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+public class EquipmentLogController {
+
+    @Autowired
+    private EquipmentLogService equipmentLogService;
+    @PostMapping("/getEquipmentLogs")
+    public String getEquipmentLogs(@ModelAttribute EquipmentLog equipmentLog) {
+        Map<String, Object> equipmentLogs= equipmentLogService.getEquipmentLogs(equipmentLog);
+        String jso = JSONObject.toJSONString(equipmentLogs);
+        return jso;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.controller.equipment;
+
+
+import com.ygj.yuemum.domain.equipment.EquipmentType;
+import com.ygj.yuemum.service.equipment.EquipmentTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class EquipmentTypeController {
+
+    @Autowired
+    private EquipmentTypeService equipmentTypeService;
+    @GetMapping("/getEquipmentTypes")
+    public List<EquipmentType> getEquipmentTypes() {
+        List<EquipmentType> equipmentTypes = equipmentTypeService.getEquipmentTypes();
+        return equipmentTypes;
+    }
+}

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

@@ -17,8 +17,12 @@ public interface EquipmentInfoDao {
 
     EquipmentInfo selectByPrimaryKey(Integer id);
 
+    EquipmentInfo getEquipmentInfoEicode(String ei_code);
+
     int updateByPrimaryKeySelective(EquipmentInfo record);
 
+    int checkEquipmentInfo(String ei_code);
+
     int getCount();
 
 }

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

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.equipment;
+
+import com.ygj.yuemum.domain.equipment.EquipmentLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EquipmentLogDao {
+
+    List<EquipmentLog> getEquipmentLogs(EquipmentLog equipmentLog);
+    int insertEquipmentLog (EquipmentLog equipmentLog);
+}

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

@@ -0,0 +1,12 @@
+package com.ygj.yuemum.dao.equipment;
+
+import com.ygj.yuemum.domain.equipment.EquipmentType;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EquipmentTypeDao {
+
+    List<EquipmentType> getEquipmentTypes();
+}

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

@@ -3,12 +3,30 @@ package com.ygj.yuemum.domain.equipment;
 public class EquipmentInfo {
 
     private Integer id;
-    private Integer et_code;
+    private String et_code;
     private String ei_code;
     private Integer ei_rent;
     private Integer ei_status;
     private Integer page;
     private Integer limit;
+    private String ei_date;
+    private String user;
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getEi_date() {
+        return ei_date;
+    }
+
+    public void setEi_date(String ei_date) {
+        this.ei_date = ei_date;
+    }
 
     public Integer getId() {
         return id;
@@ -18,11 +36,11 @@ public class EquipmentInfo {
         this.id = id;
     }
 
-    public Integer getEt_code() {
+    public String getEt_code() {
         return et_code;
     }
 
-    public void setEt_code(Integer et_code) {
+    public void setEt_code(String et_code) {
         this.et_code = et_code;
     }
 

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

@@ -0,0 +1,67 @@
+package com.ygj.yuemum.domain.equipment;
+
+public class EquipmentLog {
+    private String ei_code;
+    private Integer el_status;
+    private String el_user;
+    private String el_date;
+    private String el_billno;
+    private Integer limit;
+    private Integer page;
+
+    public String getEi_code() {
+        return ei_code;
+    }
+
+    public void setEi_code(String ei_code) {
+        this.ei_code = ei_code;
+    }
+
+    public Integer getEl_status() {
+        return el_status;
+    }
+
+    public void setEl_status(Integer el_status) {
+        this.el_status = el_status;
+    }
+
+    public String getEl_user() {
+        return el_user;
+    }
+
+    public void setEl_user(String el_user) {
+        this.el_user = el_user;
+    }
+
+    public String getEl_date() {
+        return el_date;
+    }
+
+    public void setEl_date(String el_date) {
+        this.el_date = el_date;
+    }
+
+    public String getEl_billno() {
+        return el_billno;
+    }
+
+    public void setEl_billno(String el_billno) {
+        this.el_billno = el_billno;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.ygj.yuemum.domain.equipment;
+
+public class EquipmentType {
+    private Integer id;
+    private Integer et_code;
+    private String et_name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getEt_code() {
+        return et_code;
+    }
+
+    public void setEt_code(Integer et_code) {
+        this.et_code = et_code;
+    }
+
+    public String getEt_name() {
+        return et_name;
+    }
+
+    public void setEt_name(String et_name) {
+        this.et_name = et_name;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.admin;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.admin.JlServiceUserLogDao;
 import com.ygj.yuemum.domain.admin.JlServiceUserLog;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,8 +25,9 @@ public class JlServiceUserLogService {
     public Map<String, Object> getJlServiceUserLog(int page, int limit,int js_sucode) {
         PageHelper.startPage(page, limit);
         List<JlServiceUserLog> couponBatches = jlServiceUserLogDao.getJlServiceUserLog(js_sucode);
+        PageInfo<JlServiceUserLog> pageInfo = new PageInfo<JlServiceUserLog>(couponBatches);
+        long count = pageInfo.getTotal(); //获取总记录数
         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/admin/TrainService.java

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.admin;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.admin.TrainDao;
 import com.ygj.yuemum.domain.admin.Train;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +20,9 @@ public class TrainService {
     public Map<String, Object> getTrains(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<Train> trains = trainDao.getAll();
+        PageInfo<Train> pageInfo = new PageInfo<Train>(trains);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = trainDao.getcount();
         tableData.put("items", trains);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.coupon;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.coupon.CouponBatchDao;
 import com.ygj.yuemum.domain.coupon.CouponBatch;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +22,9 @@ public class CouponBatchService {
     public Map<String, Object> getCouponBatchs(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<CouponBatch> couponBatches = couponBatchDao.getAll();
+        PageInfo<CouponBatch> pageInfo = new PageInfo<CouponBatch>(couponBatches);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = couponBatchDao.getCount();
         tableData.put("items", couponBatches);
         tableData.put("total", count);
         return tableData;
@@ -58,8 +60,9 @@ public class CouponBatchService {
     public Map<String, Object> getQCouponBatch(CouponBatch couponBatch) {
         PageHelper.startPage(couponBatch.getPage(), couponBatch.getLimit());
         List<CouponBatch> couponBatches = couponBatchDao.getQCouponBatch(couponBatch);
+        PageInfo<CouponBatch> pageInfo = new PageInfo<CouponBatch>(couponBatches);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = couponBatchDao.getQCouponBatchconut(couponBatch);
         tableData.put("items", couponBatches);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.coupon;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.coupon.CouponCreateDao;
 import com.ygj.yuemum.domain.coupon.Coupon;
 import com.ygj.yuemum.domain.coupon.CouponCreate;
@@ -22,8 +23,9 @@ public class CouponCreateService {
     public Map<String, Object> getCouponCreates(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<CouponCreate> couponCreates = couponCreateDao.getAll();
+        PageInfo<CouponCreate> pageInfo = new PageInfo<CouponCreate>(couponCreates);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = couponCreateDao.getCount();
         tableData.put("items", couponCreates);
         tableData.put("total", count);
         return tableData;
@@ -108,8 +110,9 @@ public class CouponCreateService {
     public Map<String, Object> getQCouponCreate(CouponCreate couponCreate) {
         PageHelper.startPage(couponCreate.getPage(), couponCreate.getLimit());
         List<CouponCreate> couponCreates = couponCreateDao.getQCouponCreate(couponCreate);
+        PageInfo<CouponCreate> pageInfo = new PageInfo<CouponCreate>(couponCreates);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = couponCreateDao.getQCouponCreateCount(couponCreate);
         tableData.put("items", couponCreates);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.coupon;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.coupon.CouponLogDao;
 import com.ygj.yuemum.domain.coupon.CouponLog;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +20,9 @@ public class CouponLogService {
     public Map<String, Object> getCouponLogs(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<CouponLog> couponLogs= couponLogDao.getAll();
+        PageInfo<CouponLog> pageInfo = new PageInfo<CouponLog>(couponLogs);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = couponLogDao.getCount();
         tableData.put("items", couponLogs);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.coupon;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.coupon.CouponDao;
 import com.ygj.yuemum.domain.coupon.Coupon;
 import com.ygj.yuemum.domain.coupon.CouponLog;
@@ -32,8 +33,9 @@ public class CouponService {
     public Map<String, Object> getCoupons(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<Coupon> coupons = couponDao.getAll();
+        PageInfo<Coupon> pageInfo = new PageInfo<Coupon>(coupons);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = couponDao.getCount();
         tableData.put("items", coupons);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.customer;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.customer.CustomerCouponDao;
 import com.ygj.yuemum.domain.coupon.Coupon;
 import com.ygj.yuemum.domain.coupon.CouponLog;
@@ -31,8 +32,9 @@ public class CustomerCouponService {
     public Map<String, Object> getCustomerCoupons(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<CustomerCoupon> customerCoupons = customerCouponDao.getAll();
+        PageInfo<CustomerCoupon> pageInfo = new PageInfo<CustomerCoupon>(customerCoupons);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = customerCouponDao.getCount();
         tableData.put("items", customerCoupons);
         tableData.put("total", count);
         return tableData;
@@ -74,8 +76,9 @@ public class CustomerCouponService {
     public Map<String, Object> getCustomerCoupons(CustomerCouponQuery customerCouponQuery) {
         PageHelper.startPage(customerCouponQuery.getPage(), customerCouponQuery.getLimit());
         List<CustomerCoupon> customerCoupons = customerCouponDao.getCustomerCoupons(customerCouponQuery);
+        PageInfo<CustomerCoupon> pageInfo = new PageInfo<CustomerCoupon>(customerCoupons);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = customerCouponDao.getCustomerCouponsCount(customerCouponQuery);
         tableData.put("items", customerCoupons);
         tableData.put("total", count);
         return tableData;

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

@@ -1,11 +1,15 @@
 package com.ygj.yuemum.service.equipment;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.equipment.EquipmentInfoDao;
 import com.ygj.yuemum.domain.equipment.EquipmentInfo;
+import com.ygj.yuemum.domain.equipment.EquipmentLog;
 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;
@@ -15,12 +19,17 @@ public class EquipmentInfoService {
 
     @Autowired
     private EquipmentInfoDao equipmentInfoDao;
+    @Autowired
+    private EquipmentLogService equipmentLogService;
 
     public Map<String, Object> getEquipmentInfos(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<EquipmentInfo> equipmentInfos = equipmentInfoDao.getAll();
+
+        PageInfo<EquipmentInfo> pageInfo = new PageInfo<EquipmentInfo>(equipmentInfos);
+        long count = pageInfo.getTotal(); //获取总记录数
+
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = equipmentInfos.size();
         tableData.put("items", equipmentInfos);
         tableData.put("total", count);
         return tableData;
@@ -29,8 +38,11 @@ public class EquipmentInfoService {
     public Map<String, Object> queryEquipmentInfo(EquipmentInfo equipmentInfo) {
         PageHelper.startPage(equipmentInfo.getPage(), equipmentInfo.getLimit());
         List<EquipmentInfo> equipmentInfos = equipmentInfoDao.queryEquipmentInfo(equipmentInfo);
+
+        PageInfo<EquipmentInfo> pageInfo = new PageInfo<EquipmentInfo>(equipmentInfos);
+        long count = pageInfo.getTotal(); //获取总记录数
+
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = equipmentInfos.size();
         tableData.put("items", equipmentInfos);
         tableData.put("total", count);
         return tableData;
@@ -42,7 +54,20 @@ public class EquipmentInfoService {
     }
 
     public int addEquipmentInfo(EquipmentInfo equipmentInfo) {
-        return equipmentInfoDao.insertSelective(equipmentInfo);
+        try{
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            EquipmentLog equipmentLog = new EquipmentLog();
+            equipmentLog.setEi_code(equipmentInfo.getEi_code());
+            equipmentLog.setEl_status(1);
+            equipmentLog.setEl_user(equipmentInfo.getUser());
+            equipmentLog.setEl_date(sdf.format(new Date()));
+            equipmentLogService.insertEquipmentLog(equipmentLog);
+            equipmentInfoDao.insertSelective(equipmentInfo);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
     }
 
     public int deleteEquipmentInfo(Integer id) {
@@ -56,5 +81,12 @@ public class EquipmentInfoService {
     public EquipmentInfo getEquipmentInfo(Integer id) {
         return equipmentInfoDao.selectByPrimaryKey(id);
     }
+    public EquipmentInfo getEquipmentInfoEicode(String ei_code) {
+        return equipmentInfoDao.getEquipmentInfoEicode(ei_code);
+    }
+
+    public int checkEquipmentInfo(String ei_code){
+        return equipmentInfoDao.checkEquipmentInfo(ei_code);
+    }
 
 }

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

@@ -0,0 +1,38 @@
+package com.ygj.yuemum.service.equipment;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ygj.yuemum.dao.equipment.EquipmentLogDao;
+import com.ygj.yuemum.domain.equipment.EquipmentLog;
+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 EquipmentLogService {
+
+    @Autowired
+
+    private EquipmentLogDao equipmentLogDao;
+
+    public Map<String, Object> getEquipmentLogs(EquipmentLog equipmentLog) {
+        PageHelper.startPage(equipmentLog.getPage(), equipmentLog.getLimit());
+        List<EquipmentLog> equipmentLogs = equipmentLogDao.getEquipmentLogs(equipmentLog);
+
+        PageInfo<EquipmentLog> pageInfo = new PageInfo<EquipmentLog>(equipmentLogs);
+        long count = pageInfo.getTotal(); //获取总记录数
+
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", equipmentLogs);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+    public int insertEquipmentLog(EquipmentLog equipmentLog) {
+        return equipmentLogDao.insertEquipmentLog(equipmentLog);
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package com.ygj.yuemum.service.equipment;
+
+import com.ygj.yuemum.dao.equipment.EquipmentTypeDao;
+import com.ygj.yuemum.domain.equipment.EquipmentType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class EquipmentTypeService {
+
+    @Autowired
+
+    private EquipmentTypeDao equipmentTypeDao;
+
+    public List<EquipmentType> getEquipmentTypes() {
+        return equipmentTypeDao.getEquipmentTypes();
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.maternitymatron;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.maternitymatron.JlServiceUserDao;
 import com.ygj.yuemum.dao.maternitymatron.MmStockDao;
 import com.ygj.yuemum.domain.maternitymatron.JlServiceUser;
@@ -37,8 +38,9 @@ public class JlServiceUserService {
     public Map<String, Object> getMMList(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<JlServiceUser> mmlists = jlServiceUserDao.getMMList();
+        PageInfo<JlServiceUser> pageInfo = new PageInfo<JlServiceUser>(mmlists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = jlServiceUserDao.getcount();
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;
@@ -47,8 +49,9 @@ public class JlServiceUserService {
     public Map<String, Object> queryMMList(QueryServiceUser queryServiceUser) {
         PageHelper.startPage(queryServiceUser.getPage(), queryServiceUser.getLimit());
         List<QueryServiceUser> mmlists = jlServiceUserDao.queryMMList(queryServiceUser);
+        PageInfo<QueryServiceUser> pageInfo = new PageInfo<QueryServiceUser>(mmlists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = jlServiceUserDao.getquerycount(queryServiceUser);
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;
@@ -57,8 +60,9 @@ public class JlServiceUserService {
     public Map<String, Object> queryServiceUserStock(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<JlServiceUser> mmlists = jlServiceUserDao.queryServiceUserStock();
+        PageInfo<JlServiceUser> pageInfo = new PageInfo<JlServiceUser>(mmlists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = jlServiceUserDao.getstocklistcount();
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;
@@ -108,9 +112,11 @@ public class JlServiceUserService {
         }
         PageHelper.startPage(queryServiceUserStock.getPage(), queryServiceUserStock.getLimit());
         List<QueryServiceUserStock> stockLists = jlServiceUserDao.queryServiceUserStockCondition(queryServiceUserStock);
+        PageInfo<QueryServiceUserStock> pageInfo = new PageInfo<QueryServiceUserStock>(stockLists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
         tableData.put("items", stockLists);
-        tableData.put("total", stockLists.size());
+        tableData.put("total", count);
         return tableData;
     }
 

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.maternitymatron;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.maternitymatron.MmInfoCertificateDao;
 import com.ygj.yuemum.domain.maternitymatron.MmInfoCertificate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +27,9 @@ public class MmInfoCertificateService {
 
         PageHelper.startPage(page, limit);
         List<MmInfoCertificate> mmlists = mmInfoCertificateDao.getInfoCertificate(id);
+        PageInfo<MmInfoCertificate> pageInfo = new PageInfo<MmInfoCertificate>(mmlists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = mmInfoCertificateDao.getCertificateCount(id);
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.maternitymatron;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.maternitymatron.MmInfoTrainDao;
 import com.ygj.yuemum.domain.maternitymatron.MmInfoTrain;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +26,9 @@ public class MmInfoTrainService {
 
         PageHelper.startPage(page, limit);
         List<MmInfoTrain> mmlists = mmInfoTrainDao.getInfoTrains(id);
+        PageInfo<MmInfoTrain> pageInfo = new PageInfo<MmInfoTrain>(mmlists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count  = mmInfoTrainDao.getTrainsCount(id);
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.maternitymatron;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.admin.JlServiceUserLogDao;
 import com.ygj.yuemum.dao.maternitymatron.MmStockDao;
 import com.ygj.yuemum.domain.admin.JlServiceUserLog;
@@ -108,8 +109,9 @@ public class MmStockService {
     public Map<String, Object> refMMStock(int page, int limit, Integer servant_code) {
         PageHelper.startPage(page, limit);
         List<MmStock> mmlists = mmStockDao.refMMStock(servant_code);
+        PageInfo<MmStock> pageInfo = new PageInfo<MmStock>(mmlists);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = mmStockDao.getStockCount(servant_code);
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;

src/main/java/com/ygj/yuemum/service/modoo/ModooLogService.java

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.modoo;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.modoo.ModooLogDao;
 import com.ygj.yuemum.domain.modoo.ModooLog;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +21,9 @@ public class ModooLogService {
     public Map<String, Object> getModooLogs(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<ModooLog> modooLogs = modooLogDao.getAll();
+        PageInfo<ModooLog> pageInfo = new PageInfo<ModooLog>(modooLogs);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = modooLogDao.getCount();
         tableData.put("items", modooLogs);
         tableData.put("total", count);
         return tableData;

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.service.order;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.maternitymatron.MmStockDao;
 import com.ygj.yuemum.dao.order.OrderTempDao;
 import com.ygj.yuemum.domain.maternitymatron.MmStock;
@@ -27,8 +28,9 @@ public class OrderTempService {
     public Map<String, Object> getOrderTemps(int page, int limit) {
         PageHelper.startPage(page, limit);
         List<OrderTemp> orderTemps = orderTempDao.getAll();
+        PageInfo<OrderTemp> pageInfo = new PageInfo<OrderTemp>(orderTemps);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = orderTempDao.getCount();
         tableData.put("items", orderTemps);
         tableData.put("total", count);
         return tableData;
@@ -37,8 +39,9 @@ public class OrderTempService {
     public Map<String, Object> queryOrderTemp(OrderTemp orderTemp) {
         PageHelper.startPage(orderTemp.getPage(),orderTemp.getLimit());
         List<OrderTemp> orderTemps = orderTempDao.queryOrderTemp(orderTemp);
+        PageInfo<OrderTemp> pageInfo = new PageInfo<OrderTemp>(orderTemps);
+        long count = pageInfo.getTotal(); //获取总记录数
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = orderTemps.size();
         tableData.put("items", orderTemps);
         tableData.put("total", count);
         return tableData;

src/main/resources/application.yml

@@ -2,8 +2,8 @@ server:
   port: 8888
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
-  mapper-locations: mybatis/mapper/admin/*.xml,mybatis/mapper/maternitymatron/*.xml,mybatis/mapper/coupon/*.xml,mybatis/mapper/global/*.xml,mybatis/mapper/customer/*.xml,mybatis/mapper/modoo/*.xml,mybatis/mapper/order/*.xml
-  mybatis.type-aliases-package: com.ygj.yuemum.domain/admin,com.ygj.yuemum.domain/maternitymatron,com.ygj.yuemum.domain/coupon,com.ygj.yuemum.domain/global,com.ygj.yuemum.domain/customer,com.ygj.yuemum.domain/modoo,com.ygj.yuemum.domain/order
+  mapper-locations: mybatis/mapper/admin/*.xml,mybatis/mapper/maternitymatron/*.xml,mybatis/mapper/coupon/*.xml,mybatis/mapper/global/*.xml,mybatis/mapper/customer/*.xml,mybatis/mapper/modoo/*.xml,mybatis/mapper/order/*.xml,mybatis/mapper/equipment/*.xml
+  mybatis.type-aliases-package: com.ygj.yuemum.domain/admin,com.ygj.yuemum.domain/maternitymatron,com.ygj.yuemum.domain/coupon,com.ygj.yuemum.domain/global,com.ygj.yuemum.domain/customer,com.ygj.yuemum.domain/modoo,com.ygj.yuemum.domain/order,com.ygj.yuemum.domain/equipment
   log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 spring:
   datasource:

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

@@ -4,14 +4,15 @@
 
     <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.equipment.EquipmentInfo" >
         <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="et_code" property="et_code" jdbcType="INTEGER" />
+        <result column="et_code" property="et_code" jdbcType="VARCHAR" />
         <result column="ei_code" property="ei_code" jdbcType="VARCHAR" />
         <result column="ei_rent" property="ei_rent" jdbcType="INTEGER" />
         <result column="ei_status" property="ei_status" jdbcType="INTEGER" />
+        <result column="ei_date" property="ei_date" jdbcType="DATE" />
     </resultMap>
 
     <sql id="Base_Column_List" >
-        id,et_code, ei_code,ei_rent,ei_status
+        id,et_code, ei_code,ei_rent,ei_status,ei_date
     </sql>
 
     <!--获取所有数据-->
@@ -23,25 +24,31 @@
 
     <select id="getAll" resultMap="BaseResultMap" >
         select
-        id,et_code, ei_code,ei_rent,ei_status
+        id,fgetequipmenttypename(et_code) et_code, ei_code,ei_rent,ei_status,ei_date
         from equipment_info
         order by id desc
     </select>
 
     <select id="queryEquipmentInfo" resultMap="BaseResultMap" parameterType="com.ygj.yuemum.domain.equipment.EquipmentInfo">
         select
-        id,et_code, ei_code,ei_rent,ei_status
+        id,fgetequipmenttypename(et_code) et_code, ei_code,ei_rent,ei_status,ei_date
         from equipment_info
         where 1=1
-        <if test="et_code != null and ot_code != ''">
-            and et_code like "%"#{et_code,jdbcType=VARCHAR}"%"
+        <if test="ei_code != null and et_code != ''">
+            and ei_code = #{ei_code,jdbcType=INTEGER}
         </if>
-        <if test="ei_rent != null and cm_phone != ''">
+        <if test="et_code != null and et_code != ''">
+            and et_code = #{et_code,jdbcType=INTEGER}
+        </if>
+        <if test="ei_rent != null and ei_rent != ''">
             and ei_rent = #{ei_rent,jdbcType=INTEGER}
         </if>
-        <if test="ei_status != null and ot_startdate != ''">
+        <if test="ei_status != null and ei_status != ''">
             and ei_status = #{ei_status,jdbcType=INTEGER}
         </if>
+        <if test="ei_date != null and ei_date != ''">
+            and ei_date = #{ei_date,jdbcType=DATE}
+        </if>
         order by id desc
     </select>
 
@@ -52,6 +59,20 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
 
+    <select id="getEquipmentInfoEicode" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from equipment_info
+        where ei_code = #{ei_code,jdbcType=INTEGER}
+    </select>
+
+    <select id="checkEquipmentInfo" resultType="java.lang.Integer" parameterType="java.lang.String" >
+        select
+        count(1)
+        from equipment_info
+        where ei_code = #{ei_code,jdbcType=INTEGER}
+    </select>
+
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
         delete from equipment_info
         where id = #{id,jdbcType=VARCHAR}
@@ -71,7 +92,10 @@
                 ei_rent,
             </if>
             <if test="ei_status != null" >
-                ei_status
+                ei_status,
+            </if>
+            <if test="ei_date != null" >
+                ei_date
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -85,7 +109,10 @@
                 #{ei_rent,jdbcType=INTEGER},
             </if>
             <if test="ei_status != null" >
-                #{ei_status,jdbcType=INTEGER}
+                #{ei_status,jdbcType=INTEGER},
+            </if>
+            <if test="ei_date != null" >
+                #{ei_date,jdbcType=DATE}
             </if>
         </trim>
     </insert>
@@ -104,10 +131,12 @@
                 ei_rent = #{ei_rent,jdbcType=INTEGER},
             </if>
             <if test="ei_status != null" >
-                ei_status = #{ei_status,jdbcType=INTEGER}
+                ei_status = #{ei_status,jdbcType=INTEGER},
+            </if>
+            <if test="ei_date != null" >
+                ei_date = #{ei_date,jdbcType=DATE}
             </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
-
 </mapper>

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

@@ -0,0 +1,61 @@
+<?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.equipment.EquipmentLogDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.equipment.EquipmentLog" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="ei_code" property="ei_code" jdbcType="VARCHAR" />
+        <result column="el_status" property="el_status" jdbcType="INTEGER" />
+        <result column="el_user" property="el_user" jdbcType="VARCHAR" />
+        <result column="el_date" property="el_date" jdbcType="DATE" />
+        <result column="el_billno" property="el_billno" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getEquipmentLogs" resultType="com.ygj.yuemum.domain.equipment.EquipmentLog" parameterType="com.ygj.yuemum.domain.equipment.EquipmentLog" >
+        select
+        id,ei_code,el_status,el_user,el_date,el_billno
+        from equipment_log
+        where ei_code = #{ei_code,jdbcType=VARCHAR}
+    </select>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertEquipmentLog" parameterType="com.ygj.yuemum.domain.equipment.EquipmentLog" >
+        insert into equipment_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="ei_code != null" >
+                ei_code,
+            </if>
+            <if test="el_status != null" >
+                el_status,
+            </if>
+            <if test="el_user != null" >
+                el_user,
+            </if>
+            <if test="el_date != null" >
+                el_date,
+            </if>
+            <if test="el_billno != null" >
+                el_billno
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="ei_code != null" >
+                #{ei_code,jdbcType=VARCHAR},
+            </if>
+            <if test="el_status != null" >
+                #{el_status,jdbcType=INTEGER},
+            </if>
+            <if test="el_user != null" >
+                #{el_user,jdbcType=VARCHAR},
+            </if>
+            <if test="el_date != null" >
+                #{el_date,jdbcType=DATE},
+            </if>
+            <if test="el_billno != null" >
+                #{el_billno,jdbcType=VARCHAR}
+            </if>
+        </trim>
+    </insert>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?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.equipment.EquipmentTypeDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.equipment.EquipmentType" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="et_code" property="et_code" jdbcType="INTEGER" />
+        <result column="et_name" property="et_name" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getEquipmentTypes" resultType="com.ygj.yuemum.domain.equipment.EquipmentType" >
+        select
+        id,et_code,et_name
+        from equipment_type
+    </select>
+
+</mapper>