修改实体类project和company

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -32,7 +32,7 @@ public class CompanyController {
     /**
      * 添加/修改公司
      *
-     * @param company 参数：companyName 公司名 companyAddress 公司地址
+     * @param company 参数：companyName 公司名 companyAddress 公司地址 companyType 公司类型 0-资产方 1-客户
      * @param flag    0-添加，1-修改
      * @return
      */

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectFileController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-07-30
  */
 @RestController
-@RequestMapping("/project-file")
+@RequestMapping("/projectfile")
 public class ProjectFileController {
 
 }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Company.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-26
+ * @since 2019-08-01
  */
 @TableName("tb_company")
 public class Company extends Model<Company> {
@@ -38,6 +38,12 @@ public class Company extends Model<Company> {
     @TableField("company_address")
     private String companyAddress;
 
+    /**
+     * 公司类型 0-资产方 1-生产方
+     */
+    @TableField("company_type")
+    private Integer companyType;
+
 
     public Integer getId() {
         return id;
@@ -63,6 +69,14 @@ public class Company extends Model<Company> {
         this.companyAddress = companyAddress;
     }
 
+    public Integer getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(Integer companyType) {
+        this.companyType = companyType;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -74,6 +88,7 @@ public class Company extends Model<Company> {
         "id=" + id +
         ", companyName=" + companyName +
         ", companyAddress=" + companyAddress +
+        ", companyType=" + companyType +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Project.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-31
+ * @since 2019-08-01
  */
 @TableName("tb_project")
 public class Project extends Model<Project> {
@@ -45,14 +43,12 @@ public class Project extends Model<Project> {
      * 开始时间
      */
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**
@@ -91,23 +87,10 @@ public class Project extends Model<Project> {
     @TableField("owner_company_name")
     private String ownerCompanyName;
 
-    /**
-     * 模具生产方公司id
-     */
-    @TableField("customer_company")
-    private Integer customerCompany;
-
-    /**
-     * 模具生产方公司名称
-     */
-    @TableField("customer_company_name")
-    private String customerCompanyName;
-
     /**
      * 创建时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -211,22 +194,6 @@ public class Project extends Model<Project> {
         this.ownerCompanyName = ownerCompanyName;
     }
 
-    public Integer getCustomerCompany() {
-        return customerCompany;
-    }
-
-    public void setCustomerCompany(Integer customerCompany) {
-        this.customerCompany = customerCompany;
-    }
-
-    public String getCustomerCompanyName() {
-        return customerCompanyName;
-    }
-
-    public void setCustomerCompanyName(String customerCompanyName) {
-        this.customerCompanyName = customerCompanyName;
-    }
-
     public LocalDateTime getIndate() {
         return indate;
     }
@@ -270,8 +237,6 @@ public class Project extends Model<Project> {
         ", isDelete=" + isDelete +
         ", ownerCompany=" + ownerCompany +
         ", ownerCompanyName=" + ownerCompanyName +
-        ", customerCompany=" + customerCompany +
-        ", customerCompanyName=" + customerCompanyName +
         ", indate=" + indate +
         ", managerId=" + managerId +
         ", manager=" + manager +

cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -7,17 +7,19 @@
         <id column="id" property="id" />
         <result column="company_name" property="companyName" />
         <result column="company_address" property="companyAddress" />
+        <result column="company_type" property="companyType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, company_address
+        id, company_name, company_address, company_type
     </sql>
+
     <select id="getListByKeyName" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from
-          tb_company
+        tb_company
         <where>
             <if test="keyName != null and keyName != ''">
                 company_name like concat('%',#{keyName},'%')

cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -15,8 +15,6 @@
         <result column="is_delete" property="isDelete" />
         <result column="owner_company" property="ownerCompany" />
         <result column="owner_company_name" property="ownerCompanyName" />
-        <result column="customer_company" property="customerCompany" />
-        <result column="customer_company_name" property="customerCompanyName" />
         <result column="indate" property="indate" />
         <result column="manager_id" property="managerId" />
         <result column="manager" property="manager" />
@@ -24,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, customer_company, customer_company_name, indate, manager_id, manager
+        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, indate, manager_id, manager
     </sql>
 
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
@@ -34,8 +32,6 @@
         <result column="creator_id" property="creatorId" />
         <result column="creator" property="creator" />
         <result column="is_delete" property="isDelete" />
-        <result column="customer_company" property="customerCompany" />
-        <result column="customer_company_name" property="customerCompanyName" />
         <result column="indate" property="indate" />
         <result column="manager_id" property="managerId" />
         <result column="manager" property="manager" />
@@ -49,8 +45,8 @@
     <select id="getProjectListByUid" resultMap="BaseResultMap">
         select
         p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
-        p.owner_company_name owner_company_name,p.customer_company customer_company,
-        p.customer_company_name customer_company_name,p.charger charger,p.indate indate
+        p.owner_company_name owner_company_name,
+        p.indate indate
         from
         tb_project p
         left join tb_project_user pu
@@ -68,7 +64,7 @@
     <select id="getProjectById" resultMap="BaseResultMapVO">
     select
         p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id, p.creator creator, p.owner_company owner_company,
-        p.owner_company_name owner_company_name,p.customer_company customer_company, p.customer_company_name customer_company_name, p.indate indate,
+        p.owner_company_name owner_company_name,p.indate indate,
         m.model_no model_no,m.model_name model_name
     from
         tb_project p