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

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

@@ -1509,6 +1509,12 @@ public class WeiXinCorpController {
         stages.add(stage2);
         Stage stage3 = new Stage().setName("无效").setPlan("0%").setSeq(6).setIsFinish(1).setCompanyId(company.getId()).setColor("#F4F5F7");
         stages.add(stage3);
+        Stage stage4 = new Stage().setName("验证客户").setPlan("10%").setSeq(1).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
+        stages.add(stage4);
+        Stage stage5 = new Stage().setName("需求分析").setPlan("30%").setSeq(2).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
+        stages.add(stage5);
+        Stage stage6 = new Stage().setName("方案/报价").setPlan("80%").setSeq(3).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
+        stages.add(stage6);
         return stages;
     }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/SysDict.java

@@ -75,7 +75,7 @@ public class SysDict extends Model<SysDict> {
         return this.id;
     }
 
-    public static final String[] TYPE_LIST=new String[]{"ClueSources","CustomLevel","CustomIndustry","CustomSources","BusinessStage","ProductType","ProductUnit","OrderType","ContractType","RemindType"};
+    public static final String[] TYPE_LIST=new String[]{"ClueSources","CustomLevel","CustomIndustry","CustomSources","ProductType","ProductUnit","OrderType","ContractType","RemindType"};
 
     public static List<Map<String,Object>> getSysDictList(){
         List<Map<String,Object>> itemList=new ArrayList<>();
@@ -91,8 +91,6 @@ public class SysDict extends Model<SysDict> {
                     break;
                 case "CustomSources":map.put("name","客户来源");
                     break;
-                case "BusinessStage":map.put("name","商机阶段");
-                    break;
                 case "ProductType":map.put("name","产品类型");
                     break;
                 case "ProductUnit":map.put("name","产品单位");

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

@@ -1348,6 +1348,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         stages.add(stage2);
         Stage stage3 = new Stage().setName("无效").setPlan("0%").setSeq(6).setIsFinish(1).setCompanyId(company.getId()).setColor("#F4F5F7");
         stages.add(stage3);
+        Stage stage4 = new Stage().setName("验证客户").setPlan("10%").setSeq(1).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
+        stages.add(stage4);
+        Stage stage5 = new Stage().setName("需求分析").setPlan("30%").setSeq(2).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
+        stages.add(stage5);
+        Stage stage6 = new Stage().setName("方案/报价").setPlan("80%").setSeq(3).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
+        stages.add(stage6);
         return stages;
     }