交易,落地检五张照片

admin/pom.xml

@@ -35,6 +35,21 @@
             <version>0.4.8</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.1.11</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.11</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -14,7 +14,6 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.*;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
-import com.sun.org.apache.regexp.internal.RE;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -100,6 +100,7 @@ public class SysUserController {
         accessToken.setMessage(result.getMessage());
         accessToken.setUserId(user.getId());
         accessToken.setPhone(user.getPhone());
+        accessToken.setVeterId(user.getVeterId());
         accessToken.setUser(user);
         return new Result(ResultCode.SUCCESS,accessToken);
     }
@@ -130,6 +131,7 @@ public class SysUserController {
             accessToken.setPhone(user.getPhone());
             accessToken.setLoginIp(remoteHost);
             accessToken.setUser(user);
+            accessToken.setVeterId(user.getVeterId());
         }
         if (result.getCode() == 10004) {
             accessToken.setAccountName("游客");
@@ -191,6 +193,7 @@ public class SysUserController {
                 accessToken.setPhone(accountEntity.getPhone());
                 SysUser user = (SysUser) result.getData();
                 accessToken.setUser(user);
+                accessToken.setVeterId(user.getVeterId());
 
                 accessToken.setLoginIp(remoteHost);
                 return new Result(ResultCode.SUCCESS,accessToken);
@@ -251,6 +254,7 @@ public class SysUserController {
             accessToken.setUserName(user.getUserName());
             accessToken.setUserId(user.getId());
             accessToken.setMessage(result.getMessage());
+            accessToken.setVeterId(user.getVeterId());
             return new Result(ResultCode.SUCCESS, accessToken);
         } else if (result.getCode() == 10004) {
             return new Result(10004, "待审核",false);

admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -31,5 +31,6 @@ public class AccessToken {
     private SysUser user;
     private Integer permit;
     private List<BaseUserBank> banks;
+    private String veterId;
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -309,6 +309,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         Page<BillLandingInspection> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<BillLandingInspection> billLandingInspectionPage = billLandingInspectionMapper.selectPage(page, landingInspectionQueryWrapper);
         Page<BillLandingImageVo> billLandingImageVoPage = new Page<>();
+
+        BeanUtil.copyProperties(billLandingInspectionPage,billLandingImageVoPage);
         List billLandingImageVoList = new ArrayList<>();
         for (BillLandingInspection record : billLandingInspectionPage.getRecords()) {
             BillLandingImageVo billLandingImageVo = new BillLandingImageVo();

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -600,10 +600,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         queryWrapper.eq(!StringUtils.isBlank(farmType), "farm_type", farmType);
         if (userType == 0) {
             queryWrapper.eq("user_type", 3)
-                    .like(!StringUtils.isBlank(code), "detailed_adress_code", code);
+                    .like(StringUtils.isNotBlank(code), "detailed_adress_code", code);
         } else {
             queryWrapper.eq("user_type", 3)
-                    .like("detailed_adress_code", sysUser.getBriefAddressCode());
+                    .like(StringUtils.isNotBlank(code),"detailed_adress_code", sysUser.getBriefAddressCode());
         }
         Page<SysUser> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<SysUser> sysUsers = this.page(page, queryWrapper);

admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=formal
+#spring.profiles.active=dev
+spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod