20240424_sun

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/domain/ZwywJclrYcxx.java

@@ -47,11 +47,13 @@ public class ZwywJclrYcxx extends BaseEntity
     /** 食堂编码 */
     @Excel(name = "食堂编码")
     @ApiModelProperty(value = "食堂编码", required = true)
+    @NotBlank(message = "{食堂编码}",groups = AddGroup.class)
     private String stbm;
 
     /** 食堂名称 */
     @Excel(name = "食堂名称")
     @ApiModelProperty(value = "食堂名称", required = true)
+    @NotBlank(message = "{食堂名称}",groups = AddGroup.class)
     private String stmc;
 
     /** 所属区划 */
@@ -65,16 +67,19 @@ public class ZwywJclrYcxx extends BaseEntity
     /** 姓名 */
     @Excel(name = "姓名")
     @ApiModelProperty(value = "姓名", required = true)
+    @NotBlank(message = "{姓名}",groups = AddGroup.class)
     private String xm;
 
     /** 身份证号 */
     @Excel(name = "身份证号")
     @ApiModelProperty(value = "身份证号", required = true)
+    @NotBlank(message = "{身份证号}",groups = AddGroup.class)
     private String sfzh;
 
     /** 用餐时间 */
     @Excel(name = "用餐时间")
     @ApiModelProperty(value = "用餐时间", required = true)
+    @NotBlank(message = "{用餐时间}",groups = AddGroup.class)
     private String ycsj;
 
     /** 用餐类别 */

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywJclrYcxxServiceImpl.java

@@ -3,6 +3,8 @@ package com.ruoyi.lnst.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.EncryptionUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.lnst.domain.InLnstLrxx;
 import com.ruoyi.lnst.domain.ZwywJclrYcxx;
 import com.ruoyi.lnst.mapper.ZwywJclrYcxxMapper;
@@ -86,11 +88,12 @@ public class ZwywJclrYcxxServiceImpl implements IZwywJclrYcxxService {
      */
     @Override
     public int insertZwywJclrYcxx(ZwywJclrYcxx zwywJclrYcxx) {
-        InLnstLrxx lrxx = zwywLrJbxxMapper.selectZwywLrJbxxByJmZjhm(zwywJclrYcxx.getLrZjhm());
+        InLnstLrxx lrxx = zwywLrJbxxMapper.selectOne(new LambdaQueryWrapper<InLnstLrxx>().eq(InLnstLrxx::getLrZjhm,
+                SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, zwywJclrYcxx.getSfzh())));
         if (ObjectUtils.isEmpty(lrxx)) {
             throw new ServiceException("未查询到该老人信息");
         }
-        if (StringUtils.equals(lrxx.getLzzt(), "99")) {
+        if (StringUtils.equals(lrxx.getLzzt(), "0")) {
             throw new ServiceException("该账号已被停用");
         }
         if (StringUtils.isNotEmpty(zwywJclrYcxx.getSfzh())) {
@@ -103,7 +106,7 @@ public class ZwywJclrYcxxServiceImpl implements IZwywJclrYcxxService {
     }
 
     private String getXb(String sfzh) {
-        return Integer.parseInt(String.valueOf(sfzh.charAt(sfzh.length() - 2))) % 2 == 1 ? "1" : "2";
+        return Integer.parseInt(String.valueOf(sfzh.charAt(sfzh.length() - 2))) % 2 == 1 ? "男" : "女";
     }
 
     private String getCsrq(String sfzh) {