crud

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

@@ -1,12 +1,14 @@
 package com.ygj.yuemum.controller.maternitymatron;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ygj.yuemum.domain.maternitymatron.MmInfoCertificate;
 import com.ygj.yuemum.service.maternitymatron.MmInfoCertificateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class MmInfoCertificateController {
@@ -14,6 +16,13 @@ public class MmInfoCertificateController {
     @Autowired
     private MmInfoCertificateService mmInfoCertificateService;
 
+    @GetMapping("/getInfoCertificates")
+    public String getInfoTrains(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit ,@RequestParam("id") Integer id) {
+        Map<String, Object> certificates= mmInfoCertificateService.getInfoCertificates(page,limit,id);
+        String jso = JSONObject.toJSONString(certificates);
+        return jso;
+    }
+
     @GetMapping("/getMmInfoCertificates")
     public List<MmInfoCertificate> getMmInfoCertificates() {
         return mmInfoCertificateService.getMmInfoCertificates();
@@ -24,13 +33,15 @@ public class MmInfoCertificateController {
         return mmInfoCertificateService.addMmInfoCertificate(mmInfoCertificate);
     }
 
-    @GetMapping("/deleteMmInfoCertificate/{id}")
-    public int delete(@PathVariable("id") Integer id) {
+    @GetMapping("/deleteMmInfoCertificate")
+    public int delete(@RequestParam("id") Integer id) {
         return mmInfoCertificateService.deleteMmInfoCertificate(id);
     }
 
     @PostMapping("/updateMmInfoCertificate")
-    public int update(@ModelAttribute MmInfoCertificate mmInfoCertificate) { return mmInfoCertificateService.updateMmInfoCertificate(mmInfoCertificate);}
+    public int update(@ModelAttribute MmInfoCertificate mmInfoCertificate) {
+        return mmInfoCertificateService.updateMmInfoCertificate(mmInfoCertificate);
+    }
 
     @GetMapping("/getMmInfoCertificate/{id}")
     public MmInfoCertificate getOne(@PathVariable("id") Integer id) {return  mmInfoCertificateService.getMmInfoCertificate(id);}

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

@@ -33,8 +33,8 @@ public class MmInfoTrainController {
         return mmInfoTrainService.addMmInfoTrain(mmInfoTrain);
     }
 
-    @GetMapping("/deleteMmInfoTrain/{id}")
-    public int delete(@PathVariable("id") Integer id) {
+    @GetMapping("/deleteMmInfoTrain")
+    public int delete(@RequestParam("id") Integer id) {
         return mmInfoTrainService.deleteMmInfoTrain(id);
     }
 

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

@@ -8,37 +8,19 @@ import java.util.List;
 @Repository
 public interface MmInfoCertificateDao {
 
-    /**
-     * 得到所有的照片信息
-     * @return List<MmInfoCertificate>
-     */
     List<MmInfoCertificate> getAll();
 
-    /**
-     * 根据id删除某个照片信息
-     * @param id
-     * @return
-     */
+    List<MmInfoCertificate> getInfoCertificate(Integer id);
+
+    int getCertificateCount(Integer id);
+
     int deleteByPrimaryKey(Integer id);
 
-    /**
-     * 插入一条用照片息
-     * @param record
-     * @return
-     */
     int insertSelective(MmInfoCertificate record);
 
-    /**
-     * 根据id查找某个照片信息
-     * @param id
-     * @return User
-     */
     MmInfoCertificate selectByPrimaryKey(Integer id);
 
-    /**
-     * 根据id更新一条照片信息
-     * @param record
-     * @return
-     */
     int updateByPrimaryKeySelective(MmInfoCertificate record);
+
+
 }

src/main/java/com/ygj/yuemum/domain/maternitymatron/MmInfoCertificate.java

@@ -1,14 +1,13 @@
 package com.ygj.yuemum.domain.maternitymatron;
 
-import java.util.Date;
-
 public class MmInfoCertificate {
 
     private Integer id;
     private Integer servant_code; // 月嫂编号
     private Integer certificate_code; // 证书编号
-    private Date start_date; // 领证日期
-    private Date end_date; // 到期日期
+    private String start_date; // 领证日期
+    private String end_date; // 到期日期
+    private String certificate_name;
 
     public MmInfoCertificate() {
         super();
@@ -38,22 +37,30 @@ public class MmInfoCertificate {
         this.certificate_code = certificate_code;
     }
 
-    public Date getStart_date() {
+    public String getStart_date() {
         return start_date;
     }
 
-    public void setStart_date(Date start_date) {
+    public void setStart_date(String start_date) {
         this.start_date = start_date;
     }
 
-    public Date getEnd_date() {
+    public String getEnd_date() {
         return end_date;
     }
 
-    public void setEnd_date(Date end_date) {
+    public void setEnd_date(String end_date) {
         this.end_date = end_date;
     }
 
+    public String getCertificate_name() {
+        return certificate_name;
+    }
+
+    public void setCertificate_name(String certificate_name) {
+        this.certificate_name = certificate_name;
+    }
+
     @Override
     public String toString() {
         return "MmInfoCertificate{" +

src/main/java/com/ygj/yuemum/domain/maternitymatron/MmInfoTrain.java

@@ -1,14 +1,12 @@
 package com.ygj.yuemum.domain.maternitymatron;
 
-import java.util.Date;
-
 public class MmInfoTrain {
 
     private Integer id;
-    private Integer servant_code; // 月嫂编号
-    private Integer train_code; // 培训编号
-    private Date train_date; // 培训编号
-    private String train_result; // 培训成绩
+    private Integer servant_code;
+    private Integer train_code;
+    private String train_date;
+    private String train_result;
     private String train_name;
 
     public MmInfoTrain() {
@@ -39,11 +37,11 @@ public class MmInfoTrain {
         this.train_code = train_code;
     }
 
-    public Date getTrain_date() {
+    public String getTrain_date() {
         return train_date;
     }
 
-    public void setTrain_date(Date train_date) {
+    public void setTrain_date(String train_date) {
         this.train_date = train_date;
     }
 

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

@@ -1,11 +1,14 @@
 package com.ygj.yuemum.service.maternitymatron;
 
+import com.github.pagehelper.PageHelper;
 import com.ygj.yuemum.dao.maternitymatron.MmInfoCertificateDao;
 import com.ygj.yuemum.domain.maternitymatron.MmInfoCertificate;
 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 MmInfoCertificateService {
@@ -19,6 +22,18 @@ public class MmInfoCertificateService {
         return mmInfoCertificates;
     }
 
+    public Map<String, Object> getInfoCertificates(int page, int limit , int id) {
+
+        PageHelper.startPage(page, limit);
+        List<MmInfoCertificate> mmlists = mmInfoCertificateDao.getInfoCertificate(id);
+        Map<String, Object> tableData = new HashMap<>();
+        Integer count  = mmInfoCertificateDao.getCertificateCount(id);
+        tableData.put("items", mmlists);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+
     public int addMmInfoCertificate(MmInfoCertificate mminfoCertificate) {
         return mmInfoCertificateDao.insertSelective(mminfoCertificate);
     }

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

@@ -6,12 +6,13 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="servant_code" property="servant_code" jdbcType="INTEGER" />
         <result column="certificate_code" property="certificate_code" jdbcType="INTEGER" />
-        <result column="start_date" property="start_date" jdbcType="DATE" />
-        <result column="end_date" property="end_date" jdbcType="DATE" />
+        <result column="start_date" property="start_date" jdbcType="VARCHAR" />
+        <result column="end_date" property="end_date" jdbcType="VARCHAR" />
+        <result column="certificate_name" property="certificate_name" jdbcType="VARCHAR" />
     </resultMap>
 
     <sql id="Base_Column_List" >
-        id, servant_code, certificate_code,start_date,end_date
+        id, servant_code, certificate_code,start_date,end_date,certificate_name
     </sql>
 
     <!-- 得到月嫂证书信息 -->
@@ -21,10 +22,20 @@
         from mm_info_certificate
     </select>
 
-    <!-- 根据id查找月嫂证书信息 -->
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="getCertificateCount" parameterType="java.lang.Integer" resultType="java.lang.Integer" >
         select
-        <include refid="Base_Column_List" />
+        count(1)
+        from mm_info_certificate
+        where servant_code = #{servant_code,jdbcType=INTEGER}
+    </select>
+
+    <select id="getInfoCertificate" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        id,
+        fgetcertificatename(certificate_code) certificate_name,
+        certificate_code,
+        DATE_FORMAT(start_date,'%Y-%m-%d') start_date,
+        DATE_FORMAT(end_date,'%Y-%m-%d') end_date
         from mm_info_certificate
         where servant_code = #{servant_code,jdbcType=INTEGER}
     </select>
@@ -78,10 +89,10 @@
                 certificate_code = #{certificate_code,jdbcType=VARCHAR},
             </if>
             <if test="start_date != null" >
-                start_date = #{start_date,jdbcType=INTEGER},
+                start_date = #{start_date,jdbcType=DATE},
             </if>
             <if test="end_date != null" >
-                end_date = #{end_date,jdbcType=VARCHAR}
+                end_date = #{end_date,jdbcType=DATE}
             </if>
         </set>
         where id = #{id,jdbcType=INTEGER}

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

@@ -6,7 +6,7 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="servant_code" property="servant_code" jdbcType="INTEGER" />
         <result column="train_code" property="train_code" jdbcType="INTEGER" />
-        <result column="train_date" property="train_date" jdbcType="DATE" />
+        <result column="train_date" property="train_date" jdbcType="VARCHAR" />
         <result column="train_result" property="train_result" jdbcType="VARCHAR" />
         <result column="train_name" property="train_name" jdbcType="VARCHAR" />
     </resultMap>
@@ -35,7 +35,7 @@
         id,
         fgettrainname(train_code) train_name,
         train_code,
-        train_date,
+        DATE_FORMAT(train_date,'%Y-%m-%d') train_date,
         train_result
         from mm_info_train
         where servant_code = #{servant_code,jdbcType=INTEGER}