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

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

@@ -245,6 +245,16 @@ public class ClueController {
                 }else {
                     value= String.valueOf(aClass.getMethod("get" + targetName).invoke(data)==null?"":aClass.getMethod("get" + targetName).invoke(data));
                 }
+
+                if(model.equals("clueSourceId")){
+                    value = String.valueOf(aClass.getMethod("getClueSourceValue").invoke(data));
+                }
+                if(model.equals("customerLevelId")){
+                    value = String.valueOf(aClass.getMethod("getCustomerLevelValue").invoke(data));
+                }
+                if(model.equals("customerIndustryId")){
+                    value = String.valueOf(aClass.getMethod("getCustomerIndustryValue").invoke(data));
+                }
                 item.add(value);
             }
             dataList.add(item);

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

@@ -6823,6 +6823,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         headList.add(MessageUtils.message("entry.projectType"));
         headList.add(MessageUtils.message("entry.publicProject"));
         headList.add(MessageUtils.message("entry.projectName"));
+        headList.add(MessageUtils.message("entry.projectStage"));
         headList.add(MessageUtils.message("excel.charge"));
         headList.add(MessageUtils.message("entry.Participants"));
         headList.add(MessageUtils.message("entry.startData"));
@@ -6923,6 +6924,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             //rowData.add(("1".equals(projectVO.getIsPublic())?"是":"否"));
             rowData.add(("1".equals(projectVO.getIsPublic())?MessageUtils.message("excel.yes"):MessageUtils.message("excel.no")));
             rowData.add(projectVO.getProjectName());
+            rowData.add(projectVO.getCurrentStageName());
             if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 if(projectVO.getInchargerId()!=null){
                     User us = userList.stream().filter(ul -> ul.getId().equals(projectVO.getInchargerId())).findFirst().get();
@@ -14332,13 +14334,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     });
                 }
             }
-            if(!taskService.updateBatchById(tasks) ){
-                msg.setError("验证失败");
-                return msg;
+            if(tasks.size()>0){
+                taskService.saveOrUpdateBatch(tasks);
             }
-            if(!taskExecutorService.saveBatch(taskExecutorList)){
-                msg.setError("验证失败");
-                return msg;
+            if(taskExecutorList.size()>0){
+                taskExecutorService.saveBatch(taskExecutorList);
             }
         }
         return msg;