crud

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

@@ -46,6 +46,8 @@ public class JlServiceUserController {
         return jso;
     }
 
+
+
     @PostMapping("/addjlServiceUser")
     public int add(@ModelAttribute AddMMInfo addMMInfo) {
 

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

@@ -24,6 +24,11 @@ public class JlServiceUserInfoController {
         return jlServiceUserInfoService.addJlServiceUserInfo(jlServiceUserInfo);
     }
 
+    @GetMapping("/IDCardCheck")
+    public int IDCardCheck(@RequestParam("idcard") String idcard) {
+        return jlServiceUserInfoService.idcardcheck(idcard);
+    }
+
     @GetMapping("/deleteJlServiceUserInfo/{id}")
     public int delete(@PathVariable("id") Integer id) {
         return jlServiceUserInfoService.deleteJlServiceUserInfo(id);

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

@@ -34,8 +34,14 @@ public class MmStockController {
     @PostMapping("/updateMmStock")
     public int update(@ModelAttribute MmStock mmStock) { return mmStockService.updateMmStock(mmStock);}
 
-    @GetMapping("/getMmStock/{id}")
-    public MmStock getOne(@PathVariable("id") Integer id) {return  mmStockService.getMmStock(id);}
+    @GetMapping("/getMmStock")
+    public List<MmStock> getMmStock(@RequestParam("servant_code") Integer servant_code) {
+        return  mmStockService.getMmStock(servant_code);
+    }
+    @GetMapping("/refMMStock")
+    public List<MmStock> refMMStock(@RequestParam("servant_code") Integer servant_code) {
+        return  mmStockService.refMMStock(servant_code);
+    }
 
     @InitBinder
     public void initBinder(WebDataBinder binder) {

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

@@ -13,4 +13,5 @@ public interface JlServiceUserInfoDao {
     int insertSelective(JlServiceUserInfo record);
     JlServiceUserInfo selectByPrimaryKey(Integer id);
     int updateByPrimaryKeySelective(JlServiceUserInfo record);
+    int idcardcheck(String idcard);
 }

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

@@ -7,38 +7,15 @@ import java.util.List;
 
 @Repository
 public interface MmStockDao {
-
-    /**
-     * 得到所有的库存信息
-     * @return List<Photo>
-     */
     List<MmStock> getAll();
 
-    /**
-     * 根据id删除某个库存信息
-     * @param id
-     * @return
-     */
     int deleteByPrimaryKey(Integer id);
 
-    /**
-     * 插入一条用库存息
-     * @param record
-     * @return
-     */
     int insertSelective(MmStock record);
 
-    /**
-     * 根据id查找某个库存信息
-     * @param id
-     * @return User
-     */
-    MmStock selectByPrimaryKey(Integer id);
-
-    /**
-     * 根据id更新一条库存信息
-     * @param record
-     * @return
-     */
+    List<MmStock> selectByPrimaryKey(Integer servant_code);
+
+    List<MmStock> refMMStock(Integer servant_code);
+
     int updateByPrimaryKeySelective(MmStock record);
 }

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

@@ -1,14 +1,12 @@
 package com.ygj.yuemum.domain.maternitymatron;
 
-import java.util.Date;
-
 public class MmStock {
 
     private Integer id;
     private Integer servant_code; // 月嫂编号
     private Integer stock_status; // 库存状态
-    private Date start_date; // 开始日期
-    private Date end_date; // 结束日期
+    private String start_date; // 开始日期
+    private String end_date; // 结束日期
 
     public MmStock() {
         super();
@@ -38,19 +36,19 @@ public class MmStock {
         this.stock_status = stock_status;
     }
 
-    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;
     }
 

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

@@ -14,6 +14,9 @@ public class JlServiceUserInfoService {
 
     private JlServiceUserInfoDao jlServiceUserInfoDao;
 
+    public int idcardcheck(String idcard){
+        return jlServiceUserInfoDao.idcardcheck(idcard);
+    }
 
     public List<JlServiceUserInfo> getJlServiceUserInfos() {
         List<JlServiceUserInfo> jlServiceUserInfos = jlServiceUserInfoDao.getAll();

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

@@ -32,7 +32,11 @@ public class MmStockService {
         return mmStockDao.updateByPrimaryKeySelective(mmStock);
     }
 
-    public MmStock getMmStock(Integer id) {
-        return mmStockDao.selectByPrimaryKey(id);
+    public List<MmStock> getMmStock(Integer servant_code) {
+        return mmStockDao.selectByPrimaryKey(servant_code);
+    }
+
+    public List<MmStock> refMMStock(Integer servant_code) {
+        return mmStockDao.refMMStock(servant_code);
     }
 }

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

@@ -36,6 +36,13 @@
         id,truename,mobile_phone,level,is_fulltime,total_score,email,tel,create_time,gender,portrait,birthday,qq,update_time,address,brief,idcard,education,city,district,service_number,province,update_uid,updated_at,seniority,babynumber,constellation,zodiac
     </sql>
 
+    <select id="idcardcheck" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select
+        count(1)
+        from jl_service_user_info
+        where idcard = #{idcard,jdbcType=VARCHAR}
+    </select>
+
     <!-- 得到所有的月嫂信息 -->
     <select id="getAll" resultMap="BaseResultMap" >
         select

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

@@ -47,6 +47,8 @@
         from jl_service_user
     </select>
 
+
+
     <!--获取主键-->
     <select id="getpmid" resultType="java.lang.Integer" >
         SELECT auto_increment
@@ -100,6 +102,7 @@
         order by id
     </select>
 
+
     <select id="queryMMList" resultMap="ListResultMap" parameterType="com.ygj.yuemum.domain.maternitymatron.QueryServiceUser">
         select
         jl_service_user.id,

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

@@ -6,8 +6,8 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="servant_code" property="servant_code" jdbcType="INTEGER" />
         <result column="stock_status" property="stock_status" 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" />
     </resultMap>
 
     <sql id="Base_Column_List" >
@@ -24,9 +24,26 @@
     <!-- 根据id查找某个库存信息 -->
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
         select
-        <include refid="Base_Column_List" />
+        id,
+        servant_code,
+        stock_status,
+        DATE_FORMAT(start_date,'%Y-%m-%d') start_date,
+        DATE_FORMAT(end_date,'%Y-%m-%d') end_date
+        from mm_stock
+        where servant_code = #{servant_code,jdbcType=INTEGER}
+        order by id desc
+    </select>
+
+    <select id="refMMStock" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        id,
+        servant_code,
+        stock_status,
+        DATE_FORMAT(start_date,'%Y-%m-%d') start_date,
+        DATE_FORMAT(end_date,'%Y-%m-%d') end_date
         from mm_stock
         where servant_code = #{servant_code,jdbcType=INTEGER}
+        order by id desc
     </select>
     <!-- 根据id删除某个库存信息 -->
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >