提交

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

@@ -1429,6 +1429,46 @@ public class WeiXinCorpController {
                         originalDictList.add(remindDict1);originalDictList.add(remindDict2);originalDictList.add(remindDict3);
                         originalDictList.add(remindDict4);originalDictList.add(remindDict5);originalDictList.add(remindDict6);
                         originalDictList.add(remindDict7);originalDictList.add(remindDict8);
+
+                        String[] ClueSources = {"广告", "推销电话", "员工介绍", "外部介绍", "在线商场", "X(Twitter)", "Facebook", "合作伙伴", "公开媒介", "销售邮件", "合作伙伴研讨会", "研讨会内部", "交易会", "Web下载", "Web调研", "聊天", "其他"};
+                        for (int i = 0; i < ClueSources.length; i++) {
+                            originalDictList.add(new SysDict("ClueSources", ClueSources[i], i + 1, company.getId()));
+                        }
+
+                        String[] CustomLevel={"已获得", "活跃", "市场失败", "项目取消", "关闭"};
+                        for (int i = 0; i < CustomLevel.length; i++) {
+                            originalDictList.add(new SysDict("CustomLevel", CustomLevel[i], i + 1, company.getId()));
+                        }
+
+                        String[] CustomIndustry = {"ASP(应用服务提供商)", "数据/电信/OEM", "ERP(企业资源规划)", "政府/军队", "大企业", "管理软件提供商", "MSP(管理服务提供商)", "网络设备(企业)", "非管理ISV", "光网络", "服务提供商", "中小企业", "存储设备", "存储服务提供商", "系统集成", "无线企业", "咨询", "科技", "金融服务", "教育", "制造业", "通信", "房地产", "其他"};
+                        for (int i = 0; i < CustomIndustry.length; i++) {
+                            originalDictList.add(new SysDict("CustomIndustry", CustomIndustry[i], i + 1, company.getId()));
+                        }
+
+                        String[] CustomSources = {"广告", "推销电话", "员工介绍", "外部介绍", "在线商场", "X(Twitter)", "Facebook", "合作伙伴", "公开媒介", "销售邮件", "合作伙伴研讨会", "研讨会内部", "交易会", "Web下载", "Web调研", "聊天", "其他"};
+                        for (int i = 0; i < CustomSources.length; i++) {
+                            originalDictList.add(new SysDict("CustomSources", CustomSources[i], i + 1, company.getId()));
+                        }
+
+                        String[] ProductType = {"软件", "硬件", "服务", "咨询", "信息产品", "电子产品", "家用电器", "医疗设备", "化学品与材料", "能源产品", "其他"};
+                        for (int i = 0; i < ProductType.length; i++) {
+                            originalDictList.add(new SysDict("ProductType", ProductType[i], i + 1, company.getId()));
+                        }
+
+                        String[] ProductUnit = {"个", "件", "只", "条", "台", "套", "张", "千克", "吨", "克", "毫克"};
+                        for (int i = 0; i < ProductUnit.length; i++) {
+                            originalDictList.add(new SysDict("ProductUnit", ProductUnit[i], i + 1, company.getId()));
+                        }
+
+                        String[] OrderType = {"在线订购", "线下购买", "定制开发服务", "续约", "试用版", "教育培训课程", "捐赠购买", "其他"};
+                        for (int i = 0; i < OrderType.length; i++) {
+                            originalDictList.add(new SysDict("OrderType", OrderType[i], i + 1, company.getId()));
+                        }
+
+                        String[] ContractType = {"服务协议", "供应商合同", "联合合作协议", "知识产权授权", "咨询服务协议", "采购合同"};
+                        for (int i = 0; i < ContractType.length; i++) {
+                            originalDictList.add(new SysDict("ContractType", ContractType[i], i + 1, company.getId()));
+                        }
                         sysDictService.saveBatch(originalDictList);
 
                         //设置默认表单配置

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

@@ -1215,6 +1215,47 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             originalDictList.add(remindDict4);originalDictList.add(remindDict5);originalDictList.add(remindDict6);
             originalDictList.add(remindDict7);originalDictList.add(remindDict8);
 
+
+            String[] ClueSources = {"广告", "推销电话", "员工介绍", "外部介绍", "在线商场", "X(Twitter)", "Facebook", "合作伙伴", "公开媒介", "销售邮件", "合作伙伴研讨会", "研讨会内部", "交易会", "Web下载", "Web调研", "聊天", "其他"};
+            for (int i = 0; i < ClueSources.length; i++) {
+                originalDictList.add(new SysDict("ClueSources", ClueSources[i], i + 1, company.getId()));
+            }
+
+            String[] CustomLevel={"已获得", "活跃", "市场失败", "项目取消", "关闭"};
+            for (int i = 0; i < CustomLevel.length; i++) {
+                originalDictList.add(new SysDict("CustomLevel", CustomLevel[i], i + 1, company.getId()));
+            }
+
+            String[] CustomIndustry = {"ASP(应用服务提供商)", "数据/电信/OEM", "ERP(企业资源规划)", "政府/军队", "大企业", "管理软件提供商", "MSP(管理服务提供商)", "网络设备(企业)", "非管理ISV", "光网络", "服务提供商", "中小企业", "存储设备", "存储服务提供商", "系统集成", "无线企业", "咨询", "科技", "金融服务", "教育", "制造业", "通信", "房地产", "其他"};
+            for (int i = 0; i < CustomIndustry.length; i++) {
+                originalDictList.add(new SysDict("CustomIndustry", CustomIndustry[i], i + 1, company.getId()));
+            }
+
+            String[] CustomSources = {"广告", "推销电话", "员工介绍", "外部介绍", "在线商场", "X(Twitter)", "Facebook", "合作伙伴", "公开媒介", "销售邮件", "合作伙伴研讨会", "研讨会内部", "交易会", "Web下载", "Web调研", "聊天", "其他"};
+            for (int i = 0; i < CustomSources.length; i++) {
+                originalDictList.add(new SysDict("CustomSources", CustomSources[i], i + 1, company.getId()));
+            }
+
+            String[] ProductType = {"软件", "硬件", "服务", "咨询", "信息产品", "电子产品", "家用电器", "医疗设备", "化学品与材料", "能源产品", "其他"};
+            for (int i = 0; i < ProductType.length; i++) {
+                originalDictList.add(new SysDict("ProductType", ProductType[i], i + 1, company.getId()));
+            }
+
+            String[] ProductUnit = {"个", "件", "只", "条", "台", "套", "张", "千克", "吨", "克", "毫克"};
+            for (int i = 0; i < ProductUnit.length; i++) {
+                originalDictList.add(new SysDict("ProductUnit", ProductUnit[i], i + 1, company.getId()));
+            }
+
+            String[] OrderType = {"在线订购", "线下购买", "定制开发服务", "续约", "试用版", "教育培训课程", "捐赠购买", "其他"};
+            for (int i = 0; i < OrderType.length; i++) {
+                originalDictList.add(new SysDict("OrderType", OrderType[i], i + 1, company.getId()));
+            }
+
+            String[] ContractType = {"服务协议", "供应商合同", "联合合作协议", "知识产权授权", "咨询服务协议", "采购合同"};
+            for (int i = 0; i < ContractType.length; i++) {
+                originalDictList.add(new SysDict("ContractType", ContractType[i], i + 1, company.getId()));
+            }
+
 //            sysDictMapper.batchInsertDict(originalDictList);
             sysDictService.saveBatch(originalDictList);
 

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

@@ -120,6 +120,10 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         if (sheet.getId() == null) {
             //柘中公司
             if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
+                if (sheet.getOwnerId().equals(userId)){
+                    msg.setError("机械费用不能自己给自己下发");
+                    return msg;
+                }
                 sheet.setStatus(4);//未填写
                 sheet.setReviewProcess(3);//未提交
             }else {
@@ -150,8 +154,20 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
             }
         }
         else {
+            if (sheet.getStatus()!=2&&sheet.getStatus()!=3&&sheet.getStatus()!=4) {
+                msg.setError("报销单已提交,不能修改");
+                return msg;
+            }
             if(user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID&&user.getId().equals(sheet.getOwnerId())&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
+                if (org.apache.commons.lang3.StringUtils.isEmpty(sheet.getFirstCheckerId())||org.apache.commons.lang3.StringUtils.isEmpty(sheet.getSecondCheckerId())){
+                    msg.setError("请选择第一审核人,第二审核人");
+                    return msg;
+                }
                 //柘中公司
+                if (sheet.getTotalAmount()==null){
+                    msg.setError("费用金额不能为空");
+                    return msg;
+                }
                 if (sheet.getTotalAmount() > 0) {
                     sheet.setStatus(1);//待审核
                     sheet.setReviewProcess(0);//待第一审核人审核
@@ -547,7 +563,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         queryWrapper);
                 List<ExpenseSheet> records = listIPager.getRecords();
                 List<Integer> expenseSheetIds = records.stream().map(ExpenseSheet::getId).collect(Collectors.toList());
-                List<ExpenseItem> expenseItemList = expenseItemMapper.selectList(new QueryWrapper<ExpenseItem>().in("expense_id",expenseSheetIds));
+                List<ExpenseItem> expenseItemList = expenseItemMapper.selectList(new QueryWrapper<ExpenseItem>().in(!expenseSheetIds.isEmpty(),"expense_id",expenseSheetIds));
                 List<ExpenseMainType> expenseMainTypes = expenseMainTypeService.list(new QueryWrapper<ExpenseMainType>().eq("company_id", sheet.getCompanyId()).or().eq("is_system",1));
                 records.forEach(re->{
                     Optional<ExpenseMainType> first = expenseMainTypes.stream().filter(et -> et.getId().equals(re.getType())).findFirst();
@@ -589,7 +605,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     queryWrapper);
             List<ExpenseSheet> records = listIPager.getRecords();
             List<Integer> expenseSheetIds = records.stream().map(ExpenseSheet::getId).collect(Collectors.toList());
-            List<ExpenseItem> expenseItemList = expenseItemMapper.selectList(new QueryWrapper<ExpenseItem>().in("expense_id",expenseSheetIds));
+            List<ExpenseItem> expenseItemList = expenseItemMapper.selectList(new QueryWrapper<ExpenseItem>().in(!expenseSheetIds.isEmpty(),"expense_id",expenseSheetIds));
             List<ExpenseMainType> expenseMainTypes = expenseMainTypeService.list(new QueryWrapper<ExpenseMainType>().eq("company_id", sheet.getCompanyId()).or().eq("is_system",1));
             records.forEach(re->{
                 Optional<ExpenseMainType> first = expenseMainTypes.stream().filter(et -> et.getId().equals(re.getType())).findFirst();