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

提取返回公用类至common服务

This commit is contained in:
syruan 2024-08-13 14:03:12 +08:00
parent 298daf9cfc
commit a673610a94
8 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java → bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java
View File

@ -1,4 +1,4 @@
package com.bonus.base.utils; package com.bonus.common.core.domain;
import com.bonus.common.core.constant.HttpStatus; import com.bonus.common.core.constant.HttpStatus;
import lombok.Getter; import lombok.Getter;

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java
View File

@ -2,7 +2,7 @@ package com.bonus.base.controller;
import com.bonus.base.api.domain.BmAgreement; import com.bonus.base.api.domain.BmAgreement;
import com.bonus.base.service.BmAgreementService; import com.bonus.base.service.BmAgreementService;
import com.bonus.base.utils.ResultBean; import com.bonus.common.core.domain.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.core.web.page.TableDataInfo;

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerTypeController.java
View File

@ -2,7 +2,7 @@ package com.bonus.base.controller;
import com.bonus.base.api.domain.BmCustomerType; import com.bonus.base.api.domain.BmCustomerType;
import com.bonus.base.service.BmCustomerTypeService; import com.bonus.base.service.BmCustomerTypeService;
import com.bonus.base.utils.ResultBean; import com.bonus.common.core.domain.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.core.web.page.TableDataInfo;

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java
View File

@ -2,7 +2,7 @@ package com.bonus.base.controller;
import com.bonus.base.api.domain.BmProject; import com.bonus.base.api.domain.BmProject;
import com.bonus.base.service.BmProjectService; import com.bonus.base.service.BmProjectService;
import com.bonus.base.utils.ResultBean; import com.bonus.common.core.domain.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmSupplierController.java
View File

@ -2,7 +2,7 @@ package com.bonus.base.controller;
import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.api.domain.BmSupplier;
import com.bonus.base.service.BmSupplierService; import com.bonus.base.service.BmSupplierService;
import com.bonus.base.utils.ResultBean; import com.bonus.common.core.domain.ResultBean;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.core.web.page.TableDataInfo;

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmSupplierService.java
View File

@ -1,7 +1,7 @@
package com.bonus.base.service; package com.bonus.base.service;
import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.api.domain.BmSupplier;
import com.bonus.base.utils.ResultBean; import com.bonus.common.core.domain.ResultBean;
import java.util.List; import java.util.List;

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/BmSupplierServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.bonus.base.service.impl;
import com.bonus.base.api.domain.BmSupplier; import com.bonus.base.api.domain.BmSupplier;
import com.bonus.base.mapper.BmSupplierMapper; import com.bonus.base.mapper.BmSupplierMapper;
import com.bonus.base.service.BmSupplierService; import com.bonus.base.service.BmSupplierService;
import com.bonus.base.utils.ResultBean; import com.bonus.common.core.domain.ResultBean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;

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

@ -53,9 +53,18 @@
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from bm_project bmp from bm_project bmp
where is_active = '1' where is_active = '1'
<if test="name !=null and name !=''"> <if test="name != null and name !=''">
and bmp.name LIKE CONCAT('%',#{name},'%') and bmp.name LIKE CONCAT('%',#{name},'%')
</if> </if>
<if test="projectType != null">
and bmp.project_type = #{projectType,jdbcType=INTEGER}
</if>
<if test="nature != null and nature != ''">
and bmp.nature = #{nature,jdbcType=VARCHAR}
</if>
<if test="stats != null and stats != ''">
and bmp.stats = #{stats,jdbcType=VARCHAR}
</if>
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">