crud

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

@@ -203,8 +203,8 @@ public class ImageUploadController {
             }
             while((str = br.readLine())!=null){
                 str = str.replace("$name",jlServiceUser.getTruename());
-                str = str.replace("$np",jlServiceUser.getNp()+"人");
-                str = str.replace("$age",jlServiceUser.getAge());
+                str = str.replace("$np",jlServiceUser.getNp());
+                str = str.replace("$age",jlServiceUser.getAge()+"岁");
                 str = str.replace("$ethnicgroup",jlServiceUser.getEthnicgroup());
                 str = str.replace("$constellation",jlServiceUser.getConstellation());
                 str = str.replace("$seniority",jlServiceUser.getSeniority());
@@ -214,7 +214,7 @@ public class ImageUploadController {
                 str = str.replace("$marriage",jlServiceUser.getMarriage());
                 str = str.replace("$highlight",jlServiceUser.getHighlight());
                 str = str.replace("$resumecomment",photo.getComment());
-                str = str.replace("$zodiac",jlServiceUser.getZodiac());
+                str = str.replace("$zodiac","属"+jlServiceUser.getZodiac());
                 str = str.replace("$height",jlServiceUser.getHeight());
                 str = str.replace("$starts",jlServiceUser.getGender());
                 str = str.replace("$display",photoDisplay);

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

@@ -64,7 +64,6 @@ public class JlServiceUserController {
     }
 
 
-
     @PostMapping("/addjlServiceUser")
     public int add(@ModelAttribute AddMMInfo addMMInfo) {
         int id =jlServiceUserService.getPMId();

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

@@ -55,6 +55,11 @@ public class MmStockController {
         return jso;
     }
 
+    @GetMapping("/getAllStock")
+    public List<MmStock> getAll() {
+        return mmStockService.getAll();
+    }
+
     @InitBinder
     public void initBinder(WebDataBinder binder) {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");

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

@@ -2,14 +2,14 @@ package com.ygj.yuemum.domain.maternitymatron;
 
 public class QueryListMMStock {
 
-    private Integer id;
+    private String id;
     private Integer servant_code;
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

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

@@ -2,7 +2,7 @@ package com.ygj.yuemum.domain.maternitymatron;
 
 public class QueryServiceUser {
 
-    private Integer id;
+    private String id;
     private String truename;
     private String status;
     private String idcard;
@@ -13,11 +13,11 @@ public class QueryServiceUser {
     int page;
     int limit;
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

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

@@ -2,7 +2,7 @@ package com.ygj.yuemum.domain.maternitymatron;
 
 public class QueryServiceUserStock {
 
-    private Integer id;
+    private String id;
     private String truename;
     private String status;
     private String cityname;
@@ -98,11 +98,11 @@ public class QueryServiceUserStock {
         this.ids = ids;
     }
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

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

@@ -86,4 +86,7 @@ public class MmStockService {
     public List<MmStock> getdelMMStocklist(QueryListMMStock queryListMMStock) {
         return mmStockDao.getdelMMStocklist(queryListMMStock);
     }
+    public List<MmStock> getAll(){
+        return mmStockDao.getAll();
+    }
 }

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

@@ -212,13 +212,15 @@
         jl_service_user_info.gender,
         jl_service_user.status,
         jl_service_user_info.babynumber,
-        IFNULL(mm_info_resume.resume_path,0) resume_path
+        IFNULL(mm_info_resume.resume_path,0) resume_path,
+        fgetethnicgroupname(jl_service_user_info.ethnicgroup) ethnicgroup
         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
         on jl_store_service.store_id = jl_region.`code` group by service_id) as
         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 jl_service_user.status = 1
         order by  gender desc , babynumber desc , status asc
     </select>
 
@@ -307,7 +309,7 @@
         jl_service_user_info.city,
         jl_service_user.status,
         jl_service_user_info.babynumber,
-        jl_service_user_info.ethnicgroup,
+        fgetethnicgroupname(jl_service_user_info.ethnicgroup) ethnicgroup,
         jl_service_user_info.education,
         jl_service_user_info.height,
         jl_service_user_info.marriage,
@@ -323,7 +325,7 @@
         left join mm_info_resume on jl_service_user.id = mm_info_resume.servant_code
         where 1=1
         <if test="ids != null ">
-            and jl_service_user.id not in ( #{ids,jdbcType=INTEGER} )
+            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}

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

@@ -19,6 +19,7 @@
         select
         <include refid="Base_Column_List" />
         from mm_stock
+        where year(start_date) &gt;= year(SYSDATE()) -1 and year(end_date) &lt;= year(SYSDATE()) +1
     </select>
 
     <!-- 根据id查找某个库存信息 -->