Browse Source

fix:“优化商户入驻”

soobin 1 year ago
parent
commit
d680ebda63

+ 1 - 4
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -4,8 +4,6 @@ package com.szwl.controller;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esUtil.BeanUtils;
 //import org.apache.commons.beanutils.BeanUtils;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bean.*;
-import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.*;
@@ -135,7 +132,7 @@ public class TEquipmentController {
             }
         }
         if (StringUtils.isNotEmpty(equipmentName)) {
-            query.eq(TEquipment::getName, equipmentName);
+            query.like(TEquipment::getName, equipmentName);
         }
         if (StringUtils.isNotEmpty(areaName)) {
             query.like(TEquipment::getFullName, areaName);

+ 5 - 5
src/main/java/com/szwl/controller/THuifuMchController.java

@@ -61,14 +61,14 @@ public class THuifuMchController {
             tHuifuMchCheck.setModifyDate(new Date());
             tHuifuMchCheck.setStatus("0");
             if(tHuifuMchCheck.getType().equals("0")) {
-                if(StringUtils.isNotEmpty(tHuifuMchCheck.getCardFrontPic())
-                        && StringUtils.isNotEmpty(tHuifuMchCheck.getLegalCertBackPic()) && StringUtils.isNotEmpty(tHuifuMchCheck.getLegalCertFrontPic()) ) {
+                if(StringUtils.isNotEmpty(huifuMchCheck.getCardFrontPic())
+                        && StringUtils.isNotEmpty(huifuMchCheck.getLegalCertBackPic()) && StringUtils.isNotEmpty(huifuMchCheck.getLegalCertFrontPic()) ) {
                     tHuifuMchCheck.setStatus("1");
                 }
             } else  {
-                if(StringUtils.isNotEmpty(tHuifuMchCheck.getCertFrontPic())
-                        && StringUtils.isNotEmpty(tHuifuMchCheck.getCertBackPic()) && StringUtils.isNotEmpty(tHuifuMchCheck.getLicensePic())
-                        && StringUtils.isNotEmpty(tHuifuMchCheck.getRegAcctPic())) {
+                if(StringUtils.isNotEmpty(huifuMchCheck.getCertFrontPic())
+                        && StringUtils.isNotEmpty(huifuMchCheck.getCertBackPic()) && StringUtils.isNotEmpty(huifuMchCheck.getLicensePic())
+                        && StringUtils.isNotEmpty(huifuMchCheck.getRegAcctPic())) {
                     tHuifuMchCheck.setStatus("1");
                 }
             }

+ 27 - 8
src/main/java/com/szwl/controller/TProportionController.java

@@ -84,10 +84,12 @@ public class TProportionController {
                 for(TProportionCheck proportionCheck:records){
                     if(proportionCheck.getEquipmentId()!=null){
                         TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
-                        if(StringUtils.isNotEmpty(equipment.getName())){
-                            proportionCheck.setEquipmentName(equipment.getName());
-                        }else {
-                            proportionCheck.setEquipmentName(equipment.getClientId());
+                        if(equipment != null) {
+                            if(StringUtils.isNotEmpty(equipment.getName())){
+                                proportionCheck.setEquipmentName(equipment.getName());
+                            }else {
+                                proportionCheck.setEquipmentName(equipment.getClientId());
+                            }
                         }
                     }
 
@@ -127,10 +129,12 @@ public class TProportionController {
                 for(TProportion proportion:records){
                     if(proportion.getEquipmentId()!=null){
                         TEquipment equipment = tEquipmentService.getById(proportion.getEquipmentId());
-                        if(StringUtils.isNotEmpty(equipment.getName())){
-                            proportion.setEquipmentName(equipment.getName());
-                        }else {
-                            proportion.setEquipmentName(equipment.getClientId());
+                        if(equipment != null) {
+                            if(StringUtils.isNotEmpty(equipment.getName())){
+                                proportion.setEquipmentName(equipment.getName());
+                            }else {
+                                proportion.setEquipmentName(equipment.getClientId());
+                            }
                         }
                     }
                 }
@@ -181,6 +185,21 @@ public class TProportionController {
         query.orderByDesc(TProportionCheck::getCreateDate);
         Page<TProportionCheck> page = new Page<>(current, size, true);
         IPage<TProportionCheck> iPage = tProportionCheckService.page(page, query);
+        List<TProportionCheck> records = iPage.getRecords();
+        if(records.size()>0){
+            for(TProportionCheck proportionCheck:records){
+                if(proportionCheck.getEquipmentId()!=null){
+                    TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
+                    if(equipment != null) {
+                        if(StringUtils.isNotEmpty(equipment.getName())){
+                            proportionCheck.setEquipmentName(equipment.getName());
+                        }else {
+                            proportionCheck.setEquipmentName(equipment.getClientId());
+                        }
+                    }
+                }
+            }
+        }
         return R.ok(iPage);
 
     }