Merge branch 'master' of http://gitlab.2haohro.com/private-group/hrotooa

01c79af6 · 李志平 · b93952d0 · 79537a3e · 01c79af6 · 01c79af6
Commit 01c79af6 authored Mar 23, 2021 by 李志平
5 changed files
--- a/src/main/java/com/dianmi/Application.java
+++ b/src/main/java/com/dianmi/Application.java
 package com.dianmi;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @EnableDiscoveryClient
 @SpringBootApplication
+@MapperScan("com.dianmi.mapper")
 public class Application {
    public static void main(String[] args) {

--- a/src/main/java/com/dianmi/controller/CustProjectController.java
+++ b/src/main/java/com/dianmi/controller/CustProjectController.java
 package com.dianmi.controller;
+import com.dianmi.entity.CustProject;
+import com.dianmi.interfaces.CustProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.stereotype.Controller;
+import java.util.List;
 /**
 * <p>
 * 项目表 前端控制器
@@ -18,9 +23,12 @@ import org.springframework.stereotype.Controller;
 @RequestMapping("/cust-project")
 public class CustProjectController {
+    @Autowired
+    private CustProjectService custProjectService;
    @GetMapping("/getProjectList")
    public String getActionTest() {
+        List<CustProject> list = custProjectService.list();
        System.out.println("getActionTest---");
        return "getActionTest";
    }

--- a/src/main/java/com/dianmi/entity/CustProject.java
+++ b/src/main/java/com/dianmi/entity/CustProject.java
@@ -25,169 +25,169 @@ public class CustProject extends Model<CustProject> {
     */
      private String id;
-    /**
+//    /**
-     * 客户ID
+//     * 客户ID
-     */
+//     */
-    private Long customerId;
+//    private String customerId;
+//
-    /**
+//    /**
-     * 父项目ID
+//     * 父项目ID
-     */
+//     */
-    private Long parentId;
+//    private Long parentId;
+//
-    /**
+//    /**
-     * 签约工单ID
+//     * 签约工单ID
-     */
+//     */
-    private Long woId;
+//    private Long woId;
+//
-    /**
+//    /**
-     * 项目负责人账号（父项目才有）
+//     * 项目负责人账号（父项目才有）
-     */
+//     */
-    private String managerAccount;
+//    private String managerAccount;
+//
-    /**
+//    /**
-     * 项目负责人名称（父项目才有）
+//     * 项目负责人名称（父项目才有）
-     */
+//     */
-    private String managerName;
+//    private String managerName;
+//
-    /**
+//    /**
-     * 项目名称
+//     * 项目名称
-     */
+//     */
-    private String projectName;
+//    private String projectName;
+//
-    /**
+//    /**
-     * 项目编码
+//     * 项目编码
-     */
+//     */
-    private String projectCode;
+//    private String projectCode;
+//
-    /**
+//    /**
-     * 产品类型编码
+//     * 产品类型编码
-     */
+//     */
-    private String businessTypeCode;
+//    private String businessTypeCode;
+//
-    /**
+//    /**
-     * 产品类型名称
+//     * 产品类型名称
-     */
+//     */
-    private String businessTypeName;
+//    private String businessTypeName;
+//
-    /**
+//    /**
-     * 签约公司ID
+//     * 签约公司ID
-     */
+//     */
-    private Integer signCompanyId;
+//    private Integer signCompanyId;
+//
-    /**
+//    /**
-     * 签约公司
+//     * 签约公司
-     */
+//     */
-    private String signCompanyName;
+//    private String signCompanyName;
+//
-    /**
+//    /**
-     * 是否排他
+//     * 是否排他
-     */
+//     */
-    private String isExclusive;
+//    private String isExclusive;
+//
-    /**
+//    /**
-     * 是否排他说明
+//     * 是否排他说明
-     */
+//     */
-    private String exclusiveDescription;
+//    private String exclusiveDescription;
+//
-    /**
+//    /**
-     * NC编码
+//     * NC编码
-     */
+//     */
-    private String ncCode;
+//    private String ncCode;
+//
-    /**
+//    /**
-     * 子项目接口人
+//     * 子项目接口人
-     */
+//     */
-    private String interfaceMan;
+//    private String interfaceMan;
+//
-    /**
+//    /**
-     * 子项目接口人属地
+//     * 子项目接口人属地
-     */
+//     */
-    private String interfaceManTerritory;
+//    private String interfaceManTerritory;
+//
-    private String interfaceManCity;
+//    private String interfaceManCity;
+//
-    private String interfaceManProvince;
+//    private String interfaceManProvince;
+//
-    /**
+//    /**
-     * 子项目接口人联系电话
+//     * 子项目接口人联系电话
-     */
+//     */
-    private String interfaceManPhone;
+//    private String interfaceManPhone;
+//
-    /**
+//    /**
-     * 子项目接口人邮箱
+//     * 子项目接口人邮箱
-     */
+//     */
-    private String interfaceManEmail;
+//    private String interfaceManEmail;
+//
-    /**
+//    /**
-     * 其他备注
+//     * 其他备注
-     */
+//     */
-    private String remark;
+//    private String remark;
+//
-    /**
+//    /**
-     * 是否需要招聘
+//     * 是否需要招聘
-     */
+//     */
-    private String ifNeedRecruitment;
+//    private String ifNeedRecruitment;
+//
-    /**
+//    /**
-     * 招聘方
+//     * 招聘方
-     */
+//     */
-    private String recruiter;
+//    private String recruiter;
+//
-    /**
+//    /**
-     * 服务状态
+//     * 服务状态
-     */
+//     */
-    private Boolean serviceStatus;
+//    private Boolean serviceStatus;
+//
-    /**
+//    /**
-     * e家银工资自动到卡
+//     * e家银工资自动到卡
-     */
+//     */
-    private Boolean ejyWageAutoCard;
+//    private Boolean ejyWageAutoCard;
+//
-    /**
+//    /**
-     * 数据来源
+//     * 数据来源
-     */
+//     */
-    private String dataSource;
+//    private String dataSource;
+//
-    /**
+//    /**
-     * 服务方式
+//     * 服务方式
-     */
+//     */
-    private String serviceMode;
+//    private String serviceMode;
+//
-    /**
+//    /**
-     * 服务地点-省份
+//     * 服务地点-省份
-     */
+//     */
-    private String serviceProvince;
+//    private String serviceProvince;
+//
-    /**
+//    /**
-     * 服务地点-城市
+//     * 服务地点-城市
-     */
+//     */
-    private String serviceCity;
+//    private String serviceCity;
+//
-    /**
+//    /**
-     * 大区code
+//     * 大区code
-     */
+//     */
-    private String areaCode;
+//    private String areaCode;
+//
-    /**
+//    /**
-     * 税率
+//     * 税率
-     */
+//     */
-    private String taxRate;
+//    private String taxRate;
+//
-    /**
+//    /**
-     * 创建时间
+//     * 创建时间
-     */
+//     */
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
+//
-    /**
+//    /**
-     * 更新时间
+//     * 更新时间
-     */
+//     */
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
+//
-    /**
+//    /**
-     * 销售过程ID
+//     * 销售过程ID
-     */
+//     */
-    private String custSaleProcessId;
+//    private String custSaleProcessId;
    @Override

--- a/src/main/java/com/dianmi/mapper/CustProjectMapper.xml
+++ b/src/main/java/com/dianmi/mapper/CustProjectMapper.xml
+<?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.dianmi.mapper.CustProjectMapper">
+    <resultMap id="BaseResultMap" type="com.dianmi.entity.CustProject">
+        <id column="id" property="id"/>
+<!--        <result column="customer_id" property="customerId"/>-->
+<!--        <result column="parent_id" property="parentId"/>-->
+<!--        <result column="wo_id" property="woId"/>-->
+<!--        <result column="project_name" property="projectName"/>-->
+<!--        <result column="project_code" property="projectCode"/>-->
+<!--        <result column="business_type_name" property="businessTypeName"/>-->
+<!--        <result column="business_type_code" property="businessTypeCode"/>-->
+<!--        <result column="sign_company_id" property="signCompanyId"/>-->
+<!--        <result column="sign_company_name" property="signCompanyName"/>-->
+<!--        <result column="is_exclusive" property="isExclusive"/>-->
+<!--        <result column="exclusive_description" property="exclusiveDescription"/>-->
+<!--        <result column="nc_code" property="ncCode"/>-->
+<!--        <result column="interface_man" property="interfaceMan"/>-->
+<!--        <result column="interface_man_territory" property="interfaceManTerritory"/>-->
+<!--        <result column="interface_man_phone" property="interfaceManPhone"/>-->
+<!--        <result column="interface_man_email" property="interfaceManEmail"/>-->
+<!--        <result column="remark" property="remark"/>-->
+<!--        <result column="if_need_recruitment" property="ifNeedRecruitment"/>-->
+<!--        <result column="recruiter" property="recruiter"/>-->
+<!--        <result column="service_status" property="serviceStatus"/>-->
+<!--        <result column="ejy_wage_auto_card" property="ejyWageAutoCard"/>-->
+<!--        <result column="data_source" property="dataSource"/>-->
+<!--        <result column="service_mode" property="serviceMode"/>-->
+<!--        <result column="service_province" property="serviceProvince"/>-->
+<!--        <result column="service_city" property="serviceCity"/>-->
+<!--        <result column="tax_rate" property="taxRate"/>-->
+<!--        <result column="create_time" property="createTime"/>-->
+<!--        <result column="update_time" property="updateTime"/>-->
+    </resultMap>
+    <sql id="Base_Column_List">
+        id,
+        customer_id,
+        parent_id,
+        wo_id,
+        project_name,
+        project_code,
+        business_type_name,
+        business_type_code,
+        sign_company_id,
+        sign_company_name,
+        is_exclusive,
+        exclusive_description,
+        nc_code,
+        interface_man,
+        interface_man_territory,
+        interface_man_phone,
+        interface_man_email,
+        remark,
+        if_need_recruitment,
+        recruiter,
+        service_status,
+        ejy_wage_auto_card,
+        data_source,
+        service_mode,
+        service_province,
+        service_city,
+        tax_rate,
+        create_time,
+        update_time
+    </sql>
+</mapper>
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -5,7 +5,7 @@ server:
 #spring配置
 spring:
  application:
-    name: hro-to-oa
+    name: crm-service
  cloud:
    nacos:
      discovery: