Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/dao/BeanMqMessageDao.java

+package com.dituhui.pea.order.dao;
+
+import com.dituhui.pea.order.entity.BeanMqMessageEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.CrudRepository;
+
+public interface BeanMqMessageDao extends JpaRepository<BeanMqMessageEntity, String>, JpaSpecificationExecutor<BeanMqMessageEntity>,
+        CrudRepository<BeanMqMessageEntity, String> {
+}

project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamsDTO.java

@@ -38,7 +38,7 @@ public class BusinessTeamsDTO {
         /**
          * 总条数
          */
-        private Integer total;
+        private Long total;
     }
 
     @lombok.Data

project-order/src/main/java/com/dituhui/pea/order/entity/BeanMqMessageEntity.java

+package com.dituhui.pea.order.entity;
+
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * bean mq消息储存表
+ */
+@Data
+@Entity
+@Table(name = "bean_mq_message")
+@EntityListeners(AuditingEntityListener.class)
+public class BeanMqMessageEntity implements Serializable {
+
+
+    private static final long serialVersionUID = -8806128881082006267L;
+
+    /**
+     * 主键
+     */
+    @Id
+    @GeneratedValue(generator = "uuid")
+    @GenericGenerator(name = "uuid", strategy = "uuid")
+    @Column(name = "ID", unique = true, nullable = false, length = 32)
+    private String id;
+
+    /**
+     * 消息
+     */
+    @Column(name = "msg", nullable = false)
+    private String msg;
+
+    /**
+     * 是否同步成功，0：失败，1：成功 默认成功
+     */
+    @Column(name = "success")
+    private Integer success = 1;
+
+
+    @Column(name = "create_time", nullable = false, updatable = false, columnDefinition = "timestamp default current_timestamp")
+    private LocalDateTime createTime = LocalDateTime.now();
+
+}

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java

@@ -12,6 +12,7 @@ import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
 import com.dituhui.pea.order.service.BusinessTeamService;
 import com.dituhui.pea.order.service.CommonService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -80,7 +81,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
             contents.add(content);
         }
         BusinessTeamsDTO.Result rs = new BusinessTeamsDTO.Result();
-        rs.setContent(contents).setTotal(page.getTotalPages()).setPageSize(page.getSize());
+        rs.setContent(contents).setPages(page.getTotalPages()).setTotal(page.getTotalElements()).setPageSize(page.getSize());
         return Result.success(rs);
     }
 
@@ -173,6 +174,9 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
         if (req.getWarehouseId() != null) {
             entity.setWarehouseId(req.getWarehouseId());
         }
+        if (StringUtils.isNotBlank(req.getGroupId())) {
+            entity.setGroupId(req.getGroupId());
+        }
         entity.setUpdateTime(LocalDateTime.now());
         orgTeamDao.save(entity);
 
@@ -215,19 +219,19 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
         }
 
         // 遍历新的关系映射，创建新的关系
-		for (OrgTeamEngineerEntity newRelation : newRelationsMap.values()) {
-			if (!existingRelations.contains(newRelation)) {
-				// 检查是否存在，已经存在的，只需要set status=1就可以了
-				OrgTeamEngineerEntity exist = orgTeamEngineerDao.findByTeamIdAndEngineerCode(newRelation.getTeamId(),
-						newRelation.getEngineerCode());
-				if (null != exist && exist.getId() != null) {
-					exist.setStatus(1);
-					orgTeamEngineerDao.save(exist);
-				} else {
-					orgTeamEngineerDao.save(newRelation);
-				}
-			}
-		}
+        for (OrgTeamEngineerEntity newRelation : newRelationsMap.values()) {
+            if (!existingRelations.contains(newRelation)) {
+                // 检查是否存在，已经存在的，只需要set status=1就可以了
+                OrgTeamEngineerEntity exist = orgTeamEngineerDao.findByTeamIdAndEngineerCode(newRelation.getTeamId(),
+                        newRelation.getEngineerCode());
+                if (null != exist && exist.getId() != null) {
+                    exist.setStatus(1);
+                    orgTeamEngineerDao.save(exist);
+                } else {
+                    orgTeamEngineerDao.save(newRelation);
+                }
+            }
+        }
     }
 
     @Override