数据字段修复

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/FollowUpLog.java

@@ -25,133 +25,133 @@ public class FollowUpLog extends TenantEntity {
     /**
      * 主键，自增ID
      */
-    @TableId(value = "Id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 记录编号
      */
-    @TableField("RecordsNo")
+    @TableField("records_no")
     private String recordsNo;
 
     /**
      * 数据类型
      */
-    @TableField("DataType")
+    @TableField("data_type")
     private Integer dataType;
 
     /**
      * 对象编号
      */
-    @TableField("ObjectNo")
+    @TableField("object_no")
     private String objectNo;
 
     /**
      * 客户编号
      */
-    @TableField("CustomerNo")
+    @TableField("customer_no")
     private String customerNo;
 
     /**
      * 客户名称
      */
-    @TableField("CustomerName")
+    @TableField("customer_name")
     private String customerName;
 
     /**
      * 目标对象编号
      */
-    @TableField("GoalObjectNo")
+    @TableField("goal_object_no")
     private String goalObjectNo;
 
     /**
      * 目标对象
      */
-    @TableField("GoalObject")
+    @TableField("goal_object")
     private String goalObject;
 
     /**
      * 部门
      */
-    @TableField("Department")
+    @TableField("department")
     private String department;
 
     /**
      * 行业
      */
-    @TableField("Profession")
+    @TableField("profession")
     private String profession;
 
     /**
      * 业务员
      */
-    @TableField("Salesman")
+    @TableField("salesman")
     private String salesman;
 
     /**
      * 拜访人编号
      */
-    @TableField("VisitorNo")
+    @TableField("visitor_no")
     private Long visitorNo;
 
     /**
      * 拜访人
      */
-    @TableField("Visitor")
+    @TableField("visitor")
     private String visitor;
 
     /**
      * 跟进人编号
      */
-    @TableField("FollowPeopleNo")
+    @TableField("follow_people_no")
     private String followPeopleNo;
 
     /**
      * 跟进人姓名
      */
-    @TableField("FollowPeopleName")
+    @TableField("follow_people_name")
     private String followPeopleName;
 
     /**
      * 拜访类型代码
      */
-    @TableField("CallTypeCode")
+    @TableField("call_type_code")
     private String callTypeCode;
 
     /**
      * 拜访日期
      */
-    @TableField("CallDate")
+    @TableField("call_date")
     private Date callDate;
 
     /**
      * 下次拜访日期
      */
-    @TableField("NextCallDate")
+    @TableField("next_call_date")
     private Date nextCallDate;
 
     /**
      * 拜访目的
      */
-    @TableField("CallAim")
+    @TableField("call_aim")
     private String callAim;
 
     /**
      * 跟进情况
      */
-    @TableField("FollowUpCondition")
+    @TableField("follow_up_condition")
     private String followUpCondition;
 
     /**
      * 记录图片
      */
-    @TableField("RecordPicture")
+    @TableField("record_picture")
     private String recordPicture;
 
     /**
      * 文件编号
      */
-    @TableField("FileNo")
+    @TableField("file_no")
     private String fileNo;
 
     /**
@@ -164,7 +164,7 @@ public class FollowUpLog extends TenantEntity {
      * 是否删除（0-否，1-是）
      */
     @TableLogic(value = "0", delval = "1")
-    @TableField("IsDelete")
+    @TableField("is_delete")
     private Integer isDelete = 0;
 
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/OperationLog.java

@@ -24,62 +24,62 @@ public class OperationLog extends TenantEntity {
     /**
      * 主键，自增ID
      */
-    @TableId(value = "Id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 数据类型
      */
-    @TableField("DataType")
+    @TableField("data_type")
     private Integer dataType;
 
     /**
      * 对象编号
      */
-    @TableField("ObjectNo")
+    @TableField("object_no")
     private String objectNo;
 
     /**
      * 操作人
      */
-    @TableField("Operator")
+    @TableField("operator")
     private String operator;
 
     /**
      * 操作类型
      */
-    @TableField("ActionType")
+    @TableField("action_type")
     private Integer actionType;
 
     /**
      * 目标对象
      */
-    @TableField("TargetObject")
+    @TableField("target_object")
     private String targetObject;
 
     /**
      * 操作模块
      */
-    @TableField("ActionModule")
+    @TableField("action_module")
     private Integer actionModule;
 
     /**
      * 操作详情
      */
-    @TableField("ActionDetails")
+    @TableField("action_details")
     private String actionDetails;
 
     /**
      * 客户端信息
      */
-    @TableField("ClientInformation")
+    @TableField("client_information")
     private String clientInformation;
 
     /**
      * 是否删除（0-否，1-是）
      */
     @TableLogic(value = "0", delval = "1")
-    @TableField("IsDelete")
+    @TableField("is_delete")
     private Integer isDelete = 0;
 
     /**

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/SalesAnnualFinalization.java

@@ -27,273 +27,273 @@ public class SalesAnnualFinalization extends TenantEntity {
     /**
      * 主键ID
      */
-    @TableId(value = "Id")
+    @TableId(value = "id")
     private Long id;
 
     /**
      * 项目编号
      */
-    @TableField(value = "ProjectNo")
+    @TableField(value = "project_no")
     private String projectNo;
 
     /**
      * 公司编号
      */
-    @TableField(value = "CompanyNo")
+    @TableField(value = "company_no")
     private String companyNo;
 
     /**
      * 项目名称
      */
-    @TableField(value = "ProjectName")
+    @TableField(value = "project_name")
     private String projectName;
 
     /**
      * 项目状态
      */
-    @TableField(value = "ProjectStatus")
+    @TableField(value = "project_status")
     private Integer projectStatus;
 
     /**
      * 业务类型
      */
-    @TableField(value = "BusinessType")
+    @TableField(value = "business_type")
     private Integer businessType;
 
     /**
      * 项目级别
      */
-    @TableField(value = "ProjectLevel")
+    @TableField(value = "project_level")
     private Integer projectLevel;
 
     /**
      * 客户编号
      */
-    @TableField(value = "CustomNo")
+    @TableField(value = "custom_no")
     private String customNo;
 
     /**
      * 客户名称
      */
-    @TableField(value = "CustomName")
+    @TableField(value = "custom_name")
     private String customName;
 
     /**
      * 行业
      */
-    @TableField(value = "Profession")
+    @TableField(value = "profession")
     private Integer profession;
 
     /**
      * 部门编号
      */
-    @TableField(value = "DeptNo")
+    @TableField(value = "dept_no")
     private String deptNo;
 
     /**
      * 业务员
      */
-    @TableField(value = "Salesman")
+    @TableField(value = "salesman")
     private String salesman;
 
     /**
      * 客服
      */
-    @TableField(value = "CustomService")
+    @TableField(value = "custom_service")
     private String customService;
 
     /**
      * 签约日期
      */
-    @TableField(value = "SignDate")
+    @TableField(value = "sign_date")
     private Date signDate;
 
     /**
      * 项目金额
      */
-    @TableField(value = "Amount")
+    @TableField(value = "amount")
     private BigDecimal amount;
 
     /**
      * 入围费
      */
-    @TableField(value = "EntryFee")
+    @TableField(value = "entry_fee")
     private BigDecimal entryFee;
 
     /**
      * 投标保证金
      */
-    @TableField(value = "BidBond")
+    @TableField(value = "bid_bond")
     private BigDecimal bidBond;
 
     /**
      * 保证金状态
      */
-    @TableField(value = "BidBondStatus")
+    @TableField(value = "bid_bond_status")
     private Integer bidBondStatus;
 
     /**
      * 招标日期
      */
-    @TableField(value = "TenderDate")
+    @TableField(value = "tender_date")
     private Date tenderDate;
 
     /**
      * 中标率
      */
-    @TableField(value = "WinningRate")
+    @TableField(value = "winning_rate")
     private Double winningRate;
 
     /**
      * 报名截止日期
      */
-    @TableField(value = "SignUpDeadline")
+    @TableField(value = "sign_up_deadline")
     private Date signUpDeadline;
 
     /**
      * 投标截止日期
      */
-    @TableField(value = "TenderDeadline")
+    @TableField(value = "tender_deadline")
     private Date tenderDeadline;
 
     /**
      * 标准周期
      */
-    @TableField(value = "StandardPeriod")
+    @TableField(value = "standard_period")
     private Double standardPeriod;
 
     /**
      * 入围类型
      */
-    @TableField(value = "ShortlistedType")
+    @TableField(value = "shortlisted_type")
     private Integer shortlistedType;
 
     /**
      * 招标类型
      */
-    @TableField(value = "BiddingType")
+    @TableField(value = "bidding_type")
     private Integer biddingType = 1;
 
     /**
      * 招标代理机构
      */
-    @TableField(value = "BiddingAgency")
+    @TableField(value = "bidding_agency")
     private String biddingAgency;
 
     /**
      * 代理联系人
      */
-    @TableField(value = "AgencyContact")
+    @TableField(value = "agency_contact")
     private String agencyContact;
 
     /**
      * 项目描述
      */
-    @TableField(value = "ProjectDesc")
+    @TableField(value = "project_desc")
     private String projectDesc;
 
     /**
      * 负责人ID
      */
-    @TableField(value = "Leader")
+    @TableField(value = "leader")
     private Long leader;
 
     /**
      * 负责人名称
      */
-    @TableField(value = "LeaderName")
+    @TableField(value = "leader_name")
     private String leaderName;
 
     /**
      * 文件编号
      */
-    @TableField(value = "FileNo")
+    @TableField(value = "file_no")
     private String fileNo;
 
     /**
      * 产品支持
      */
-    @TableField(value = "ProductSupport")
+    @TableField(value = "product_support")
     private String productSupport;
 
     /**
      * 是否删除 0=否 1=是
      */
     @TableLogic
-    @TableField(value = "IsDelete")
+    @TableField(value = "is_delete")
     private Integer isDelete;
 
 
     /**
      * 项目进度
      */
-    @TableField(value = "ProjectSchedule")
+    @TableField(value = "project_schedule")
     private String projectSchedule;
 
     /**
      * 投标周期类型
      */
-    @TableField(value = "BidPeriodType")
+    @TableField(value = "bid_period_type")
     private Integer bidPeriodType;
 
     /**
      * 下次招标时间
      */
-    @TableField(value = "NextBiddingTime")
+    @TableField(value = "next_bidding_time")
     private Date nextBiddingTime;
 
     /**
      * 入围类型 (FinalizationType)
      */
-    @TableField(value = "FinalizationType")
+    @TableField(value = "finalization_type")
     private Integer finalizationType;
 
     /**
      * 提前通知天数
      */
-    @TableField(value = "NoticeAdvanceDays")
+    @TableField(value = "notice_advance_days")
     private Integer noticeAdvanceDays;
 
     /**
      * 是否提前通知
      */
-    @TableField(value = "IsNoticeAdvance")
+    @TableField(value = "is_notice_advance")
     private Integer isNoticeAdvance;
 
     /**
      * 项目等级
      */
-    @TableField(value = "ProjectGrade")
+    @TableField(value = "project_grade")
     private String projectGrade;
 
     /**
      * 条件
      */
-    @TableField(value = "`Condition`")
+    @TableField(value = "`condition`")
     private String condition;
 
     /**
      * 招标链接
      */
-    @TableField(value = "BiddingLink")
+    @TableField(value = "bidding_link")
     private String biddingLink;
 
     /**
      * 平台名称
      */
-    @TableField(value = "PlatformName")
+    @TableField(value = "platform_name")
     private String platformName;
 
     /**
      * 平台链接
      */
-    @TableField(value = "PlatformLink")
+    @TableField(value = "platform_link")
     private String platformLink;
 
     /**
      * 服务时间
      */
-    @TableField(value = "ServiceTime")
+    @TableField(value = "service_time")
     private String serviceTime;
 
 }

ruoyi-modules/ruoyi-customer/src/main/resources/mapper/customer/SalesAnnualFinalizationMapper.xml

@@ -5,41 +5,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="org.dromara.customer.mapper.SalesAnnualFinalizationMapper">
 
     <select id="selectSalesAnnualFinalizationList" resultType="org.dromara.customer.domain.vo.SalesAnnualFinalizationVo">
-        SELECT s.*, d.dept_name AS deptName
+        SELECT s.*, d.dept_name AS deptName, ic.industry_category_name AS industryName
         FROM salesannualfinalization s
-        LEFT JOIN com_staff cs ON s.Leader = cs.staff_id
+        LEFT JOIN com_staff cs ON s.leader = cs.staff_id
         LEFT JOIN sys_dept d ON cs.dept_id = d.dept_id
+        LEFT JOIN customer_info ci ON s.custom_no = ci.customer_no
+        LEFT JOIN industry_category ic ON ci.industry_category_id = ic.id
         <where>
-            s.IsDelete = 0
+            s.is_delete = 0
             <if test="bo.projectName != null and bo.projectName != ''">
-                AND s.ProjectName LIKE concat('%', #{bo.projectName}, '%')
+                AND s.project_name LIKE concat('%', #{bo.projectName}, '%')
             </if>
             <if test="bo.companyNo != null and bo.companyNo != ''">
-                AND s.CompanyNo = #{bo.companyNo}
+                AND s.company_no = #{bo.companyNo}
             </if>
             <if test="bo.customName != null and bo.customName != ''">
-                AND s.CustomName LIKE concat('%', #{bo.customName}, '%')
+                AND s.custom_name LIKE concat('%', #{bo.customName}, '%')
             </if>
             <if test="bo.leader != null">
-                AND s.Leader = #{bo.leader}
+                AND s.leader = #{bo.leader}
             </if>
             <if test="bo.deptNo != null and bo.deptNo != ''">
-                AND (s.DeptNo = #{bo.deptNo} OR cs.dept_id = #{bo.deptNo})
+                AND (s.dept_no = #{bo.deptNo} OR cs.dept_id = #{bo.deptNo})
             </if>
             <if test="bo.projectStatus != null">
-                AND s.ProjectStatus = #{bo.projectStatus}
+                AND s.project_status = #{bo.projectStatus}
             </if>
             <if test="bo.projectLevel != null">
-                AND s.ProjectLevel = #{bo.projectLevel}
+                AND s.project_level = #{bo.projectLevel}
             </if>
             <if test="bo.businessType != null">
-                AND s.BusinessType = #{bo.businessType}
+                AND s.business_type = #{bo.businessType}
             </if>
             <if test="bo.finalizationType != null">
-                AND s.FinalizationType = #{bo.finalizationType}
+                AND s.finalization_type = #{bo.finalizationType}
             </if>
             <if test="bo.productSupport != null and bo.productSupport != ''">
-                AND s.ProductSupport = #{bo.productSupport}
+                AND s.product_support = #{bo.productSupport}
             </if>
             ${bo.params.dataScope}
         </where>