crud

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

@@ -0,0 +1,23 @@
+package com.ygj.yuemum.controller.admin;
+
+
+import com.ygj.yuemum.domain.admin.Constellation;
+import com.ygj.yuemum.service.admin.ConstellationService;
+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 ConstellationController {
+
+    @Autowired
+    private ConstellationService constellationService;
+    @GetMapping("/getConstellation")
+    public List<Constellation> getConstellation() {
+        List<Constellation> constellations = constellationService.getConstellation();
+        return constellations;
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package com.ygj.yuemum.controller.admin;
+
+
+import com.ygj.yuemum.domain.admin.Zodiac;
+import com.ygj.yuemum.service.admin.ZodiacService;
+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 ZodiacController {
+
+    @Autowired
+    private ZodiacService zodiacService;
+    @GetMapping("/getZodiac")
+    public List<Zodiac> getZodiac() {
+        List<Zodiac> zodiacs = zodiacService.getZodiac();
+        return zodiacs;
+    }
+
+}

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

@@ -61,9 +61,7 @@ public class JlServiceUserController {
 
     @PostMapping("/addjlServiceUser")
     public int add(@ModelAttribute AddMMInfo addMMInfo) {
-
         int id =jlServiceUserService.getPMId();
-
         JlServiceUserInfo jlServiceUserInfo = new JlServiceUserInfo();
         JlServiceUser jlServiceUser = new JlServiceUser();
         // jlServiceUser
@@ -112,7 +110,50 @@ public class JlServiceUserController {
     }
 
     @PostMapping("/updatejlServiceUser")
-    public int update(@ModelAttribute JlServiceUser jlServiceUser) { return jlServiceUserService.updateJlServiceUser(jlServiceUser);}
+    public int updatejlServiceUser(@ModelAttribute JlServiceUser jlServiceUser) {
+        JlServiceUserInfo jlServiceUserInfo = new JlServiceUserInfo();
+        //jlServiceUserInfo
+        jlServiceUserInfo.setIdcard(jlServiceUser.getIdcard());
+        jlServiceUserInfo.setSeniority(jlServiceUser.getSeniority());
+        jlServiceUserInfo.setBabynumber(jlServiceUser.getBabynumber());
+        if (jlServiceUser.getGender() != null) {
+            jlServiceUserInfo.setGender(Integer.valueOf(jlServiceUser.getGender()));
+        }
+        if(jlServiceUser.getNp() != null) {
+            jlServiceUserInfo.setCity(Integer.valueOf(jlServiceUser.getNp()));
+        }
+        jlServiceUserInfo.setId(jlServiceUser.getId());
+        jlServiceUserInfo.setConstellation(jlServiceUser.getConstellation());
+        jlServiceUserInfo.setZodiac(jlServiceUser.getZodiac());
+        jlServiceUserInfo.setEducation(jlServiceUser.getEducation());
+        jlServiceUserInfo.setEthnicgroup(jlServiceUser.getEthnicgroup());
+        jlServiceUserInfo.setHeight(jlServiceUser.getHeight());
+        jlServiceUserInfo.setHighlight(jlServiceUser.getHighlight());
+        jlServiceUserInfo.setMarriage(jlServiceUser.getMarriage());
+        jlServiceUserInfo.setWeight(jlServiceUser.getWeight());
+        try {
+            jlServiceUserService.updateJlServiceUser(jlServiceUser);
+            jlServiceUserInfoService.updateJlServiceUserInfo(jlServiceUserInfo);
+            // jlStoreX
+            if(jlServiceUser.getCityname() != null) {
+                String sum[] = jlServiceUser.getCityname().split(",");
+                jlStoreXService.deleteJlStoreX(jlServiceUser.getId());
+                for(int i=0;i<sum.length;i++){
+                    JlStoreX jlStoreX = new JlStoreX();
+                    jlStoreX.setService_id(String.valueOf(jlServiceUser.getId()));
+                    jlStoreX.setStore_id(Integer.valueOf(sum[i]));
+                    jlStoreXService.addJlStoreX(jlStoreX);
+                }
+                return 1;
+            }
+            return 1;
+        }catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+    @PostMapping("/upDateStatus")
+    public int upDateStatus(@ModelAttribute JlServiceUser jlServiceUser) { return jlServiceUserService.upDateStatus(jlServiceUser);}
 
     @GetMapping("/getjlServiceUser")
     public JlServiceUser getOne(@RequestParam("id") Integer id) {return  jlServiceUserService.getJlServiceUser(id);}

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

@@ -0,0 +1,12 @@
+package com.ygj.yuemum.dao.admin;
+
+import com.ygj.yuemum.domain.admin.Constellation;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ConstellationDao {
+
+    List<Constellation> getConstellation();
+}

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

@@ -0,0 +1,12 @@
+package com.ygj.yuemum.dao.admin;
+
+import com.ygj.yuemum.domain.admin.Zodiac;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ZodiacDao {
+
+    List<Zodiac> getzodiac();
+}

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

@@ -29,6 +29,7 @@ public interface JlServiceUserDao {
     int getStock(QueryServiceUserStock queryServiceUserStock);
     int getquerycount(QueryServiceUser record);
     int getpmid();
+    int upDateStatus(JlServiceUser record);
 
     /**
      * 根据id删除某个库存信息

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.domain.admin;
+
+public class Constellation {
+    private Integer id;
+    private String name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.domain.admin;
+
+public class Zodiac {
+    private Integer id;
+    private String name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -32,6 +32,33 @@ public class JlServiceUser {
     private String marriage;
     private String highlight;
     private String education;
+    private String weight;
+    private String citycode;
+    private String city;
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getCitycode() {
+        return citycode;
+    }
+
+    public void setCitycode(String citycode) {
+        this.citycode = citycode;
+    }
 
     public String getEthnicgroup() {
         return ethnicgroup;

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

@@ -0,0 +1,21 @@
+package com.ygj.yuemum.service.admin;
+
+import com.ygj.yuemum.dao.admin.ConstellationDao;
+import com.ygj.yuemum.domain.admin.Constellation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ConstellationService {
+
+    @Autowired
+
+    private ConstellationDao constellationDao;
+
+    public List<Constellation> getConstellation() {
+        return constellationDao.getConstellation();
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package com.ygj.yuemum.service.admin;
+
+import com.ygj.yuemum.dao.admin.ZodiacDao;
+import com.ygj.yuemum.domain.admin.Zodiac;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ZodiacService {
+
+    @Autowired
+
+    private ZodiacDao zodiacDao;
+
+    public List<Zodiac> getZodiac() {
+        return zodiacDao.getzodiac();
+    }
+
+}

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

@@ -126,7 +126,9 @@ public class JlServiceUserService {
     public int updateJlServiceUser(JlServiceUser jlServiceUser) {
         return jlServiceUserDao.updateByPrimaryKeySelective(jlServiceUser);
     }
-
+    public int upDateStatus(JlServiceUser jlServiceUser) {
+        return jlServiceUserDao.upDateStatus(jlServiceUser);
+    }
     public JlServiceUser getJlServiceUser(Integer id) {
         return jlServiceUserDao.selectByPrimaryKey(id);
     }

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

@@ -0,0 +1,17 @@
+<?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.ConstellationDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.admin.Constellation" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getConstellation" resultType="com.ygj.yuemum.domain.admin.Constellation" >
+        select
+        id,name
+        from constellation
+    </select>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.ZodiacDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.admin.Zodiac" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getzodiac" resultType="com.ygj.yuemum.domain.admin.Zodiac" >
+        select
+        id,name
+        from zodiac
+    </select>
+
+</mapper>

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

@@ -316,7 +316,7 @@
                 address = #{address,jdbcType=VARCHAR},
             </if>
             <if test="brief != null" >
-                brief = #{brief,jdbcType=VARCHAR}
+                brief = #{brief,jdbcType=VARCHAR},
             </if>
             <if test="idcard != null" >
                 idcard = #{idcard,jdbcType=VARCHAR},
@@ -352,22 +352,22 @@
                 constellation = #{constellation,jdbcType=VARCHAR},
             </if>
             <if test="zodiac != null" >
-                zodiac = #{zodiac,jdbcType=VARCHAR}
+                zodiac = #{zodiac,jdbcType=VARCHAR},
             </if>
             <if test="ethnicgroup != null" >
-                ethnicgroup = #{ethnicgroup,jdbcType=VARCHAR}
+                ethnicgroup = #{ethnicgroup,jdbcType=VARCHAR},
             </if>
             <if test="education != null" >
-                education = #{education,jdbcType=VARCHAR}
+                education = #{education,jdbcType=VARCHAR},
             </if>
             <if test="height != null" >
-                height = #{height,jdbcType=VARCHAR}
+                height = #{height,jdbcType=VARCHAR},
             </if>
             <if test="marriage != null" >
-                marriage = #{marriage,jdbcType=VARCHAR}
+                marriage = #{marriage,jdbcType=VARCHAR},
             </if>
             <if test="highlight != null" >
-                highlight = #{highlight,jdbcType=VARCHAR}
+                highlight = #{highlight,jdbcType=VARCHAR},
             </if>
             <if test="weight != null" >
                 weight = #{weight,jdbcType=VARCHAR}

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

@@ -40,6 +40,7 @@
     <resultMap id="queryStockResultMap" type="com.ygj.yuemum.domain.maternitymatron.JlServiceUser">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="truename" property="truename" jdbcType="VARCHAR"/>
+        <result column="idcard" property="idcard" jdbcType="VARCHAR"/>
         <result column="age" property="age" jdbcType="VARCHAR"/>
         <result column="status" property="status" jdbcType="VARCHAR"/>
         <result column="cityname" property="cityname" jdbcType="VARCHAR"/>
@@ -55,7 +56,9 @@
         <result column="height" property="height" jdbcType="VARCHAR"/>
         <result column="marriage" property="marriage" jdbcType="VARCHAR"/>
         <result column="highlight" property="highlight" jdbcType="VARCHAR"/>
-
+        <result column="citycode" property="citycode" jdbcType="VARCHAR"/>
+        <result column="weight" property="weight" jdbcType="VARCHAR"/>
+        <result column="city" property="city" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         id, password, truename,mobile_phone,status,last_login_time,last_login_ip,salt,token,zone_code,updated_at,stock_status,usertype
@@ -78,6 +81,9 @@
         <if test="ids != null and ids != ''">
             and jl_service_user.id not in ( #{ids,jdbcType=INTEGER} )
         </if>
+        <if test="id != null and id != ''">
+            and jl_service_user.id = #{id,jdbcType=INTEGER}
+        </if>
         <if test="truename != null and truename !=''">
             and jl_service_user.truename like "%"#{truename,jdbcType=VARCHAR}"%"
         </if>
@@ -260,14 +266,23 @@
         jl_service_user.id,
         jl_service_user.truename,
         jl_service_user_info.constellation,
+        jl_service_user_info.idcard,
         year(CURDATE())-substring(jl_service_user_info.idcard,7,4) age,
         jl_service_user_info.zodiac,
         fgetcityname(CONCAT(substring(jl_service_user_info.idcard,1,4),'00')) np,
         city.cityname,
         jl_service_user_info.seniority,
         jl_service_user_info.gender,
+        jl_service_user_info.city,
         jl_service_user.status,
-        jl_service_user_info.babynumber
+        jl_service_user_info.babynumber,
+        jl_service_user_info.ethnicgroup,
+        jl_service_user_info.education,
+        jl_service_user_info.height,
+        jl_service_user_info.marriage,
+        jl_service_user_info.highlight,
+        jl_service_user_info.weight,
+        city.citycode
         from jl_service_user
         LEFT JOIN jl_service_user_info on jl_service_user.id = jl_service_user_info.id
         LEFT JOIN (select service_id,GROUP_CONCAT(jl_region.`name`) cityname,GROUP_CONCAT(store_id) citycode from jl_store_service LEFT JOIN jl_region
@@ -480,5 +495,14 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
+    <update id="upDateStatus" parameterType="com.ygj.yuemum.domain.maternitymatron.JlServiceUser">
+        update jl_service_user
+        <set>
+            <if test="status != null">
+                status = #{status,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 
 </mapper>

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

@@ -21,7 +21,7 @@
     <!-- 根据id删除某个服务者信息 -->
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
         delete from jl_store_service
-        where service_id = #{service_id,jdbcType=INTEGER} and store_id = #{store_id,jdbcType=INTEGER}
+        where service_id = #{service_id,jdbcType=INTEGER}
     </delete>
 
     <!-- 插入一条服务者信息 -->