“xubinhui 2 anni fa
parent
commit
8fad9db06b

+ 1 - 0
.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

+ 9 - 3
src/main/java/com/izouma/yzzscq/service/supply/TechnicalManagerService.java

@@ -3,8 +3,12 @@ package com.izouma.yzzscq.service.supply;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.izouma.yzzscq.domain.Information;
+import com.izouma.yzzscq.domain.Setting;
 import com.izouma.yzzscq.domain.supply.TechnicalManager;
 import com.izouma.yzzscq.dto.PageQuery;
+import com.izouma.yzzscq.enums.ApplyStatus;
+import com.izouma.yzzscq.exception.BusinessException;
 import com.izouma.yzzscq.repo.InformationRepo;
 import com.izouma.yzzscq.repo.SettingRepo;
 import com.izouma.yzzscq.repo.supply.TechnicalManagerRepo;
@@ -12,9 +16,11 @@ import com.izouma.yzzscq.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Predicate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -110,9 +116,9 @@ public class TechnicalManagerService {
         TechnicalManager record = technicalManagerRepo.findById(id).orElseThrow(new BusinessException("无记录"));
 
         Information information = Information.builder()
-                .receiveUserId(record.getUserId())
-                .isRead(false)
-                .build();
+                                             .receiveUserId(record.getUserId())
+                                             .isRead(false)
+                                             .build();
 
         if (pass) {
             record.setStatus(ApplyStatus.PASS);

+ 2 - 2
src/main/resources/application.yaml

@@ -12,7 +12,7 @@ spring:
     profiles:
         active: dev
     datasource:
-        url: jdbc:mysql://mysql.izouma.com/zhirongip_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+        url: jdbc:mysql://mysql.izouma.com/yangzhou_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
         username: microball
         password: 2wsx@WSX#EDC
         hikari:
@@ -86,7 +86,7 @@ general:
 
 spring:
     profiles: test
-    url: jdbc:mysql://mysql.izouma.com/zhirongip_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    url: jdbc:mysql://mysql.izouma.com/yangzhou_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
 
 ---
 

+ 1 - 1
src/test/java/com/izouma/yzzscq/repo/SettingRepoTest.java

@@ -1,6 +1,6 @@
 package com.izouma.yzzscq.repo;
 
-import com.izouma.zhirongip.ApplicationTests;
+import com.izouma.yzzscq.ApplicationTests;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 

+ 1 - 1
src/test/java/com/izouma/yzzscq/repo/SmsRecordRepoTest.java

@@ -1,6 +1,6 @@
 package com.izouma.yzzscq.repo;
 
-import com.izouma.zhirongip.domain.SmsRecord;
+import com.izouma.yzzscq.domain.SmsRecord;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

+ 5 - 5
src/test/java/com/izouma/yzzscq/service/supply/PatentServiceTest.java

@@ -1,20 +1,20 @@
 package com.izouma.yzzscq.service.supply;
 
-import com.izouma.zhirongip.ApplicationTests;
-import com.izouma.zhirongip.dto.PageQuery;
-import com.izouma.zhirongip.repo.supply.PatentRepo;
+
+import com.izouma.yzzscq.dto.PageQuery;
+import com.izouma.yzzscq.repo.supply.PatentRepo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Map;
 
-class PatentServiceTest extends com.izouma.zhirongip.ApplicationTests {
+class PatentServiceTest extends com.izouma.yzzscq.ApplicationTests {
 
     @Autowired
     private PatentService patentService;
 
     @Autowired
-    private  PatentRepo patentRepo;
+    private PatentRepo patentRepo;
 
     @Test
     void all() {

+ 3 - 2
src/test/java/com/izouma/yzzscq/service/supply/TechnicalManagerServiceTest.java

@@ -1,7 +1,8 @@
 package com.izouma.yzzscq.service.supply;
 
-import com.izouma.zhirongip.ApplicationTests;
-import com.izouma.zhirongip.dto.PageQuery;
+
+import com.izouma.yzzscq.ApplicationTests;
+import com.izouma.yzzscq.dto.PageQuery;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 

+ 3 - 2
src/test/java/com/izouma/yzzscq/service/supply/TechnologyProductServiceTest.java

@@ -1,7 +1,8 @@
 package com.izouma.yzzscq.service.supply;
 
-import com.izouma.zhirongip.ApplicationTests;
-import com.izouma.zhirongip.dto.PageQuery;
+
+import com.izouma.yzzscq.ApplicationTests;
+import com.izouma.yzzscq.dto.PageQuery;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;