Explorar el Código

修改用档案户数据,没有时新增判定新增

anderx hace 1 año
padre
commit
85a416c36e

+ 0 - 7
src/main/java/com/goafanti/common/model/UserArchives.java

@@ -59,7 +59,6 @@ public class UserArchives implements Serializable {
      */
     private Date createTime;
 
-
     public Integer getId() {
         return id;
     }
@@ -77,7 +76,6 @@ public class UserArchives implements Serializable {
     }
 
     public Integer getPatentCount() {
-        if (patentCount == null)return 0;
         return patentCount;
     }
 
@@ -86,7 +84,6 @@ public class UserArchives implements Serializable {
     }
 
     public Integer getInventionPatentCount() {
-        if (inventionPatentCount == null)return 0;
         return inventionPatentCount;
     }
 
@@ -95,7 +92,6 @@ public class UserArchives implements Serializable {
     }
 
     public Integer getUtilityModelCount() {
-        if (utilityModelCount == null)return 0;
         return utilityModelCount;
     }
 
@@ -104,7 +100,6 @@ public class UserArchives implements Serializable {
     }
 
     public Integer getAppearancePatentCount() {
-        if (appearancePatentCount == null)return 0;
         return appearancePatentCount;
     }
 
@@ -113,7 +108,6 @@ public class UserArchives implements Serializable {
     }
 
     public Integer getSoftwareWorksCount() {
-        if (softwareWorksCount == null)return 0;
         return softwareWorksCount;
     }
 
@@ -122,7 +116,6 @@ public class UserArchives implements Serializable {
     }
 
     public Integer getOtherCount() {
-        if (otherCount == null)return 0;
         return otherCount;
     }
 

+ 10 - 7
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -101,13 +101,15 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
      */
     @Override
     public UserArchives insert(UserArchives userArchives) {
-        int count = 0;
-        count+=userArchives.getAppearancePatentCount();
-        count+=userArchives.getInventionPatentCount();
-        count+=userArchives.getUtilityModelCount();
-        count+=userArchives.getSoftwareWorksCount();
-        count+=userArchives.getOtherCount();
-        userArchives.setPatentCount(count);
+        if (userArchives.getAppearancePatentCount()!=null||
+                userArchives.getInventionPatentCount()!=null||
+                userArchives.getUtilityModelCount() !=null||
+                userArchives.getSoftwareWorksCount()!=null||
+                userArchives.getOtherCount()!=null
+        ){
+            int count = getCount(userArchives);
+            userArchives.setPatentCount(count);
+        }
         this.userArchivesMapper.insert(userArchives);
         return userArchives;
     }
@@ -120,6 +122,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
      */
     @Override
     public UserArchives update(UserArchives userArchives) {
+        System.out.println(userArchives.getAppearancePatentCount()!=null);
         if (userArchives.getAppearancePatentCount()!=null||
             userArchives.getInventionPatentCount()!=null||
                 userArchives.getUtilityModelCount() !=null||