移除CRM开发功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysFileController.java

@@ -1,104 +0,0 @@
-package com.ruoyi.web.controller.system;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.SysFile;
-import com.ruoyi.system.service.ISysFileService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 附件Controller
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-@RestController
-@RequestMapping("/system/file")
-public class SysFileController extends BaseController
-{
-    @Autowired
-    private ISysFileService sysFileService;
-
-    /**
-     * 查询附件列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:file:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysFile sysFile)
-    {
-        startPage();
-        List<SysFile> list = sysFileService.selectSysFileList(sysFile);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出附件列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:file:export')")
-    @Log(title = "附件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, SysFile sysFile)
-    {
-        List<SysFile> list = sysFileService.selectSysFileList(sysFile);
-        ExcelUtil<SysFile> util = new ExcelUtil<SysFile>(SysFile.class);
-        util.exportExcel(response, list, "附件数据");
-    }
-
-    /**
-     * 获取附件详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('system:file:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
-        return success(sysFileService.selectSysFileById(id));
-    }
-
-    /**
-     * 新增附件
-     */
-    @PreAuthorize("@ss.hasPermi('system:file:add')")
-    @Log(title = "附件", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody SysFile sysFile)
-    {
-        return toAjax(sysFileService.insertSysFile(sysFile));
-    }
-
-    /**
-     * 修改附件
-     */
-    @PreAuthorize("@ss.hasPermi('system:file:edit')")
-    @Log(title = "附件", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SysFile sysFile)
-    {
-        return toAjax(sysFileService.updateSysFile(sysFile));
-    }
-
-    /**
-     * 删除附件
-     */
-    @PreAuthorize("@ss.hasPermi('system:file:remove')")
-    @Log(title = "附件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
-        return toAjax(sysFileService.deleteSysFileByIds(ids));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/CrmController.java

@@ -1,80 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.flowable.domain.vo.FlowTaskVo;
-import com.ruoyi.flowable.service.crm.CrmService;
-import com.ruoyi.system.domain.crm.Customer;
-import com.ruoyi.system.service.crm.ICustomerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *  crm系统
- */
-@Api(tags = "CRM系统")
-@RestController
-@RequestMapping("/crmSystem")
-public class CrmController extends BaseController {
-
-    @Autowired
-    private CrmService crmService;
-
-    @Autowired
-    private ICustomerService customerService;
-
-    @ApiOperation(value = "发起流程")
-    @PostMapping("/start/{procDefId}")
-    public AjaxResult start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
-                            @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables
-    ) {
-        return crmService.startProcessInstanceById(procDefId,variables);
-    }
-
-    /**
-     * 获取公司客户列表
-     */
-    @ApiOperation(value = "获取公司客户列表")
-    @PreAuthorize("@ss.hasPermi('crmSystem:crm:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Customer customer)
-    {
-        startPage();
-        List<Customer> list = customerService.selectCustomerList(customer);
-        return getDataTable(list);
-    }
-
-    @ApiOperation(value = "获取待办列表", response = Customer.class)
-    @GetMapping(value = "/myTaskList")
-    public TableDataInfo myTaskList(@ApiParam(value = "客户实体") @RequestBody Customer customer)
-    {
-        startPage();
-        List<Customer> list = customerService.myTaskList(customer);
-        return getDataTable(list);
-    }
-
-
-    @ApiOperation(value = "修改客户和项目信息，进入流程")
-    @PostMapping("/submit")
-    public AjaxResult submit(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
-                            @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables
-    ) {
-        return AjaxResult.success("审批成功");
-    }
-
-    @ApiOperation(value = "审批任务")
-    @PostMapping(value = "/complete")
-    public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) {
-        return AjaxResult.success("审批成功");
-    }
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/CrmFileController.java

@@ -1,106 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.system.domain.crm.CrmFile;
-import com.ruoyi.system.service.crm.ICrmFileService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * crm附件Controller
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-@RestController
-@RequestMapping("/crm/crmFile")
-public class CrmFileController extends BaseController
-{
-    @Autowired
-    private ICrmFileService crmFileService;
-
-    /**
-     * 查询crm附件列表
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(CrmFile crmFile)
-    {
-        startPage();
-        List<CrmFile> list = crmFileService.selectCrmFileList(crmFile);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出crm附件列表
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:export')")
-    @Log(title = "crm附件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CrmFile crmFile)
-    {
-        List<CrmFile> list = crmFileService.selectCrmFileList(crmFile);
-        ExcelUtil<CrmFile> util = new ExcelUtil<CrmFile>(CrmFile.class);
-        util.exportExcel(response, list, "crm附件数据");
-    }
-
-    /**
-     * 获取crm附件详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(crmFileService.selectCrmFileById(id));
-    }
-
-    /**
-     * 新增crm附件
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:add')")
-    @Log(title = "crm附件", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CrmFile crmFile)
-    {
-        return toAjax(crmFileService.insertCrmFile(crmFile));
-    }
-
-    /**
-     * 修改crm附件
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:edit')")
-    @Log(title = "crm附件", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CrmFile crmFile)
-    {
-        return toAjax(crmFileService.updateCrmFile(crmFile));
-    }
-
-    /**
-     * 删除crm附件
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:remove')")
-    @Log(title = "crm附件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(crmFileService.deleteCrmFileByIds(ids));
-    }
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TCustomerController.java

@@ -1,115 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.system.domain.crm.TCustomer;
-import com.ruoyi.system.service.crm.ITCustomerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * crmController
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-@Api(tags = "CRM系统接口")
-@RestController
-@RequestMapping("/system/customer")
-public class TCustomerController extends BaseController
-{
-    @Autowired
-    private ITCustomerService tCustomerService;
-
-    /**
-     * 查询crm列表
-     */
-    @ApiOperation(value = "获取客户列表")
-    @PreAuthorize("@ss.hasPermi('system:customer:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TCustomer tCustomer)
-    {
-        startPage();
-        List<TCustomer> list = tCustomerService.selectTCustomerList(tCustomer);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出crm列表
-     */
-    @ApiOperation(value = "导出客户列表")
-    @PreAuthorize("@ss.hasPermi('system:customer:export')")
-    @Log(title = "crm", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, TCustomer tCustomer)
-    {
-        List<TCustomer> list = tCustomerService.selectTCustomerList(tCustomer);
-        ExcelUtil<TCustomer> util = new ExcelUtil<TCustomer>(TCustomer.class);
-        util.exportExcel(response, list, "crm数据");
-    }
-
-    /**
-     * 获取crm详细信息
-     */
-    @ApiOperation(value = "获取crm详细信息")
-    @PreAuthorize("@ss.hasPermi('system:customer:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
-        return success(tCustomerService.selectTCustomerById(id));
-    }
-
-    /**
-     * 新增crm
-     */
-    @ApiOperation(value = "新增crm")
-    @PreAuthorize("@ss.hasPermi('system:customer:add')")
-    @Log(title = "crm", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TCustomer tCustomer)
-    {
-        tCustomer.setCreateBy(getUsername());
-        return toAjax(tCustomerService.insertTCustomer(tCustomer));
-    }
-
-    /**
-     * 修改crm
-     */
-    @ApiOperation(value = "修改crm")
-    @PreAuthorize("@ss.hasPermi('system:customer:edit')")
-    @Log(title = "crm", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TCustomer tCustomer)
-    {
-        return toAjax(tCustomerService.updateTCustomer(tCustomer));
-    }
-
-    /**
-     * 删除crm
-     */
-    @ApiOperation(value = "删除crm")
-    @PreAuthorize("@ss.hasPermi('system:customer:remove')")
-    @Log(title = "crm", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
-        return toAjax(tCustomerService.deleteTCustomerByIds(ids));
-    }
-}

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/crm/CrmService.java

@@ -1,25 +0,0 @@
-package com.ruoyi.flowable.service.crm;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.flowable.domain.vo.FlowQueryVo;
-import com.ruoyi.system.domain.crm.Address;
-import com.ruoyi.system.domain.crm.Contacts;
-import com.ruoyi.system.domain.crm.Customer;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- */
-public interface CrmService {
-
-
-    AjaxResult startProcessInstanceById(String procDefId, Map<String, Object>  variables);
-
-
-
-}

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/crm/Impl/CrmServiceImpl.java

@@ -1,226 +0,0 @@
-package com.ruoyi.flowable.service.crm.Impl;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.flowable.common.enums.FlowComment;
-import com.ruoyi.flowable.domain.dto.FlowTaskDto;
-import com.ruoyi.flowable.domain.vo.FlowQueryVo;
-import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.service.crm.CrmService;
-import com.ruoyi.system.domain.crm.Address;
-import com.ruoyi.system.domain.crm.Contacts;
-import com.ruoyi.system.domain.crm.CrmFile;
-import com.ruoyi.system.domain.crm.Customer;
-import com.ruoyi.system.service.crm.IAddressService;
-import com.ruoyi.system.service.crm.IContactsService;
-import com.ruoyi.system.service.crm.ICrmFileService;
-import com.ruoyi.system.service.crm.ICustomerService;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.TaskQuery;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.flowable.common.constant.ProcessConstants;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-@Slf4j
-public class CrmServiceImpl extends FlowServiceFactory implements CrmService {
-
-
-    @Resource
-    private ICustomerService customerService;
-
-    @Resource
-    private IContactsService contactsService;
-
-    @Resource
-    private IAddressService addressService;
-
-    @Resource
-    private ICrmFileService crmFileService;
-
-
-    /**
-     * 新增客户流程开启
-     * @param procDefId
-     * @param variables
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AjaxResult startProcessInstanceById(String procDefId, Map<String, Object>  variables) {
-        try {
-
-            if (StringUtils.isNull(variables.get("customer")))return AjaxResult.error("请填写客户联系人信息");
-
-            if (StringUtils.isNull(variables.get("contactsList")))return AjaxResult.error("请填写客户联系人信息");
-
-            SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-
-            ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId)
-                    .latestVersion().singleResult();
-            if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
-                return AjaxResult.error("流程已被挂起,请先激活流程");
-            }
-
-            identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
-            variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
-            //设置部门领导审批人
-
-
-            variables.put("MANAGER", sysUser.getUserId());
-            //设置事业部负责人审批人
-            variables.put("LEADER", sysUser.getUserId());
-            //设置事业群领导审批人
-            variables.put("DEPTLEADER", sysUser.getUserId());
-
-            /**
-             * todo 流程节点流转配置
-             * =============================
-             */
-
-
-
-            //开启流程
-            ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDefId, variables);
-
-            //判断审批通过或暂存
-            //true 提交 false:暂存
-            if(Boolean.valueOf(variables.get("FLAG").toString())) {
-                // 给第一步申请人节点设置任务执行人和意见
-                Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
-                if (Objects.nonNull(task)) {
-                    taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), sysUser.getNickName() + "发起流程申请");
-                    taskService.setAssignee(task.getId(), sysUser.getUserId().toString());
-                    taskService.complete(task.getId(), variables);
-                }
-            }
-            Customer customer = new ObjectMapper().readValue(variables.get("customer").toString(), Customer.class);
-
-            List<Contacts> contactsList = new ObjectMapper().readValue(variables.get("contactsList").toString(), new TypeReference<List<Contacts>>(){});
-
-            Address address = new ObjectMapper().readValue(variables.get("address").toString(), Address.class);
-
-            //保存客户信息
-            customer.setProcInsId(processInstance.getProcessInstanceId());
-//			customer.setCustomerId(uuid);
-//			customer.setCustomerCode(getNumber());
-            customer.setCreateBy(sysUser.getUserName());
-            customer.setSalesManager(sysUser.getUserName());
-//            customer.setCompanyId(userInfo.getCompanyId());//所在的公司Id
-            customer.setDeptId(sysUser.getDeptId().toString());//添加部门
-            customer.setDatefrom("0");//系统
-            if(Boolean.valueOf(variables.get("FLAG").toString())){
-                customer.setState("0");//已提交状态
-            }else{
-                customer.setState("1");//暂存状态
-            }
-            customerService.insertCustomer(customer);
-
-            //保存客户联系人信息
-            if (CollectionUtils.isNotEmpty(contactsList)){
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-                for (Contacts contacts : contactsList) {
-					contacts.setContactsId(IdUtils.fastUUID());
-                    contacts.setCustomerId(customer.getCustomerId());
-                    contacts.setContactCode(sdf.format(new Date()));
-//                    contacts.setCompanyId(customer.getCompanyId());
-                    contacts.setCreatedBy(sysUser.getUserName());
-                }
-                contactsService.batchInsertContacts(contactsList);
-            }
-
-            //保存账户信息
-            if (StringUtils.isNull(address)){
-                address.setCustomerId(customer.getCustomerId());
-                addressService.insertAddress(address);
-            }
-
-            //保存附件信息
-//            if(upfile.length>0){
-//                this.uploadFile(upfile,variables.get("fileMap").toString());
-//            }
-
-            // todo 保存流程审批记录-待开发
-
-            return AjaxResult.success("流程启动成功");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return AjaxResult.error("流程启动错误");
-        }
-    }
-
-    public AjaxResult  uploadFile(MultipartFile[] upfile,String fileMap){
-        try {
-            SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-            if(sysUser!=null){
-                List<CrmFile> fileList = new ArrayList<CrmFile>();
-                JSONObject jsonObject = JSONObject.from(fileMap);
-                Map<String, Map<String,List<String>>> mapStr = (Map)jsonObject;
-                //获取文件保存地址
-                String visit_url = RuoYiConfig.getUploadPath();
-
-                for(int i=0;i<upfile.length;i++){
-                    CrmFile cf = new CrmFile();
-                    String fileName = upfile[i].getOriginalFilename().trim();
-
-                    String uuid = IdUtils.fastUUID();
-                    //获取文件后缀
-                    String prefix=fileName.substring(fileName.lastIndexOf(".")+1);
-                    String newFileName = uuid+"."+prefix;
-                    File file = new File(visit_url+"/crmFile");
-                    if(!file.exists()){
-                        file.mkdirs();
-                    }
-                    upfile[i].transferTo(new File(file,newFileName));
-                    cf.setFileId(IdUtils.fastUUID());
-                    List<String> data = FileUtils.getData(mapStr, fileName);
-                    if(data!=null && data.size()>0 && data.size()>1){
-                        cf.setObjectId(data.get(0));
-                        cf.setType(data.get(1));
-                    }
-                    cf.setUploadName(fileName);
-                    cf.setUploadPath(visit_url+"/crmFile/"+newFileName);
-                    cf.setUploadType(prefix);
-                    fileList.add(cf);
-                }
-                if(fileList.size()>0){
-                    for (CrmFile po:fileList) {
-                        crmFileService.insertCrmFile(po);
-                    }
-                }
-                return AjaxResult.success("文件上传成功");
-            }else{
-                return AjaxResult.error("系统出错，请联系管理员");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return AjaxResult.error("文件上传失败");
-        }
-
-    }
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysFile.java

@@ -1,148 +0,0 @@
-package com.ruoyi.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 附件对象 sys_file
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public class SysFile extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 文件ID */
-    private String fileId;
-
-    /** 文件名称 */
-    @Excel(name = "文件名称")
-    private String uploadName;
-
-    /** 文件类别 */
-    @Excel(name = "文件类别")
-    private String uploadType;
-
-    /** 文件地址 */
-    private String uploadPath;
-
-    /** 文件格式 */
-    @Excel(name = "文件格式")
-    private String uploadFormat;
-
-    /** 新文件名称 */
-    private String newUploadName;
-
-    /** 状态 */
-    private String delFlag;
-
-    /** 附件业务ID */
-    private String fileBusinessId;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setFileId(String fileId) 
-    {
-        this.fileId = fileId;
-    }
-
-    public String getFileId() 
-    {
-        return fileId;
-    }
-    public void setUploadName(String uploadName) 
-    {
-        this.uploadName = uploadName;
-    }
-
-    public String getUploadName() 
-    {
-        return uploadName;
-    }
-    public void setUploadType(String uploadType) 
-    {
-        this.uploadType = uploadType;
-    }
-
-    public String getUploadType() 
-    {
-        return uploadType;
-    }
-    public void setUploadPath(String uploadPath) 
-    {
-        this.uploadPath = uploadPath;
-    }
-
-    public String getUploadPath() 
-    {
-        return uploadPath;
-    }
-    public void setUploadFormat(String uploadFormat) 
-    {
-        this.uploadFormat = uploadFormat;
-    }
-
-    public String getUploadFormat() 
-    {
-        return uploadFormat;
-    }
-    public void setNewUploadName(String newUploadName) 
-    {
-        this.newUploadName = newUploadName;
-    }
-
-    public String getNewUploadName() 
-    {
-        return newUploadName;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setFileBusinessId(String fileBusinessId) 
-    {
-        this.fileBusinessId = fileBusinessId;
-    }
-
-    public String getFileBusinessId() 
-    {
-        return fileBusinessId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fileId", getFileId())
-            .append("uploadName", getUploadName())
-            .append("uploadType", getUploadType())
-            .append("uploadPath", getUploadPath())
-            .append("uploadFormat", getUploadFormat())
-            .append("newUploadName", getNewUploadName())
-            .append("delFlag", getDelFlag())
-            .append("fileBusinessId", getFileBusinessId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/crm/Address.java

@@ -1,100 +0,0 @@
-package com.ruoyi.system.domain.crm;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("账户信息")
-public class Address extends BaseEntity {
-
-    @ApiModelProperty("主键id")
-    private String id;
-
-    @ApiModelProperty("账户id")
-    private String addressId;
-
-    @ApiModelProperty("客户id")
-    private String customerId;
-
-    @ApiModelProperty("发票地址")
-    private String invoiceAddress;//发票地址
-
-    @ApiModelProperty("送货地址")
-    private String sendAddress;//送货地址
-
-    @ApiModelProperty("【发票地址】邮政信箱")
-    private String invoicePostbox;//【发票地址】邮政信箱
-
-    @ApiModelProperty("【送货地址】邮政信箱")
-    private String sendPostbox;//【送货地址】邮政信箱
-
-    @ApiModelProperty("【发票地址】国家")
-    private String invoiceCountry;//【发票地址】国家
-
-    @ApiModelProperty("【送货地址】国家")
-    private String sendCountry;//【送货地址】国家
-
-    @ApiModelProperty("【发票地址】省份")
-    private String invoiceProvince;//【发票地址】省份
-
-    @ApiModelProperty("【送货地址】省份")
-    private String sendProvince;//【送货地址】省份
-
-    @ApiModelProperty("【发票地址】城市")
-    private String invoiceCity;//【发票地址】城市
-
-    @ApiModelProperty("【送货地址】城市")
-    private String sendCity;//【送货地址】城市
-
-    @ApiModelProperty("【发票地址】邮编")
-    private String invoicePostCode;//【发票地址】邮编
-
-    @ApiModelProperty("【送货地址】邮编")
-    private String sendPostCode;//【送货地址】邮编
-
-    @ApiModelProperty("审核")
-    private String isActive;
-
-    @ApiModelProperty("客户名称")
-    private String customerName;//销售经理
-
-    @ApiModelProperty("姓名")
-    private String userName;//销售经理
-
-    @ApiModelProperty("公司id")
-    private String companyId;
-
-    private String salesManager;
-
-    @ApiModelProperty("开户名称")
-    private String accountName;//开户名称
-
-    @ApiModelProperty("公司税号")
-    private String companyTaxNum;//公司税号
-
-    @ApiModelProperty("开户银行")
-    private String bankOfDeposit;//开户银行
-
-    @ApiModelProperty("银行账号")
-    private String bankAccount;//银行账号
-
-    @ApiModelProperty("公司地址")
-    private String companyAddress;//公司地址
-
-    @ApiModelProperty("公司电话")
-    private String companyPhone;//公司电话
-
-    @ApiModelProperty("纳税人")
-    private String taxpayer;//纳税人
-
-    @ApiModelProperty("税率")
-    private  String customerTaxrate;//税率
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/crm/Contacts.java

@@ -1,95 +0,0 @@
-package com.ruoyi.system.domain.crm;
-
-
-import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("联系人")
-public class Contacts extends BaseEntity {
-
-    @ApiModelProperty("主键id")
-    private Integer id;
-
-    @ApiModelProperty("联系人ID")
-    private String contactsId;
-
-    @ApiModelProperty("客户实体id")
-    private String customerId;
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-    @ApiModelProperty("联系人编号")
-    private String contactCode;
-
-    @ApiModelProperty("手机")
-    private String phone;
-
-    @ApiModelProperty("手机")
-    private String tel;
-
-    @ApiModelProperty("手机")
-    private String tel2;
-
-    @ApiModelProperty("传真")
-    private String fax;
-
-    @ApiModelProperty("电子邮箱")
-    private String email;
-
-    @ApiModelProperty("QQ")
-    private String qq;
-
-    @ApiModelProperty("所属部门")
-    private String department;
-
-    @ApiModelProperty("职位")
-    private String position;
-
-    @ApiModelProperty("办公地址")
-    private String officeAddress;
-
-    @ApiModelProperty("来源")
-    private String source;
-
-    @ApiModelProperty("邮编")
-    private String postcode;
-
-    @ApiModelProperty("照片")
-    private String Photo;
-
-    @ApiModelProperty("创建人")
-    private String createdBy;
-
-    @ApiModelProperty("创建时间")
-    private String createdDate;
-
-    @ApiModelProperty("修改人")
-    private String updatedBy;
-
-    @ApiModelProperty("修改时间")
-    private String updatedDate;
-
-    @ApiModelProperty("")
-    private String is_Active;
-
-    @ApiModelProperty("删除时间")
-    private String deleteDate;
-
-    @ApiModelProperty("删除人")
-    private String deleteBy;
-
-    @ApiModelProperty("公司id")
-    private String companyId;
-
-    @ApiModelProperty("是否删除0:未删除,1:已删除")
-    private String isDelete;
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/crm/CrmFile.java

@@ -1,135 +0,0 @@
-package com.ruoyi.system.domain.crm;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * crm附件对象 crm_file
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public class CrmFile extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 文件ID */
-    @Excel(name = "文件ID")
-    private String fileId;
-
-    /** 关联信息ID */
-    @Excel(name = "关联信息ID")
-    private String objectId;
-
-    /** 0:项目文件;1:活动计划文件;2活动实际文件;3客户信息文件;4联系人信息文件;5地址信息文件 */
-    @Excel(name = "0:项目文件;1:活动计划文件;2活动实际文件;3客户信息文件;4联系人信息文件;5地址信息文件")
-    private String type;
-
-    /** 文件名称 */
-    @Excel(name = "文件名称")
-    private String uploadName;
-
-    /** 文件类型 */
-    @Excel(name = "文件类型")
-    private String uploadType;
-
-    /** 文件地址 */
-    @Excel(name = "文件地址")
-    private String uploadPath;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companyId;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setFileId(String fileId) 
-    {
-        this.fileId = fileId;
-    }
-
-    public String getFileId() 
-    {
-        return fileId;
-    }
-    public void setObjectId(String objectId) 
-    {
-        this.objectId = objectId;
-    }
-
-    public String getObjectId() 
-    {
-        return objectId;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setUploadName(String uploadName) 
-    {
-        this.uploadName = uploadName;
-    }
-
-    public String getUploadName() 
-    {
-        return uploadName;
-    }
-    public void setUploadType(String uploadType) 
-    {
-        this.uploadType = uploadType;
-    }
-
-    public String getUploadType() 
-    {
-        return uploadType;
-    }
-    public void setUploadPath(String uploadPath) 
-    {
-        this.uploadPath = uploadPath;
-    }
-
-    public String getUploadPath() 
-    {
-        return uploadPath;
-    }
-    public void setCompanyId(String companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public String getCompanyId() 
-    {
-        return companyId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fileId", getFileId())
-            .append("objectId", getObjectId())
-            .append("type", getType())
-            .append("uploadName", getUploadName())
-            .append("uploadType", getUploadType())
-            .append("uploadPath", getUploadPath())
-            .append("companyId", getCompanyId())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/crm/CrmVo.java

@@ -1,30 +0,0 @@
-package com.ruoyi.system.domain.crm;
-
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CrmVo {
-
-    private String expenseItemName;//项目名称
-
-    private String expenseItemNumber;//项目编号
-
-    private String costCenter;//成本中心
-
-    private String planIncome;//合同收入
-
-    private String flag;//0:总裁室开放所有权限    1：部门领导看这个部门所有数据    2：个人权限数据
-
-    private String startMonth;
-
-    private String endMonth;
-
-    private String key;
-
-    private List<CrmFile> crmFiles;
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/crm/Customer.java

@@ -1,143 +0,0 @@
-package com.ruoyi.system.domain.crm;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("客户实体")
-public class Customer extends BaseEntity {
-
-    @ApiModelProperty("主键id")
-    private String id;
-
-    @ApiModelProperty("客户id")
-    private String customerId;
-
-    @ApiModelProperty("客户编码")
-    private String customerCode;
-
-    @ApiModelProperty("客户名称")
-    private String customerName;
-
-    @ApiModelProperty("客户状态")
-    private String status;
-
-    @ApiModelProperty("网站")
-    private String website;
-
-    private String yearBusiness;
-
-    @ApiModelProperty("股票代码")
-    private String stockCode;
-
-    @ApiModelProperty("法人代表")
-    private String legalPerson;
-
-    @ApiModelProperty("关联单位")
-    private String connectedEntities;
-
-    @ApiModelProperty("行业")
-    private String trade;
-
-    @ApiModelProperty("员工人数")
-    private int workforce;
-
-    @ApiModelProperty("客户类型")
-    private String customerType;
-
-    @ApiModelProperty("负责部门")
-    private String responsibleDept;
-
-    @ApiModelProperty("销售经理")
-    private String salesManager;
-
-    @ApiModelProperty("备注")
-    private String mark;
-
-    @ApiModelProperty("isActive")
-    private String isActive;
-
-    @ApiModelProperty("删除时间")
-    private String deleteDate;
-
-    @ApiModelProperty("删除人")
-    private String deleteBy;
-
-    @ApiModelProperty("销售经理")
-    private String salesManagerName;
-
-    @ApiModelProperty("角色名称")
-    private String roleName;
-
-    private String technicalSupport;
-
-    @ApiModelProperty("公司Id")
-    private String companyId;
-
-    @ApiModelProperty("公司名称")
-    private String companyName;
-
-    @ApiModelProperty("部门id")
-    private String deptId;
-
-    @ApiModelProperty("部门名称")
-    private String deptName;
-
-    private boolean finish;
-
-    private String customerNature;
-
-    private String state;
-
-    @ApiModelProperty("0:系统,1:U8")
-    private String datefrom;
-
-    @ApiModelProperty("是否删除")
-    private  int isDelete;
-
-    private String companyAddress;
-
-    @ApiModelProperty("0:开启,1:关闭")
-    private String isOpen;
-
-    @ApiModelProperty("其他性质")
-    private String otherNature;
-
-    @ApiModelProperty("其他类别")
-    private String otherCategory;
-
-    @ApiModelProperty("注册资本金")
-    private String capital;
-
-    @ApiModelProperty("销售经理")
-    private String currency;
-
-    @ApiModelProperty("客户成立时间")
-    private String registDate;
-
-    @ApiModelProperty("流程示例id")
-    private String procInsId;
-
-    @ApiModelProperty("预签公司Id")
-    private String dhrmCompanyId;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createDate;
-
-    /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateDate;
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/crm/TCustomer.java

@@ -1,163 +0,0 @@
-package com.ruoyi.system.domain.crm;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * crm对象 t_customer
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public class TCustomer extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private String id;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companyName;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companyWhere;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companyEnterprisepro;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companyState;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companyCapital;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String companySales;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String userName;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String userPhone;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String userDepartment;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setCompanyName(String companyName) 
-    {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyName() 
-    {
-        return companyName;
-    }
-    public void setCompanyWhere(String companyWhere) 
-    {
-        this.companyWhere = companyWhere;
-    }
-
-    public String getCompanyWhere() 
-    {
-        return companyWhere;
-    }
-    public void setCompanyEnterprisepro(String companyEnterprisepro) 
-    {
-        this.companyEnterprisepro = companyEnterprisepro;
-    }
-
-    public String getCompanyEnterprisepro() 
-    {
-        return companyEnterprisepro;
-    }
-    public void setCompanyState(String companyState) 
-    {
-        this.companyState = companyState;
-    }
-
-    public String getCompanyState() 
-    {
-        return companyState;
-    }
-    public void setCompanyCapital(String companyCapital) 
-    {
-        this.companyCapital = companyCapital;
-    }
-
-    public String getCompanyCapital() 
-    {
-        return companyCapital;
-    }
-    public void setCompanySales(String companySales) 
-    {
-        this.companySales = companySales;
-    }
-
-    public String getCompanySales() 
-    {
-        return companySales;
-    }
-    public void setUserName(String userName) 
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName() 
-    {
-        return userName;
-    }
-    public void setUserPhone(String userPhone) 
-    {
-        this.userPhone = userPhone;
-    }
-
-    public String getUserPhone() 
-    {
-        return userPhone;
-    }
-    public void setUserDepartment(String userDepartment) 
-    {
-        this.userDepartment = userDepartment;
-    }
-
-    public String getUserDepartment() 
-    {
-        return userDepartment;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("companyName", getCompanyName())
-            .append("companyWhere", getCompanyWhere())
-            .append("companyEnterprisepro", getCompanyEnterprisepro())
-            .append("companyState", getCompanyState())
-            .append("companyCapital", getCompanyCapital())
-            .append("companySales", getCompanySales())
-            .append("userName", getUserName())
-            .append("userPhone", getUserPhone())
-            .append("userDepartment", getUserDepartment())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectInformation.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 文件资料对象 t_project_information
  * 
  * @author ruoyi
- * @date 2024-02-22
+ * @date 2024-02-23
  */
 public class TProjectInformation extends BaseEntity
 {
@@ -29,6 +29,10 @@ public class TProjectInformation extends BaseEntity
     /** 项目ID */
     private String projectPoolId;
 
+    /** 项目阶段 */
+    @Excel(name = "项目阶段")
+    private String projectStage;
+
     /** 会议编号 */
     @Excel(name = "会议编号")
     private String meetingCode;
@@ -75,6 +79,15 @@ public class TProjectInformation extends BaseEntity
     {
         return projectPoolId;
     }
+    public void setProjectStage(String projectStage) 
+    {
+        this.projectStage = projectStage;
+    }
+
+    public String getProjectStage() 
+    {
+        return projectStage;
+    }
     public void setMeetingCode(String meetingCode) 
     {
         this.meetingCode = meetingCode;
@@ -110,6 +123,7 @@ public class TProjectInformation extends BaseEntity
             .append("fileName", getFileName())
             .append("fileType", getFileType())
             .append("projectPoolId", getProjectPoolId())
+            .append("projectStage", getProjectStage())
             .append("meetingCode", getMeetingCode())
             .append("fileBusinessId", getFileBusinessId())
             .append("delFlag", getDelFlag())

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysFileMapper.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import java.util.List;
-import com.ruoyi.system.domain.SysFile;
-
-/**
- * 附件Mapper接口
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public interface SysFileMapper 
-{
-    /**
-     * 查询附件
-     * 
-     * @param id 附件主键
-     * @return 附件
-     */
-    public SysFile selectSysFileById(String id);
-
-    /**
-     * 查询附件列表
-     * 
-     * @param sysFile 附件
-     * @return 附件集合
-     */
-    public List<SysFile> selectSysFileList(SysFile sysFile);
-
-    /**
-     * 新增附件
-     * 
-     * @param sysFile 附件
-     * @return 结果
-     */
-    public int insertSysFile(SysFile sysFile);
-
-    /**
-     * 修改附件
-     * 
-     * @param sysFile 附件
-     * @return 结果
-     */
-    public int updateSysFile(SysFile sysFile);
-
-    /**
-     * 删除附件
-     * 
-     * @param id 附件主键
-     * @return 结果
-     */
-    public int deleteSysFileById(String id);
-
-    /**
-     * 批量删除附件
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSysFileByIds(String[] ids);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/crm/AddressMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.mapper.crm;
-
-import com.ruoyi.system.domain.crm.Address;
-
-import java.util.List;
-
-/**
- * 账户信息Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface AddressMapper 
-{
-    /**
-     * 查询账户信息
-     * 
-     * @param id 账户信息主键
-     * @return 账户信息
-     */
-    public Address selectAddressById(Long id);
-
-    /**
-     * 查询账户信息列表
-     * 
-     * @param address 账户信息
-     * @return 账户信息集合
-     */
-    public List<Address> selectAddressList(Address address);
-
-    /**
-     * 新增账户信息
-     * 
-     * @param address 账户信息
-     * @return 结果
-     */
-    public int insertAddress(Address address);
-
-    /**
-     * 修改账户信息
-     * 
-     * @param address 账户信息
-     * @return 结果
-     */
-    public int updateAddress(Address address);
-
-    /**
-     * 删除账户信息
-     * 
-     * @param id 账户信息主键
-     * @return 结果
-     */
-    public int deleteAddressById(Long id);
-
-    /**
-     * 批量删除账户信息
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAddressByIds(Long[] ids);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/crm/ContactsMapper.java

@@ -1,70 +0,0 @@
-package com.ruoyi.system.mapper.crm;
-
-import com.ruoyi.system.domain.crm.Contacts;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 客户联系人信息Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface ContactsMapper 
-{
-    /**
-     * 查询客户联系人信息
-     * 
-     * @param id 客户联系人信息主键
-     * @return 客户联系人信息
-     */
-    public Contacts selectContactsById(Long id);
-
-    /**
-     * 查询客户联系人信息列表
-     * 
-     * @param contacts 客户联系人信息
-     * @return 客户联系人信息集合
-     */
-    public List<Contacts> selectContactsList(Contacts contacts);
-
-    /**
-     * 新增客户联系人信息
-     * 
-     * @param contacts 客户联系人信息
-     * @return 结果
-     */
-    public int insertContacts(Contacts contacts);
-
-    /**
-     * 修改客户联系人信息
-     * 
-     * @param contacts 客户联系人信息
-     * @return 结果
-     */
-    public int updateContacts(Contacts contacts);
-
-    /**
-     * 删除客户联系人信息
-     * 
-     * @param id 客户联系人信息主键
-     * @return 结果
-     */
-    public int deleteContactsById(Long id);
-
-    /**
-     * 批量删除客户联系人信息
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteContactsByIds(Long[] ids);
-
-    /**
-     * 批量新增客户联系人信息
-     * @param contactsList
-     * @return
-     */
-    public int batchInsertContacts(@Param("contactsList") List<Contacts> contactsList);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/crm/CrmFileMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.mapper.crm;
-
-import com.ruoyi.system.domain.crm.CrmFile;
-
-import java.util.List;
-
-/**
- * crm附件Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface CrmFileMapper 
-{
-    /**
-     * 查询crm附件
-     * 
-     * @param id crm附件主键
-     * @return crm附件
-     */
-    public CrmFile selectCrmFileById(Long id);
-
-    /**
-     * 查询crm附件列表
-     * 
-     * @param crmFile crm附件
-     * @return crm附件集合
-     */
-    public List<CrmFile> selectCrmFileList(CrmFile crmFile);
-
-    /**
-     * 新增crm附件
-     * 
-     * @param crmFile crm附件
-     * @return 结果
-     */
-    public int insertCrmFile(CrmFile crmFile);
-
-    /**
-     * 修改crm附件
-     * 
-     * @param crmFile crm附件
-     * @return 结果
-     */
-    public int updateCrmFile(CrmFile crmFile);
-
-    /**
-     * 删除crm附件
-     * 
-     * @param id crm附件主键
-     * @return 结果
-     */
-    public int deleteCrmFileById(Long id);
-
-    /**
-     * 批量删除crm附件
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCrmFileByIds(Long[] ids);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/crm/CustomerMapper.java

@@ -1,69 +0,0 @@
-package com.ruoyi.system.mapper.crm;
-
-import com.ruoyi.system.domain.crm.Customer;
-
-import java.util.List;
-
-/**
- * CRM系统Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface CustomerMapper 
-{
-    /**
-     * 查询CRM系统
-     * 
-     * @param id CRM系统主键
-     * @return CRM系统
-     */
-    public Customer selectCustomerById(Long id);
-
-    /**
-     * 查询CRM系统列表
-     * 
-     * @param customer CRM系统
-     * @return CRM系统集合
-     */
-    public List<Customer> selectCustomerList(Customer customer);
-
-    /**
-     * 新增CRM系统
-     * 
-     * @param customer CRM系统
-     * @return 结果
-     */
-    public int insertCustomer(Customer customer);
-
-    /**
-     * 修改CRM系统
-     * 
-     * @param customer CRM系统
-     * @return 结果
-     */
-    public int updateCustomer(Customer customer);
-
-    /**
-     * 删除CRM系统
-     * 
-     * @param id CRM系统主键
-     * @return 结果
-     */
-    public int deleteCustomerById(Long id);
-
-    /**
-     * 批量删除CRM系统
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCustomerByIds(Long[] ids);
-
-    /**
-     * 我的待办任务
-     * @param customer
-     * @return
-     */
-    public List<Customer> myTaskList(Customer customer);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/crm/TCustomerMapper.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.mapper.crm;
-
-import com.ruoyi.system.domain.crm.TCustomer;
-
-import java.util.List;
-/**
- * crmMapper接口
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public interface TCustomerMapper 
-{
-    /**
-     * 查询crm
-     * 
-     * @param id crm主键
-     * @return crm
-     */
-    public TCustomer selectTCustomerById(String id);
-
-    /**
-     * 查询crm列表
-     * 
-     * @param tCustomer crm
-     * @return crm集合
-     */
-    public List<TCustomer> selectTCustomerList(TCustomer tCustomer);
-
-    /**
-     * 新增crm
-     * 
-     * @param tCustomer crm
-     * @return 结果
-     */
-    public int insertTCustomer(TCustomer tCustomer);
-
-    /**
-     * 修改crm
-     * 
-     * @param tCustomer crm
-     * @return 结果
-     */
-    public int updateTCustomer(TCustomer tCustomer);
-
-    /**
-     * 删除crm
-     * 
-     * @param id crm主键
-     * @return 结果
-     */
-    public int deleteTCustomerById(String id);
-
-    /**
-     * 批量删除crm
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteTCustomerByIds(String[] ids);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectInformationMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 文件资料Mapper接口
  * 
  * @author ruoyi
- * @date 2024-02-22
+ * @date 2024-02-23
  */
 public interface TProjectInformationMapper 
 {

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysFileService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.SysFile;
-
-/**
- * 附件Service接口
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public interface ISysFileService 
-{
-    /**
-     * 查询附件
-     * 
-     * @param id 附件主键
-     * @return 附件
-     */
-    public SysFile selectSysFileById(String id);
-
-    /**
-     * 查询附件列表
-     * 
-     * @param sysFile 附件
-     * @return 附件集合
-     */
-    public List<SysFile> selectSysFileList(SysFile sysFile);
-
-    /**
-     * 新增附件
-     * 
-     * @param sysFile 附件
-     * @return 结果
-     */
-    public int insertSysFile(SysFile sysFile);
-
-    /**
-     * 修改附件
-     * 
-     * @param sysFile 附件
-     * @return 结果
-     */
-    public int updateSysFile(SysFile sysFile);
-
-    /**
-     * 批量删除附件
-     * 
-     * @param ids 需要删除的附件主键集合
-     * @return 结果
-     */
-    public int deleteSysFileByIds(String[] ids);
-
-    /**
-     * 删除附件信息
-     * 
-     * @param id 附件主键
-     * @return 结果
-     */
-    public int deleteSysFileById(String id);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysFileServiceImpl.java

@@ -1,98 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.SysFileMapper;
-import com.ruoyi.system.domain.SysFile;
-import com.ruoyi.system.service.ISysFileService;
-
-/**
- * 附件Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-@Service
-public class SysFileServiceImpl implements ISysFileService 
-{
-    @Autowired
-    private SysFileMapper sysFileMapper;
-
-    /**
-     * 查询附件
-     * 
-     * @param id 附件主键
-     * @return 附件
-     */
-    @Override
-    public SysFile selectSysFileById(String id)
-    {
-        return sysFileMapper.selectSysFileById(id);
-    }
-
-    /**
-     * 查询附件列表
-     * 
-     * @param sysFile 附件
-     * @return 附件
-     */
-    @Override
-    public List<SysFile> selectSysFileList(SysFile sysFile)
-    {
-        return sysFileMapper.selectSysFileList(sysFile);
-    }
-
-    /**
-     * 新增附件
-     * 
-     * @param sysFile 附件
-     * @return 结果
-     */
-    @Override
-    public int insertSysFile(SysFile sysFile)
-    {
-        sysFile.setCreateTime(DateUtils.getNowDate());
-        sysFile.setId(IdUtils.fastSimpleUUID());
-        return sysFileMapper.insertSysFile(sysFile);
-    }
-
-    /**
-     * 修改附件
-     * 
-     * @param sysFile 附件
-     * @return 结果
-     */
-    @Override
-    public int updateSysFile(SysFile sysFile)
-    {
-        sysFile.setUpdateTime(DateUtils.getNowDate());
-        return sysFileMapper.updateSysFile(sysFile);
-    }
-
-    /**
-     * 批量删除附件
-     * 
-     * @param ids 需要删除的附件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysFileByIds(String[] ids)
-    {
-        return sysFileMapper.deleteSysFileByIds(ids);
-    }
-
-    /**
-     * 删除附件信息
-     * 
-     * @param id 附件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysFileById(String id)
-    {
-        return sysFileMapper.deleteSysFileById(id);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectInformationService.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 文件资料Service接口
  * 
  * @author ruoyi
- * @date 2024-02-22
+ * @date 2024-02-23
  */
 public interface ITProjectInformationService 
 {

ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectInformationServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * 文件资料Service业务层处理
  * 
  * @author ruoyi
- * @date 2024-02-22
+ * @date 2024-02-23
  */
 @Service
 public class TProjectInformationServiceImpl implements ITProjectInformationService

ruoyi-system/src/main/resources/mapper/crm/AddressMapper.xml

@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.crm.AddressMapper">
-    
-    <resultMap type="Address" id="AddressResult">
-        <result property="id"    column="id"    />
-        <result property="addressId"    column="address_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="addressType"    column="address_type"    />
-        <result property="invoiceAddress"    column="invoice_address"    />
-        <result property="sendAddress"    column="send_address"    />
-        <result property="invoicePostbox"    column="invoice_postbox"    />
-        <result property="sendPostbox"    column="send_postbox"    />
-        <result property="invoiceCountry"    column="invoice_country"    />
-        <result property="sendCountry"    column="send_country"    />
-        <result property="invoiceProvince"    column="invoice_province"    />
-        <result property="sendProvince"    column="send_province"    />
-        <result property="invoiceCity"    column="invoice_city"    />
-        <result property="sendCity"    column="send_city"    />
-        <result property="invoicePostCode"    column="invoice_post_code"    />
-        <result property="sendPostCode"    column="send_post_code"    />
-        <result property="isActive"    column="is_Active"    />
-        <result property="accountName"    column="account_name"    />
-        <result property="companyTaxNum"    column="company_tax_num"    />
-        <result property="bankOfDeposit"    column="bank_of_deposit"    />
-        <result property="bankAccount"    column="bank_account"    />
-        <result property="companyAddress"    column="company_address"    />
-        <result property="companyPhone"    column="company_phone"    />
-        <result property="taxpayer"    column="taxpayer"    />
-        <result property="customerTaxrate"    column="customer_taxrate"    />
-    </resultMap>
-
-    <sql id="selectAddressVo">
-        select id, address_id, customer_id, address_type, invoice_address, send_address, invoice_postbox, send_postbox, invoice_country, send_country, invoice_province, send_province, invoice_city, send_city, invoice_post_code, send_post_code, is_Active, account_name, company_tax_num, bank_of_deposit, bank_account, company_address, company_phone, taxpayer, customer_taxrate from crm_address
-    </sql>
-
-    <select id="selectAddressList" parameterType="Address" resultMap="AddressResult">
-        <include refid="selectAddressVo"/>
-        <where>  
-            <if test="addressId != null  and addressId != ''"> and address_id = #{addressId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="addressType != null  and addressType != ''"> and address_type = #{addressType}</if>
-            <if test="invoiceAddress != null  and invoiceAddress != ''"> and invoice_address = #{invoiceAddress}</if>
-            <if test="sendAddress != null  and sendAddress != ''"> and send_address = #{sendAddress}</if>
-            <if test="invoicePostbox != null  and invoicePostbox != ''"> and invoice_postbox = #{invoicePostbox}</if>
-            <if test="sendPostbox != null  and sendPostbox != ''"> and send_postbox = #{sendPostbox}</if>
-            <if test="invoiceCountry != null  and invoiceCountry != ''"> and invoice_country = #{invoiceCountry}</if>
-            <if test="sendCountry != null  and sendCountry != ''"> and send_country = #{sendCountry}</if>
-            <if test="invoiceProvince != null  and invoiceProvince != ''"> and invoice_province = #{invoiceProvince}</if>
-            <if test="sendProvince != null  and sendProvince != ''"> and send_province = #{sendProvince}</if>
-            <if test="invoiceCity != null  and invoiceCity != ''"> and invoice_city = #{invoiceCity}</if>
-            <if test="sendCity != null  and sendCity != ''"> and send_city = #{sendCity}</if>
-            <if test="invoicePostCode != null  and invoicePostCode != ''"> and invoice_post_code = #{invoicePostCode}</if>
-            <if test="sendPostCode != null  and sendPostCode != ''"> and send_post_code = #{sendPostCode}</if>
-            <if test="isActive != null  and isActive != ''"> and is_Active = #{isActive}</if>
-            <if test="accountName != null  and accountName != ''"> and account_name like concat('%', #{accountName}, '%')</if>
-            <if test="companyTaxNum != null  and companyTaxNum != ''"> and company_tax_num = #{companyTaxNum}</if>
-            <if test="bankOfDeposit != null  and bankOfDeposit != ''"> and bank_of_deposit = #{bankOfDeposit}</if>
-            <if test="bankAccount != null  and bankAccount != ''"> and bank_account = #{bankAccount}</if>
-            <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>
-            <if test="companyPhone != null  and companyPhone != ''"> and company_phone = #{companyPhone}</if>
-            <if test="taxpayer != null "> and taxpayer = #{taxpayer}</if>
-            <if test="customerTaxrate != null  and customerTaxrate != ''"> and customer_taxrate = #{customerTaxrate}</if>
-        </where>
-    </select>
-    
-    <select id="selectAddressById" parameterType="Long" resultMap="AddressResult">
-        <include refid="selectAddressVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertAddress" parameterType="Address" useGeneratedKeys="true" keyProperty="id">
-        insert into crm_address
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="addressId != null">address_id,</if>
-            <if test="customerId != null and customerId != ''">customer_id,</if>
-            <if test="addressType != null">address_type,</if>
-            <if test="invoiceAddress != null">invoice_address,</if>
-            <if test="sendAddress != null">send_address,</if>
-            <if test="invoicePostbox != null">invoice_postbox,</if>
-            <if test="sendPostbox != null">send_postbox,</if>
-            <if test="invoiceCountry != null">invoice_country,</if>
-            <if test="sendCountry != null">send_country,</if>
-            <if test="invoiceProvince != null">invoice_province,</if>
-            <if test="sendProvince != null">send_province,</if>
-            <if test="invoiceCity != null">invoice_city,</if>
-            <if test="sendCity != null">send_city,</if>
-            <if test="invoicePostCode != null">invoice_post_code,</if>
-            <if test="sendPostCode != null">send_post_code,</if>
-            <if test="isActive != null">is_Active,</if>
-            <if test="accountName != null">account_name,</if>
-            <if test="companyTaxNum != null">company_tax_num,</if>
-            <if test="bankOfDeposit != null">bank_of_deposit,</if>
-            <if test="bankAccount != null">bank_account,</if>
-            <if test="companyAddress != null">company_address,</if>
-            <if test="companyPhone != null">company_phone,</if>
-            <if test="taxpayer != null">taxpayer,</if>
-            <if test="customerTaxrate != null">customer_taxrate,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="addressId != null">#{addressId},</if>
-            <if test="customerId != null and customerId != ''">#{customerId},</if>
-            <if test="addressType != null">#{addressType},</if>
-            <if test="invoiceAddress != null">#{invoiceAddress},</if>
-            <if test="sendAddress != null">#{sendAddress},</if>
-            <if test="invoicePostbox != null">#{invoicePostbox},</if>
-            <if test="sendPostbox != null">#{sendPostbox},</if>
-            <if test="invoiceCountry != null">#{invoiceCountry},</if>
-            <if test="sendCountry != null">#{sendCountry},</if>
-            <if test="invoiceProvince != null">#{invoiceProvince},</if>
-            <if test="sendProvince != null">#{sendProvince},</if>
-            <if test="invoiceCity != null">#{invoiceCity},</if>
-            <if test="sendCity != null">#{sendCity},</if>
-            <if test="invoicePostCode != null">#{invoicePostCode},</if>
-            <if test="sendPostCode != null">#{sendPostCode},</if>
-            <if test="isActive != null">#{isActive},</if>
-            <if test="accountName != null">#{accountName},</if>
-            <if test="companyTaxNum != null">#{companyTaxNum},</if>
-            <if test="bankOfDeposit != null">#{bankOfDeposit},</if>
-            <if test="bankAccount != null">#{bankAccount},</if>
-            <if test="companyAddress != null">#{companyAddress},</if>
-            <if test="companyPhone != null">#{companyPhone},</if>
-            <if test="taxpayer != null">#{taxpayer},</if>
-            <if test="customerTaxrate != null">#{customerTaxrate},</if>
-         </trim>
-    </insert>
-
-    <update id="updateAddress" parameterType="Address">
-        update crm_address
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="addressId != null">address_id = #{addressId},</if>
-            <if test="customerId != null and customerId != ''">customer_id = #{customerId},</if>
-            <if test="addressType != null">address_type = #{addressType},</if>
-            <if test="invoiceAddress != null">invoice_address = #{invoiceAddress},</if>
-            <if test="sendAddress != null">send_address = #{sendAddress},</if>
-            <if test="invoicePostbox != null">invoice_postbox = #{invoicePostbox},</if>
-            <if test="sendPostbox != null">send_postbox = #{sendPostbox},</if>
-            <if test="invoiceCountry != null">invoice_country = #{invoiceCountry},</if>
-            <if test="sendCountry != null">send_country = #{sendCountry},</if>
-            <if test="invoiceProvince != null">invoice_province = #{invoiceProvince},</if>
-            <if test="sendProvince != null">send_province = #{sendProvince},</if>
-            <if test="invoiceCity != null">invoice_city = #{invoiceCity},</if>
-            <if test="sendCity != null">send_city = #{sendCity},</if>
-            <if test="invoicePostCode != null">invoice_post_code = #{invoicePostCode},</if>
-            <if test="sendPostCode != null">send_post_code = #{sendPostCode},</if>
-            <if test="isActive != null">is_Active = #{isActive},</if>
-            <if test="accountName != null">account_name = #{accountName},</if>
-            <if test="companyTaxNum != null">company_tax_num = #{companyTaxNum},</if>
-            <if test="bankOfDeposit != null">bank_of_deposit = #{bankOfDeposit},</if>
-            <if test="bankAccount != null">bank_account = #{bankAccount},</if>
-            <if test="companyAddress != null">company_address = #{companyAddress},</if>
-            <if test="companyPhone != null">company_phone = #{companyPhone},</if>
-            <if test="taxpayer != null">taxpayer = #{taxpayer},</if>
-            <if test="customerTaxrate != null">customer_taxrate = #{customerTaxrate},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAddressById" parameterType="Long">
-        delete from crm_address where id = #{id}
-    </delete>
-
-    <delete id="deleteAddressByIds" parameterType="String">
-        delete from crm_address where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/crm/ContactsMapper.xml

@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.crm.ContactsMapper">
-    
-    <resultMap type="Contacts" id="ContactsResult">
-        <result property="id"    column="id"    />
-        <result property="contactsId"    column="contacts_id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="name"    column="name"    />
-        <result property="contactCode"    column="contact_code"    />
-        <result property="phone"    column="phone"    />
-        <result property="tel"    column="tel"    />
-        <result property="tel2"    column="tel2"    />
-        <result property="fax"    column="fax"    />
-        <result property="email"    column="email"    />
-        <result property="qq"    column="qq"    />
-        <result property="department"    column="department"    />
-        <result property="position"    column="position"    />
-        <result property="officeAddress"    column="office_address"    />
-        <result property="source"    column="source"    />
-        <result property="postcode"    column="postcode"    />
-        <result property="photo"    column="photo"    />
-        <result property="createdBy"    column="createdBy"    />
-        <result property="createdDate"    column="createdDate"    />
-        <result property="updatedBy"    column="updatedBy"    />
-        <result property="updatedDate"    column="updatedDate"    />
-        <result property="isActive"    column="is_Active"    />
-        <result property="deleteDate"    column="deleteDate"    />
-        <result property="deleteBy"    column="deleteBy"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="isDelete"    column="is_delete"    />
-    </resultMap>
-
-    <sql id="selectContactsVo">
-        select id, contacts_id, customer_id, name, contact_code, phone, tel, tel2, fax, email, qq, department, position, office_address, source, postcode, photo, createdBy, createdDate, updatedBy, updatedDate, is_Active, deleteDate, deleteBy, company_id, is_delete from crm_contacts_info
-    </sql>
-
-    <select id="selectContactsList" parameterType="Contacts" resultMap="ContactsResult">
-        <include refid="selectContactsVo"/>
-        <where>  
-            <if test="contactsId != null  and contactsId != ''"> and contacts_id = #{contactsId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="contactCode != null  and contactCode != ''"> and contact_code = #{contactCode}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="tel != null  and tel != ''"> and tel = #{tel}</if>
-            <if test="tel2 != null  and tel2 != ''"> and tel2 = #{tel2}</if>
-            <if test="fax != null  and fax != ''"> and fax = #{fax}</if>
-            <if test="email != null  and email != ''"> and email = #{email}</if>
-            <if test="qq != null  and qq != ''"> and qq = #{qq}</if>
-            <if test="department != null  and department != ''"> and department = #{department}</if>
-            <if test="position != null  and position != ''"> and position = #{position}</if>
-            <if test="officeAddress != null  and officeAddress != ''"> and office_address = #{officeAddress}</if>
-            <if test="source != null  and source != ''"> and source = #{source}</if>
-            <if test="postcode != null  and postcode != ''"> and postcode = #{postcode}</if>
-            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
-            <if test="createdBy != null  and createdBy != ''"> and createdBy = #{createdBy}</if>
-            <if test="createdDate != null "> and createdDate = #{createdDate}</if>
-            <if test="updatedBy != null  and updatedBy != ''"> and updatedBy = #{updatedBy}</if>
-            <if test="updatedDate != null "> and updatedDate = #{updatedDate}</if>
-            <if test="isActive != null  and isActive != ''"> and is_Active = #{isActive}</if>
-            <if test="deleteDate != null "> and deleteDate = #{deleteDate}</if>
-            <if test="deleteBy != null  and deleteBy != ''"> and deleteBy = #{deleteBy}</if>
-            <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-        </where>
-    </select>
-    
-    <select id="selectContactsById" parameterType="Long" resultMap="ContactsResult">
-        <include refid="selectContactsVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertContacts" parameterType="Contacts" useGeneratedKeys="true" keyProperty="id">
-        insert into crm_contacts_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="contactsId != null">contacts_id,</if>
-            <if test="customerId != null">customer_id,</if>
-            <if test="name != null">name,</if>
-            <if test="contactCode != null">contact_code,</if>
-            <if test="phone != null">phone,</if>
-            <if test="tel != null">tel,</if>
-            <if test="tel2 != null">tel2,</if>
-            <if test="fax != null">fax,</if>
-            <if test="email != null">email,</if>
-            <if test="qq != null">qq,</if>
-            <if test="department != null">department,</if>
-            <if test="position != null">position,</if>
-            <if test="officeAddress != null">office_address,</if>
-            <if test="source != null">source,</if>
-            <if test="postcode != null">postcode,</if>
-            <if test="photo != null">photo,</if>
-            <if test="createdBy != null">createdBy,</if>
-            <if test="createdDate != null">createdDate,</if>
-            <if test="updatedBy != null">updatedBy,</if>
-            <if test="updatedDate != null">updatedDate,</if>
-            <if test="isActive != null">is_Active,</if>
-            <if test="deleteDate != null">deleteDate,</if>
-            <if test="deleteBy != null">deleteBy,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="isDelete != null">is_delete,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="contactsId != null">#{contactsId},</if>
-            <if test="customerId != null">#{customerId},</if>
-            <if test="name != null">#{name},</if>
-            <if test="contactCode != null">#{contactCode},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="tel != null">#{tel},</if>
-            <if test="tel2 != null">#{tel2},</if>
-            <if test="fax != null">#{fax},</if>
-            <if test="email != null">#{email},</if>
-            <if test="qq != null">#{qq},</if>
-            <if test="department != null">#{department},</if>
-            <if test="position != null">#{position},</if>
-            <if test="officeAddress != null">#{officeAddress},</if>
-            <if test="source != null">#{source},</if>
-            <if test="postcode != null">#{postcode},</if>
-            <if test="photo != null">#{photo},</if>
-            <if test="createdBy != null">#{createdBy},</if>
-            <if test="createdDate != null">#{createdDate},</if>
-            <if test="updatedBy != null">#{updatedBy},</if>
-            <if test="updatedDate != null">#{updatedDate},</if>
-            <if test="isActive != null">#{isActive},</if>
-            <if test="deleteDate != null">#{deleteDate},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="isDelete != null">#{isDelete},</if>
-         </trim>
-    </insert>
-
-    <update id="updateContacts" parameterType="Contacts">
-        update crm_contacts_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="contactsId != null">contacts_id = #{contactsId},</if>
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="contactCode != null">contact_code = #{contactCode},</if>
-            <if test="phone != null">phone = #{phone},</if>
-            <if test="tel != null">tel = #{tel},</if>
-            <if test="tel2 != null">tel2 = #{tel2},</if>
-            <if test="fax != null">fax = #{fax},</if>
-            <if test="email != null">email = #{email},</if>
-            <if test="qq != null">qq = #{qq},</if>
-            <if test="department != null">department = #{department},</if>
-            <if test="position != null">position = #{position},</if>
-            <if test="officeAddress != null">office_address = #{officeAddress},</if>
-            <if test="source != null">source = #{source},</if>
-            <if test="postcode != null">postcode = #{postcode},</if>
-            <if test="photo != null">photo = #{photo},</if>
-            <if test="createdBy != null">createdBy = #{createdBy},</if>
-            <if test="createdDate != null">createdDate = #{createdDate},</if>
-            <if test="updatedBy != null">updatedBy = #{updatedBy},</if>
-            <if test="updatedDate != null">updatedDate = #{updatedDate},</if>
-            <if test="isActive != null">is_Active = #{isActive},</if>
-            <if test="deleteDate != null">deleteDate = #{deleteDate},</if>
-            <if test="deleteBy != null">deleteBy = #{deleteBy},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="isDelete != null">is_delete = #{isDelete},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteContactsById" parameterType="Long">
-        delete from crm_contacts_info where id = #{id}
-    </delete>
-
-    <delete id="deleteContactsByIds" parameterType="String">
-        delete from crm_contacts_info where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <insert id="batchInsertContacts" parameterType="java.util.List">
-        insert into crm_contacts_info(
-            contacts_id,
-            customer_id,
-            name,
-            contact_code,
-            phone,
-            tel,
-            tel2,
-            fax,
-            email,
-            qq,
-            department,
-            position,
-            office_address,
-            source,
-            postcode,
-            photo,
-            company_id,
-            createdBy,
-            createdDate,
-            is_Active
-        )
-        values
-        <foreach collection="contactsList" item="contacts" index="index" separator="," >
-            (
-            #{contacts.contactsId},
-            #{contacts.customerId},
-            #{contacts.name},
-            #{contacts.contactCode},
-            #{contacts.phone},
-            #{contacts.tel},
-            #{contacts.tel2},
-            #{contacts.fax},
-            #{contacts.email},
-            #{contacts.qq},
-            #{contacts.department},
-            #{contacts.position},
-            #{contacts.officeAddress},
-            #{contacts.source},
-            #{contacts.postcode},
-            #{contacts.photo},
-            #{contacts.companyId},
-            #{contacts.createdBy},
-            NOW(),
-            'Y'
-            )
-        </foreach>
-    </insert>
-
-
-</mapper>

ruoyi-system/src/main/resources/mapper/crm/CrmFileMapper.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.crm.CrmFileMapper">
-    
-    <resultMap type="CrmFile" id="CrmFileResult">
-        <result property="id"    column="id"    />
-        <result property="fileId"    column="file_id"    />
-        <result property="objectId"    column="object_id"    />
-        <result property="type"    column="type"    />
-        <result property="uploadName"    column="upload_name"    />
-        <result property="uploadType"    column="upload_type"    />
-        <result property="uploadPath"    column="upload_path"    />
-        <result property="companyId"    column="company_id"    />
-    </resultMap>
-
-    <sql id="selectCrmFileVo">
-        select id, file_id, object_id, type, upload_name, upload_type, upload_path, company_id from crm_file
-    </sql>
-
-    <select id="selectCrmFileList" parameterType="CrmFile" resultMap="CrmFileResult">
-        <include refid="selectCrmFileVo"/>
-        <where>  
-            <if test="fileId != null  and fileId != ''"> and file_id = #{fileId}</if>
-            <if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="uploadName != null  and uploadName != ''"> and upload_name like concat('%', #{uploadName}, '%')</if>
-            <if test="uploadType != null  and uploadType != ''"> and upload_type = #{uploadType}</if>
-            <if test="uploadPath != null  and uploadPath != ''"> and upload_path = #{uploadPath}</if>
-            <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
-        </where>
-    </select>
-    
-    <select id="selectCrmFileById" parameterType="Long" resultMap="CrmFileResult">
-        <include refid="selectCrmFileVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertCrmFile" parameterType="CrmFile" useGeneratedKeys="true" keyProperty="id">
-        insert into crm_file
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fileId != null and fileId != ''">file_id,</if>
-            <if test="objectId != null and objectId != ''">object_id,</if>
-            <if test="type != null and type != ''">type,</if>
-            <if test="uploadName != null and uploadName != ''">upload_name,</if>
-            <if test="uploadType != null and uploadType != ''">upload_type,</if>
-            <if test="uploadPath != null and uploadPath != ''">upload_path,</if>
-            <if test="companyId != null">company_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fileId != null and fileId != ''">#{fileId},</if>
-            <if test="objectId != null and objectId != ''">#{objectId},</if>
-            <if test="type != null and type != ''">#{type},</if>
-            <if test="uploadName != null and uploadName != ''">#{uploadName},</if>
-            <if test="uploadType != null and uploadType != ''">#{uploadType},</if>
-            <if test="uploadPath != null and uploadPath != ''">#{uploadPath},</if>
-            <if test="companyId != null">#{companyId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCrmFile" parameterType="CrmFile">
-        update crm_file
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fileId != null and fileId != ''">file_id = #{fileId},</if>
-            <if test="objectId != null and objectId != ''">object_id = #{objectId},</if>
-            <if test="type != null and type != ''">type = #{type},</if>
-            <if test="uploadName != null and uploadName != ''">upload_name = #{uploadName},</if>
-            <if test="uploadType != null and uploadType != ''">upload_type = #{uploadType},</if>
-            <if test="uploadPath != null and uploadPath != ''">upload_path = #{uploadPath},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCrmFileById" parameterType="Long">
-        delete from crm_file where id = #{id}
-    </delete>
-
-    <delete id="deleteCrmFileByIds" parameterType="String">
-        delete from crm_file where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/crm/CustomerMapper.xml

@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.crm.CustomerMapper">
-    
-    <resultMap type="Customer" id="CustomerResult">
-        <result property="id"    column="id"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="customerCode"    column="customer_code"    />
-        <result property="customerName"    column="customer_name"    />
-        <result property="status"    column="status"    />
-        <result property="website"    column="website"    />
-        <result property="yearBusiness"    column="year_business"    />
-        <result property="stockCode"    column="stock_code"    />
-        <result property="legalPerson"    column="legalPerson"    />
-        <result property="connectedEntities"    column="connected_entities"    />
-        <result property="trade"    column="trade"    />
-        <result property="workforce"    column="workforce"    />
-        <result property="customerType"    column="customer_type"    />
-        <result property="responsibleDept"    column="responsible_dept"    />
-        <result property="salesManager"    column="sales_manager"    />
-        <result property="mark"    column="mark"    />
-        <result property="createBy"    column="createBy"    />
-        <result property="createDate"    column="createDate"    />
-        <result property="updateBy"    column="updateBy"    />
-        <result property="updateDate"    column="updateDate"    />
-        <result property="isActive"    column="is_Active"    />
-        <result property="deleteDate"    column="deleteDate"    />
-        <result property="deleteBy"    column="deleteBy"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="procInsId"    column="proc_ins_id"    />
-        <result property="deptId"    column="deptId"    />
-        <result property="dhrmCompanyId"    column="dhrmCompanyId"    />
-        <result property="customerNature"    column="customer_nature"    />
-        <result property="datefrom"    column="datefrom"    />
-        <result property="state"    column="state"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="companyAddress"    column="company_address"    />
-        <result property="isOpen"    column="is_open"    />
-        <result property="otherNature"    column="other_nature"    />
-        <result property="otherCategory"    column="other_category"    />
-        <result property="capital"    column="capital"    />
-        <result property="currency"    column="currency"    />
-        <result property="registDate"    column="registDate"    />
-    </resultMap>
-
-    <sql id="selectCustomerVo">
-        select id, customer_id, customer_code, customer_name, status, website, year_business, stock_code, legalPerson, connected_entities, trade, workforce, customer_type, responsible_dept, sales_manager, mark, createBy, createDate, updateBy, updateDate, is_Active, deleteDate, deleteBy, company_id, proc_ins_id, deptId, dhrmCompanyId, customer_nature, datefrom, state, is_delete, company_address, is_open, other_nature, other_category, capital, currency, registDate from crm_customer_info
-    </sql>
-
-    <select id="selectCustomerList" parameterType="Customer" resultMap="CustomerResult">
-        <include refid="selectCustomerVo"/>
-        <where>
-            is_Active = 'Y' and state != 4 and (datefrom = '0'or datefrom='2') and is_delete=0
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="customerCode != null  and customerCode != ''"> and customer_code = #{customerCode}</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="website != null  and website != ''"> and website = #{website}</if>
-            <if test="yearBusiness != null "> and year_business = #{yearBusiness}</if>
-            <if test="stockCode != null  and stockCode != ''"> and stock_code = #{stockCode}</if>
-            <if test="legalPerson != null  and legalPerson != ''"> and legalPerson = #{legalPerson}</if>
-            <if test="connectedEntities != null  and connectedEntities != ''"> and connected_entities = #{connectedEntities}</if>
-            <if test="trade != null  and trade != ''"> and trade = #{trade}</if>
-            <if test="workforce != null "> and workforce = #{workforce}</if>
-            <if test="customerType != null  and customerType != ''"> and customer_type = #{customerType}</if>
-            <if test="responsibleDept != null  and responsibleDept != ''"> and responsible_dept = #{responsibleDept}</if>
-            <if test="salesManager != null  and salesManager != ''"> and sales_manager = #{salesManager}</if>
-            <if test="mark != null  and mark != ''"> and mark = #{mark}</if>
-            <if test="createBy != null  and createBy != ''"> and createBy = #{createBy}</if>
-            <if test="createDate != null  and createDate != ''"> and createDate = #{createDate}</if>
-            <if test="updateBy != null  and updateBy != ''"> and updateBy = #{updateBy}</if>
-            <if test="updateDate != null "> and updatedDate = #{updateDate}</if>
-            <if test="isActive != null  and isActive != ''"> and is_Active = #{isActive}</if>
-            <if test="deleteDate != null  and deleteDate != ''"> and deleteDate = #{deleteDate}</if>
-            <if test="deleteBy != null  and deleteBy != ''"> and deleteBy = #{deleteBy}</if>
-            <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
-            <if test="procInsId != null  and procInsId != ''"> and proc_ins_id = #{procInsId}</if>
-            <if test="deptId != null  and deptId != ''"> and deptId = #{deptId}</if>
-            <if test="dhrmCompanyId != null  and dhrmCompanyId != ''"> and dhrmCompanyId = #{dhrmCompanyId}</if>
-            <if test="customerNature != null  and customerNature != ''"> and customer_nature = #{customerNature}</if>
-            <if test="datefrom != null  and datefrom != ''"> and datefrom = #{datefrom}</if>
-            <if test="state != null  and state != ''"> and state = #{state}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>
-            <if test="isOpen != null  and isOpen != ''"> and is_open = #{isOpen}</if>
-            <if test="otherNature != null  and otherNature != ''"> and other_nature = #{otherNature}</if>
-            <if test="otherCategory != null  and otherCategory != ''"> and other_category = #{otherCategory}</if>
-            <if test="capital != null "> and capital = #{capital}</if>
-            <if test="currency != null  and currency != ''"> and currency = #{currency}</if>
-            <if test="registDate != null  and registDate != ''"> and registDate = #{registDate}</if>
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectCustomerById" parameterType="Long" resultMap="CustomerResult">
-        <include refid="selectCustomerVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertCustomer" parameterType="Customer" useGeneratedKeys="true" keyProperty="id">
-        insert into crm_customer_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="customerId != null">customer_id,</if>
-            <if test="customerCode != null">customer_code,</if>
-            <if test="customerName != null">customer_name,</if>
-            <if test="status != null">status,</if>
-            <if test="website != null">website,</if>
-            <if test="yearBusiness != null">year_business,</if>
-            <if test="stockCode != null">stock_code,</if>
-            <if test="legalPerson != null">legalPerson,</if>
-            <if test="connectedEntities != null">connected_entities,</if>
-            <if test="trade != null">trade,</if>
-            <if test="workforce != null">workforce,</if>
-            <if test="customerType != null">customer_type,</if>
-            <if test="responsibleDept != null">responsible_dept,</if>
-            <if test="salesManager != null">sales_manager,</if>
-            <if test="mark != null">mark,</if>
-            <if test="createBy != null">createBy,</if>
-            <if test="createDate != null">createDate,</if>
-            <if test="updateBy != null">updateBy,</if>
-            <if test="updateDate != null">updateDate,</if>
-            <if test="isActive != null">is_Active,</if>
-            <if test="deleteDate != null">deleteDate,</if>
-            <if test="deleteBy != null">deleteBy,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="procInsId != null">proc_ins_id,</if>
-            <if test="deptId != null">deptId,</if>
-            <if test="dhrmCompanyId != null">dhrmCompanyId,</if>
-            <if test="customerNature != null">customer_nature,</if>
-            <if test="datefrom != null">datefrom,</if>
-            <if test="state != null">state,</if>
-            <if test="isDelete != null">is_delete,</if>
-            <if test="companyAddress != null">company_address,</if>
-            <if test="isOpen != null">is_open,</if>
-            <if test="otherNature != null">other_nature,</if>
-            <if test="otherCategory != null">other_category,</if>
-            <if test="capital != null">capital,</if>
-            <if test="currency != null">currency,</if>
-            <if test="registDate != null">registDate,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="customerId != null">#{customerId},</if>
-            <if test="customerCode != null">#{customerCode},</if>
-            <if test="customerName != null">#{customerName},</if>
-            <if test="status != null">#{status},</if>
-            <if test="website != null">#{website},</if>
-            <if test="yearBusiness != null">#{yearBusiness},</if>
-            <if test="stockCode != null">#{stockCode},</if>
-            <if test="legalPerson != null">#{legalPerson},</if>
-            <if test="connectedEntities != null">#{connectedEntities},</if>
-            <if test="trade != null">#{trade},</if>
-            <if test="workforce != null">#{workforce},</if>
-            <if test="customerType != null">#{customerType},</if>
-            <if test="responsibleDept != null">#{responsibleDept},</if>
-            <if test="salesManager != null">#{salesManager},</if>
-            <if test="mark != null">#{mark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createDate != null">#{createDate},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateDate != null">#{updateDate},</if>
-            <if test="isActive != null">#{isActive},</if>
-            <if test="deleteDate != null">#{deleteDate},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="procInsId != null">#{procInsId},</if>
-            <if test="deptId != null">#{deptId},</if>
-            <if test="dhrmCompanyId != null">#{dhrmCompanyId},</if>
-            <if test="customerNature != null">#{customerNature},</if>
-            <if test="datefrom != null">#{datefrom},</if>
-            <if test="state != null">#{state},</if>
-            <if test="isDelete != null">#{isDelete},</if>
-            <if test="companyAddress != null">#{companyAddress},</if>
-            <if test="isOpen != null">#{isOpen},</if>
-            <if test="otherNature != null">#{otherNature},</if>
-            <if test="otherCategory != null">#{otherCategory},</if>
-            <if test="capital != null">#{capital},</if>
-            <if test="currency != null">#{currency},</if>
-            <if test="registDate != null">#{registDate},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCustomer" parameterType="Customer">
-        update crm_customer_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="customerId != null">customer_id = #{customerId},</if>
-            <if test="customerCode != null">customer_code = #{customerCode},</if>
-            <if test="customerName != null">customer_name = #{customerName},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="website != null">website = #{website},</if>
-            <if test="yearBusiness != null">year_business = #{yearBusiness},</if>
-            <if test="stockCode != null">stock_code = #{stockCode},</if>
-            <if test="legalPerson != null">legalPerson = #{legalPerson},</if>
-            <if test="connectedEntities != null">connected_entities = #{connectedEntities},</if>
-            <if test="trade != null">trade = #{trade},</if>
-            <if test="workforce != null">workforce = #{workforce},</if>
-            <if test="customerType != null">customer_type = #{customerType},</if>
-            <if test="responsibleDept != null">responsible_dept = #{responsibleDept},</if>
-            <if test="salesManager != null">sales_manager = #{salesManager},</if>
-            <if test="mark != null">mark = #{mark},</if>
-            <if test="createBy != null">createBy = #{createBy},</if>
-            <if test="createDate != null">createDate = #{createDate},</if>
-            <if test="updateBy != null">updateBy = #{updateBy},</if>
-            <if test="updateDate != null">updateDate = #{updateDate},</if>
-            <if test="isActive != null">is_Active = #{isActive},</if>
-            <if test="deleteDate != null">deleteDate = #{deleteDate},</if>
-            <if test="deleteBy != null">deleteBy = #{deleteBy},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="procInsId != null">proc_ins_id = #{procInsId},</if>
-            <if test="deptId != null">deptId = #{deptId},</if>
-            <if test="dhrmCompanyId != null">dhrmCompanyId = #{dhrmCompanyId},</if>
-            <if test="customerNature != null">customer_nature = #{customerNature},</if>
-            <if test="datefrom != null">datefrom = #{datefrom},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="isDelete != null">is_delete = #{isDelete},</if>
-            <if test="companyAddress != null">company_address = #{companyAddress},</if>
-            <if test="isOpen != null">is_open = #{isOpen},</if>
-            <if test="otherNature != null">other_nature = #{otherNature},</if>
-            <if test="otherCategory != null">other_category = #{otherCategory},</if>
-            <if test="capital != null">capital = #{capital},</if>
-            <if test="currency != null">currency = #{currency},</if>
-            <if test="registDate != null">registDate = #{registDate},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCustomerById" parameterType="Long">
-        delete from crm_customer_info where id = #{id}
-    </delete>
-
-    <delete id="deleteCustomerByIds" parameterType="String">
-        delete from crm_customer_info where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="myTaskList" resultMap="CustomerResult">
-        select
-            distinct
-            m.*
-        from crm_customer_info m
-        where m.is_delete ='0'
-        <if test="customer.customerCode!=null and customer.customerCode!=''">
-            and m.customer_code like concat('%',#{customer.customerCode},'%')
-        </if>
-        <if test="customer.customerName!=null and customer.customerName!=''">
-            and m.customer_name like concat('%',#{customer.customerName},'%')
-        </if>
-        ORDER BY applyTime DESC
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-
-</mapper>

ruoyi-system/src/main/resources/mapper/crm/TCustomerMapper.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.crm.TCustomerMapper">
-    
-    <resultMap type="TCustomer" id="TCustomerResult">
-        <result property="id"    column="id"    />
-        <result property="companyName"    column="company_name"    />
-        <result property="companyWhere"    column="company_where"    />
-        <result property="companyEnterprisepro"    column="company_enterprisepro"    />
-        <result property="companyState"    column="company_state"    />
-        <result property="companyCapital"    column="company_capital"    />
-        <result property="companySales"    column="company_sales"    />
-        <result property="userName"    column="user_name"    />
-        <result property="userPhone"    column="user_phone"    />
-        <result property="userDepartment"    column="user_department"    />
-        <result property="createBy"     column="create_by"    />
-        <result property="createTime"   column="create_time"  />
-    </resultMap>
-
-    <sql id="selectTCustomerVo">
-        select id, company_name, company_where, company_enterprisepro, company_state, company_capital, company_sales, user_name, user_phone, user_department, create_by, create_time from t_customer
-    </sql>
-
-    <select id="selectTCustomerList" parameterType="TCustomer" resultMap="TCustomerResult">
-        <include refid="selectTCustomerVo"/>
-        <where>  
-            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
-            <if test="companyWhere != null  and companyWhere != ''"> and company_where = #{companyWhere}</if>
-            <if test="companyEnterprisepro != null  and companyEnterprisepro != ''"> and company_enterprisepro = #{companyEnterprisepro}</if>
-            <if test="companyState != null  and companyState != ''"> and company_state = #{companyState}</if>
-            <if test="companyCapital != null  and companyCapital != ''"> and company_capital = #{companyCapital}</if>
-            <if test="companySales != null  and companySales != ''"> and company_sales = #{companySales}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
-            <if test="userDepartment != null  and userDepartment != ''"> and user_department = #{userDepartment}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectTCustomerById" parameterType="String" resultMap="TCustomerResult">
-        <include refid="selectTCustomerVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTCustomer" parameterType="TCustomer" useGeneratedKeys="true" keyProperty="id">
-        insert into t_customer
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="companyName != null">company_name,</if>
-            <if test="companyWhere != null">company_where,</if>
-            <if test="companyEnterprisepro != null">company_enterprisepro,</if>
-            <if test="companyState != null">company_state,</if>
-            <if test="companyCapital != null">company_capital,</if>
-            <if test="companySales != null">company_sales,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="userPhone != null">user_phone,</if>
-            <if test="userDepartment != null">user_department,</if>
-            <if test="createBy != null">create_by,</if>
-            create_time,
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="companyName != null">#{companyName},</if>
-            <if test="companyWhere != null">#{companyWhere},</if>
-            <if test="companyEnterprisepro != null">#{companyEnterprisepro},</if>
-            <if test="companyState != null">#{companyState},</if>
-            <if test="companyCapital != null">#{companyCapital},</if>
-            <if test="companySales != null">#{companySales},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="userPhone != null">#{userPhone},</if>
-            <if test="userDepartment != null">#{userDepartment},</if>
-            <if test="createBy != null">#{createBy},</if>
-            sysdate(),
-         </trim>
-    </insert>
-
-    <update id="updateTCustomer" parameterType="TCustomer">
-        update t_customer
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="companyName != null">company_name = #{companyName},</if>
-            <if test="companyWhere != null">company_where = #{companyWhere},</if>
-            <if test="companyEnterprisepro != null">company_enterprisepro = #{companyEnterprisepro},</if>
-            <if test="companyState != null">company_state = #{companyState},</if>
-            <if test="companyCapital != null">company_capital = #{companyCapital},</if>
-            <if test="companySales != null">company_sales = #{companySales},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="userPhone != null">user_phone = #{userPhone},</if>
-            <if test="userDepartment != null">user_department = #{userDepartment},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTCustomerById" parameterType="String">
-        delete from t_customer where id = #{id}
-    </delete>
-
-    <delete id="deleteTCustomerByIds" parameterType="String">
-        delete from t_customer where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/invest/TProjectInformationMapper.xml

@@ -2,13 +2,14 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectInformationMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectInformationMapper">
     
     <resultMap type="TProjectInformation" id="TProjectInformationResult">
         <result property="id"    column="id"    />
         <result property="fileName"    column="file_name"    />
         <result property="fileType"    column="file_type"    />
         <result property="projectPoolId"    column="project_pool_id"    />
+        <result property="projectStage"    column="project_stage"    />
         <result property="meetingCode"    column="meeting_code"    />
         <result property="fileBusinessId"    column="file_business_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProjectInformationVo">
-        select id, file_name, file_type, project_pool_id, meeting_code, file_business_id, del_flag, remark, create_by, create_time, update_by, update_time from t_project_information
+        select id, file_name, file_type, project_pool_id, project_stage, meeting_code, file_business_id, del_flag, remark, create_by, create_time, update_by, update_time from t_project_information
     </sql>
 
     <select id="selectTProjectInformationList" parameterType="TProjectInformation" resultMap="TProjectInformationResult">
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
+            <if test="projectStage != null  and projectStage != ''"> and project_stage = #{projectStage}</if>
             <if test="meetingCode != null  and meetingCode != ''"> and meeting_code = #{meetingCode}</if>
         </where>
     </select>
@@ -44,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileName != null">file_name,</if>
             <if test="fileType != null">file_type,</if>
             <if test="projectPoolId != null">project_pool_id,</if>
+            <if test="projectStage != null">project_stage,</if>
             <if test="meetingCode != null">meeting_code,</if>
             <if test="fileBusinessId != null">file_business_id,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileName != null">#{fileName},</if>
             <if test="fileType != null">#{fileType},</if>
             <if test="projectPoolId != null">#{projectPoolId},</if>
+            <if test="projectStage != null">#{projectStage},</if>
             <if test="meetingCode != null">#{meetingCode},</if>
             <if test="fileBusinessId != null">#{fileBusinessId},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -75,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileName != null">file_name = #{fileName},</if>
             <if test="fileType != null">file_type = #{fileType},</if>
             <if test="projectPoolId != null">project_pool_id = #{projectPoolId},</if>
+            <if test="projectStage != null">project_stage = #{projectStage},</if>
             <if test="meetingCode != null">meeting_code = #{meetingCode},</if>
             <if test="fileBusinessId != null">file_business_id = #{fileBusinessId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

ruoyi-system/src/main/resources/mapper/system/SysFileMapper.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysFileMapper">
-    
-    <resultMap type="SysFile" id="SysFileResult">
-        <result property="id"    column="id"    />
-        <result property="fileId"    column="file_id"    />
-        <result property="uploadName"    column="upload_name"    />
-        <result property="uploadType"    column="upload_type"    />
-        <result property="uploadPath"    column="upload_path"    />
-        <result property="uploadFormat"    column="upload_format"    />
-        <result property="newUploadName"    column="new_upload_name"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="fileBusinessId"    column="file_business_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectSysFileVo">
-        select id, file_id, upload_name, upload_type, upload_path, upload_format, new_upload_name, del_flag, file_business_id, create_by, create_time, update_by, update_time from sys_file
-    </sql>
-
-    <select id="selectSysFileList" parameterType="SysFile" resultMap="SysFileResult">
-        <include refid="selectSysFileVo"/>
-        <where>  
-            <if test="uploadName != null  and uploadName != ''"> and upload_name like concat('%', #{uploadName}, '%')</if>
-            <if test="uploadType != null  and uploadType != ''"> and upload_type = #{uploadType}</if>
-            <if test="uploadFormat != null  and uploadFormat != ''"> and upload_format = #{uploadFormat}</if>
-        </where>
-    </select>
-    
-    <select id="selectSysFileById" parameterType="String" resultMap="SysFileResult">
-        <include refid="selectSysFileVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertSysFile" parameterType="SysFile">
-        insert into sys_file
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="fileId != null">file_id,</if>
-            <if test="uploadName != null">upload_name,</if>
-            <if test="uploadType != null">upload_type,</if>
-            <if test="uploadPath != null">upload_path,</if>
-            <if test="uploadFormat != null">upload_format,</if>
-            <if test="newUploadName != null">new_upload_name,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="fileBusinessId != null">file_business_id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="fileId != null">#{fileId},</if>
-            <if test="uploadName != null">#{uploadName},</if>
-            <if test="uploadType != null">#{uploadType},</if>
-            <if test="uploadPath != null">#{uploadPath},</if>
-            <if test="uploadFormat != null">#{uploadFormat},</if>
-            <if test="newUploadName != null">#{newUploadName},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="fileBusinessId != null">#{fileBusinessId},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSysFile" parameterType="SysFile">
-        update sys_file
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fileId != null">file_id = #{fileId},</if>
-            <if test="uploadName != null">upload_name = #{uploadName},</if>
-            <if test="uploadType != null">upload_type = #{uploadType},</if>
-            <if test="uploadPath != null">upload_path = #{uploadPath},</if>
-            <if test="uploadFormat != null">upload_format = #{uploadFormat},</if>
-            <if test="newUploadName != null">new_upload_name = #{newUploadName},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="fileBusinessId != null">file_business_id = #{fileBusinessId},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysFileById" parameterType="String">
-        delete from sys_file where id = #{id}
-    </delete>
-
-    <delete id="deleteSysFileByIds" parameterType="String">
-        delete from sys_file where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>