From 4ffa82f310708af134d3c799bc2820f5d6b94bb9 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Mon, 12 Aug 2024 10:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/base/api}/domain/BmAgreement.java | 5 +- .../bonus/base/api}/domain/BmCustomer.java | 2 +- .../base/api}/domain/BmCustomerType.java | 4 +- .../com/bonus/base/api}/domain/BmProject.java | 4 +- .../bonus/base/api}/domain/BmSupplier.java | 2 +- .../controller/BmAgreementController.java | 3 +- .../base/controller/BmCustomerController.java | 3 +- .../controller/BmCustomerTypeController.java | 2 +- .../base/controller/BmProjectController.java | 2 +- .../base/controller/BmSupplierController.java | 2 +- .../bonus/base/mapper/BmAgreementMapper.java | 4 +- .../bonus/base/mapper/BmCustomerMapper.java | 2 +- .../base/mapper/BmCustomerTypeMapper.java | 4 +- .../bonus/base/mapper/BmProjectMapper.java | 4 +- .../bonus/base/mapper/BmSupplierMapper.java | 2 +- .../base/service/BmAgreementService.java | 4 +- .../base/service/BmCustomerTypeService.java | 20 ++--- .../bonus/base/service/BmProjectService.java | 8 +- .../bonus/base/service/BmSupplierService.java | 2 +- .../base/service/IBmCustomerService.java | 2 +- .../service/impl/BmCustomerServiceImpl.java | 3 +- .../service/impl/BmSupplierServiceImpl.java | 2 +- .../resources/mapper/BmAgreementMapper.xml | 88 +++++++++---------- .../resources/mapper/BmCustomerMapper.xml | 6 +- .../resources/mapper/BmCustomerTypeMapper.xml | 22 ++--- .../main/resources/mapper/BmProjectMapper.xml | 34 +++---- .../resources/mapper/BmSupplierMapper.xml | 2 +- 27 files changed, 117 insertions(+), 121 deletions(-) rename {bonus-modules/bonus-base/src/main/java/com/bonus/base => bonus-api/bonus-api-system/src/main/java/com/bonus/base/api}/domain/BmAgreement.java (97%) rename {bonus-modules/bonus-base/src/main/java/com/bonus/base => bonus-api/bonus-api-system/src/main/java/com/bonus/base/api}/domain/BmCustomer.java (98%) rename {bonus-modules/bonus-base/src/main/java/com/bonus/base => bonus-api/bonus-api-system/src/main/java/com/bonus/base/api}/domain/BmCustomerType.java (95%) rename {bonus-modules/bonus-base/src/main/java/com/bonus/base => bonus-api/bonus-api-system/src/main/java/com/bonus/base/api}/domain/BmProject.java (98%) rename {bonus-modules/bonus-base/src/main/java/com/bonus/base => bonus-api/bonus-api-system/src/main/java/com/bonus/base/api}/domain/BmSupplier.java (99%) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmAgreement.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java similarity index 97% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmAgreement.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java index 3a54057..399abfe 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmAgreement.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java @@ -1,4 +1,4 @@ -package com.bonus.base.domain; +package com.bonus.base.api.domain; import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -55,6 +55,7 @@ public class BmAgreement extends BaseEntity implements Serializable { @ApiModelProperty(value="") private String creator; + @ApiModelProperty(value="") private String remark; @@ -79,4 +80,4 @@ public class BmAgreement extends BaseEntity implements Serializable { @ApiModelProperty(value="i8系统是否推送") private String isPush; -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmCustomer.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java similarity index 98% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmCustomer.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java index 16fc935..8959ca0 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmCustomer.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java @@ -1,4 +1,4 @@ -package com.bonus.base.domain; +package com.bonus.base.api.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmCustomerType.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java similarity index 95% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmCustomerType.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java index 1be19fc..0df234d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmCustomerType.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java @@ -1,4 +1,4 @@ -package com.bonus.base.domain; +package com.bonus.base.api.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -40,4 +40,4 @@ public class BmCustomerType implements Serializable { @ApiModelProperty(value="数据所属组织") private Integer companyId; -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmProject.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmProject.java similarity index 98% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmProject.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmProject.java index f9002c3..e91675f 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmProject.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmProject.java @@ -1,4 +1,4 @@ -package com.bonus.base.domain; +package com.bonus.base.api.domain; import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -179,4 +179,4 @@ public class BmProject extends BaseEntity implements Serializable { private String isMatch; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmSupplier.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmSupplier.java similarity index 99% rename from bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmSupplier.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmSupplier.java index 9d3df7d..56cd433 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmSupplier.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmSupplier.java @@ -1,4 +1,4 @@ -package com.bonus.base.domain; +package com.bonus.base.api.domain; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java index 5a5ffbb..746bade 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java @@ -1,9 +1,8 @@ package com.bonus.base.controller; -import com.bonus.base.domain.BmAgreement; +import com.bonus.base.api.domain.BmAgreement; import com.bonus.base.service.BmAgreementService; import com.bonus.base.utils.ResultBean; -import com.bonus.common.core.constant.HttpStatus; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java index ca33baa..a0e7391 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java @@ -1,6 +1,6 @@ package com.bonus.base.controller; -import com.bonus.base.domain.BmCustomer; +import com.bonus.base.api.domain.BmCustomer; import com.bonus.base.service.IBmCustomerService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -9,7 +9,6 @@ import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.common.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java index bbd353e..dea5d90 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java @@ -1,6 +1,6 @@ package com.bonus.base.controller; -import com.bonus.base.domain.BmCustomerType; +import com.bonus.base.api.domain.BmCustomerType; import com.bonus.base.service.BmCustomerTypeService; import com.bonus.base.utils.ResultBean; import com.bonus.common.core.web.controller.BaseController; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java index a9402a1..c2c7296 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java @@ -1,5 +1,5 @@ package com.bonus.base.controller; -import com.bonus.base.domain.BmProject; +import com.bonus.base.api.domain.BmProject; import com.bonus.base.service.BmProjectService; import com.bonus.base.utils.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java index 8cc15bc..1169cd4 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java @@ -1,6 +1,6 @@ package com.bonus.base.controller; -import com.bonus.base.domain.BmSupplier; +import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.service.BmSupplierService; import com.bonus.base.utils.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java index a0e2565..e299615 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java @@ -1,6 +1,6 @@ package com.bonus.base.mapper; -import com.bonus.base.domain.BmAgreement; +import com.bonus.base.api.domain.BmAgreement; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -62,4 +62,4 @@ public interface BmAgreementMapper { */ int updateByPrimaryKey(BmAgreement record); -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerMapper.java index 5d07002..4ca4507 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerMapper.java @@ -1,6 +1,6 @@ package com.bonus.base.mapper; -import com.bonus.base.domain.BmCustomer; +import com.bonus.base.api.domain.BmCustomer; import java.util.List; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerTypeMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerTypeMapper.java index 81ce05a..f368edd 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerTypeMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmCustomerTypeMapper.java @@ -1,6 +1,6 @@ package com.bonus.base.mapper; -import com.bonus.base.domain.BmCustomerType; +import com.bonus.base.api.domain.BmCustomerType; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -63,4 +63,4 @@ public interface BmCustomerTypeMapper { List selectAll(); int updateById(@Param("updated") BmCustomerType updated, @Param("id") Integer id); -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java index a6779d1..e8d1a92 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java @@ -1,6 +1,6 @@ package com.bonus.base.mapper; -import com.bonus.base.domain.BmProject; +import com.bonus.base.api.domain.BmProject; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -64,4 +64,4 @@ public interface BmProjectMapper { * @return update count */ int updateByPrimaryKey(BmProject record); -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmSupplierMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmSupplierMapper.java index 326e625..02b25ca 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmSupplierMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmSupplierMapper.java @@ -1,6 +1,6 @@ package com.bonus.base.mapper; -import com.bonus.base.domain.BmSupplier; +import com.bonus.base.api.domain.BmSupplier; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java index 57577d0..4f8d071 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java @@ -2,9 +2,7 @@ package com.bonus.base.service; import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import com.bonus.base.domain.BmAgreement; +import com.bonus.base.api.domain.BmAgreement; import com.bonus.base.mapper.BmAgreementMapper; import javax.annotation.Resource; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmCustomerTypeService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmCustomerTypeService.java index 0ed7e3f..ffbe0bc 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmCustomerTypeService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmCustomerTypeService.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -import com.bonus.base.domain.BmCustomerType; +import com.bonus.base.api.domain.BmCustomerType; import com.bonus.base.mapper.BmCustomerTypeMapper; /** * @PackagePath: com.bonus.base @@ -24,47 +24,47 @@ public class BmCustomerTypeService{ return bmCustomerTypeMapper.deleteByPrimaryKey(id); } - + public int insert(BmCustomerType record) { return bmCustomerTypeMapper.insert(record); } - + public int insertOrUpdate(BmCustomerType record) { return bmCustomerTypeMapper.insertOrUpdate(record); } - + public int insertOrUpdateSelective(BmCustomerType record) { return bmCustomerTypeMapper.insertOrUpdateSelective(record); } - + public int insertSelective(BmCustomerType record) { return bmCustomerTypeMapper.insertSelective(record); } - + public BmCustomerType selectByPrimaryKey(Integer id) { return bmCustomerTypeMapper.selectByPrimaryKey(id); } - + public int updateByPrimaryKeySelective(BmCustomerType record) { return bmCustomerTypeMapper.updateByPrimaryKeySelective(record); } - + public int updateByPrimaryKey(BmCustomerType record) { return bmCustomerTypeMapper.updateByPrimaryKey(record); } - + public List selectAll() { return bmCustomerTypeMapper.selectAll(); } - + public int updateById(BmCustomerType updated,Integer id) { return bmCustomerTypeMapper.updateById(updated,id); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java index 2ed76c9..1db749a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.bonus.base.domain.BmProject; +import com.bonus.base.api.domain.BmProject; import java.util.List; @@ -33,7 +33,7 @@ public class BmProjectService{ public int updateIsActive(Integer id) { return bmProjectMapper.updateIsActive(id); } - + public int insert(BmProject record) { return bmProjectMapper.insert(record); } @@ -45,7 +45,7 @@ public class BmProjectService{ public int insertOrUpdateSelective(BmProject record) { return bmProjectMapper.insertOrUpdateSelective(record); } - + public int insertSelective(BmProject record) { return bmProjectMapper.insertSelective(record); } @@ -57,7 +57,7 @@ public class BmProjectService{ public int updateByPrimaryKeySelective(BmProject record) { return bmProjectMapper.updateByPrimaryKeySelective(record); } - + public int updateByPrimaryKey(BmProject record) { return bmProjectMapper.updateByPrimaryKey(record); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java index 2558ded..4ba8e33 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java @@ -1,6 +1,6 @@ package com.bonus.base.service; -import com.bonus.base.domain.BmSupplier; +import com.bonus.base.api.domain.BmSupplier; import java.util.List; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java index 8d8c01e..5e008ae 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/IBmCustomerService.java @@ -1,6 +1,6 @@ package com.bonus.base.service; -import com.bonus.base.domain.BmCustomer; +import com.bonus.base.api.domain.BmCustomer; import java.util.List; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java index 19dd724..f915fe3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmCustomerServiceImpl.java @@ -1,7 +1,6 @@ package com.bonus.base.service.impl; -import com.bonus.base.domain.BmCustomer; -import com.bonus.base.mapper.BmAgreementMapper; +import com.bonus.base.api.domain.BmCustomer; import com.bonus.base.mapper.BmCustomerMapper; import com.bonus.base.service.IBmCustomerService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java index 084ee2a..393a694 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java @@ -1,6 +1,6 @@ package com.bonus.base.service.impl; -import com.bonus.base.domain.BmSupplier; +import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.mapper.BmSupplierMapper; import com.bonus.base.service.BmSupplierService; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml index 1c1e076..e682e50 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml @@ -1,7 +1,7 @@ - + @@ -27,12 +27,12 @@ id, code, sign_date, project, start_time, lease_term, advance_charge, - authorizing_person, authorizing_phone, contract_number, creator, create_time, remark, + authorizing_person, authorizing_phone, contract_number, creator, create_time, remark, settlement_time, is_balance, url, is_sure, company_id, is_push - select + select from bm_customer_type where ID = #{id,jdbcType=INTEGER} @@ -29,14 +29,14 @@ where ID = #{id,jdbcType=INTEGER} - + insert into bm_customer_type (`NAME`, IS_ACTIVE, COMPANY_ID ) values (#{name,jdbcType=VARCHAR}, #{isActive,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER} ) - + insert into bm_customer_type @@ -62,7 +62,7 @@ - + update bm_customer_type @@ -78,7 +78,7 @@ where ID = #{id,jdbcType=INTEGER} - + update bm_customer_type set `NAME` = #{name,jdbcType=VARCHAR}, @@ -115,7 +115,7 @@ where ID = #{id,jdbcType=INTEGER} - + insert into bm_customer_type @@ -135,7 +135,7 @@ #{isActive,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, - on duplicate key update + on duplicate key update ID = #{id,jdbcType=INTEGER}, @@ -146,7 +146,7 @@ - + insert into bm_customer_type @@ -178,7 +178,7 @@ #{companyId,jdbcType=INTEGER}, - on duplicate key update + on duplicate key update ID = #{id,jdbcType=INTEGER}, @@ -195,4 +195,4 @@ - \ No newline at end of file + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml index 3c3d185..55e831f 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml @@ -1,7 +1,7 @@ - + @@ -34,14 +34,14 @@ - id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remarks, + id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remarks, material_clerk, company_id, `time`, is_active, lon, lat, company, imp_unit, dept_name, pro_id, dept_id, cvo, stats, htzt, is_match