销售合同变更添加后缀

hx-common/src/main/java/com/fjhx/common/service/employee/impl/EmployeeHandoverServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -48,14 +49,14 @@ public class EmployeeHandoverServiceImpl extends ServiceImpl<EmployeeHandoverMap
         //关键字搜索
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
             DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-            List<Object> objects = userService.listObjs(Wrappers.<SysUser>lambdaQuery().like(SysUser::getNickName, dto.getKeyword()));
+            List<SysUser> userList = userService.list(Wrappers.<SysUser>lambdaQuery().like(SysUser::getNickName, dto.getKeyword()));
+            List<Long> userIds = userList.stream().map(SysUser::getUserId).collect(Collectors.toList());
             DynamicDataSourceContextHolder.poll();
-            objects.add(null);
             wrapper.and(q -> q
                     .like(EmployeeHandoverVo::getReason, dto.getKeyword())
                     .or().like(EmployeeHandoverVo::getRemark, dto.getKeyword())
-                    .or().in(EmployeeHandoverVo::getHandoverPersonId, objects)
-                    .or().in(EmployeeHandoverVo::getRecipientId, objects)
+                    .or().in(EmployeeHandoverVo::getHandoverPersonId, userIds)
+                    .or().in(EmployeeHandoverVo::getRecipientId, userIds)
             );
         }
         wrapper.orderByDesc("eh", EmployeeHandover::getId);

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -19,6 +19,8 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -91,6 +93,16 @@ public class ContractUpdateFlow extends FlowDelegate {
 
         }
 
+        //变更后往合同编号后面加后缀
+        String code = contract.getCode();
+        Matcher matcher = Pattern.compile(".*\\((.*?)\\)$").matcher(code);
+        int index = 2;
+        if (matcher.find()) {
+            index = (Integer.parseInt(matcher.group(1)) + 1);
+            code = code.substring(0, code.lastIndexOf("("));
+        }
+        contract.setCode(code + "(" + index + ")");
+
         return contractFlow.start(contract);
     }