Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -338,19 +338,19 @@
             and cc1.name like concat('%',#{personal.clientSubName},'%')
         </if>
         <if test="personal!=null and personal.clientManager!=null and personal.clientManager!='' ">
-            and u.name like concat('%',#{personal.clientManager},'%')
+            and u1.name like concat('%',#{personal.clientManager},'%')
         </if>
         <if test="personal!=null and personal.outwardStaffName!=null and personal.outwardStaffName!='' ">
-            and u1.name like concat('%',#{personal.outwardStaffName},'%')
+            and u2.name like concat('%',#{personal.outwardStaffName},'%')
         </if>
         <if test="personal!=null and personal.inwardStaffName!=null and personal.inwardStaffName!='' ">
-            and u2.name like concat('%',#{personal.inwardStaffName},'%')
+            and u3.name like concat('%',#{personal.inwardStaffName},'%')
         </if>
         <if test="personal!=null and personal.pricingStaffName!=null and personal.pricingStaffName!='' ">
-            and u3.name like concat('%',#{personal.pricingStaffName},'%')
+            and u4.name like concat('%',#{personal.pricingStaffName},'%')
         </if>
         <if test="personal!=null and personal.handlerName!=null and personal.handlerName!='' ">
-            and u4.name like concat('%',#{personal.handlerName},'%')
+            and u.name like concat('%',#{personal.handlerName},'%')
         </if>
     </select>
 

service/src/main/java/com/dayou/service/impl/BusinessNumberServiceImpl.java

@@ -42,7 +42,7 @@ public class BusinessNumberServiceImpl extends ServiceImpl<BusinessNumberMapper,
     private static DecimalFormat zero2 = new DecimalFormat("00");
 
     @Override
-    public String takeMainNumber(TakeNumberDTO taskRecordDTO) {
+    public synchronized String takeMainNumber(TakeNumberDTO taskRecordDTO) {
         TakeNumberEnum takeType = taskRecordDTO.getTakeType();
         MainBusinessEnum businessType = taskRecordDTO.getBusinessType();
         Integer year = taskRecordDTO.getYear();