chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
磷叶 2025-04-15 18:16:35 +08:00
commit 6adb8fd44d
6 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-service/src/main/java/com/ruoyi/bst/customerService/mapper/CustomerServiceMapper.xml
View File

@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="searchCondition">
<if test="query.id != null "> and bcs.id = #{query.id}</if>
<if test="query.areaId != null "> and bcs.area_id = #{query.areaId}</if>
<if test="query.storeId != null "> and bcs.store_id = #{query.storeId}</if>
<if test="query.name != null and query.name != ''"> and bcs.name like concat('%', #{query.name}, '%')</if>
<if test="query.contact != null and query.contact != ''"> and bcs.contact like concat('%',#{query.contact},'%')</if>
<if test="query.startTime != null "> and bcs.start_time = #{query.startTime}</if>

4
ruoyi-service/src/main/java/com/ruoyi/bst/mchApply/domain/MchApply.java
View File

@ -43,6 +43,10 @@ public class MchApply extends BaseEntity
@ApiModelProperty("详细信息")
private String content;
@Excel(name = "意向城市")
@ApiModelProperty("意向城市")
private String city;
@Excel(name = "反馈信息", readConverterExp = "对=外")
@ApiModelProperty("反馈信息")
private String callback;

4
ruoyi-service/src/main/java/com/ruoyi/bst/mchApply/mapper/MchApplyMapper.xml
View File

@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="name" column="name" />
<result property="mobile" column="mobile" />
<result property="content" column="content" />
<result property="city" column="city" />
<result property="remark" column="remark" />
<result property="callback" column="callback" />
<result property="verifyBy" column="verify_by" />
@ -33,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bma.mobile,
bma.content,
bma.remark,
bma.city,
bma.callback,
bma.verify_by,
bma.verify_time,
@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''">name,</if>
<if test="mobile != null and mobile != ''">mobile,</if>
<if test="content != null and content != ''">content,</if>
<if test="city != null and city != ''">city,</if>
<if test="remark != null">remark,</if>
<if test="callback != null">callback,</if>
<if test="verifyBy != null">verify_by,</if>
@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''">#{name},</if>
<if test="mobile != null and mobile != ''">#{mobile},</if>
<if test="content != null and content != ''">#{content},</if>
<if test="city != null and city != ''">#{city},</if>
<if test="remark != null">#{remark},</if>
<if test="callback != null">#{callback},</if>
<if test="verifyBy != null">#{verifyBy},</if>

1
ruoyi-web/src/main/java/com/ruoyi/web/app/AppMchApply.java
View File

@ -28,7 +28,6 @@ public class AppMchApply extends BaseController {
@PostMapping
public AjaxResult add(@RequestBody MchApplyVO mchApply) {
mchApply.setUserId(getUserId());
mchApply.setName(getUsername());
return success(mchApplyService.insertMchApply(mchApply));
}

3
ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
View File

@ -55,8 +55,9 @@ public class AdController extends BaseController
{
startPage();
startOrderBy();
query.setScope(true);
query.setDeleted(false);
query.setUserId(getUserId());
query.setScope(true);
return getDataTable(adService.selectAdList(query));
}

1
ruoyi-web/src/main/java/com/ruoyi/web/bst/CustomerServiceController.java
View File

@ -60,6 +60,7 @@ public class CustomerServiceController extends BaseController
{
startPage();
startOrderBy();
query.setStoreId(getUserId());
query.setScope(true);
List<CustomerServiceVO> list = customerServiceService.selectCustomerServiceList(query);
return getDataTable(list);