crud

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

@@ -30,11 +30,11 @@ public class ImageUploadController {
     @Autowired
     private ResumeService resumeService;
     private ResourceLoader resourceLoader;
-    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://47.97.74.34:8080/resume/img/";
-    public static final String httphtmlRoot = "http://yuesuo.yueguanjia.com:8080/resume/";
-    public static final String modulePath = "/usr/local/tomcat/tomcat7/webapps/resume/resume.html";
+    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 = "D:/apache-tomcat-9.0.6/webapps/resume/img/";
 //    public static final String ResumeFile = "D:/apache-tomcat-9.0.6/webapps/resume/";

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

@@ -74,6 +74,7 @@ public class JlServiceUserController {
         jlServiceUser.setUsertype("6");
         jlServiceUser.setStatus("1");
         jlServiceUser.setTruename(addMMInfo.getTruename());
+        jlServiceUser.setSalt(addMMInfo.getSalt());
         //jlServiceUserInfo
         jlServiceUserInfo.setId(id);
         jlServiceUserInfo.setIdcard(addMMInfo.getIdcard());
@@ -161,6 +162,11 @@ public class JlServiceUserController {
     @PostMapping("/upDateStatus")
     public int upDateStatus(@ModelAttribute JlServiceUser jlServiceUser) { return jlServiceUserService.upDateStatus(jlServiceUser);}
 
+    @GetMapping("/SaltCheck")
+    public int IDCardCheck(@RequestParam("salt") String salt) {
+        return jlServiceUserService.saltcheck(salt);
+    }
+
     @GetMapping("/getjlServiceUser")
     public JlServiceUser getOne(@RequestParam("id") Integer id) {return  jlServiceUserService.getJlServiceUser(id);}
 }

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

@@ -29,10 +29,12 @@ public interface JlServiceUserDao {
     List<QueryServiceUserStock> queryEditServiceUser(QueryServiceUserStock record);
 
     int getcount();
+    int getstocklistcount();
     int getStock(QueryServiceUserStock queryServiceUserStock);
     int getquerycount(QueryServiceUser record);
     int getpmid();
     int upDateStatus(JlServiceUser record);
+    int saltcheck(String salt);
 
     /**
      * 根据id删除某个库存信息

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

@@ -36,7 +36,6 @@ public class JlServiceUser {
     private String citycode;
     private String city;
     private String resume_path;
-
     public String getResume_path() {
         return resume_path;
     }

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

@@ -10,9 +10,18 @@ public class QueryServiceUser {
     private String np;
     private String experience;
     private String gender;
+    private String salt;
     int page;
     int limit;
 
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -23,9 +23,18 @@ public class QueryServiceUserStock {
     private String weight;
     private String agestart;
     private String ageend;
+    private String salt;
     int page;
     int limit;
 
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
     public String getEthnicgroup() {
         return ethnicgroup;
     }

src/main/java/com/ygj/yuemum/domain/utils/AddMMInfo.java

@@ -19,6 +19,15 @@ public class AddMMInfo {
    private String highlight;
    private String education;
    private String weight;
+   private String salt;
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
 
     public String getWeight() {
         return weight;

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

@@ -58,7 +58,7 @@ public class JlServiceUserService {
         PageHelper.startPage(page, limit);
         List<JlServiceUser> mmlists = jlServiceUserDao.queryServiceUserStock();
         Map<String, Object> tableData = new HashMap<>();
-        Integer count = jlServiceUserDao.getcount();
+        Integer count = jlServiceUserDao.getstocklistcount();
         tableData.put("items", mmlists);
         tableData.put("total", count);
         return tableData;
@@ -134,6 +134,9 @@ public class JlServiceUserService {
     public int updateJlServiceUser(JlServiceUser jlServiceUser) {
         return jlServiceUserDao.updateByPrimaryKeySelective(jlServiceUser);
     }
+    public int saltcheck(String salt){
+        return jlServiceUserDao.saltcheck(salt);
+    }
     public int upDateStatus(JlServiceUser jlServiceUser) {
         return jlServiceUserDao.upDateStatus(jlServiceUser);
     }

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

@@ -39,6 +39,7 @@
 
     <resultMap id="queryStockResultMap" type="com.ygj.yuemum.domain.maternitymatron.JlServiceUser">
         <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="salt" property="salt" jdbcType="VARCHAR"/>
         <result column="truename" property="truename" jdbcType="VARCHAR"/>
         <result column="idcard" property="idcard" jdbcType="VARCHAR"/>
         <result column="age" property="age" jdbcType="VARCHAR"/>
@@ -70,6 +71,13 @@
         count(1)
         from jl_service_user
     </select>
+    <select id="getstocklistcount" resultType="java.lang.Integer" >
+        select
+        count(1)
+        from jl_service_user
+        where jl_service_user.status = 1
+    </select>
+
     <select id="getStock" resultType="java.lang.Integer" parameterType="com.ygj.yuemum.domain.maternitymatron.QueryServiceUser">
         select
         count(1)
@@ -85,6 +93,9 @@
         <if test="id != null and id != ''">
             and jl_service_user.id = #{id,jdbcType=INTEGER}
         </if>
+        <if test="salt != null and salt !=''">
+            and jl_service_user.salt like "%"#{salt,jdbcType=VARCHAR}"%"
+        </if>
         <if test="truename != null and truename !=''">
             and jl_service_user.truename like "%"#{truename,jdbcType=VARCHAR}"%"
         </if>
@@ -97,7 +108,7 @@
         <if test="np != null and np !=''">
             and city = #{np,jdbcType=VARCHAR}
         </if>
-        <if test="experience != null and experience !=''">
+        <if test="experience != null and experience != 0">
             and seniority = #{experience,jdbcType=VARCHAR}
         </if>
         <if test="gender != null and gender !=''">
@@ -174,12 +185,15 @@
         <if test="np != null and np != ''">
             and city = #{np,jdbcType=VARCHAR}
         </if>
-        <if test="experience != null and experience != ''">
+        <if test="experience != null and experience != 0">
             and seniority = #{experience,jdbcType=VARCHAR}
         </if>
         <if test="gender != null and gender != ''">
             and gender = #{gender,jdbcType=VARCHAR}
         </if>
+        <if test="salt != null and salt != ''">
+            and salt like "%"#{salt,jdbcType=VARCHAR}"%"
+        </if>
     </select>
     <!--getList-->
     <select id="getMMList" resultMap="ListResultMap">
@@ -190,7 +204,8 @@
         jl_service_user_info.idcard,
         city.cityname,
         fgetcityname(CONCAT(substring(jl_service_user_info.idcard,1,4),'00')) np,
-        jl_service_user.status
+        jl_service_user.status,
+        jl_service_user.salt
         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 from jl_store_service LEFT JOIN jl_region
@@ -202,6 +217,7 @@
     <select id="queryServiceUserStock" resultMap="queryStockResultMap">
         select
         jl_service_user.id,
+        jl_service_user.salt,
         jl_service_user.truename,
         fgetconstellationname(jl_service_user_info.constellation) constellation,
         year(CURDATE())-substring(jl_service_user_info.idcard,7,4) age,
@@ -232,14 +248,15 @@
         jl_service_user_info.idcard,
         city.cityname,
         fgetcityname(CONCAT(substring(jl_service_user_info.idcard,1,4),'00')) np,
-        jl_service_user.status
+        jl_service_user.status,
+        jl_service_user.salt
         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
         on jl_store_service.store_id = jl_region.`code` group by service_id) as
         city ON jl_service_user.id = city.service_id
         where 1=1
-        <if test="id != null ">
+        <if test="id != null and id !=''">
           and jl_service_user.id = #{id,jdbcType=INTEGER}
         </if>
         <if test="truename != null">
@@ -257,12 +274,15 @@
         <if test="np != null ">
             and city = #{np,jdbcType=VARCHAR}
         </if>
-        <if test="experience != null ">
+        <if test="experience != null and experience != 0">
             and seniority = #{experience,jdbcType=VARCHAR}
         </if>
         <if test="gender != null ">
             and gender = #{gender,jdbcType=VARCHAR}
         </if>
+        <if test="salt != null and salt !=''">
+            and salt like "%"#{salt,jdbcType=VARCHAR}"%"
+        </if>
         order by id
     </select>
 
@@ -297,6 +317,7 @@
     <select id="queryServiceUserStockCondition" resultMap="queryStockResultMap" parameterType="com.ygj.yuemum.domain.maternitymatron.QueryServiceUser">
         select
         jl_service_user.id,
+        jl_service_user.salt,
         jl_service_user.truename,
         fgetconstellationname(jl_service_user_info.constellation) constellation,
         jl_service_user_info.idcard,
@@ -324,11 +345,11 @@
         city ON jl_service_user.id = city.service_id
         left join mm_info_resume on jl_service_user.id = mm_info_resume.servant_code
         where 1=1
-        <if test="ids != null ">
+        <if test="ids != null and id !=''">
             and FIND_IN_SET(jl_service_user.id,#{ids,jdbcType=INTEGER}) = 0
         </if>
-        <if test="id != null ">
-            and jl_service_user.id =  #{id,jdbcType=INTEGER}
+        <if test="salt != null and salt !=''">
+            and jl_service_user.salt like "%"#{salt,jdbcType=VARCHAR}"%"
         </if>
         <if test="truename != null ">
             and jl_service_user.truename like "%"#{truename,jdbcType=VARCHAR}"%"
@@ -342,7 +363,7 @@
         <if test="np != null ">
             and city = #{np,jdbcType=VARCHAR}
         </if>
-        <if test="experience != null ">
+        <if test="experience != null and experience != 0">
             and seniority = #{experience,jdbcType=VARCHAR}
         </if>
         <if test="gender != null ">
@@ -389,6 +410,7 @@
     <select id="queryEditServiceUser" resultMap="queryStockResultMap" parameterType="com.ygj.yuemum.domain.maternitymatron.QueryServiceUser">
         select
         jl_service_user.id,
+        jl_service_user.salt,
         jl_service_user.truename,
         jl_service_user_info.constellation,
         jl_service_user_info.idcard,
@@ -419,7 +441,7 @@
         <if test="ids != null ">
             and jl_service_user.id not in ( #{ids,jdbcType=INTEGER} )
         </if>
-        <if test="id != null ">
+        <if test="id != null and id !=''">
             and jl_service_user.id =  #{id,jdbcType=INTEGER}
         </if>
         <if test="truename != null ">
@@ -434,7 +456,7 @@
         <if test="np != null ">
             and city = #{np,jdbcType=VARCHAR}
         </if>
-        <if test="experience != null ">
+        <if test="experience != null and experience != 0">
             and seniority = #{experience,jdbcType=VARCHAR}
         </if>
         <if test="gender != null ">
@@ -485,6 +507,13 @@
         from jl_service_user
     </select>
 
+    <select id="saltcheck" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select
+        count(1)
+        from jl_service_user
+        where salt = #{salt,jdbcType=VARCHAR}
+    </select>
+
     <!-- 根据id查找某个月嫂信息 -->
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select