fan zha 0802

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.smscheck.controller;
 
 import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -15,12 +17,15 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SpecialExamination;
 import org.jeecg.modules.smscheck.service.BusinessReminderCardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * 入网信息业务
@@ -213,4 +218,34 @@ public class BusinessReminderCardController {
         }
         return Result.error("恢复失败");
     }
+
+
+    /**
+     * 修改 入网用户信息
+     *
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/queryByCardNo")
+    public Result<?> queryByCardNo(HttpServletRequest request) {
+        String cardNo = request.getParameterMap().get("cardNo")==null?"": Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
+         LambdaQueryWrapper<BusinessReminderCard> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getCreateTime);
+        List<BusinessReminderCard> businessReminderCard = businessReminderCardService.list(queryWrapperData);
+        int i = 0;
+        for (BusinessReminderCard reminderCard : businessReminderCard) {
+            if (ObjectUtil.isNotNull(reminderCard.getNumberResults())){
+                if (reminderCard.getNumberResults() !=1){
+                    i++;
+                }
+            }
+            if (i>=2){
+                reminderCard.setIsSizeNumberResults("is");
+            }
+        }
+
+        return Result.OK(businessReminderCard);
+
+    }
+
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCard.java

@@ -108,4 +108,39 @@ public class BusinessReminderCard {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 
+
+    /** 有效期结束 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期结束")
+    private Date cardEndTime;
+    /** 有效期开始 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期开始")
+    private Date cardStartTime;
+    /** 证件号 */
+    @ApiModelProperty(value = "证件号")
+    private String cardNo;
+
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名")
+    private String cardName;
+
+
+    /** 位置信息 */
+    @ApiModelProperty(value = "位置信息")
+    private String positionInformation;
+
+
+    /** 工作地址 */
+    @ApiModelProperty(value = "工作地址")
+    private String wordAddress;
+
+    /** 营业厅地址 */
+    @ApiModelProperty(value = "营业厅地址")
+    private String businessAddress;
+
+    // 研判结果 个数
+    private String isSizeNumberResults;
 }