Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SysFormController.java

@@ -41,7 +41,18 @@ public class SysFormController {
     public HttpRespMsg list(){
         HttpRespMsg msg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        Company company = companyMapper.selectById(companyId);
         List<SysForm> list = sysFormService.list(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, companyId));
+        if (!list.isEmpty()&&company.getIsExistBusiness()==0){
+            for (SysForm sysForm : list) {
+                String config = sysForm.getConfig();
+                String replacedConfig = config.replaceAll("商机", "项目");
+                sysForm.setConfig(replacedConfig);
+                if (sysForm.getName().contains("商机")){
+                    sysForm.setName(sysForm.getName().replaceAll("商机","项目"));
+                }
+            }
+        }
         msg.setData(list);
         return msg;
     }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/BusinessItemProductMapper.java

@@ -19,4 +19,6 @@ public interface BusinessItemProductMapper extends BaseMapper<BusinessItemProduc
     List<BusinessItemProduct> selectListToBoId(Integer id);
 
     List<BusinessItemProduct> getUnDelBIPListByBId(@Param("busOppId") Integer busOppId);
+
+    List<BusinessItemProduct> getUnDelBIPListByBIdInfo(@Param("busOppId") Integer busOppId);
 }

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

@@ -126,7 +126,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
         }
         businessOpportunity.setTaskList(tasks);
 //        List<BusinessItemProduct> businessItemProducts = bipMapper.selectList(new QueryWrapper<BusinessItemProduct>().eq("business_id", bo.getId()));
-        List<BusinessItemProduct> businessItemProducts  = bipMapper.getUnDelBIPListByBId(bo.getId());
+        List<BusinessItemProduct> businessItemProducts  = bipMapper.getUnDelBIPListByBIdInfo(bo.getId());
         if (businessItemProducts.size() > 0) {
 
             List<Integer> productIds = businessItemProducts.stream()
@@ -468,6 +468,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
     public HttpRespMsg importData(MultipartFile multipartFile) {
         System.out.println("=====开始进行商机导入=====");
         HttpRespMsg msg=new HttpRespMsg();
+        String str = getString();
         if(!multipartFile.getOriginalFilename().endsWith(".xlsx")){
             msg.setError("文件格式错误,请使用.xlsx格式的Excel文件进行导入");
             return msg;
@@ -697,10 +698,11 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
 //                List<ActionLog> ads = new ArrayList<>();
                 for (BusinessOpportunity bo : importProductList) {
                     ActionLog actionLog = new ActionLog();
-                    actionLog.setName("新增了商机");
+                    actionLog.setName("新增了"+str);
                     actionLog.setItemId(bo.getId());
                     actionLog.setCode("business");
                     actionLog.setUserId(user.getId());
+                    actionLog.setCreatTime(new Date());
                     actionLogMapper.insert(actionLog);
                 }
             }

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

@@ -51,6 +51,7 @@ public class UserCommonModuleServiceImpl extends ServiceImpl<UserCommonModuleMap
     public HttpRespMsg getCommonModules(HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         User user= userMapper.selectById(request.getHeader("token"));
+        Company company = companyMapper.selectById(user.getCompanyId());
         if(null == user){
             httpRespMsg.setError("用户不存在");
             return httpRespMsg;
@@ -95,7 +96,11 @@ public class UserCommonModuleServiceImpl extends ServiceImpl<UserCommonModuleMap
         if(CollectionUtils.isNotEmpty(modelIds)){
             commonModules = commonModules.stream().filter(t -> modelIds.contains(t.getModuleId())).collect(Collectors.toList());
         }
-
+        if (company.getIsExistBusiness()==0) {
+            for (UserCommonModuleVO module : commonModules) {
+                module.setModuleName(module.getModuleName().replaceAll("商机","项目"));
+            }
+        }
         httpRespMsg.setData(commonModules);
         return httpRespMsg;
     }

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

@@ -38,5 +38,12 @@
         where bip.product_id = #{busOppId}
           and p.is_delete = 0
     </select>
+    <select id="getUnDelBIPListByBIdInfo" resultType="com.management.platform.entity.BusinessItemProduct">
+        select bip.*
+        from business_item_product bip
+                 left join product p on bip.product_id = p.id
+        where bip.business_id = #{busOppId}
+          and p.is_delete = 0
+    </select>
 
 </mapper>