bonus
/
ahdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

继承baseEntity类修改

This commit is contained in:
bonus 2024-08-12 14:01:49 +08:00
parent d846cdda5a
commit 7831c1ebf5
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.api.domain; package com.bonus.base.api.domain;
import com.bonus.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -12,7 +13,7 @@ import lombok.Data;
* @author bonus * @author bonus
*/ */
@Data @Data
public class BmCustomer implements Serializable { public class BmCustomer extends BaseEntity implements Serializable {
/** /**
* *
*/ */

3
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.api.domain; package com.bonus.base.api.domain;
import com.bonus.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
@ -15,7 +16,7 @@ import lombok.Data;
@ApiModel(description="往来单位类型") @ApiModel(description="往来单位类型")
@Data @Data
public class BmCustomerType implements Serializable { public class BmCustomerType extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

40
bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml
View File

@ -14,7 +14,7 @@
<result column="phone" jdbcType="VARCHAR" property="phone" /> <result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="fax" jdbcType="VARCHAR" property="fax" /> <result column="fax" jdbcType="VARCHAR" property="fax" />
<result column="address" jdbcType="VARCHAR" property="address" /> <result column="address" jdbcType="VARCHAR" property="address" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="material_clerk" jdbcType="VARCHAR" property="materialClerk" /> <result column="material_clerk" jdbcType="VARCHAR" property="materialClerk" />
<result column="company_id" jdbcType="INTEGER" property="companyId" /> <result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="time" jdbcType="VARCHAR" property="time" /> <result column="time" jdbcType="VARCHAR" property="time" />
@ -34,7 +34,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remarks, id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remark,
material_clerk, company_id, `time`, material_clerk, company_id, `time`,
is_active, lon, lat, company, imp_unit, dept_name, pro_id, dept_id, cvo, stats, htzt, is_match is_active, lon, lat, company, imp_unit, dept_name, pro_id, dept_id, cvo, stats, htzt, is_match
</sql> </sql>
@ -66,7 +66,7 @@
insert into bm_project (project_type, `name`, num, insert into bm_project (project_type, `name`, num,
manager, nature, telphone, manager, nature, telphone,
phone, fax, address, phone, fax, address,
remarks, material_clerk, company_id, remark, material_clerk, company_id,
`time`, is_active, lon, `time`, is_active, lon,
lat, company, imp_unit, lat, company, imp_unit,
dept_name, pro_id, dept_id, dept_name, pro_id, dept_id,
@ -74,7 +74,7 @@
values (#{projectType,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR}, values (#{projectType,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR},
#{manager,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR}, #{telphone,jdbcType=VARCHAR}, #{manager,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR}, #{telphone,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{remarks,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
#{time,jdbcType=VARCHAR}, '1', #{lon,jdbcType=VARCHAR}, #{time,jdbcType=VARCHAR}, '1', #{lon,jdbcType=VARCHAR},
#{lat,jdbcType=VARCHAR}, #{company,jdbcType=VARCHAR}, #{impUnit,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, #{company,jdbcType=VARCHAR}, #{impUnit,jdbcType=VARCHAR},
#{deptName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{deptId,jdbcType=INTEGER}, #{deptName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{deptId,jdbcType=INTEGER},
@ -112,8 +112,8 @@
<if test="address != null and address != ''"> <if test="address != null and address != ''">
address, address,
</if> </if>
<if test="remarks != null and remarks != ''"> <if test="remark != null and remark != ''">
remarks, remark,
</if> </if>
<if test="materialClerk != null and materialClerk != ''"> <if test="materialClerk != null and materialClerk != ''">
material_clerk, material_clerk,
@ -186,8 +186,8 @@
<if test="address != null and address != ''"> <if test="address != null and address != ''">
#{address,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
</if> </if>
<if test="remarks != null and remarks != ''"> <if test="remark != null and remark != ''">
#{remarks,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="materialClerk != null and materialClerk != ''"> <if test="materialClerk != null and materialClerk != ''">
#{materialClerk,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR},
@ -264,8 +264,8 @@
<if test="address != null and address != ''"> <if test="address != null and address != ''">
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
</if> </if>
<if test="remarks != null and remarks != ''"> <if test="remark != null and remark != ''">
remarks = #{remarks,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="materialClerk != null and materialClerk != ''"> <if test="materialClerk != null and materialClerk != ''">
material_clerk = #{materialClerk,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR},
@ -325,7 +325,7 @@
phone = #{phone,jdbcType=VARCHAR}, phone = #{phone,jdbcType=VARCHAR},
fax = #{fax,jdbcType=VARCHAR}, fax = #{fax,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
material_clerk = #{materialClerk,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR},
company_id = #{companyId,jdbcType=INTEGER}, company_id = #{companyId,jdbcType=INTEGER},
`time` = #{time,jdbcType=VARCHAR}, `time` = #{time,jdbcType=VARCHAR},
@ -359,7 +359,7 @@
phone, phone,
fax, fax,
address, address,
remarks, remark,
material_clerk, material_clerk,
company_id, company_id,
`time`, `time`,
@ -389,7 +389,7 @@
#{phone,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
#{fax,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{remarks,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
#{materialClerk,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR},
#{companyId,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER},
#{time,jdbcType=VARCHAR}, #{time,jdbcType=VARCHAR},
@ -419,7 +419,7 @@
phone = #{phone,jdbcType=VARCHAR}, phone = #{phone,jdbcType=VARCHAR},
fax = #{fax,jdbcType=VARCHAR}, fax = #{fax,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
material_clerk = #{materialClerk,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR},
company_id = #{companyId,jdbcType=INTEGER}, company_id = #{companyId,jdbcType=INTEGER},
`time` = #{time,jdbcType=VARCHAR}, `time` = #{time,jdbcType=VARCHAR},
@ -470,8 +470,8 @@
<if test="address != null and address != ''"> <if test="address != null and address != ''">
address, address,
</if> </if>
<if test="remarks != null and remarks != ''"> <if test="remark != null and remark != ''">
remarks, remark,
</if> </if>
<if test="materialClerk != null and materialClerk != ''"> <if test="materialClerk != null and materialClerk != ''">
material_clerk, material_clerk,
@ -548,8 +548,8 @@
<if test="address != null and address != ''"> <if test="address != null and address != ''">
#{address,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
</if> </if>
<if test="remarks != null and remarks != ''"> <if test="remark != null and remark != ''">
#{remarks,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="materialClerk != null and materialClerk != ''"> <if test="materialClerk != null and materialClerk != ''">
#{materialClerk,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR},
@ -626,8 +626,8 @@
<if test="address != null and address != ''"> <if test="address != null and address != ''">
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
</if> </if>
<if test="remarks != null and remarks != ''"> <if test="remark != null and remark != ''">
remarks = #{remarks,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="materialClerk != null and materialClerk != ''"> <if test="materialClerk != null and materialClerk != ''">
material_clerk = #{materialClerk,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR},