选择地址

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerAddressInfoController.java

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerAddressInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +19,57 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/cargoOwnerAddressInfo")
 public class CargoOwnerAddressInfoController {
 
+    @Autowired
+    private ICargoOwnerAddressInfoService cargoOwnerAddressInfoService;
+
+    /**
+     * 选择地址列表
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @GetMapping("/selectCargoOwnerAddress")
+    public Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        return cargoOwnerAddressInfoService.selectCargoOwnerAddress(cargoOwnerAddressInfo);
+    }
+
+    /**
+     * 新增地址
+     * @param
+     * @return
+     */
+    @PostMapping("/api/addCargoOwnerAddress")
+    public String addCargoOwnerAddress(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
+        return cargoOwnerAddressInfoService.addCargoOwnerAddress(cargoOwnerAddressInfo);
+    }
+
+    /**
+     * 编辑地址
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @PostMapping("/api/editCargoOwnerAddress")
+    public String editCargoOwnerAddress(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
+        return cargoOwnerAddressInfoService.editCargoOwnerAddress(cargoOwnerAddressInfo);
+    }
+
+    /**
+     * 删除地址
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @PostMapping("/api/deleteCargoOwnerAddress")
+    public void deleteCargoOwnerAddress(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        cargoOwnerAddressInfoService.deleteCargoOwnerAddress(cargoOwnerAddressInfo.getId());
+    }
+
+    /**
+     * 设置默认/置顶
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @PostMapping("/api/setDefault")
+    public String setDefault(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
+        return cargoOwnerAddressInfoService.setDefault(cargoOwnerAddressInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PublishTaskInfoController.java

@@ -8,6 +8,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.IPublishTaskInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 发布任务信息 前端控制器
@@ -33,6 +35,16 @@ public class PublishTaskInfoController {
         return publishTaskInfoService.selectTask(publishTaskInfo);
     }
 
+    /**
+     * 根据日期查询任务列表
+     * @param
+     * @return
+     */
+    @GetMapping("/selectPublishTaskInfoList")
+    public List<PublishTaskInfo> selectPublishTaskInfoList() {
+        return publishTaskInfoService.selectPublishTaskInfoList();
+    }
+
     /**
      * 发布任务
      * @param

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerAddressInfo.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -38,7 +39,7 @@ public class CargoOwnerAddressInfo extends BaseModel<CargoOwnerAddressInfo> {
     /**
      * 省
      */
-    private String privates;
+    private String province;
     /**
      * 市
      */
@@ -72,10 +73,26 @@ public class CargoOwnerAddressInfo extends BaseModel<CargoOwnerAddressInfo> {
      */
     private String toppingFlag;
 
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 设置默认标识（1默认发货2默认收货3置顶）
+     */
+    @TableField(exist = false)
+    private String defaultFlag;
+
 
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
+    public static class QueryFiles {
+
+        public static final String COMMON_ID = "common_id";
 
+        public static final String DELETE_FLAG = "delete_flag";
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FreightInfo.java

@@ -46,22 +46,42 @@ public class FreightInfo extends BaseModel<FreightInfo> {
      * 预付运费
      */
     private Float prepaidFreight;
+    /**
+     * 预付运费时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date prepaidFreightDate;
     /**
      * 运费尾款
      */
     private Float freightBalance;
+    /**
+     * 运费尾款支付时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date freightBalanceDate;
     /**
      * 明细
      */
     private String detailed;
     /**
-     * 应还运费
+     * 扣款
      */
-    private Float freightPayable;
+    private Float deduction;
+    /**
+     * 服务费
+     */
+    private Float serviceCharge;
     /**
      * 合计付款
      */
     private Float totalRepayable;
+    /**
+     * 应还运费
+     */
+    private Float freightPayable;
     /**
      * 合计收款
      */
@@ -70,34 +90,14 @@ public class FreightInfo extends BaseModel<FreightInfo> {
      * 超期费
      */
     private Float overdueFee;
-    /**
-     * 平台确认还款金额
-     */
-    private Float repaymentConfirm;
-    /**
-     * 预付运费时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date prepaidFreightDate;
-    /**
-     * 运费尾款支付时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date freightBalanceDate;
-    /**
-     * 扣款
-     */
-    private Float deduction;
-    /**
-     * 服务费
-     */
-    private Float serviceCharge;
     /**
      * 超期利率
      */
     private Float interestRate;
+    /**
+     * 平台确认还款金额
+     */
+    private Float repaymentConfirm;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentInfo.java

@@ -3,10 +3,12 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -51,16 +53,13 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
     /**
      * 还款时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date repaymentDate;
     /**
      * 还款尾号
      */
     private String lastNumber;
-
-    /**
-     * 已还
-     */
-    private Float alreadyRepaid;
     /**
      * 合计应还
      */
@@ -69,6 +68,10 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
      * 还款账户银行
      */
     private String repaymentBank;
+    /**
+     * 已还
+     */
+    private Float alreadyRepaid;
 
 
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerAddressInfoMapper.java

@@ -2,6 +2,10 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface CargoOwnerAddressInfoMapper extends BaseMapper<CargoOwnerAddressInfo> {
 
+    /**
+     * 根据条件查询地址总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询地址列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<CargoOwnerAddressInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/PublishTaskInfoMapper.java

@@ -70,4 +70,11 @@ public interface PublishTaskInfoMapper extends BaseMapper<PublishTaskInfo> {
      * @return
      */
     List<PublishTaskInfo> getAllListsByCondition(Map<String, Object> pageView);
+    /**
+     * 根据日期查询任务列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<PublishTaskInfo> getListsByDateCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerAddressInfoService.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -13,4 +14,32 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface ICargoOwnerAddressInfoService extends IService<CargoOwnerAddressInfo> {
 
+    /**
+     * 选择地址列表
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    /**
+     * 新增地址
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    String addCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    /**
+     * 编辑地址
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    String editCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    /**
+     * 删除地址
+     * @param id
+     */
+    void deleteCargoOwnerAddress(String id);
+    /**
+     * 设置默认
+     * @param cargoOwnerAddressInfo
+     */
+    String setDefault(CargoOwnerAddressInfo cargoOwnerAddressInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPublishTaskInfoService.java

@@ -5,6 +5,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 
+import java.util.List;
+
 /**
  * <p>
  * 发布任务信息 服务类
@@ -22,6 +24,14 @@ public interface IPublishTaskInfoService extends IService<PublishTaskInfo> {
      */
     Page<PublishTaskInfo> selectTask(PublishTaskInfo publishTaskInfo);
 
+    /**
+     * 根据日期查询任务列表
+     *
+     * @param
+     * @return
+     */
+    List<PublishTaskInfo> selectPublishTaskInfoList();
+
     /**
      * 发布任务
      * @param publishTaskInfo

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerAddressInfoServiceImpl.java

@@ -1,10 +1,21 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerAddressInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerAddressInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +28,107 @@ import org.springframework.stereotype.Service;
 @Service
 public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddressInfoMapper, CargoOwnerAddressInfo> implements ICargoOwnerAddressInfoService {
 
+    /**
+     * 选择地址列表
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @Override
+    public Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (cargoOwnerAddressInfo.getCurrentPage() - 1)
+                * cargoOwnerAddressInfo.getPageSize());
+        //用户id
+        pageView.put("commonId", cargoOwnerAddressInfo.getCommonId());
+        pageView.put("searchKeyWord", cargoOwnerAddressInfo.getSearchKeyWord());
+        pageView.put("pageSize", cargoOwnerAddressInfo.getPageSize());
+        pageView.put("currentPage", cargoOwnerAddressInfo.getCurrentPage());
+        // 查询任务总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<CargoOwnerAddressInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<CargoOwnerAddressInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(cargoOwnerAddressInfo.getCurrentPage());
+        page.setSize(cargoOwnerAddressInfo.getPageSize());
+        return page;
+    }
+
+    /**
+     * 新增地址
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @Override
+    public String addCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo){
+        //新增主键id
+        cargoOwnerAddressInfo.setId(IdGenerator.generateUUID());
+        this.insert(cargoOwnerAddressInfo);
+        return "ok";
+    }
+
+    /**
+     * 编辑地址
+     */
+    @Override
+    public String editCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        //信息编辑
+        this.updateById(cargoOwnerAddressInfo);
+        return "OK";
+    }
+
+    /**
+     * 删除地址
+     * @param id
+     * @return
+     */
+    @Override
+    public void deleteCargoOwnerAddress(String id) {
+        CargoOwnerAddressInfo cargoOwnerAddressInfo = this.selectById(id);
+        this.deleteById(cargoOwnerAddressInfo.getId());
+    }
+
+    /**
+     * 设置默认/置顶
+     * @param cargoOwnerAddressInfo
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String setDefault(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        //查询货主所有地址
+        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList = this.selectList(new EntityWrapper<CargoOwnerAddressInfo>()
+                .eq(CargoOwnerAddressInfo.QueryFiles.COMMON_ID, cargoOwnerAddressInfo.getCommonId())
+                .eq(CargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if(!CollectionUtils.isEmpty(cargoOwnerAddressInfoList)){
+            for (CargoOwnerAddressInfo cargoOwnerAddressInfo1 : cargoOwnerAddressInfoList){
+                //id相等设置默认，其余数据取消默认
+                if(cargoOwnerAddressInfo1.getId().equals(cargoOwnerAddressInfo.getId())){
+                    if("1".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                        //设置默认发货
+                        cargoOwnerAddressInfo1.setDefaultShipment("1");
+                    }else if("2".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                        //设置默认收货
+                        cargoOwnerAddressInfo1.setDefaultReceipt("1");
+                    }else {
+                        //设置置顶
+                        cargoOwnerAddressInfo1.setToppingFlag("1");
+                    }
+                    this.updateById(cargoOwnerAddressInfo1);
+                }else {
+                    if("1".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                        //取消默认发货
+                        cargoOwnerAddressInfo1.setDefaultShipment("0");
+                    }else if("2".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                        //取消默认收货
+                        cargoOwnerAddressInfo1.setDefaultReceipt("0");
+                    }else {
+                        //取消置顶
+                        cargoOwnerAddressInfo1.setToppingFlag("0");
+                    }
+                    this.updateById(cargoOwnerAddressInfo1);
+                }
+            }
+        }
+        return "ok";
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -191,6 +191,22 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         return page;
     }
 
+    /**
+     * 根据日期查询任务列表
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public List<PublishTaskInfo> selectPublishTaskInfoList() {
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String date = f.format(new Date(System.currentTimeMillis()));
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("date", date);
+        List<PublishTaskInfo> dataList = baseMapper.getListsByDateCondition(pageView);
+        return dataList;
+    }
+
     /**
      * 发布任务
      * @param publishTaskInfo
@@ -201,6 +217,29 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     public String addTask(PublishTaskInfo publishTaskInfo) {
         //新增主键id
         publishTaskInfo.setId(IdGenerator.generateUUID());
+        //获取当前年月日
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String date = f.format(new Date(System.currentTimeMillis()));
+        //查询当天任务集合
+        List<PublishTaskInfo> publishTaskInfoList = this.selectPublishTaskInfoList();//调用Service中的方法
+        if(publishTaskInfoList.size() > 0){
+            //取第一条数据的编号
+            String n = publishTaskInfoList.get(0).getTaskNo();
+            //截取编号后6位
+            int intNumber = Integer.parseInt(n.substring(10));
+            intNumber++;
+            String number = String.valueOf(intNumber);
+            for (int i = 0; i < 6; i++){
+                number = number.length() < 6 ? "0" + number : number;
+            }
+            //编号自增
+            number = "YS" + date + number;
+            publishTaskInfo.setTaskNo(number);
+        }else{
+            //如果当天数据为空，生成第一条数据
+            String number = "YS" + date + "000001";
+            publishTaskInfo.setTaskNo(number);
+        }
         publishTaskInfo.setShowHide("1");
         publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
         publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
@@ -241,12 +280,16 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //查询货主姓名
         CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
             .eq("common_id",publishTaskInfo.getCommonId()));
-        publishTaskInfo.setCargoOwnerName(cargoOwnerInfo.getName());
-        publishTaskInfo.setCargoOwnerPhone(cargoOwnerInfo.getPhone());
+        if (cargoOwnerInfo != null){
+            publishTaskInfo.setCargoOwnerName(cargoOwnerInfo.getName());
+            publishTaskInfo.setCargoOwnerPhone(cargoOwnerInfo.getPhone());
+        }
         //查询货主头像
         CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>()
             .eq("id",publishTaskInfo.getCommonId()));
-        publishTaskInfo.setCargoOwnerPortrait(commonUser.getAvatarUrl());
+        if (commonUser != null){
+            publishTaskInfo.setCargoOwnerPortrait(commonUser.getAvatarUrl());
+        }
         return publishTaskInfo;
     }
 
@@ -296,8 +339,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //获取当前年月日
         SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
         String date = f.format(new Date(System.currentTimeMillis()));
-//        Map<String, Object> pageView = new HashMap<>();
-//        pageView.put("date", date);
         //查询订单集合
         List<OrderInfo> orderInfoList = orderInfoService.selectOrderInfoList();//调用Service中的方法
         if(orderInfoList.size() > 0){

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CargoOwnerAddressInfoMapper.xml

@@ -2,4 +2,53 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerAddressInfoMapper">
 
+    <!-- 获得地址总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM cargo_owner_address_info
+        WHERE delete_flag = '0'
+        AND common_id = #{commonId}
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(province) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(detailed_address) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(contacts) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(contact_phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得地址列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo">
+        SELECT
+        id,
+        common_id as commonId,
+        province,
+        city,
+        area,
+        detailed_address as detailedAddress,
+        contacts,
+        contact_phone as contactPhone,
+        default_shipment as defaultShipment,
+        default_receipt as defaultReceipt,
+        topping_flag as toppingFlag,
+        create_date as createDate,
+        update_date as updateDate
+        FROM cargo_owner_address_info
+        WHERE delete_flag = '0'
+        AND common_id = #{commonId}
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(province) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(detailed_address) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(contacts) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(contact_phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/PublishTaskInfoMapper.xml

@@ -43,7 +43,11 @@
         AND common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         ORDER BY create_date DESC
@@ -423,4 +427,14 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+
+    <!-- 根据日期查询任务列表 -->
+    <select id="getListsByDateCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo">
+        select task_no from publish_task_info where delete_flag = '0'
+        <if test="date != null and date != ''">
+            AND (lower(task_no) like lower(CONCAT('%',#{date},'%')))
+        </if>
+        order by task_no desc
+    </select>
 </mapper>