Commit 0f5fadef authored by lanbaoming's avatar lanbaoming

2024-07-03-2提交

parent df7ba16c
...@@ -846,7 +846,6 @@ public class CustomerController { ...@@ -846,7 +846,6 @@ public class CustomerController {
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> catchCustomer(@RequestParam("id") Long id) { public CommonResult<Boolean> catchCustomer(@RequestParam("id") Long id) {
//公海池捞取客户,修改客户业绩类型需要调整此处的逻辑 //公海池捞取客户,修改客户业绩类型需要调整此处的逻辑
//lanbm 2024-05-07 处理
customerService.catchCustomer(id); customerService.catchCustomer(id);
return success(true); return success(true);
} }
......
...@@ -10,7 +10,6 @@ import java.math.BigDecimal; ...@@ -10,7 +10,6 @@ import java.math.BigDecimal;
/* /*
客户分析结果 客户分析结果
lanbm 2024-04-02 add
字段值名称首字母要小写,字段中不能含有下划线 字段值名称首字母要小写,字段中不能含有下划线
*/ */
@ApiModel("管理后台-客户分析报表结果") @ApiModel("管理后台-客户分析报表结果")
......
...@@ -10,7 +10,7 @@ import lombok.*; ...@@ -10,7 +10,7 @@ import lombok.*;
/** /**
* 报表权限(EcwReportPermission)实体类 * 报表权限(EcwReportPermission)实体类
* *
* @author lanbm * @author
* @since 2024-04-09 23:10:39 * @since 2024-04-09 23:10:39
*/ */
......
...@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
/* /*
订单业务数据 lanbm 2024-04-25 add 订单业务数据
*/ */
@Mapper @Mapper
public interface view_order_businesstimeMapper { public interface view_order_businesstimeMapper {
...@@ -32,7 +32,7 @@ public interface view_order_businesstimeMapper { ...@@ -32,7 +32,7 @@ public interface view_order_businesstimeMapper {
*/ */
/* /*
获取订单业务数据 lanbm 2024-04-25 获取订单业务数据
*/ */
List<view_order_businesstime> getOrderBusinessData(); List<view_order_businesstime> getOrderBusinessData();
} }
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
and type in ${customerrolestrs} and type in ${customerrolestrs}
</if> </if>
<!--lanbm 2024-06-24 添加国家多选功能--> <!-- 添加国家多选功能-->
<if test="countrystr!=null and countrystr!=''"> <if test="countrystr!=null and countrystr!=''">
and c.country= #{countrystr} and c.country= #{countrystr}
</if> </if>
......
...@@ -239,7 +239,7 @@ public class MakeBillOfLadingController { ...@@ -239,7 +239,7 @@ public class MakeBillOfLadingController {
} }
/* /*
lanbm 2024-05-07 修改报关价显示单位问题 修改报关价显示单位问题
*/ */
@GetMapping("/make") @GetMapping("/make")
@ApiOperation("制作提货单") @ApiOperation("制作提货单")
......
...@@ -157,7 +157,7 @@ public class ReceiptItemController { ...@@ -157,7 +157,7 @@ public class ReceiptItemController {
/* /*
获取剩余金额 lanbm 2024-06-10 add 获取剩余金额
*/ */
private BigDecimal getSY(ReceiptItemBackVO v, long id) { private BigDecimal getSY(ReceiptItemBackVO v, long id) {
Map<Integer, CurrencyRespDTO> currencyMap = currencyApi.getAllCurrency(); Map<Integer, CurrencyRespDTO> currencyMap = currencyApi.getAllCurrency();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment