客户修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -239,10 +239,10 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         custom1.setFiles(uploadFileMapper.selectByInfoList("custom", custom1.getId()));
         //商机列表
         List<BusinessOpportunity> bos = businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id", custom1.getId()));
-        if (bos.size() >0){
+        if (bos.size() > 0) {
             List<Integer> sIds = bos.stream().map(BusinessOpportunity::getStageId).distinct().collect(Collectors.toList());
             List<Stage> stages = stageMapper.selectList(new QueryWrapper<Stage>().in("id", sIds));
-            Map<Integer, String> stageValue =  stages.stream()
+            Map<Integer, String> stageValue = stages.stream()
                     .collect(Collectors.toMap(Stage::getId, Stage::getName));
             custom1.setBusinessOpportunitys(bos);
             for (BusinessOpportunity bo : bos) {
@@ -258,7 +258,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
                     })
                     .distinct() // 去重
                     .collect(Collectors.toList());
-            if (userIds.size()>0){
+            if (userIds.size() > 0) {
                 List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
                 Map<String, String> userIdToNameMap = users.stream()
                         .collect(Collectors.toMap(User::getId, User::getName));
@@ -277,7 +277,18 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         //联系人
         custom1.setContacts(contactsMapper.selectList((new QueryWrapper<Contacts>().eq("custom_id", custom1.getId()))));
         //订单
-        custom1.setSalesOrders(salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id", custom1.getId()))));
+        List<SalesOrder> orders = salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id", custom1.getId())));
+        if (orders.size() > 0 ){
+            List<Integer> tids = orders.stream().map(SalesOrder::getType).collect(Collectors.toList());
+            List<SysDict> sysDicts = sysDictMapper.selectList(new QueryWrapper<SysDict>().eq("code", "OrderType").in("id", tids));
+            Map<Integer, String> map = sysDicts.stream()
+                    .collect(Collectors.toMap(SysDict::getId, SysDict::getName));
+            for (SalesOrder order : orders) {
+                order.setCustomName(custom1.getCustomName());
+                order.setTypeName(map.get(order.getType()));
+            }
+        }
+        custom1.setSalesOrders(orders);
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         httpRespMsg.setData(custom1);
         return httpRespMsg;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomMapper.xml

@@ -59,6 +59,7 @@
         c.incharger_id,
         (select `name` from `user` where id = incharger_id) inchargerName,
         c.creator_id,
+        c.create_time,
         (select `name` from `user` where id = creator_id) creatorName
         from custom c
         left join sys_dict sd on c.customer_level_id = sd.id
@@ -150,6 +151,7 @@
         c.incharger_id,
         (select `name` from `user` where id = incharger_id) inchargerName,
         c.creator_id,
+        c.create_time,
         (select `name` from `user` where id = creator_id) creatorName
         from custom c
         left join sys_dict sd on c.customer_level_id = sd.id
@@ -251,7 +253,7 @@
         from custom
         where company_id = #{companyId}
         and is_delete =#{isDelete}
-        and incharger_id = #{inchargerId}
+        and incharger_id = #{userId}
         or incharger_id is null
         <if test="inchargerId != null and inchargerId != ''  ">
             and incharger_id =#{inchargerId}