Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fg/FgController.java

@@ -1,301 +0,0 @@
-package com.ruoyi.web.controller.fg;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.fg.FgUrlConstant;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.http.OkHttpFGUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.fg.Overview;
-import com.ruoyi.system.domain.fg.SalesTrendData;
-import com.ruoyi.system.domain.fg.School;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Api(value = "fgController", tags = "飞瓜数据抓取接口")
-@Controller
-@RequestMapping(value = "/fg")
-public class FgController {
-
-
-    /**
-     * 获取数据
-     * @param response
-     */
-    @ApiOperation(value = "导出数据")
-    @PostMapping("/exportOverviewData")
-    @ResponseBody
-    public void exportOverviewData(HttpServletResponse response) {
-
-
-        List<Overview> resultList = new ArrayList<>();
-        /**
-         * 8074429374  小陈茶事
-         * 99666314082 学茶研习社
-         * 50792923107 茶小曼
-         * 69965719530 小茶婆婆
-         * 4367697845697440 晨曦语茶
-         * 2862722089489764 伍刻茶馆
-         * 2383382425373133 茶姐Molly
-         * 3034272730720768 茶诵君
-         * 3109849681105640 八马茶叶官方旗舰店
-         * 44432286818743 柒月茶坊
-         */
-        String[] strings = {"8074429374","99666314082","50792923107","69965719530","4367697845697440",
-                "2862722089489764","2383382425373133","3034272730720768","3109849681105640","44432286818743","109581763451","2444960999676388"};
-        String[] names = {"小陈茶事","学茶研习社","茶小曼","小茶婆婆","晨曦语茶",
-                "伍刻茶馆","茶姐Molly","茶诵君","八马茶叶官方旗舰店","柒月茶坊","茶二代","茶三姐"};
-
-        for (int i = 0; i < strings.length; i++) {
-            Overview po = new Overview();
-            po.setUuid(strings[i]);
-            po.setName(names[i]);
-            resultList.add(po);
-        }
-
-        // todo 直播数据
-        for (Overview  overview:  resultList) {
-            String liveResult = HttpUtils.sendGet("http://120.27.232.118/api/v3/blogger/overview/live/stat","uid="+overview.getUuid()+"&fromDateCode=20221206&toDateCode=20231130");
-
-            Map liveMaps = (Map) JSON.parse(liveResult);
-            for(Object map : liveMaps.entrySet()){
-                if(((Map.Entry)map).getKey().toString().equals("Data")){
-
-                    Map poMap = (Map) JSON.parse(((Map.Entry)map).getValue().toString());
-                    overview.setAvgDurationStr(poMap.get("AvgDurationStr").toString());
-                    overview.setAvgLiveSaleCountStr(poMap.get("AvgLiveSaleCountStr").toString());
-                    overview.setAvgLiveSaleGmvStr(poMap.get("AvgLiveSaleGmvStr").toString());
-                    overview.setAvgLiveTotalUserCountStr(poMap.get("AvgLiveTotalUserCountStr").toString());
-                    overview.setAvgLiveUserCountStr(poMap.get("AvgLiveUserCountStr").toString());
-                    overview.setAvgUserPriceStr(poMap.get("AvgUserPriceStr").toString());
-                    overview.setCommerceLiveCountStr(poMap.get("CommerceLiveCountStr").toString());
-                    overview.setLiveCountStr(poMap.get("LiveCountStr").toString());
-                    overview.setLiveSaleCountStr(poMap.get("LiveSaleCountStr").toString());
-                    overview.setLiveSaleGmvStr(poMap.get("LiveSaleGmvStr").toString());
-                    overview.setMaxLiveTotalUserCountStr(poMap.get("MaxLiveTotalUserCountStr").toString());
-                    overview.setUVStr(poMap.get("UVStr").toString());
-
-                }
-            }
-
-            String awemeResult = HttpUtils.sendGet("http://120.27.232.118/api/v3/blogger/overview/aweme/stat","uid="+overview.getUuid()+"&fromDateCode=20221206&toDateCode=20231130");
-            Map awemeMaps = (Map) JSON.parse(awemeResult);
-            for(Object map : awemeMaps.entrySet()){
-                if(((Map.Entry)map).getKey().toString().equals("Data")){
-
-                    Map poMap = (Map) JSON.parse(((Map.Entry)map).getValue().toString());
-                    overview.setAvgAwemeSaleCountStr(poMap.get("AvgAwemeSaleCountStr").toString());
-                    overview.setAvgAwemeSaleGmvStr(poMap.get("AvgAwemeSaleGmvStr").toString());
-                    overview.setAvgCommentCountStr(poMap.get("AvgCommentCountStr").toString());
-                    overview.setAvgLikeCommentRateStr(poMap.get("AvgLikeCommentRateStr").toString());
-                    overview.setAvgLikeCountStr(poMap.get("AvgLikeCountStr").toString());
-                    overview.setAwemeCountStr(poMap.get("AwemeCountStr").toString());
-                    overview.setAwemeSaleCountStr(poMap.get("AwemeSaleCountStr").toString());
-                    overview.setAwemeSaleGmvStr(poMap.get("AwemeSaleGmvStr").toString());
-                    overview.setCommerceAwemeCountStr(poMap.get("CommerceAwemeCountStr").toString());
-                    overview.setMaxCommentCountStr(poMap.get("MaxCommentCountStr").toString());
-                    overview.setMaxLikeCommentRateStr(poMap.get("MaxLikeCommentRateStr").toString());
-                    overview.setMaxLikeCountStr(poMap.get("MaxLikeCountStr").toString());
-
-                }
-            }
-
-            String recommendResult = HttpUtils.sendGet("http://120.27.232.118/api/v3/blogger/overview/recommend/stat","uid="+overview.getUuid()+"&fromDateCode=20221206&toDateCode=20231130");
-            Map recommendMaps = (Map) JSON.parse(recommendResult);
-            for(Object map : recommendMaps.entrySet()){
-                if(((Map.Entry)map).getKey().toString().equals("Data")){
-
-                    Map poMap = (Map) JSON.parse(((Map.Entry)map).getValue().toString());
-                    overview.setBloggerPriceStr(poMap.get("BloggerPriceStr").toString());
-                    overview.setBrandCountStr(poMap.get("BrandCountStr").toString());
-                    overview.setCPEStr(poMap.get("CPEStr").toString());
-                    overview.setCateCountStr(poMap.get("CateCountStr").toString());
-                    overview.setGrassVideoCountStr(poMap.get("GrassVideoCountStr").toString());
-                    overview.setMainCateNameStr(poMap.get("MainCateNameStr").toString());
-                    overview.setMainCateRatioStr(poMap.get("MainCateRatioStr").toString());
-
-                }
-            }
-
-        }
-
-
-        ExcelUtil<Overview> util = new ExcelUtil<Overview>(Overview.class);
-        util.exportExcel(response, resultList, "数据");
-
-    }
-
-
-
-    /**
-     * 获取数据
-     * @param response
-     */
-    @ApiOperation(value = "导出茶90天直播销售额与视频销售额")
-    @PostMapping("/exportSalesTrendData")
-    @ResponseBody
-    public void exportSalesTrendData(HttpServletResponse response) {
-
-        String URL = "http://120.27.232.118/api/v1/goodsDataOverView/salesTrendData";
-
-        List<SalesTrendData> resultList = new ArrayList<>();
-
-        String result = HttpUtils.sendGet(URL,"periodType=90&fromDateCode=20230829&toDateCode=20231126&cateId=20004");
-
-        Map maps = (Map) JSON.parse(result);
-        for(Object map : maps.entrySet()){
-            if(((Map.Entry)map).getKey().toString().equals("Data")){
-
-                JSONArray dataJArray = JSONObject.parseArray(((Map.Entry)map).getValue().toString());
-                List<Object> dataList = dataJArray;
-
-                for (Object po:
-                        dataList) {
-                    Map poMap = (Map) JSON.parse(po.toString());
-
-                    poMap.get("DateCode").toString();
-                    SalesTrendData salesTrendData = new SalesTrendData();
-
-                    salesTrendData.setAwemeSalesCount(poMap.get("AwemeSalesCount").toString());
-                    salesTrendData.setAwemeSalesCountStr(poMap.get("AwemeSalesCountStr").toString());
-                    salesTrendData.setAwemeSaleCountRatio(poMap.get("AwemeSaleCountRatio").toString());
-                    salesTrendData.setAwemeSales(poMap.get("AwemeSales").toString());
-                    salesTrendData.setAwemeSalesStr(poMap.get("AwemeSalesStr").toString());
-                    salesTrendData.setAwemeSalesRatio(poMap.get("AwemeSalesRatio").toString());
-
-                    salesTrendData.setDateCode(poMap.get("DateCode").toString());
-
-                    salesTrendData.setLiveSalesCount(poMap.get("LiveSalesCount").toString());
-                    salesTrendData.setLiveSalesCountStr(poMap.get("LiveSalesCountStr").toString());
-                    salesTrendData.setLiveSaleCountRatio(poMap.get("LiveSaleCountRatio").toString());
-                    salesTrendData.setLiveSales(poMap.get("LiveSales").toString());
-                    salesTrendData.setLiveSalesStr(poMap.get("LiveSalesStr").toString());
-                    salesTrendData.setLiveSalesRatio(poMap.get("LiveSalesRatio").toString());
-
-                    salesTrendData.setOtherSalesCount(poMap.get("OtherSalesCount").toString());
-                    salesTrendData.setOtherSalesCountStr(poMap.get("OtherSalesCountStr").toString());
-                    salesTrendData.setOtherSaleCountRatio(poMap.get("OtherSaleCountRatio").toString());
-                    salesTrendData.setOtherSales(poMap.get("OtherSales").toString());
-                    salesTrendData.setOtherSalesStr(poMap.get("OtherSalesStr").toString());
-                    salesTrendData.setOtherSalesRatio(poMap.get("OtherSalesRatio").toString());
-
-                    salesTrendData.setPV(poMap.get("PV").toString());
-                    salesTrendData.setPVStr(poMap.get("PVStr").toString());
-                    salesTrendData.setStatDate(poMap.get("StatDate").toString());
-                    salesTrendData.setSumSalesCount(poMap.get("SumSalesCount").toString());
-                    salesTrendData.setSumSalesCountStr(poMap.get("SumSalesCountStr").toString());
-                    salesTrendData.setTotalSales(poMap.get("TotalSales").toString());
-                    salesTrendData.setTotalSalesStr(poMap.get("TotalSalesStr").toString());
-
-                    resultList.add(salesTrendData);
-
-                }
-            }
-        }
-
-        ExcelUtil<SalesTrendData> util = new ExcelUtil<SalesTrendData>(SalesTrendData.class);
-        util.exportExcel(response, resultList, "茶90天直播销售额与视频销售额");
-
-    }
-
-
-    /**
-     * 导出crm附件列表
-     */
-    @ApiOperation("")
-    @Log(title = "导出中国大学专业排名", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, String year) throws InterruptedException {
-        String URL = "https://www.shanghairanking.cn/api/pub/v1/bcmr/rank";
-
-        List<School> resultList = new ArrayList<>();
-
-        String result = HttpUtils.sendGet(URL,"year=2023&majorCode=010101");
-
-        Map<String, List<Object>> map = OkHttpFGUtils.getSchoolMap(result);
-
-        for (Object majors: map.get("majorsList")) {
-
-            Map majorsMap = (Map) JSON.parse(majors.toString());
-
-            JSONArray childrens = JSONObject.parseArray(majorsMap.get("children").toString());
-            List<Object> childrenList = childrens;
-            if(StringUtils.isNotEmpty(childrenList)){
-                for (Object children: childrenList) {
-                    Map childrenMap = (Map) JSON.parse(children.toString());
-
-                    JSONArray childrens1 = JSONObject.parseArray(childrenMap.get("children").toString());
-                    List<Object> children1List = childrens1;
-                    if(StringUtils.isNotEmpty(children1List)) {
-                        for (Object children1 : children1List) {
-                            Map children1Map = (Map) JSON.parse(children1.toString());
-                            String rankingsResult = HttpUtils.sendGet(URL,"year=2023&majorCode="+children1Map.get("code").toString());
-
-                            Thread.sleep(10000); // 暂停10秒
-                            Map<String, List<Object>> univMap = OkHttpFGUtils.getSchoolMap(rankingsResult);
-
-                            for (Object rankings:
-                                    univMap.get("rankingsList")) {
-                                Map rankingsMap = (Map) JSON.parse(rankings.toString());
-
-                                if(rankingsMap.get("grade").toString().equals("A+")||rankingsMap.get("grade").toString().equals("A")){
-
-                                    School school = new School();
-
-                                    school.setlName(majorsMap.get("name").toString());
-                                    school.setlCode(majorsMap.get("code").toString());
-                                    school.setpName(childrenMap.get("name").toString());
-                                    school.setpCode(childrenMap.get("code").toString());
-                                    school.setzName(children1Map.get("name").toString());
-                                    school.setzCode(children1Map.get("code").toString());
-                                    school.setGrade(rankingsMap.get("grade").toString());
-                                    school.setUnivNameCn(rankingsMap.get("univNameCn").toString());
-                                    school.setScore(rankingsMap.get("score").toString());
-                                    school.setProvince(rankingsMap.get("province").toString());
-                                    school.setCity(rankingsMap.get("city").toString());
-                                    school.setUnivLikeCount(rankingsMap.get("univLikeCount").toString());
-                                    school.setUnivTags(rankingsMap.get("univTags").toString());
-                                    school.setRanking(rankingsMap.get("ranking").toString());
-
-                                    Map indGradesMap = (Map) JSON.parse(rankingsMap.get("indGrades").toString());
-                                    if (!indGradesMap.isEmpty()){
-                                        school.setNameCn12(indGradesMap.get(12)!=null?indGradesMap.get(12).toString():"/");
-                                        school.setNameCn13(indGradesMap.get(13)!=null?indGradesMap.get(13).toString():"/");
-                                        school.setNameCn14(indGradesMap.get(14)!=null?indGradesMap.get(14).toString():"/");
-                                        school.setNameCn15(indGradesMap.get(15)!=null?indGradesMap.get(15).toString():"/");
-                                        school.setNameCn16(indGradesMap.get(16)!=null?indGradesMap.get(16).toString():"/");
-                                    }
-
-                                    resultList.add(school);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        ExcelUtil<School> util = new ExcelUtil<School>(School.class);
-        util.exportExcel(response, resultList, "学校附件数据统计");
-
-    }
-
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCompanyController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.invest;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.invest.TProjectCompany;
+import com.ruoyi.system.service.invest.ITProjectCompanyService;
+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;
+
+/**
+ * 项目公司信息Controller
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@RestController
+@RequestMapping("/invest/company")
+public class TProjectCompanyController extends BaseController
+{
+    @Autowired
+    private ITProjectCompanyService tProjectCompanyService;
+
+    /**
+     * 查询项目公司信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:company:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProjectCompany tProjectCompany)
+    {
+        startPage();
+        List<TProjectCompany> list = tProjectCompanyService.selectTProjectCompanyList(tProjectCompany);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目公司信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:company:export')")
+    @Log(title = "项目公司信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TProjectCompany tProjectCompany)
+    {
+        List<TProjectCompany> list = tProjectCompanyService.selectTProjectCompanyList(tProjectCompany);
+        ExcelUtil<TProjectCompany> util = new ExcelUtil<TProjectCompany>(TProjectCompany.class);
+        util.exportExcel(response, list, "项目公司信息数据");
+    }
+
+    /**
+     * 获取项目公司信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:company:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tProjectCompanyService.selectTProjectCompanyById(id));
+    }
+
+    /**
+     * 新增项目公司信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:company:add')")
+    @Log(title = "项目公司信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProjectCompany tProjectCompany)
+    {
+        return toAjax(tProjectCompanyService.insertTProjectCompany(tProjectCompany));
+    }
+
+    /**
+     * 修改项目公司信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:company:edit')")
+    @Log(title = "项目公司信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProjectCompany tProjectCompany)
+    {
+        return toAjax(tProjectCompanyService.updateTProjectCompany(tProjectCompany));
+    }
+
+    /**
+     * 删除项目公司信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:company:remove')")
+    @Log(title = "项目公司信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tProjectCompanyService.deleteTProjectCompanyByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.invest;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.invest.TProjectInformation;
+import com.ruoyi.system.service.invest.ITProjectInformationService;
+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;
+
+/**
+ * 文件资料Controller
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@RestController
+@RequestMapping("/invest/information")
+public class TProjectInformationController extends BaseController
+{
+    @Autowired
+    private ITProjectInformationService tProjectInformationService;
+
+    /**
+     * 查询文件资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:information:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProjectInformation tProjectInformation)
+    {
+        startPage();
+        List<TProjectInformation> list = tProjectInformationService.selectTProjectInformationList(tProjectInformation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出文件资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:information:export')")
+    @Log(title = "文件资料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TProjectInformation tProjectInformation)
+    {
+        List<TProjectInformation> list = tProjectInformationService.selectTProjectInformationList(tProjectInformation);
+        ExcelUtil<TProjectInformation> util = new ExcelUtil<TProjectInformation>(TProjectInformation.class);
+        util.exportExcel(response, list, "文件资料数据");
+    }
+
+    /**
+     * 获取文件资料详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:information:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tProjectInformationService.selectTProjectInformationById(id));
+    }
+
+    /**
+     * 新增文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('invest:information:add')")
+    @Log(title = "文件资料", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProjectInformation tProjectInformation)
+    {
+        return toAjax(tProjectInformationService.insertTProjectInformation(tProjectInformation));
+    }
+
+    /**
+     * 修改文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('invest:information:edit')")
+    @Log(title = "文件资料", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProjectInformation tProjectInformation)
+    {
+        return toAjax(tProjectInformationService.updateTProjectInformation(tProjectInformation));
+    }
+
+    /**
+     * 删除文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('invest:information:remove')")
+    @Log(title = "文件资料", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tProjectInformationService.deleteTProjectInformationByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.invest;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.invest.TProjectMeeting;
+import com.ruoyi.system.service.invest.ITProjectMeetingService;
+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;
+
+/**
+ * 会议记录Controller
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@RestController
+@RequestMapping("/invest/meeting")
+public class TProjectMeetingController extends BaseController
+{
+    @Autowired
+    private ITProjectMeetingService tProjectMeetingService;
+
+    /**
+     * 查询会议记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProjectMeeting tProjectMeeting)
+    {
+        startPage();
+        List<TProjectMeeting> list = tProjectMeetingService.selectTProjectMeetingList(tProjectMeeting);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:export')")
+    @Log(title = "会议记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TProjectMeeting tProjectMeeting)
+    {
+        List<TProjectMeeting> list = tProjectMeetingService.selectTProjectMeetingList(tProjectMeeting);
+        ExcelUtil<TProjectMeeting> util = new ExcelUtil<TProjectMeeting>(TProjectMeeting.class);
+        util.exportExcel(response, list, "会议记录数据");
+    }
+
+    /**
+     * 获取会议记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tProjectMeetingService.selectTProjectMeetingById(id));
+    }
+
+    /**
+     * 新增会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:add')")
+    @Log(title = "会议记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProjectMeeting tProjectMeeting)
+    {
+        return toAjax(tProjectMeetingService.insertTProjectMeeting(tProjectMeeting));
+    }
+
+    /**
+     * 修改会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:edit')")
+    @Log(title = "会议记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProjectMeeting tProjectMeeting)
+    {
+        return toAjax(tProjectMeetingService.updateTProjectMeeting(tProjectMeeting));
+    }
+
+    /**
+     * 删除会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:remove')")
+    @Log(title = "会议记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tProjectMeetingService.deleteTProjectMeetingByIds(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/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/fg/Blogger.java

@@ -1,737 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-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;
-
-/**
- * 达人数据对象 t_blogger
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-public class Blogger extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String age;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avatar;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgGuestPrice;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgGuestPriceStr;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avglike30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgTotalUserCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgUserCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgUserSale;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgUserSaleStr;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemeavgsalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemeavgsalesgmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemeCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemecount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemesalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemesalesgmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemes;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String city;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String contentTags;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String customVerify;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String enterpriseVerify;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String fansinc30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String gender;
-
-    /** $column.columnComment */
-    private String id;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String includeState;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isBrandSelf;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isFavorite;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isFocus;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isMcn;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isRooming;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String likeCount;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String likesinc30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveavggmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveavgsalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String livegmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String livesalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveTags;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String location;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String nickName;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String platformFans;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String province;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String score;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String sellgoodsawemecount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String sellgoodslivecount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String shortId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String signature;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String tags;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String uid;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String uniqueId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String url;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean withFusionShopEntry;
-
-    public void setAge(String age) 
-    {
-        this.age = age;
-    }
-
-    public String getAge() 
-    {
-        return age;
-    }
-    public void setAvatar(String avatar) 
-    {
-        this.avatar = avatar;
-    }
-
-    public String getAvatar() 
-    {
-        return avatar;
-    }
-    public void setAvgGuestPrice(String avgGuestPrice) 
-    {
-        this.avgGuestPrice = avgGuestPrice;
-    }
-
-    public String getAvgGuestPrice() 
-    {
-        return avgGuestPrice;
-    }
-    public void setAvgGuestPriceStr(String avgGuestPriceStr) 
-    {
-        this.avgGuestPriceStr = avgGuestPriceStr;
-    }
-
-    public String getAvgGuestPriceStr() 
-    {
-        return avgGuestPriceStr;
-    }
-    public void setAvglike30day(String avglike30day) 
-    {
-        this.avglike30day = avglike30day;
-    }
-
-    public String getAvglike30day() 
-    {
-        return avglike30day;
-    }
-    public void setAvgTotalUserCount30Day(String avgTotalUserCount30Day) 
-    {
-        this.avgTotalUserCount30Day = avgTotalUserCount30Day;
-    }
-
-    public String getAvgTotalUserCount30Day() 
-    {
-        return avgTotalUserCount30Day;
-    }
-    public void setAvgUserCount30Day(String avgUserCount30Day) 
-    {
-        this.avgUserCount30Day = avgUserCount30Day;
-    }
-
-    public String getAvgUserCount30Day() 
-    {
-        return avgUserCount30Day;
-    }
-    public void setAvgUserSale(String avgUserSale) 
-    {
-        this.avgUserSale = avgUserSale;
-    }
-
-    public String getAvgUserSale() 
-    {
-        return avgUserSale;
-    }
-    public void setAvgUserSaleStr(String avgUserSaleStr) 
-    {
-        this.avgUserSaleStr = avgUserSaleStr;
-    }
-
-    public String getAvgUserSaleStr() 
-    {
-        return avgUserSaleStr;
-    }
-    public void setAwemeavgsalescount30day(String awemeavgsalescount30day) 
-    {
-        this.awemeavgsalescount30day = awemeavgsalescount30day;
-    }
-
-    public String getAwemeavgsalescount30day() 
-    {
-        return awemeavgsalescount30day;
-    }
-    public void setAwemeavgsalesgmv30day(String awemeavgsalesgmv30day) 
-    {
-        this.awemeavgsalesgmv30day = awemeavgsalesgmv30day;
-    }
-
-    public String getAwemeavgsalesgmv30day() 
-    {
-        return awemeavgsalesgmv30day;
-    }
-    public void setAwemeCount30Day(String awemeCount30Day) 
-    {
-        this.awemeCount30Day = awemeCount30Day;
-    }
-
-    public String getAwemeCount30Day() 
-    {
-        return awemeCount30Day;
-    }
-    public void setAwemecount30day(String awemecount30day) 
-    {
-        this.awemecount30day = awemecount30day;
-    }
-
-    public String getAwemecount30day() 
-    {
-        return awemecount30day;
-    }
-    public void setAwemesalescount30day(String awemesalescount30day) 
-    {
-        this.awemesalescount30day = awemesalescount30day;
-    }
-
-    public String getAwemesalescount30day() 
-    {
-        return awemesalescount30day;
-    }
-    public void setAwemesalesgmv30day(String awemesalesgmv30day) 
-    {
-        this.awemesalesgmv30day = awemesalesgmv30day;
-    }
-
-    public String getAwemesalesgmv30day() 
-    {
-        return awemesalesgmv30day;
-    }
-    public void setAwemes(String awemes) 
-    {
-        this.awemes = awemes;
-    }
-
-    public String getAwemes() 
-    {
-        return awemes;
-    }
-    public void setCity(String city) 
-    {
-        this.city = city;
-    }
-
-    public String getCity() 
-    {
-        return city;
-    }
-    public void setContentTags(String contentTags) 
-    {
-        this.contentTags = contentTags;
-    }
-
-    public String getContentTags() 
-    {
-        return contentTags;
-    }
-    public void setCustomVerify(String customVerify) 
-    {
-        this.customVerify = customVerify;
-    }
-
-    public String getCustomVerify() 
-    {
-        return customVerify;
-    }
-    public void setEnterpriseVerify(String enterpriseVerify) 
-    {
-        this.enterpriseVerify = enterpriseVerify;
-    }
-
-    public String getEnterpriseVerify() 
-    {
-        return enterpriseVerify;
-    }
-    public void setFansinc30day(String fansinc30day) 
-    {
-        this.fansinc30day = fansinc30day;
-    }
-
-    public String getFansinc30day() 
-    {
-        return fansinc30day;
-    }
-    public void setGender(String gender) 
-    {
-        this.gender = gender;
-    }
-
-    public String getGender() 
-    {
-        return gender;
-    }
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setIncludeState(String includeState) 
-    {
-        this.includeState = includeState;
-    }
-
-    public String getIncludeState() 
-    {
-        return includeState;
-    }
-    public void setIsBrandSelf(Boolean isBrandSelf) 
-    {
-        this.isBrandSelf = isBrandSelf;
-    }
-
-    public Boolean getIsBrandSelf() 
-    {
-        return isBrandSelf;
-    }
-    public void setIsFavorite(Boolean isFavorite) 
-    {
-        this.isFavorite = isFavorite;
-    }
-
-    public Boolean getIsFavorite() 
-    {
-        return isFavorite;
-    }
-    public void setIsFocus(Boolean isFocus) 
-    {
-        this.isFocus = isFocus;
-    }
-
-    public Boolean getIsFocus() 
-    {
-        return isFocus;
-    }
-    public void setIsMcn(Boolean isMcn) 
-    {
-        this.isMcn = isMcn;
-    }
-
-    public Boolean getIsMcn() 
-    {
-        return isMcn;
-    }
-    public void setIsRooming(Boolean isRooming) 
-    {
-        this.isRooming = isRooming;
-    }
-
-    public Boolean getIsRooming() 
-    {
-        return isRooming;
-    }
-    public void setLikeCount(String likeCount) 
-    {
-        this.likeCount = likeCount;
-    }
-
-    public String getLikeCount() 
-    {
-        return likeCount;
-    }
-    public void setLikesinc30day(String likesinc30day) 
-    {
-        this.likesinc30day = likesinc30day;
-    }
-
-    public String getLikesinc30day() 
-    {
-        return likesinc30day;
-    }
-    public void setLiveavggmv30day(String liveavggmv30day) 
-    {
-        this.liveavggmv30day = liveavggmv30day;
-    }
-
-    public String getLiveavggmv30day() 
-    {
-        return liveavggmv30day;
-    }
-    public void setLiveavgsalescount30day(String liveavgsalescount30day) 
-    {
-        this.liveavgsalescount30day = liveavgsalescount30day;
-    }
-
-    public String getLiveavgsalescount30day() 
-    {
-        return liveavgsalescount30day;
-    }
-    public void setLiveCount30Day(String liveCount30Day) 
-    {
-        this.liveCount30Day = liveCount30Day;
-    }
-
-    public String getLiveCount30Day() 
-    {
-        return liveCount30Day;
-    }
-    public void setLivegmv30day(String livegmv30day) 
-    {
-        this.livegmv30day = livegmv30day;
-    }
-
-    public String getLivegmv30day() 
-    {
-        return livegmv30day;
-    }
-    public void setLivesalescount30day(String livesalescount30day) 
-    {
-        this.livesalescount30day = livesalescount30day;
-    }
-
-    public String getLivesalescount30day() 
-    {
-        return livesalescount30day;
-    }
-    public void setLiveTags(String liveTags) 
-    {
-        this.liveTags = liveTags;
-    }
-
-    public String getLiveTags() 
-    {
-        return liveTags;
-    }
-    public void setLocation(String location) 
-    {
-        this.location = location;
-    }
-
-    public String getLocation() 
-    {
-        return location;
-    }
-    public void setNickName(String nickName) 
-    {
-        this.nickName = nickName;
-    }
-
-    public String getNickName() 
-    {
-        return nickName;
-    }
-    public void setPlatformFans(String platformFans) 
-    {
-        this.platformFans = platformFans;
-    }
-
-    public String getPlatformFans() 
-    {
-        return platformFans;
-    }
-    public void setProvince(String province) 
-    {
-        this.province = province;
-    }
-
-    public String getProvince() 
-    {
-        return province;
-    }
-    public void setScore(String score) 
-    {
-        this.score = score;
-    }
-
-    public String getScore() 
-    {
-        return score;
-    }
-    public void setSellgoodsawemecount30day(String sellgoodsawemecount30day) 
-    {
-        this.sellgoodsawemecount30day = sellgoodsawemecount30day;
-    }
-
-    public String getSellgoodsawemecount30day() 
-    {
-        return sellgoodsawemecount30day;
-    }
-    public void setSellgoodslivecount30day(String sellgoodslivecount30day) 
-    {
-        this.sellgoodslivecount30day = sellgoodslivecount30day;
-    }
-
-    public String getSellgoodslivecount30day() 
-    {
-        return sellgoodslivecount30day;
-    }
-    public void setShortId(String shortId) 
-    {
-        this.shortId = shortId;
-    }
-
-    public String getShortId() 
-    {
-        return shortId;
-    }
-    public void setSignature(String signature) 
-    {
-        this.signature = signature;
-    }
-
-    public String getSignature() 
-    {
-        return signature;
-    }
-    public void setTags(String tags) 
-    {
-        this.tags = tags;
-    }
-
-    public String getTags() 
-    {
-        return tags;
-    }
-    public void setUid(String uid) 
-    {
-        this.uid = uid;
-    }
-
-    public String getUid() 
-    {
-        return uid;
-    }
-    public void setUniqueId(String uniqueId) 
-    {
-        this.uniqueId = uniqueId;
-    }
-
-    public String getUniqueId() 
-    {
-        return uniqueId;
-    }
-    public void setUrl(String url) 
-    {
-        this.url = url;
-    }
-
-    public String getUrl() 
-    {
-        return url;
-    }
-    public void setWithFusionShopEntry(Boolean withFusionShopEntry) 
-    {
-        this.withFusionShopEntry = withFusionShopEntry;
-    }
-
-    public Boolean getWithFusionShopEntry() 
-    {
-        return withFusionShopEntry;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("age", getAge())
-            .append("avatar", getAvatar())
-            .append("avgGuestPrice", getAvgGuestPrice())
-            .append("avgGuestPriceStr", getAvgGuestPriceStr())
-            .append("avglike30day", getAvglike30day())
-            .append("avgTotalUserCount30Day", getAvgTotalUserCount30Day())
-            .append("avgUserCount30Day", getAvgUserCount30Day())
-            .append("avgUserSale", getAvgUserSale())
-            .append("avgUserSaleStr", getAvgUserSaleStr())
-            .append("awemeavgsalescount30day", getAwemeavgsalescount30day())
-            .append("awemeavgsalesgmv30day", getAwemeavgsalesgmv30day())
-            .append("awemeCount30Day", getAwemeCount30Day())
-            .append("awemecount30day", getAwemecount30day())
-            .append("awemesalescount30day", getAwemesalescount30day())
-            .append("awemesalesgmv30day", getAwemesalesgmv30day())
-            .append("awemes", getAwemes())
-            .append("city", getCity())
-            .append("contentTags", getContentTags())
-            .append("customVerify", getCustomVerify())
-            .append("enterpriseVerify", getEnterpriseVerify())
-            .append("fansinc30day", getFansinc30day())
-            .append("gender", getGender())
-            .append("id", getId())
-            .append("includeState", getIncludeState())
-            .append("isBrandSelf", getIsBrandSelf())
-            .append("isFavorite", getIsFavorite())
-            .append("isFocus", getIsFocus())
-            .append("isMcn", getIsMcn())
-            .append("isRooming", getIsRooming())
-            .append("likeCount", getLikeCount())
-            .append("likesinc30day", getLikesinc30day())
-            .append("liveavggmv30day", getLiveavggmv30day())
-            .append("liveavgsalescount30day", getLiveavgsalescount30day())
-            .append("liveCount30Day", getLiveCount30Day())
-            .append("livegmv30day", getLivegmv30day())
-            .append("livesalescount30day", getLivesalescount30day())
-            .append("liveTags", getLiveTags())
-            .append("location", getLocation())
-            .append("nickName", getNickName())
-            .append("platformFans", getPlatformFans())
-            .append("province", getProvince())
-            .append("score", getScore())
-            .append("sellgoodsawemecount30day", getSellgoodsawemecount30day())
-            .append("sellgoodslivecount30day", getSellgoodslivecount30day())
-            .append("shortId", getShortId())
-            .append("signature", getSignature())
-            .append("tags", getTags())
-            .append("uid", getUid())
-            .append("uniqueId", getUniqueId())
-            .append("url", getUrl())
-            .append("withFusionShopEntry", getWithFusionShopEntry())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/fg/Overview.java

@@ -1,345 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-public class Overview extends BaseEntity {
-
-    @Excel(name = "用户名称")
-    private String name;
-    @Excel(name = "用户编码")
-    private String uuid;
-    @Excel(name = "场均直播时长")
-    private String AvgDurationStr;
-    @Excel(name = "场均销量")
-    private String AvgLiveSaleCountStr;
-    @Excel(name = "场均销售额")
-    private String AvgLiveSaleGmvStr;
-    @Excel(name = "场均观看人次")
-    private String AvgLiveTotalUserCountStr;
-    @Excel(name = "场均人气峰值")
-    private String AvgLiveUserCountStr;
-    @Excel(name = "直播客单价")
-    private String AvgUserPriceStr;
-
-    @Excel(name = "带货直播")
-    private String CommerceLiveCountStr;
-    @Excel(name = "直播场次")
-    private String LiveCountStr;
-    @Excel(name = "直播销量")
-    private String LiveSaleCountStr;
-    @Excel(name = "直播销售额")
-    private String LiveSaleGmvStr;
-    @Excel(name = "最高观看")
-    private String MaxLiveTotalUserCountStr;
-    @Excel(name = "人均UV价值")
-    private String UVStr;
-
-    /**===   ===**/
-
-    @Excel(name = "平均销量")
-    private String AvgAwemeSaleCountStr;
-    @Excel(name = "平均销售额")
-    private String AvgAwemeSaleGmvStr;
-    @Excel(name = "平均评论")
-    private String AvgCommentCountStr;
-    @Excel(name = "平均赞评比")
-    private String AvgLikeCommentRateStr;
-    @Excel(name = "平均点赞")
-    private String AvgLikeCountStr;
-    @Excel(name = "视频数")
-    private String AwemeCountStr;
-    @Excel(name = "视频销量")
-    private String AwemeSaleCountStr;
-    @Excel(name = "视频销售额")
-    private String AwemeSaleGmvStr;
-    @Excel(name = "带货视频")
-    private String CommerceAwemeCountStr;
-    @Excel(name = "最高评论")
-    private String MaxCommentCountStr;
-    @Excel(name = "最高赞评比")
-    private String MaxLikeCommentRateStr;
-    @Excel(name = "最高点赞")
-    private String MaxLikeCountStr;
-
-    /**===  种草数据 ===**/
-    @Excel(name = "星图报价")
-    private String BloggerPriceStr;
-    @Excel(name = "种草品牌")
-    private String BrandCountStr;
-    @Excel(name = "CPE")
-    private String CPEStr;
-    @Excel(name = "种草品类")
-    private String CateCountStr;
-    @Excel(name = "种草视频")
-    private String GrassVideoCountStr;
-    @Excel(name = "主要种草类目")
-    private String MainCateNameStr;
-    @Excel(name = "主要种草类目百分比")
-    private String MainCateRatioStr;
-
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getAvgDurationStr() {
-        return AvgDurationStr;
-    }
-
-    public void setAvgDurationStr(String avgDurationStr) {
-        AvgDurationStr = avgDurationStr;
-    }
-
-    public String getAvgLiveSaleCountStr() {
-        return AvgLiveSaleCountStr;
-    }
-
-    public void setAvgLiveSaleCountStr(String avgLiveSaleCountStr) {
-        AvgLiveSaleCountStr = avgLiveSaleCountStr;
-    }
-
-    public String getAvgLiveSaleGmvStr() {
-        return AvgLiveSaleGmvStr;
-    }
-
-    public void setAvgLiveSaleGmvStr(String avgLiveSaleGmvStr) {
-        AvgLiveSaleGmvStr = avgLiveSaleGmvStr;
-    }
-
-    public String getAvgLiveTotalUserCountStr() {
-        return AvgLiveTotalUserCountStr;
-    }
-
-    public void setAvgLiveTotalUserCountStr(String avgLiveTotalUserCountStr) {
-        AvgLiveTotalUserCountStr = avgLiveTotalUserCountStr;
-    }
-
-    public String getAvgLiveUserCountStr() {
-        return AvgLiveUserCountStr;
-    }
-
-    public void setAvgLiveUserCountStr(String avgLiveUserCountStr) {
-        AvgLiveUserCountStr = avgLiveUserCountStr;
-    }
-
-    public String getAvgUserPriceStr() {
-        return AvgUserPriceStr;
-    }
-
-    public void setAvgUserPriceStr(String avgUserPriceStr) {
-        AvgUserPriceStr = avgUserPriceStr;
-    }
-
-    public String getCommerceLiveCountStr() {
-        return CommerceLiveCountStr;
-    }
-
-    public void setCommerceLiveCountStr(String commerceLiveCountStr) {
-        CommerceLiveCountStr = commerceLiveCountStr;
-    }
-
-    public String getLiveCountStr() {
-        return LiveCountStr;
-    }
-
-    public void setLiveCountStr(String liveCountStr) {
-        LiveCountStr = liveCountStr;
-    }
-
-    public String getLiveSaleCountStr() {
-        return LiveSaleCountStr;
-    }
-
-    public void setLiveSaleCountStr(String liveSaleCountStr) {
-        LiveSaleCountStr = liveSaleCountStr;
-    }
-
-    public String getLiveSaleGmvStr() {
-        return LiveSaleGmvStr;
-    }
-
-    public void setLiveSaleGmvStr(String liveSaleGmvStr) {
-        LiveSaleGmvStr = liveSaleGmvStr;
-    }
-
-    public String getMaxLiveTotalUserCountStr() {
-        return MaxLiveTotalUserCountStr;
-    }
-
-    public void setMaxLiveTotalUserCountStr(String maxLiveTotalUserCountStr) {
-        MaxLiveTotalUserCountStr = maxLiveTotalUserCountStr;
-    }
-
-    public String getUVStr() {
-        return UVStr;
-    }
-
-    public void setUVStr(String UVStr) {
-        this.UVStr = UVStr;
-    }
-
-    public String getAvgAwemeSaleCountStr() {
-        return AvgAwemeSaleCountStr;
-    }
-
-    public void setAvgAwemeSaleCountStr(String avgAwemeSaleCountStr) {
-        AvgAwemeSaleCountStr = avgAwemeSaleCountStr;
-    }
-
-    public String getAvgAwemeSaleGmvStr() {
-        return AvgAwemeSaleGmvStr;
-    }
-
-    public void setAvgAwemeSaleGmvStr(String avgAwemeSaleGmvStr) {
-        AvgAwemeSaleGmvStr = avgAwemeSaleGmvStr;
-    }
-
-    public String getAvgCommentCountStr() {
-        return AvgCommentCountStr;
-    }
-
-    public void setAvgCommentCountStr(String avgCommentCountStr) {
-        AvgCommentCountStr = avgCommentCountStr;
-    }
-
-    public String getAvgLikeCommentRateStr() {
-        return AvgLikeCommentRateStr;
-    }
-
-    public void setAvgLikeCommentRateStr(String avgLikeCommentRateStr) {
-        AvgLikeCommentRateStr = avgLikeCommentRateStr;
-    }
-
-    public String getAvgLikeCountStr() {
-        return AvgLikeCountStr;
-    }
-
-    public void setAvgLikeCountStr(String avgLikeCountStr) {
-        AvgLikeCountStr = avgLikeCountStr;
-    }
-
-    public String getAwemeCountStr() {
-        return AwemeCountStr;
-    }
-
-    public void setAwemeCountStr(String awemeCountStr) {
-        AwemeCountStr = awemeCountStr;
-    }
-
-    public String getAwemeSaleCountStr() {
-        return AwemeSaleCountStr;
-    }
-
-    public void setAwemeSaleCountStr(String awemeSaleCountStr) {
-        AwemeSaleCountStr = awemeSaleCountStr;
-    }
-
-    public String getAwemeSaleGmvStr() {
-        return AwemeSaleGmvStr;
-    }
-
-    public void setAwemeSaleGmvStr(String awemeSaleGmvStr) {
-        AwemeSaleGmvStr = awemeSaleGmvStr;
-    }
-
-    public String getCommerceAwemeCountStr() {
-        return CommerceAwemeCountStr;
-    }
-
-    public void setCommerceAwemeCountStr(String commerceAwemeCountStr) {
-        CommerceAwemeCountStr = commerceAwemeCountStr;
-    }
-
-    public String getMaxCommentCountStr() {
-        return MaxCommentCountStr;
-    }
-
-    public void setMaxCommentCountStr(String maxCommentCountStr) {
-        MaxCommentCountStr = maxCommentCountStr;
-    }
-
-    public String getMaxLikeCommentRateStr() {
-        return MaxLikeCommentRateStr;
-    }
-
-    public void setMaxLikeCommentRateStr(String maxLikeCommentRateStr) {
-        MaxLikeCommentRateStr = maxLikeCommentRateStr;
-    }
-
-    public String getMaxLikeCountStr() {
-        return MaxLikeCountStr;
-    }
-
-    public void setMaxLikeCountStr(String maxLikeCountStr) {
-        MaxLikeCountStr = maxLikeCountStr;
-    }
-
-    public String getBloggerPriceStr() {
-        return BloggerPriceStr;
-    }
-
-    public void setBloggerPriceStr(String bloggerPriceStr) {
-        BloggerPriceStr = bloggerPriceStr;
-    }
-
-    public String getBrandCountStr() {
-        return BrandCountStr;
-    }
-
-    public void setBrandCountStr(String brandCountStr) {
-        BrandCountStr = brandCountStr;
-    }
-
-    public String getCPEStr() {
-        return CPEStr;
-    }
-
-    public void setCPEStr(String CPEStr) {
-        this.CPEStr = CPEStr;
-    }
-
-    public String getCateCountStr() {
-        return CateCountStr;
-    }
-
-    public void setCateCountStr(String cateCountStr) {
-        CateCountStr = cateCountStr;
-    }
-
-    public String getGrassVideoCountStr() {
-        return GrassVideoCountStr;
-    }
-
-    public void setGrassVideoCountStr(String grassVideoCountStr) {
-        GrassVideoCountStr = grassVideoCountStr;
-    }
-
-    public String getMainCateNameStr() {
-        return MainCateNameStr;
-    }
-
-    public void setMainCateNameStr(String mainCateNameStr) {
-        MainCateNameStr = mainCateNameStr;
-    }
-
-    public String getMainCateRatioStr() {
-        return MainCateRatioStr;
-    }
-
-    public void setMainCateRatioStr(String mainCateRatioStr) {
-        MainCateRatioStr = mainCateRatioStr;
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/fg/SalesTrendData.java

@@ -1,273 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-public class SalesTrendData extends BaseEntity {
-
-    @Excel(name = "视频销量总数")
-    private String AwemeSalesCount;
-    @Excel(name = "视频销量区间数")
-    private String AwemeSalesCountStr;
-    @Excel(name = "视频销量百分比")
-    private String AwemeSaleCountRatio;
-    @Excel(name = "视频销售额")
-    private String AwemeSales;
-    @Excel(name = "视频销售额区间数")
-    private String AwemeSalesStr;
-    @Excel(name = "视频销售额百分比")
-    private String AwemeSalesRatio;
-
-    @Excel(name = "日期")
-    private String DateCode;
-    @Excel(name = "直播销量总数")
-    private String LiveSalesCount;
-    @Excel(name = "直播销量区间数")
-    private String LiveSalesCountStr;
-    @Excel(name = "直播销量百分比")
-    private String LiveSaleCountRatio;
-    @Excel(name = "直播销售额")
-    private String LiveSales;
-    @Excel(name = "直播销售额区间数")
-    private String LiveSalesStr;
-    @Excel(name = "直播销售额百分比")
-    private String LiveSalesRatio;
-
-    @Excel(name = "商品卡销量总数")
-    private String OtherSalesCount;
-    @Excel(name = "商品卡销售区间数")
-    private String OtherSalesCountStr;
-    @Excel(name = "商品卡销量百分比")
-    private String OtherSaleCountRatio;
-    @Excel(name = "商品卡销量额")
-    private String OtherSales;
-    @Excel(name = "商品卡销量额区间数")
-    private String OtherSalesStr;
-    @Excel(name = "商品卡销售额百分比")
-    private String OtherSalesRatio;
-
-
-
-    @Excel(name = "总PV")
-    private String PV;
-    @Excel(name = "总PV区间值")
-    private String PVStr;
-    @Excel(name = "时间")
-    private String StatDate;
-    @Excel(name = "总计")
-    private String SumSalesCount;
-    @Excel(name = "总计区间值")
-    private String SumSalesCountStr;
-    @Excel(name = "总量")
-    private String TotalSales;
-    @Excel(name = "总量区间值")
-    private String TotalSalesStr;
-
-    public String getAwemeSalesCount() {
-        return AwemeSalesCount;
-    }
-
-    public void setAwemeSalesCount(String awemeSalesCount) {
-        AwemeSalesCount = awemeSalesCount;
-    }
-
-    public String getAwemeSalesCountStr() {
-        return AwemeSalesCountStr;
-    }
-
-    public void setAwemeSalesCountStr(String awemeSalesCountStr) {
-        AwemeSalesCountStr = awemeSalesCountStr;
-    }
-
-    public String getAwemeSaleCountRatio() {
-        return AwemeSaleCountRatio;
-    }
-
-    public void setAwemeSaleCountRatio(String awemeSaleCountRatio) {
-        AwemeSaleCountRatio = awemeSaleCountRatio;
-    }
-
-    public String getAwemeSales() {
-        return AwemeSales;
-    }
-
-    public void setAwemeSales(String awemeSales) {
-        AwemeSales = awemeSales;
-    }
-
-    public String getAwemeSalesStr() {
-        return AwemeSalesStr;
-    }
-
-    public void setAwemeSalesStr(String awemeSalesStr) {
-        AwemeSalesStr = awemeSalesStr;
-    }
-
-    public String getAwemeSalesRatio() {
-        return AwemeSalesRatio;
-    }
-
-    public void setAwemeSalesRatio(String awemeSalesRatio) {
-        AwemeSalesRatio = awemeSalesRatio;
-    }
-
-    public String getDateCode() {
-        return DateCode;
-    }
-
-    public void setDateCode(String dateCode) {
-        DateCode = dateCode;
-    }
-
-    public String getLiveSalesCount() {
-        return LiveSalesCount;
-    }
-
-    public void setLiveSalesCount(String liveSalesCount) {
-        LiveSalesCount = liveSalesCount;
-    }
-
-    public String getLiveSalesCountStr() {
-        return LiveSalesCountStr;
-    }
-
-    public void setLiveSalesCountStr(String liveSalesCountStr) {
-        LiveSalesCountStr = liveSalesCountStr;
-    }
-
-    public String getLiveSaleCountRatio() {
-        return LiveSaleCountRatio;
-    }
-
-    public void setLiveSaleCountRatio(String liveSaleCountRatio) {
-        LiveSaleCountRatio = liveSaleCountRatio;
-    }
-
-    public String getLiveSales() {
-        return LiveSales;
-    }
-
-    public void setLiveSales(String liveSales) {
-        LiveSales = liveSales;
-    }
-
-    public String getLiveSalesStr() {
-        return LiveSalesStr;
-    }
-
-    public void setLiveSalesStr(String liveSalesStr) {
-        LiveSalesStr = liveSalesStr;
-    }
-
-    public String getLiveSalesRatio() {
-        return LiveSalesRatio;
-    }
-
-    public void setLiveSalesRatio(String liveSalesRatio) {
-        LiveSalesRatio = liveSalesRatio;
-    }
-
-    public String getOtherSalesCount() {
-        return OtherSalesCount;
-    }
-
-    public void setOtherSalesCount(String otherSalesCount) {
-        OtherSalesCount = otherSalesCount;
-    }
-
-    public String getOtherSalesCountStr() {
-        return OtherSalesCountStr;
-    }
-
-    public void setOtherSalesCountStr(String otherSalesCountStr) {
-        OtherSalesCountStr = otherSalesCountStr;
-    }
-
-    public String getOtherSaleCountRatio() {
-        return OtherSaleCountRatio;
-    }
-
-    public void setOtherSaleCountRatio(String otherSaleCountRatio) {
-        OtherSaleCountRatio = otherSaleCountRatio;
-    }
-
-    public String getOtherSales() {
-        return OtherSales;
-    }
-
-    public void setOtherSales(String otherSales) {
-        OtherSales = otherSales;
-    }
-
-    public String getOtherSalesStr() {
-        return OtherSalesStr;
-    }
-
-    public void setOtherSalesStr(String otherSalesStr) {
-        OtherSalesStr = otherSalesStr;
-    }
-
-    public String getOtherSalesRatio() {
-        return OtherSalesRatio;
-    }
-
-    public void setOtherSalesRatio(String otherSalesRatio) {
-        OtherSalesRatio = otherSalesRatio;
-    }
-
-    public String getPV() {
-        return PV;
-    }
-
-    public void setPV(String PV) {
-        this.PV = PV;
-    }
-
-    public String getPVStr() {
-        return PVStr;
-    }
-
-    public void setPVStr(String PVStr) {
-        this.PVStr = PVStr;
-    }
-
-    public String getStatDate() {
-        return StatDate;
-    }
-
-    public void setStatDate(String statDate) {
-        StatDate = statDate;
-    }
-
-    public String getSumSalesCount() {
-        return SumSalesCount;
-    }
-
-    public void setSumSalesCount(String sumSalesCount) {
-        SumSalesCount = sumSalesCount;
-    }
-
-    public String getSumSalesCountStr() {
-        return SumSalesCountStr;
-    }
-
-    public void setSumSalesCountStr(String sumSalesCountStr) {
-        SumSalesCountStr = sumSalesCountStr;
-    }
-
-    public String getTotalSales() {
-        return TotalSales;
-    }
-
-    public void setTotalSales(String totalSales) {
-        TotalSales = totalSales;
-    }
-
-    public String getTotalSalesStr() {
-        return TotalSalesStr;
-    }
-
-    public void setTotalSalesStr(String totalSalesStr) {
-        TotalSalesStr = totalSalesStr;
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/fg/School.java

@@ -1,199 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-public class School extends BaseEntity {
-
-    @Excel(name = "大类")
-    private String lName;
-
-    @Excel(name = "大类code")
-    private String lCode;
-    @Excel(name = "小类")
-    private String pName;
-    @Excel(name = "小类code")
-    private String pCode;
-    @Excel(name = "子类")
-    private String zName;
-    @Excel(name = "子类code")
-    private String zCode;
-    @Excel(name = "评级")
-    private String grade;
-    @Excel(name = "学校名称")
-    private String univNameCn;
-    @Excel(name = "总分")
-    private String score;
-    @Excel(name = "省")
-    private String province;
-    @Excel(name = "市")
-    private String city;
-    @Excel(name = "总分数")
-    private String univLikeCount;
-    @Excel(name = "学校类型")
-    private String univTags;
-    @Excel(name = "排名")
-    private String ranking;
-    @Excel(name = "学校条件")
-    private String nameCn12;
-    @Excel(name = "学校支撑")
-    private String nameCn13;
-    @Excel(name = "专业生源")
-    private String nameCn14;
-    @Excel(name = "专业就业")
-    private String nameCn15;
-    @Excel(name = "专业条件")
-    private String nameCn16;
-
-    public String getlName() {
-        return lName;
-    }
-
-    public void setlName(String lName) {
-        this.lName = lName;
-    }
-
-    public String getlCode() {
-        return lCode;
-    }
-
-    public void setlCode(String lCode) {
-        this.lCode = lCode;
-    }
-
-    public String getpName() {
-        return pName;
-    }
-
-    public void setpName(String pName) {
-        this.pName = pName;
-    }
-
-    public String getpCode() {
-        return pCode;
-    }
-
-    public void setpCode(String pCode) {
-        this.pCode = pCode;
-    }
-
-    public String getzName() {
-        return zName;
-    }
-
-    public void setzName(String zName) {
-        this.zName = zName;
-    }
-
-    public String getzCode() {
-        return zCode;
-    }
-
-    public void setzCode(String zCode) {
-        this.zCode = zCode;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public String getUnivNameCn() {
-        return univNameCn;
-    }
-
-    public void setUnivNameCn(String univNameCn) {
-        this.univNameCn = univNameCn;
-    }
-
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getUnivLikeCount() {
-        return univLikeCount;
-    }
-
-    public void setUnivLikeCount(String univLikeCount) {
-        this.univLikeCount = univLikeCount;
-    }
-
-    public String getUnivTags() {
-        return univTags;
-    }
-
-    public void setUnivTags(String univTags) {
-        this.univTags = univTags;
-    }
-
-    public String getRanking() {
-        return ranking;
-    }
-
-    public void setRanking(String ranking) {
-        this.ranking = ranking;
-    }
-
-    public String getNameCn12() {
-        return nameCn12;
-    }
-
-    public void setNameCn12(String nameCn12) {
-        this.nameCn12 = nameCn12;
-    }
-
-    public String getNameCn13() {
-        return nameCn13;
-    }
-
-    public void setNameCn13(String nameCn13) {
-        this.nameCn13 = nameCn13;
-    }
-
-    public String getNameCn14() {
-        return nameCn14;
-    }
-
-    public void setNameCn14(String nameCn14) {
-        this.nameCn14 = nameCn14;
-    }
-
-    public String getNameCn15() {
-        return nameCn15;
-    }
-
-    public void setNameCn15(String nameCn15) {
-        this.nameCn15 = nameCn15;
-    }
-
-    public String getNameCn16() {
-        return nameCn16;
-    }
-
-    public void setNameCn16(String nameCn16) {
-        this.nameCn16 = nameCn16;
-    }
-}

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

@@ -0,0 +1,219 @@
+package com.ruoyi.system.domain.invest;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 项目公司信息对象 t_project_company
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public class TProjectCompany extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    private String companyName;
+
+    /** 项目ID */
+    private String projectPoolId;
+
+    /** 企业统一社会信用代码 */
+    @Excel(name = "企业统一社会信用代码")
+    private String companyCode;
+
+    /** 营业开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "营业开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 营业结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "营业结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 注册资本 */
+    private String registeredCapital;
+
+    /** 注册地址 */
+    private String registeredAddress;
+
+    /** 实缴资本 */
+    private String paidCapital;
+
+    /** 办公地址 */
+    private String businessAddress;
+
+    /** 实控人 */
+    @Excel(name = "实控人")
+    private String actualBod;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 所属类型 */
+    private String type;
+
+    /** 状态 */
+    private String delFlag;
+
+    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 setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setCompanyCode(String companyCode) 
+    {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyCode() 
+    {
+        return companyCode;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setRegisteredCapital(String registeredCapital) 
+    {
+        this.registeredCapital = registeredCapital;
+    }
+
+    public String getRegisteredCapital() 
+    {
+        return registeredCapital;
+    }
+    public void setRegisteredAddress(String registeredAddress) 
+    {
+        this.registeredAddress = registeredAddress;
+    }
+
+    public String getRegisteredAddress() 
+    {
+        return registeredAddress;
+    }
+    public void setPaidCapital(String paidCapital) 
+    {
+        this.paidCapital = paidCapital;
+    }
+
+    public String getPaidCapital() 
+    {
+        return paidCapital;
+    }
+    public void setBusinessAddress(String businessAddress) 
+    {
+        this.businessAddress = businessAddress;
+    }
+
+    public String getBusinessAddress() 
+    {
+        return businessAddress;
+    }
+    public void setActualBod(String actualBod) 
+    {
+        this.actualBod = actualBod;
+    }
+
+    public String getActualBod() 
+    {
+        return actualBod;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyName", getCompanyName())
+            .append("projectPoolId", getProjectPoolId())
+            .append("companyCode", getCompanyCode())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("registeredCapital", getRegisteredCapital())
+            .append("registeredAddress", getRegisteredAddress())
+            .append("paidCapital", getPaidCapital())
+            .append("businessAddress", getBusinessAddress())
+            .append("actualBod", getActualBod())
+            .append("phone", getPhone())
+            .append("type", getType())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,137 @@
+package com.ruoyi.system.domain.invest;
+
+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;
+
+/**
+ * 文件资料对象 t_project_information
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public class TProjectInformation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    private String fileName;
+
+    /** 文件类别 */
+    @Excel(name = "文件类别")
+    private String fileType;
+
+    /** 项目ID */
+    private String projectPoolId;
+
+    /** 项目阶段 */
+    @Excel(name = "项目阶段")
+    private String projectStage;
+
+    /** 会议编号 */
+    @Excel(name = "会议编号")
+    private String meetingCode;
+
+    /** 附件业务ID */
+    private String fileBusinessId;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setFileName(String fileName) 
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() 
+    {
+        return fileName;
+    }
+    public void setFileType(String fileType) 
+    {
+        this.fileType = fileType;
+    }
+
+    public String getFileType() 
+    {
+        return fileType;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setProjectStage(String projectStage) 
+    {
+        this.projectStage = projectStage;
+    }
+
+    public String getProjectStage() 
+    {
+        return projectStage;
+    }
+    public void setMeetingCode(String meetingCode) 
+    {
+        this.meetingCode = meetingCode;
+    }
+
+    public String getMeetingCode() 
+    {
+        return meetingCode;
+    }
+    public void setFileBusinessId(String fileBusinessId) 
+    {
+        this.fileBusinessId = fileBusinessId;
+    }
+
+    public String getFileBusinessId() 
+    {
+        return fileBusinessId;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fileName", getFileName())
+            .append("fileType", getFileType())
+            .append("projectPoolId", getProjectPoolId())
+            .append("projectStage", getProjectStage())
+            .append("meetingCode", getMeetingCode())
+            .append("fileBusinessId", getFileBusinessId())
+            .append("delFlag", getDelFlag())
+            .append("remark", getRemark())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,182 @@
+package com.ruoyi.system.domain.invest;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 会议记录对象 t_project_meeting
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public class TProjectMeeting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 会议主题 */
+    @Excel(name = "会议主题")
+    private String meetingTheme;
+
+    /** 会议编号 */
+    @Excel(name = "会议编号")
+    private String meetingCode;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    private String meetingType;
+
+    /** 项目ID */
+    private String projectPoolId;
+
+    /** 会议开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 会议结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 会议地点 */
+    @Excel(name = "会议地点")
+    private String place;
+
+    /** 会议发起人 */
+    @Excel(name = "会议发起人")
+    private String promoter;
+
+    /** 会议参与人 */
+    private String participants;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setMeetingTheme(String meetingTheme) 
+    {
+        this.meetingTheme = meetingTheme;
+    }
+
+    public String getMeetingTheme() 
+    {
+        return meetingTheme;
+    }
+    public void setMeetingCode(String meetingCode) 
+    {
+        this.meetingCode = meetingCode;
+    }
+
+    public String getMeetingCode() 
+    {
+        return meetingCode;
+    }
+    public void setMeetingType(String meetingType) 
+    {
+        this.meetingType = meetingType;
+    }
+
+    public String getMeetingType() 
+    {
+        return meetingType;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setPromoter(String promoter) 
+    {
+        this.promoter = promoter;
+    }
+
+    public String getPromoter() 
+    {
+        return promoter;
+    }
+    public void setParticipants(String participants) 
+    {
+        this.participants = participants;
+    }
+
+    public String getParticipants() 
+    {
+        return participants;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("meetingTheme", getMeetingTheme())
+            .append("meetingCode", getMeetingCode())
+            .append("meetingType", getMeetingType())
+            .append("projectPoolId", getProjectPoolId())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("place", getPlace())
+            .append("promoter", getPromoter())
+            .append("participants", getParticipants())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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/fg/BloggerMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.mapper.fg;
-
-import com.ruoyi.system.domain.fg.Blogger;
-
-import java.util.List;
-
-/**
- * 达人数据Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-public interface BloggerMapper 
-{
-    /**
-     * 查询达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 达人数据
-     */
-    public Blogger selectBloggerByAge(String age);
-
-    /**
-     * 查询达人数据列表
-     * 
-     * @param blogger 达人数据
-     * @return 达人数据集合
-     */
-    public List<Blogger> selectBloggerList(Blogger blogger);
-
-    /**
-     * 新增达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int insertBlogger(Blogger blogger);
-
-    /**
-     * 修改达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int updateBlogger(Blogger blogger);
-
-    /**
-     * 删除达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 结果
-     */
-    public int deleteBloggerByAge(String age);
-
-    /**
-     * 批量删除达人数据
-     * 
-     * @param ages 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBloggerByAges(String[] ages);
-}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.invest;
+
+import com.ruoyi.system.domain.invest.TProjectCompany;
+
+import java.util.List;
+
+/**
+ * 项目公司信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface TProjectCompanyMapper 
+{
+    /**
+     * 查询项目公司信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 项目公司信息
+     */
+    public TProjectCompany selectTProjectCompanyById(String id);
+
+    /**
+     * 查询项目公司信息列表
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 项目公司信息集合
+     */
+    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany);
+
+    /**
+     * 新增项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    public int insertTProjectCompany(TProjectCompany tProjectCompany);
+
+    /**
+     * 修改项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    public int updateTProjectCompany(TProjectCompany tProjectCompany);
+
+    /**
+     * 删除项目公司信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 结果
+     */
+    public int deleteTProjectCompanyById(String id);
+
+    /**
+     * 批量删除项目公司信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTProjectCompanyByIds(String[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.invest;
+
+import com.ruoyi.system.domain.invest.TProjectInformation;
+
+import java.util.List;
+
+/**
+ * 文件资料Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public interface TProjectInformationMapper 
+{
+    /**
+     * 查询文件资料
+     * 
+     * @param id 文件资料主键
+     * @return 文件资料
+     */
+    public TProjectInformation selectTProjectInformationById(String id);
+
+    /**
+     * 查询文件资料列表
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 文件资料集合
+     */
+    public List<TProjectInformation> selectTProjectInformationList(TProjectInformation tProjectInformation);
+
+    /**
+     * 新增文件资料
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 结果
+     */
+    public int insertTProjectInformation(TProjectInformation tProjectInformation);
+
+    /**
+     * 修改文件资料
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 结果
+     */
+    public int updateTProjectInformation(TProjectInformation tProjectInformation);
+
+    /**
+     * 删除文件资料
+     * 
+     * @param id 文件资料主键
+     * @return 结果
+     */
+    public int deleteTProjectInformationById(String id);
+
+    /**
+     * 批量删除文件资料
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTProjectInformationByIds(String[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.invest;
+
+import com.ruoyi.system.domain.invest.TProjectMeeting;
+
+import java.util.List;
+
+/**
+ * 会议记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface TProjectMeetingMapper 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    public TProjectMeeting selectTProjectMeetingById(String id);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 会议记录集合
+     */
+    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 删除会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    public int deleteTProjectMeetingById(String id);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTProjectMeetingByIds(String[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/IAddressService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.service.crm;
-
-import com.ruoyi.system.domain.crm.Address;
-
-import java.util.List;
-
-/**
- * 账户信息Service接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface IAddressService 
-{
-    /**
-     * 查询账户信息
-     * 
-     * @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 ids 需要删除的账户信息主键集合
-     * @return 结果
-     */
-    public int deleteAddressByIds(Long[] ids);
-
-    /**
-     * 删除账户信息信息
-     * 
-     * @param id 账户信息主键
-     * @return 结果
-     */
-    public int deleteAddressById(Long id);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/IContactsService.java

@@ -1,71 +0,0 @@
-package com.ruoyi.system.service.crm;
-
-import com.ruoyi.system.domain.crm.Contacts;
-
-import java.util.List;
-
-/**
- * 客户联系人信息Service接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface IContactsService 
-{
-    /**
-     * 查询客户联系人信息
-     * 
-     * @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 ids 需要删除的客户联系人信息主键集合
-     * @return 结果
-     */
-    public int deleteContactsByIds(Long[] ids);
-
-    /**
-     * 删除客户联系人信息信息
-     * 
-     * @param id 客户联系人信息主键
-     * @return 结果
-     */
-    public int deleteContactsById(Long id);
-
-
-    /**
-     * 批量新增客户联系人信息
-     * @param contactsList
-     */
-    public int batchInsertContacts(List<Contacts> contactsList);
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/ICrmFileService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.service.crm;
-
-import com.ruoyi.system.domain.crm.CrmFile;
-
-import java.util.List;
-
-/**
- * crm附件Service接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface ICrmFileService 
-{
-    /**
-     * 查询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 ids 需要删除的crm附件主键集合
-     * @return 结果
-     */
-    public int deleteCrmFileByIds(Long[] ids);
-
-    /**
-     * 删除crm附件信息
-     * 
-     * @param id crm附件主键
-     * @return 结果
-     */
-    public int deleteCrmFileById(Long id);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/ICustomerService.java

@@ -1,72 +0,0 @@
-package com.ruoyi.system.service.crm;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.domain.crm.Customer;
-
-import java.util.List;
-
-/**
- * CRM系统Service接口
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-public interface ICustomerService 
-{
-    /**
-     * 查询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 ids 需要删除的CRM系统主键集合
-     * @return 结果
-     */
-    public int deleteCustomerByIds(Long[] ids);
-
-    /**
-     * 删除CRM系统信息
-     * 
-     * @param id CRM系统主键
-     * @return 结果
-     */
-    public int deleteCustomerById(Long id);
-
-    /**
-     * 我的待办任务
-     * @param customer
-     * @return
-     */
-    List<Customer> myTaskList(Customer customer);
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/ITCustomerService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.service.crm;
-
-import com.ruoyi.system.domain.crm.TCustomer;
-
-import java.util.List;
-
-/**
- * crmService接口
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public interface ITCustomerService 
-{
-    /**
-     * 查询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 ids 需要删除的crm主键集合
-     * @return 结果
-     */
-    public int deleteTCustomerByIds(String[] ids);
-
-    /**
-     * 删除crm信息
-     * 
-     * @param id crm主键
-     * @return 结果
-     */
-    public int deleteTCustomerById(String id);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/impl/AddressServiceImpl.java

@@ -1,93 +0,0 @@
-package com.ruoyi.system.service.crm.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.crm.Address;
-import com.ruoyi.system.mapper.crm.AddressMapper;
-import com.ruoyi.system.service.crm.IAddressService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-/**
- * 账户信息Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-@Service
-public class AddressServiceImpl implements IAddressService
-{
-    @Autowired
-    private AddressMapper addressMapper;
-
-    /**
-     * 查询账户信息
-     * 
-     * @param id 账户信息主键
-     * @return 账户信息
-     */
-    @Override
-    public Address selectAddressById(Long id)
-    {
-        return addressMapper.selectAddressById(id);
-    }
-
-    /**
-     * 查询账户信息列表
-     * 
-     * @param address 账户信息
-     * @return 账户信息
-     */
-    @Override
-    public List<Address> selectAddressList(Address address)
-    {
-        return addressMapper.selectAddressList(address);
-    }
-
-    /**
-     * 新增账户信息
-     * 
-     * @param address 账户信息
-     * @return 结果
-     */
-    @Override
-    public int insertAddress(Address address)
-    {
-        return addressMapper.insertAddress(address);
-    }
-
-    /**
-     * 修改账户信息
-     * 
-     * @param address 账户信息
-     * @return 结果
-     */
-    @Override
-    public int updateAddress(Address address)
-    {
-        return addressMapper.updateAddress(address);
-    }
-
-    /**
-     * 批量删除账户信息
-     * 
-     * @param ids 需要删除的账户信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAddressByIds(Long[] ids)
-    {
-        return addressMapper.deleteAddressByIds(ids);
-    }
-
-    /**
-     * 删除账户信息信息
-     * 
-     * @param id 账户信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAddressById(Long id)
-    {
-        return addressMapper.deleteAddressById(id);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/impl/ContactsServiceImpl.java

@@ -1,104 +0,0 @@
-package com.ruoyi.system.service.crm.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.crm.Contacts;
-import com.ruoyi.system.mapper.crm.ContactsMapper;
-import com.ruoyi.system.service.crm.IContactsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 客户联系人信息Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-@Service
-public class ContactsServiceImpl implements IContactsService
-{
-    @Autowired
-    private ContactsMapper contactsMapper;
-
-    /**
-     * 查询客户联系人信息
-     * 
-     * @param id 客户联系人信息主键
-     * @return 客户联系人信息
-     */
-    @Override
-    public Contacts selectContactsById(Long id)
-    {
-        return contactsMapper.selectContactsById(id);
-    }
-
-    /**
-     * 查询客户联系人信息列表
-     * 
-     * @param contacts 客户联系人信息
-     * @return 客户联系人信息
-     */
-    @Override
-    public List<Contacts> selectContactsList(Contacts contacts)
-    {
-        return contactsMapper.selectContactsList(contacts);
-    }
-
-    /**
-     * 新增客户联系人信息
-     * 
-     * @param contacts 客户联系人信息
-     * @return 结果
-     */
-    @Override
-    public int insertContacts(Contacts contacts)
-    {
-        return contactsMapper.insertContacts(contacts);
-    }
-
-    /**
-     * 修改客户联系人信息
-     * 
-     * @param contacts 客户联系人信息
-     * @return 结果
-     */
-    @Override
-    public int updateContacts(Contacts contacts)
-    {
-        return contactsMapper.updateContacts(contacts);
-    }
-
-    /**
-     * 批量删除客户联系人信息
-     * 
-     * @param ids 需要删除的客户联系人信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteContactsByIds(Long[] ids)
-    {
-        return contactsMapper.deleteContactsByIds(ids);
-    }
-
-    /**
-     * 删除客户联系人信息信息
-     * 
-     * @param id 客户联系人信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteContactsById(Long id)
-    {
-        return contactsMapper.deleteContactsById(id);
-    }
-
-    /**
-     * 批量新增客户联系人信息
-     * @param contactsList
-     * @return
-     */
-    @Override
-    public int batchInsertContacts(List<Contacts> contactsList) {
-        return contactsMapper.batchInsertContacts(contactsList);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/impl/CrmFileServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.system.service.crm.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.crm.CrmFile;
-import com.ruoyi.system.mapper.crm.CrmFileMapper;
-import com.ruoyi.system.service.crm.ICrmFileService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * crm附件Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-@Service
-public class CrmFileServiceImpl implements ICrmFileService
-{
-    @Autowired
-    private CrmFileMapper crmFileMapper;
-
-    /**
-     * 查询crm附件
-     * 
-     * @param id crm附件主键
-     * @return crm附件
-     */
-    @Override
-    public CrmFile selectCrmFileById(Long id)
-    {
-        return crmFileMapper.selectCrmFileById(id);
-    }
-
-    /**
-     * 查询crm附件列表
-     * 
-     * @param crmFile crm附件
-     * @return crm附件
-     */
-    @Override
-    public List<CrmFile> selectCrmFileList(CrmFile crmFile)
-    {
-        return crmFileMapper.selectCrmFileList(crmFile);
-    }
-
-    /**
-     * 新增crm附件
-     * 
-     * @param crmFile crm附件
-     * @return 结果
-     */
-    @Override
-    public int insertCrmFile(CrmFile crmFile)
-    {
-        return crmFileMapper.insertCrmFile(crmFile);
-    }
-
-    /**
-     * 修改crm附件
-     * 
-     * @param crmFile crm附件
-     * @return 结果
-     */
-    @Override
-    public int updateCrmFile(CrmFile crmFile)
-    {
-        return crmFileMapper.updateCrmFile(crmFile);
-    }
-
-    /**
-     * 批量删除crm附件
-     * 
-     * @param ids 需要删除的crm附件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCrmFileByIds(Long[] ids)
-    {
-        return crmFileMapper.deleteCrmFileByIds(ids);
-    }
-
-    /**
-     * 删除crm附件信息
-     * 
-     * @param id crm附件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCrmFileById(Long id)
-    {
-        return crmFileMapper.deleteCrmFileById(id);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/impl/CustomerServiceImpl.java

@@ -1,102 +0,0 @@
-package com.ruoyi.system.service.crm.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.system.domain.crm.Customer;
-import com.ruoyi.system.mapper.crm.CustomerMapper;
-import com.ruoyi.system.service.crm.ICustomerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * CRM系统Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-@Service
-public class CustomerServiceImpl implements ICustomerService
-{
-    @Autowired
-    private CustomerMapper customerMapper;
-
-    /**
-     * 查询CRM系统
-     * 
-     * @param id CRM系统主键
-     * @return CRM系统
-     */
-    @Override
-    public Customer selectCustomerById(Long id)
-    {
-        return customerMapper.selectCustomerById(id);
-    }
-
-    /**
-     * 查询CRM系统列表
-     * 
-     * @param customer CRM系统
-     * @return CRM系统
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<Customer> selectCustomerList(Customer customer)
-    {
-        return customerMapper.selectCustomerList(customer);
-    }
-
-    /**
-     * 新增CRM系统
-     * 
-     * @param customer CRM系统
-     * @return 结果
-     */
-    @Override
-    public int insertCustomer(Customer customer)
-    {
-        return customerMapper.insertCustomer(customer);
-    }
-
-    /**
-     * 修改CRM系统
-     * 
-     * @param customer CRM系统
-     * @return 结果
-     */
-    @Override
-    public int updateCustomer(Customer customer)
-    {
-        return customerMapper.updateCustomer(customer);
-    }
-
-    /**
-     * 批量删除CRM系统
-     * 
-     * @param ids 需要删除的CRM系统主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCustomerByIds(Long[] ids)
-    {
-        return customerMapper.deleteCustomerByIds(ids);
-    }
-
-    /**
-     * 删除CRM系统信息
-     * 
-     * @param id CRM系统主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCustomerById(Long id)
-    {
-        return customerMapper.deleteCustomerById(id);
-    }
-
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<Customer> myTaskList(Customer customer) {
-        return customerMapper.myTaskList(customer);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/crm/impl/TCustomerServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.system.service.crm.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.crm.TCustomer;
-import com.ruoyi.system.mapper.crm.TCustomerMapper;
-import com.ruoyi.system.service.crm.ITCustomerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * crmService业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-@Service
-public class TCustomerServiceImpl implements ITCustomerService
-{
-    @Autowired
-    private TCustomerMapper tCustomerMapper;
-
-    /**
-     * 查询crm
-     * 
-     * @param id crm主键
-     * @return crm
-     */
-    @Override
-    public TCustomer selectTCustomerById(String id)
-    {
-        return tCustomerMapper.selectTCustomerById(id);
-    }
-
-    /**
-     * 查询crm列表
-     * 
-     * @param tCustomer crm
-     * @return crm
-     */
-    @Override
-    public List<TCustomer> selectTCustomerList(TCustomer tCustomer)
-    {
-        return tCustomerMapper.selectTCustomerList(tCustomer);
-    }
-
-    /**
-     * 新增crm
-     * 
-     * @param tCustomer crm
-     * @return 结果
-     */
-    @Override
-    public int insertTCustomer(TCustomer tCustomer)
-    {
-        return tCustomerMapper.insertTCustomer(tCustomer);
-    }
-
-    /**
-     * 修改crm
-     * 
-     * @param tCustomer crm
-     * @return 结果
-     */
-    @Override
-    public int updateTCustomer(TCustomer tCustomer)
-    {
-        return tCustomerMapper.updateTCustomer(tCustomer);
-    }
-
-    /**
-     * 批量删除crm
-     * 
-     * @param ids 需要删除的crm主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTCustomerByIds(String[] ids)
-    {
-        return tCustomerMapper.deleteTCustomerByIds(ids);
-    }
-
-    /**
-     * 删除crm信息
-     * 
-     * @param id crm主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTCustomerById(String id)
-    {
-        return tCustomerMapper.deleteTCustomerById(id);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/fg/IBloggerService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.service.fg;
-
-import com.ruoyi.system.domain.fg.Blogger;
-
-import java.util.List;
-
-/**
- * 达人数据Service接口
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-public interface IBloggerService 
-{
-    /**
-     * 查询达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 达人数据
-     */
-    public Blogger selectBloggerByAge(String age);
-
-    /**
-     * 查询达人数据列表
-     * 
-     * @param blogger 达人数据
-     * @return 达人数据集合
-     */
-    public List<Blogger> selectBloggerList(Blogger blogger);
-
-    /**
-     * 新增达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int insertBlogger(Blogger blogger);
-
-    /**
-     * 修改达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int updateBlogger(Blogger blogger);
-
-    /**
-     * 批量删除达人数据
-     * 
-     * @param ages 需要删除的达人数据主键集合
-     * @return 结果
-     */
-    public int deleteBloggerByAges(String[] ages);
-
-    /**
-     * 删除达人数据信息
-     * 
-     * @param age 达人数据主键
-     * @return 结果
-     */
-    public int deleteBloggerByAge(String age);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/fg/impl/BloggerServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.system.service.fg.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.fg.Blogger;
-import com.ruoyi.system.mapper.fg.BloggerMapper;
-import com.ruoyi.system.service.fg.IBloggerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 达人数据Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-@Service
-public class BloggerServiceImpl implements IBloggerService
-{
-    @Autowired
-    private BloggerMapper bloggerMapper;
-
-    /**
-     * 查询达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 达人数据
-     */
-    @Override
-    public Blogger selectBloggerByAge(String age)
-    {
-        return bloggerMapper.selectBloggerByAge(age);
-    }
-
-    /**
-     * 查询达人数据列表
-     * 
-     * @param blogger 达人数据
-     * @return 达人数据
-     */
-    @Override
-    public List<Blogger> selectBloggerList(Blogger blogger)
-    {
-        return bloggerMapper.selectBloggerList(blogger);
-    }
-
-    /**
-     * 新增达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    @Override
-    public int insertBlogger(Blogger blogger)
-    {
-        return bloggerMapper.insertBlogger(blogger);
-    }
-
-    /**
-     * 修改达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    @Override
-    public int updateBlogger(Blogger blogger)
-    {
-        return bloggerMapper.updateBlogger(blogger);
-    }
-
-    /**
-     * 批量删除达人数据
-     * 
-     * @param ages 需要删除的达人数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBloggerByAges(String[] ages)
-    {
-        return bloggerMapper.deleteBloggerByAges(ages);
-    }
-
-    /**
-     * 删除达人数据信息
-     * 
-     * @param age 达人数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBloggerByAge(String age)
-    {
-        return bloggerMapper.deleteBloggerByAge(age);
-    }
-}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.invest;
+
+import com.ruoyi.system.domain.invest.TProjectCompany;
+
+import java.util.List;
+
+/**
+ * 项目公司信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface ITProjectCompanyService 
+{
+    /**
+     * 查询项目公司信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 项目公司信息
+     */
+    public TProjectCompany selectTProjectCompanyById(String id);
+
+    /**
+     * 查询项目公司信息列表
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 项目公司信息集合
+     */
+    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany);
+
+    /**
+     * 新增项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    public int insertTProjectCompany(TProjectCompany tProjectCompany);
+
+    /**
+     * 修改项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    public int updateTProjectCompany(TProjectCompany tProjectCompany);
+
+    /**
+     * 批量删除项目公司信息
+     * 
+     * @param ids 需要删除的项目公司信息主键集合
+     * @return 结果
+     */
+    public int deleteTProjectCompanyByIds(String[] ids);
+
+    /**
+     * 删除项目公司信息信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 结果
+     */
+    public int deleteTProjectCompanyById(String id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.invest;
+
+import com.ruoyi.system.domain.invest.TProjectInformation;
+
+import java.util.List;
+
+/**
+ * 文件资料Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public interface ITProjectInformationService 
+{
+    /**
+     * 查询文件资料
+     * 
+     * @param id 文件资料主键
+     * @return 文件资料
+     */
+    public TProjectInformation selectTProjectInformationById(String id);
+
+    /**
+     * 查询文件资料列表
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 文件资料集合
+     */
+    public List<TProjectInformation> selectTProjectInformationList(TProjectInformation tProjectInformation);
+
+    /**
+     * 新增文件资料
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 结果
+     */
+    public int insertTProjectInformation(TProjectInformation tProjectInformation);
+
+    /**
+     * 修改文件资料
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 结果
+     */
+    public int updateTProjectInformation(TProjectInformation tProjectInformation);
+
+    /**
+     * 批量删除文件资料
+     * 
+     * @param ids 需要删除的文件资料主键集合
+     * @return 结果
+     */
+    public int deleteTProjectInformationByIds(String[] ids);
+
+    /**
+     * 删除文件资料信息
+     * 
+     * @param id 文件资料主键
+     * @return 结果
+     */
+    public int deleteTProjectInformationById(String id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.invest;
+
+import com.ruoyi.system.domain.invest.TProjectMeeting;
+
+import java.util.List;
+
+/**
+ * 会议记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface ITProjectMeetingService 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    public TProjectMeeting selectTProjectMeetingById(String id);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 会议记录集合
+     */
+    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的会议记录主键集合
+     * @return 结果
+     */
+    public int deleteTProjectMeetingByIds(String[] ids);
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    public int deleteTProjectMeetingById(String id);
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.system.service.invest.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.domain.invest.TProjectCompany;
+import com.ruoyi.system.mapper.invest.TProjectCompanyMapper;
+import com.ruoyi.system.service.invest.ITProjectCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目公司信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@Service
+public class TProjectCompanyServiceImpl implements ITProjectCompanyService
+{
+    @Autowired
+    private TProjectCompanyMapper tProjectCompanyMapper;
+
+    /**
+     * 查询项目公司信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 项目公司信息
+     */
+    @Override
+    public TProjectCompany selectTProjectCompanyById(String id)
+    {
+        return tProjectCompanyMapper.selectTProjectCompanyById(id);
+    }
+
+    /**
+     * 查询项目公司信息列表
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 项目公司信息
+     */
+    @Override
+    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany)
+    {
+        return tProjectCompanyMapper.selectTProjectCompanyList(tProjectCompany);
+    }
+
+    /**
+     * 新增项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectCompany(TProjectCompany tProjectCompany)
+    {
+        tProjectCompany.setCreateTime(DateUtils.getNowDate());
+        tProjectCompany.setId(IdUtils.fastSimpleUUID());
+        return tProjectCompanyMapper.insertTProjectCompany(tProjectCompany);
+    }
+
+    /**
+     * 修改项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectCompany(TProjectCompany tProjectCompany)
+    {
+        tProjectCompany.setUpdateTime(DateUtils.getNowDate());
+        return tProjectCompanyMapper.updateTProjectCompany(tProjectCompany);
+    }
+
+    /**
+     * 批量删除项目公司信息
+     * 
+     * @param ids 需要删除的项目公司信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectCompanyByIds(String[] ids)
+    {
+        return tProjectCompanyMapper.deleteTProjectCompanyByIds(ids);
+    }
+
+    /**
+     * 删除项目公司信息信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectCompanyById(String id)
+    {
+        return tProjectCompanyMapper.deleteTProjectCompanyById(id);
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.system.service.invest.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.domain.invest.TProjectInformation;
+import com.ruoyi.system.mapper.invest.TProjectInformationMapper;
+import com.ruoyi.system.service.invest.ITProjectInformationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文件资料Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+@Service
+public class TProjectInformationServiceImpl implements ITProjectInformationService
+{
+    @Autowired
+    private TProjectInformationMapper tProjectInformationMapper;
+
+    /**
+     * 查询文件资料
+     * 
+     * @param id 文件资料主键
+     * @return 文件资料
+     */
+    @Override
+    public TProjectInformation selectTProjectInformationById(String id)
+    {
+        return tProjectInformationMapper.selectTProjectInformationById(id);
+    }
+
+    /**
+     * 查询文件资料列表
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 文件资料
+     */
+    @Override
+    public List<TProjectInformation> selectTProjectInformationList(TProjectInformation tProjectInformation)
+    {
+        return tProjectInformationMapper.selectTProjectInformationList(tProjectInformation);
+    }
+
+    /**
+     * 新增文件资料
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectInformation(TProjectInformation tProjectInformation)
+    {
+        tProjectInformation.setCreateTime(DateUtils.getNowDate());
+        tProjectInformation.setId(IdUtils.fastSimpleUUID());
+        return tProjectInformationMapper.insertTProjectInformation(tProjectInformation);
+    }
+
+    /**
+     * 修改文件资料
+     * 
+     * @param tProjectInformation 文件资料
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectInformation(TProjectInformation tProjectInformation)
+    {
+        tProjectInformation.setUpdateTime(DateUtils.getNowDate());
+        return tProjectInformationMapper.updateTProjectInformation(tProjectInformation);
+    }
+
+    /**
+     * 批量删除文件资料
+     * 
+     * @param ids 需要删除的文件资料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectInformationByIds(String[] ids)
+    {
+        return tProjectInformationMapper.deleteTProjectInformationByIds(ids);
+    }
+
+    /**
+     * 删除文件资料信息
+     * 
+     * @param id 文件资料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectInformationById(String id)
+    {
+        return tProjectInformationMapper.deleteTProjectInformationById(id);
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.system.service.invest.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.domain.invest.TProjectMeeting;
+import com.ruoyi.system.mapper.invest.TProjectMeetingMapper;
+import com.ruoyi.system.service.invest.ITProjectMeetingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 会议记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@Service
+public class TProjectMeetingServiceImpl implements ITProjectMeetingService
+{
+    @Autowired
+    private TProjectMeetingMapper tProjectMeetingMapper;
+
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    @Override
+    public TProjectMeeting selectTProjectMeetingById(String id)
+    {
+        return tProjectMeetingMapper.selectTProjectMeetingById(id);
+    }
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 会议记录
+     */
+    @Override
+    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting)
+    {
+        return tProjectMeetingMapper.selectTProjectMeetingList(tProjectMeeting);
+    }
+
+    /**
+     * 新增会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting)
+    {
+        tProjectMeeting.setCreateTime(DateUtils.getNowDate());
+        tProjectMeeting.setId(IdUtils.fastSimpleUUID());
+        return tProjectMeetingMapper.insertTProjectMeeting(tProjectMeeting);
+    }
+
+    /**
+     * 修改会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting)
+    {
+        tProjectMeeting.setUpdateTime(DateUtils.getNowDate());
+        return tProjectMeetingMapper.updateTProjectMeeting(tProjectMeeting);
+    }
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectMeetingByIds(String[] ids)
+    {
+        return tProjectMeetingMapper.deleteTProjectMeetingByIds(ids);
+    }
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectMeetingById(String id)
+    {
+        return tProjectMeetingMapper.deleteTProjectMeetingById(id);
+    }
+}

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/TProjectCompanyMapper.xml

@@ -0,0 +1,126 @@
+<?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.invest.TProjectCompanyMapper">
+    
+    <resultMap type="TProjectCompany" id="TProjectCompanyResult">
+        <result property="id"    column="id"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="projectPoolId"    column="project_pool_id"    />
+        <result property="companyCode"    column="company_code"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="registeredCapital"    column="registered_capital"    />
+        <result property="registeredAddress"    column="registered_address"    />
+        <result property="paidCapital"    column="paid_capital"    />
+        <result property="businessAddress"    column="business_address"    />
+        <result property="actualBod"    column="actual_bod"    />
+        <result property="phone"    column="phone"    />
+        <result property="type"    column="type"    />
+        <result property="delFlag"    column="del_flag"    />
+        <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="selectTProjectCompanyVo">
+        select id, company_name, project_pool_id, company_code, start_time, end_time, registered_capital, registered_address, paid_capital, business_address, actual_bod, phone, type, del_flag, create_by, create_time, update_by, update_time from t_project_company
+    </sql>
+
+    <select id="selectTProjectCompanyList" parameterType="TProjectCompany" resultMap="TProjectCompanyResult">
+        <include refid="selectTProjectCompanyVo"/>
+        <where>  
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyCode != null  and companyCode != ''"> and company_code = #{companyCode}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="actualBod != null  and actualBod != ''"> and actual_bod = #{actualBod}</if>
+        </where>
+    </select>
+    
+    <select id="selectTProjectCompanyById" parameterType="String" resultMap="TProjectCompanyResult">
+        <include refid="selectTProjectCompanyVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTProjectCompany" parameterType="TProjectCompany">
+        insert into t_project_company
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="companyName != null">company_name,</if>
+            <if test="projectPoolId != null">project_pool_id,</if>
+            <if test="companyCode != null">company_code,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="registeredCapital != null">registered_capital,</if>
+            <if test="registeredAddress != null">registered_address,</if>
+            <if test="paidCapital != null">paid_capital,</if>
+            <if test="businessAddress != null">business_address,</if>
+            <if test="actualBod != null">actual_bod,</if>
+            <if test="phone != null">phone,</if>
+            <if test="type != null">type,</if>
+            <if test="delFlag != null">del_flag,</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="companyName != null">#{companyName},</if>
+            <if test="projectPoolId != null">#{projectPoolId},</if>
+            <if test="companyCode != null">#{companyCode},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="registeredCapital != null">#{registeredCapital},</if>
+            <if test="registeredAddress != null">#{registeredAddress},</if>
+            <if test="paidCapital != null">#{paidCapital},</if>
+            <if test="businessAddress != null">#{businessAddress},</if>
+            <if test="actualBod != null">#{actualBod},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="type != null">#{type},</if>
+            <if test="delFlag != null">#{delFlag},</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="updateTProjectCompany" parameterType="TProjectCompany">
+        update t_project_company
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="projectPoolId != null">project_pool_id = #{projectPoolId},</if>
+            <if test="companyCode != null">company_code = #{companyCode},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="registeredCapital != null">registered_capital = #{registeredCapital},</if>
+            <if test="registeredAddress != null">registered_address = #{registeredAddress},</if>
+            <if test="paidCapital != null">paid_capital = #{paidCapital},</if>
+            <if test="businessAddress != null">business_address = #{businessAddress},</if>
+            <if test="actualBod != null">actual_bod = #{actualBod},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</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="deleteTProjectCompanyById" parameterType="String">
+        delete from t_project_company where id = #{id}
+    </delete>
+
+    <delete id="deleteTProjectCompanyByIds" parameterType="String">
+        delete from t_project_company where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,105 @@
+<?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.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"    />
+        <result property="remark"    column="remark"    />
+        <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="selectTProjectInformationVo">
+        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">
+        <include refid="selectTProjectInformationVo"/>
+        <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>
+    
+    <select id="selectTProjectInformationById" parameterType="String" resultMap="TProjectInformationResult">
+        <include refid="selectTProjectInformationVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTProjectInformation" parameterType="TProjectInformation">
+        insert into t_project_information
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <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>
+            <if test="remark != null">remark,</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="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>
+            <if test="remark != null">#{remark},</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="updateTProjectInformation" parameterType="TProjectInformation">
+        update t_project_information
+        <trim prefix="SET" suffixOverrides=",">
+            <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>
+            <if test="remark != null">remark = #{remark},</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="deleteTProjectInformationById" parameterType="String">
+        delete from t_project_information where id = #{id}
+    </delete>
+
+    <delete id="deleteTProjectInformationByIds" parameterType="String">
+        delete from t_project_information where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,114 @@
+<?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.invest.TProjectMeetingMapper">
+    
+    <resultMap type="TProjectMeeting" id="TProjectMeetingResult">
+        <result property="id"    column="id"    />
+        <result property="meetingTheme"    column="meeting_theme"    />
+        <result property="meetingCode"    column="meeting_code"    />
+        <result property="meetingType"    column="meeting_type"    />
+        <result property="projectPoolId"    column="project_pool_id"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="place"    column="place"    />
+        <result property="promoter"    column="promoter"    />
+        <result property="participants"    column="participants"    />
+        <result property="delFlag"    column="del_flag"    />
+        <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="selectTProjectMeetingVo">
+        select id, meeting_theme, meeting_code, meeting_type, project_pool_id, start_time, end_time, place, promoter, participants, del_flag, create_by, create_time, update_by, update_time from t_project_meeting
+    </sql>
+
+    <select id="selectTProjectMeetingList" parameterType="TProjectMeeting" resultMap="TProjectMeetingResult">
+        <include refid="selectTProjectMeetingVo"/>
+        <where>  
+            <if test="meetingTheme != null  and meetingTheme != ''"> and meeting_theme = #{meetingTheme}</if>
+            <if test="meetingCode != null  and meetingCode != ''"> and meeting_code = #{meetingCode}</if>
+            <if test="meetingType != null  and meetingType != ''"> and meeting_type = #{meetingType}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTProjectMeetingById" parameterType="String" resultMap="TProjectMeetingResult">
+        <include refid="selectTProjectMeetingVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTProjectMeeting" parameterType="TProjectMeeting">
+        insert into t_project_meeting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="meetingTheme != null">meeting_theme,</if>
+            <if test="meetingCode != null">meeting_code,</if>
+            <if test="meetingType != null">meeting_type,</if>
+            <if test="projectPoolId != null">project_pool_id,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="place != null">place,</if>
+            <if test="promoter != null">promoter,</if>
+            <if test="participants != null">participants,</if>
+            <if test="delFlag != null">del_flag,</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="meetingTheme != null">#{meetingTheme},</if>
+            <if test="meetingCode != null">#{meetingCode},</if>
+            <if test="meetingType != null">#{meetingType},</if>
+            <if test="projectPoolId != null">#{projectPoolId},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="place != null">#{place},</if>
+            <if test="promoter != null">#{promoter},</if>
+            <if test="participants != null">#{participants},</if>
+            <if test="delFlag != null">#{delFlag},</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="updateTProjectMeeting" parameterType="TProjectMeeting">
+        update t_project_meeting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="meetingTheme != null">meeting_theme = #{meetingTheme},</if>
+            <if test="meetingCode != null">meeting_code = #{meetingCode},</if>
+            <if test="meetingType != null">meeting_type = #{meetingType},</if>
+            <if test="projectPoolId != null">project_pool_id = #{projectPoolId},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="promoter != null">promoter = #{promoter},</if>
+            <if test="participants != null">participants = #{participants},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</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="deleteTProjectMeetingById" parameterType="String">
+        delete from t_project_meeting where id = #{id}
+    </delete>
+
+    <delete id="deleteTProjectMeetingByIds" parameterType="String">
+        delete from t_project_meeting where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>