提交代码

dev-discount
胡锐 3 years ago
parent d46f4e848c
commit 486492a4d4
  1. 4
      hai-bweb/src/main/java/com/bweb/controller/HighGasClassGroupController.java
  2. 4
      hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java
  3. 4
      hai-service/src/main/java/com/hai/service/impl/HighGasClassGroupServiceImpl.java

@ -139,7 +139,8 @@ public class HighGasClassGroupController {
@RequestMapping(value = "/getClassGroupList", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询班组列表")
public ResponseData getClassGroupList(@RequestParam(name = "principalName", required = false) String principalName,
public ResponseData getClassGroupList(@RequestParam(name = "name", required = false) String name,
@RequestParam(name = "principalName", required = false) String principalName,
@RequestParam(name = "principalPhone", required = false) String principalPhone,
@RequestParam(name = "pageNum", required = true) Integer pageNum,
@RequestParam(name = "pageSize", required = true) Integer pageSize) {
@ -151,6 +152,7 @@ public class HighGasClassGroupController {
Map<String,Object> param = new HashMap<>();
param.put("merchantStoreId", userInfoModel.getMerchantStore().getId());
param.put("name", name);
param.put("principalName", principalName);
param.put("principalPhone", principalPhone);

@ -17,7 +17,6 @@ public interface HighGasClassGroupTaskMapperExt {
" COUNT(1) refuelNum," +
" case when SUM(a.gas_liters_preferences) is not null then SUM(a.gas_liters_preferences) else 0 end refuelLiters" +
" from high_child_order a" +
" LEFT JOIN high_order b on b.id = a.order_id" +
" where goods_type = 3 " +
" and gas_class_group_task_id = #{gasClassGroupTaskId} " +
" and child_orde_status in (2,3)" +
@ -30,7 +29,6 @@ public interface HighGasClassGroupTaskMapperExt {
" COUNT(1) refundNum," +
" case when SUM(a.gas_liters_preferences) is not null then SUM(a.gas_liters_preferences) else 0 end refundLiters" +
" from high_child_order a" +
" LEFT JOIN high_order b on b.id = a.order_id" +
" where goods_type = 3 " +
" and gas_class_group_task_id = #{gasClassGroupTaskId} " +
" and child_orde_status in (4)" +
@ -52,7 +50,7 @@ public interface HighGasClassGroupTaskMapperExt {
" from high_child_order a" +
" where gas_class_group_task_id = #{gasClassGroupTaskId} and goods_type = 3 and child_orde_status in (2,3)" +
" GROUP BY a.gas_oil_no) b on b.gas_oil_no = a.oil_no" +
" WHERE a.merchant_store_id = #{gasId} and `status` <> 0 " +
" WHERE a.merchant_store_id = #{gasId} and <![CDATA[ `status` <> 0 ]]> " +
"</script>")
List<Map<String, Object>> countOilData(@Param("gasId") Long gasId, @Param("gasClassGroupTaskId") Long gasClassGroupTaskId);
}

@ -63,6 +63,10 @@ public class HighGasClassGroupServiceImpl implements HighGasClassGroupService {
criteria.andMerchantStoreNameLike("%" + MapUtils.getString(param, "merchantStoreId") + "%");
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "name"))) {
criteria.andNameLike("%" + MapUtils.getString(param, "name") + "%");
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "principalName"))) {
criteria.andPrincipalNameLike("%" + MapUtils.getString(param, "principalName") + "%");
}

Loading…
Cancel
Save