Просмотр исходного кода

Merge branch 'test3' into test

# Conflicts:
#	src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java
anderx 1 год назад
Родитель
Сommit
8296d04ef7

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrderYearMaxDurationMapper.java

@@ -81,7 +81,7 @@ public interface OrderYearMaxDurationMapper {
      */
     int deleteById(Integer id);
 
-    void updateByOrderNoAndYear(OrderYearMaxDuration orderYearMaxDuration);
+    int updateByOrderNoAndYear(OrderYearMaxDuration orderYearMaxDuration);
 
     List<OrderYearMaxDuration> selectByOrderNo(String orderNo);
 }

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

@@ -184,22 +184,22 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         UserArchives use = userArchivesMapper.queryById(userArchives.getId());
         Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
         List<UserDataLog> list =new ArrayList<>();
-        if(userArchives.getFinancialData()!=null&&!use.getFinancialData().equals(userArchives.getFinancialData())){
+        if(userArchives.getFinancialData()!=null&&!Objects.equals(use.getFinancialData(),userArchives.getFinancialData())){
             String builder = admin.getName() + "修改了财务数据: " + use.getFinancialData() + "=>" + userArchives.getFinancialData();
             UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,1);
             list.add(userDataLog);
         }
-        if (userArchives.getEarlyCommunication()!=null&&!use.getEarlyCommunication().equals(userArchives.getEarlyCommunication())){
+        if (userArchives.getEarlyCommunication()!=null&&!Objects.equals(use.getEarlyCommunication(),userArchives.getEarlyCommunication())){
             String builder = admin.getName() + "修改了前期沟通: " + use.getEarlyCommunication() + "=>" + userArchives.getEarlyCommunication();
             UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,2);
             list.add(userDataLog);
         }
-        if (userArchives.getInterviewIdeas()!=null&&!use.getInterviewIdeas().equals(userArchives.getInterviewIdeas())){
+        if (userArchives.getInterviewIdeas()!=null&&!Objects.equals(use.getInterviewIdeas(),userArchives.getInterviewIdeas())){
             String builder = admin.getName() + "修改了面谈思路: " + use.getInterviewIdeas() + "=>" + userArchives.getInterviewIdeas();
             UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,3);
             list.add(userDataLog);
         }
-        userDataLogMapper.insertBatch(list);
+        if (!list.isEmpty())userDataLogMapper.insertBatch(list);
     }
 
     /**

+ 6 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -773,7 +773,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				out.setMaxType(1);
 			}
 			orderYearMaxDuration.setOrderNo(orderNew.getOrderNo());
-			orderYearMaxDurationMapper.insert(orderYearMaxDuration);
+			int x = orderYearMaxDurationMapper.queryAllByCount(new OrderYearMaxDuration(orderNew.getOrderNo(), 0));
+			if (x>0){
+				orderYearMaxDurationMapper.updateByOrderNoAndYear(orderYearMaxDuration);
+			}else {
+				orderYearMaxDurationMapper.insert(orderYearMaxDuration);
+			}
 		}else {
 			//会员的处理
 			for (TTaskMember e : tTaskMembers) {