Pārlūkot izejas kodu

业务表增加确认人,作业表增加接单人

lzm 3 gadi atpakaļ
vecāks
revīzija
2578ce0dab

+ 0 - 34
sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -727,22 +727,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                     .setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
                     .setItemTypeId(typeId).setItemTypeName(tbItemType.getName())
                     .setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now);
-            //合作伙伴创建记录接单操作人by lzm
-//            String businessType = item.getBusinessType();
-//            if (!StrUtil.equals(businessType, TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
-//                String currCustomerId = StpUserUtil.getCustomerId();
-//                TbCostomer currCostomer = tbCostomerService.getById(currCustomerId);
-//                List<String> customerType = new ArrayList<>();
-//                if (currCostomer != null) {
-//                    customerType = StrUtil.splitTrim(currCostomer.getType(), ",");
-//                }
-//                if (customerType.contains(businessType)) {
-//                    SpAdmin currAdmin = StpUserUtil.getAdmin();
-//                    String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
-//                    item.setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
-//                }
-//            }
-            //
             price = price.add(itemTotalPrice);
             itemList.add(item);
             index++;
@@ -864,24 +848,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                         .setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
                         .setItemTypeId(tbItem.getTypeId()).setItemTypeName(tbItemType.getName())
                         .setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now);
-                //by lzm
-//                String businessType = item.getBusinessType();
-//                if (!StrUtil.equals(businessType, TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
-//                    String currCustomerId = StpUserUtil.getCustomerId();
-//                    TbCostomer currCostomer = tbCostomerService.getById(currCustomerId);
-//                    List<String> customerType = new ArrayList<>();
-//                    if (currCostomer != null) {
-//                        customerType = StrUtil.splitTrim(currCostomer.getType(), ",");
-//                    }
-//                    if (customerType.contains(businessType)) {
-//                        SpAdmin currAdmin = StpUserUtil.getAdmin();
-//                        String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
-//                        item.setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
-//                    }else {
-//                        item.setPickBy("").setPickByAdminId("");
-//                    }
-//                }
-                //
                 price = price.add(itemTotalPrice);
                 itemList.add(item);
                 index++;