java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

feat(all): 配送签收率统计 

1 修改配送签收率分组条件
dev
zhaoqiaobo 2 weeks ago
parent
ad91df761e
commit
d6c51743b0
3 changed files with 72 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
  2. 2
      blade-service/logpm-report/src/main/java/com/logpm/report/query/QualityDispatchNumberQuery.java
  3. 8
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java

65
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
Unescape View File

@ -4,7 +4,12 @@
<select id="number" resultType="com.logpm.report.vo.qulity.dispatch.QualityDispatchNumberVO">
select
<if test="query.warehouseName != null and query.warehouseName != ''">
t.warehouse_name,
</if>
<if test="query.warehouseName == null or query.warehouseName == ''">
'全部' warehouse_name,
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
t.delivery_type,
</if>
@ -84,6 +89,12 @@
#{item}
</foreach>
</if>
<if test="query.authWarehouseName != null and query.authWarehouseName != ''">
and t.warehouse_name in
<foreach collection="query.authWarehouseName.split(',')" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
and t.delivery_type in
<foreach collection="query.deliveryType.split(',')" item="item" separator="," open="(" close=")">
@ -226,7 +237,13 @@
</select>
<select id="exceptionNumber" resultType="com.logpm.report.vo.qulity.dispatch.QualityDispatchNumberVO">
select t.warehouse_name
select
<if test="query.warehouseName == null or query.warehouseName == ''">
'全部' warehouse_name
</if>
<if test="query.warehouseName != null and query.warehouseName != ''">
t.warehouse_name
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
,t.type deliveryType
</if>
@ -252,6 +269,12 @@
#{item}
</foreach>
</if>
<if test="query.authWarehouseName != null and query.authWarehouseName != ''">
and t.warehouse_name in
<foreach collection="query.authWarehouseName.split(',')" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
and t.delivery_type in
<foreach collection="query.deliveryType.split(',')" item="item" separator="," open="(" close=")">
@ -266,14 +289,46 @@
</if>
</foreach>
</if>
group by dl.warehouse_name
<if test="(query.warehouseName != null and query.warehouseName != '') or (query.deliveryType != null and query.deliveryType != '')">
GROUP BY
<trim suffixOverrides=",">
<if test="query.warehouseName != null and query.warehouseName != ''">
dl.warehouse_name,
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
, dl.type
dl.type,
</if>
</trim>
order by
<trim suffixOverrides=",">
<if test="query.warehouseName != null and query.warehouseName != ''">
dl.warehouse_name,
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
dl.type,
</if>
</trim>
</if>
) t
group by t.warehouse_name
<if test="(query.warehouseName != null and query.warehouseName != '') or (query.deliveryType != null and query.deliveryType != '')">
GROUP BY
<trim suffixOverrides=",">
<if test="query.warehouseName != null and query.warehouseName != ''">
t.warehouse_name,
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
, t.type
t.type,
</if>
</trim>
order by
<trim suffixOverrides=",">
<if test="query.warehouseName != null and query.warehouseName != ''">
t.warehouse_name,
</if>
<if test="query.deliveryType != null and query.deliveryType != ''">
t.type,
</if>
</trim>
</if>
</select>

2
blade-service/logpm-report/src/main/java/com/logpm/report/query/QualityDispatchNumberQuery.java
Unescape View File

@ -24,6 +24,8 @@ public class QualityDispatchNumberQuery extends Query {
@ApiModelProperty(value = "仓库", position = 3)
private String warehouseName;
private String authWarehouseName;
@ApiModelProperty(value = "配送类型", position = 4)
private String deliveryType;

8
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java
Unescape View File

@ -61,10 +61,10 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
if (StrUtil.isEmpty(query.getWarehouseName())) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
query.setWarehouseName(myCurrentWarehouse.getName());
query.setAuthWarehouseName(myCurrentWarehouse.getName());
} else {
List<BasicdataWarehouseEntity> warehouseEntities = warehouseClient.getMyWarehouseList();
query.setWarehouseName(warehouseEntities.stream().map(BasicdataWarehouseEntity::getName).collect(Collectors.joining(",")));
query.setAuthWarehouseName(warehouseEntities.stream().map(BasicdataWarehouseEntity::getName).collect(Collectors.joining(",")));
}
}
List<QualityDispatchNumberVO> list = numberMapper.number(page, query);
@ -132,10 +132,10 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
if (StrUtil.isEmpty(query.getWarehouseName())) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
query.setWarehouseName(myCurrentWarehouse.getName());
query.setAuthWarehouseName(myCurrentWarehouse.getName());
} else {
List<BasicdataWarehouseEntity> warehouseEntities = warehouseClient.getMyWarehouseList();
query.setWarehouseName(warehouseEntities.stream().map(BasicdataWarehouseEntity::getName).collect(Collectors.joining(",")));
query.setAuthWarehouseName(warehouseEntities.stream().map(BasicdataWarehouseEntity::getName).collect(Collectors.joining(",")));
}
}
List<QualityDispatchNumberVO> list = numberMapper.number(page, query);

Write Preview
Loading…
Cancel
Save