运单详情

src/main/java/com/jkcredit/invoice/hub/controller/web/record/BillRecordResource.java

@@ -0,0 +1,44 @@
+package com.jkcredit.invoice.hub.controller.web.record;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.hub.controller.base.WebResource;
+import com.jkcredit.invoice.hub.controller.web.record.fb.BillRecordFB;
+import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.BillRecordDto;
+import com.jkcredit.invoice.hub.model.vo.record.BillRecordVo;
+import com.jkcredit.invoice.hub.service.carFreeCarrierBillStart.CarFreeCarrierBillStartService;
+import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
+import com.jkcredit.invoice.hub.spi.web.data.ResponseData;
+import com.jkcredit.invoice.hub.util.BeanUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/1/20 16:31
+ * @version: V1.0
+ **/
+@Slf4j
+@RestController
+public class BillRecordResource extends WebResource {
+    @Autowired
+    CarFreeCarrierBillStartService startService;
+
+    @GetMapping("/billRecord")
+    public ResponseData billRecord(Page page, @RequestBody BillRecordFB fb) {
+        try {
+            BillRecordDto dto = new BillRecordDto();
+            BeanUtil.copyProperties(dto, fb);
+            IPage<BillRecordVo> billRecordVoList = startService.getBillRecord(page, dto);
+            ResponseData success = ResponseData.success(billRecordVoList);
+            return success;
+        } catch (ServiceException e) {
+            log.error("获取运单详情列表失败, 失败原因：{}", e.getMessage());
+            return ResponseData.failed("获取运单详情列表失败");
+        }
+    }
+}

src/main/java/com/jkcredit/invoice/hub/controller/web/record/fb/BillRecordFB.java

@@ -0,0 +1,21 @@
+package com.jkcredit.invoice.hub.controller.web.record.fb;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/1/20 16:43
+ * @version: V1.0
+ **/
+@Data
+public class BillRecordFB implements Serializable {
+    private static final long serialVersionUID = 8856797887246078234L;
+    private String appKey;
+    private String num;
+    private String status;
+    private String isHistory;
+    private String plateNum;
+}

src/main/java/com/jkcredit/invoice/hub/mapper/CarFreeCarrierBillStartMapper.java

@@ -1,9 +1,15 @@
 package com.jkcredit.invoice.hub.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.BillRecordDto;
+import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.BillRecordPo;
 import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -23,4 +29,6 @@ public interface CarFreeCarrierBillStartMapper extends BaseMapper<CarFreeCarrier
 
     // 查询未被查询过的运单编号
     List<String> getNoSearchNums(String userId);
+
+    IPage<BillRecordPo> getBillRecord(Page page, @Param("query") BillRecordDto dto);
 }

src/main/java/com/jkcredit/invoice/hub/model/dto/carFreeCarrierBillStart/BillRecordDto.java

@@ -0,0 +1,26 @@
+package com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/1/20 16:02
+ * @version: V1.0
+ **/
+@Data
+public class BillRecordDto implements Serializable {
+    private static final long serialVersionUID = 1415406603260088278L;
+    private String num;
+    private String plateNumber;
+    private Integer status;
+    private Integer isHistory;
+    private Date startBillCreateTime;
+    private String realDestAddr;
+    private Date endBillCreateTime;
+    private String appKey;
+    private String company;
+}

src/main/java/com/jkcredit/invoice/hub/model/po/carFreeCarrierBillStart/BillRecordPo.java

@@ -0,0 +1,25 @@
+package com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/1/20 16:09
+ * @version: V1.0
+ **/
+@Data
+public class BillRecordPo implements Serializable {
+    private String num;
+    private String plateNumber;
+    private Integer status;
+    private Integer isHistory;
+    private Date startBillCreateTime;
+    private String realDestAddr;
+    private Date endBillCreateTime;
+    private String appKey;
+    private String company;
+}

src/main/java/com/jkcredit/invoice/hub/model/vo/record/BillRecordVo.java

@@ -0,0 +1,26 @@
+package com.jkcredit.invoice.hub.model.vo.record;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/1/20 16:24
+ * @version: V1.0
+ **/
+@Data
+public class BillRecordVo implements Serializable {
+    private static final long serialVersionUID = -4302668640764667162L;
+    private String num;
+    private String plateNumber;
+    private Integer status;
+    private Integer isHistory;
+    private Date startBillCreateTime;
+    private String realDestAddr;
+    private Date endBillCreateTime;
+    private String appKey;
+    private String company;
+}

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillStart/CarFreeCarrierBillStartService.java

@@ -1,7 +1,11 @@
 package com.jkcredit.invoice.hub.service.carFreeCarrierBillStart;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.BillRecordDto;
 import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.CarFreeCarrierBillStartDto;
 import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
+import com.jkcredit.invoice.hub.model.vo.record.BillRecordVo;
 
 import java.util.List;
 
@@ -27,4 +31,6 @@ public interface CarFreeCarrierBillStartService {
     void updateBillStartIsSearch(String num);
 
     List<String> getNoSearchNums(String userId);
+
+    IPage<BillRecordVo> getBillRecord(Page page, BillRecordDto dto);
 }

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillStart/CarFreeCarrierBillStartServiceImpl.java

@@ -1,9 +1,14 @@
 package com.jkcredit.invoice.hub.service.carFreeCarrierBillStart;
 
 import cn.com.taiji.common.manager.net.http.binclient.ApiRequestException;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.hub.mapper.CarFreeCarrierBillStartMapper;
+import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.BillRecordDto;
 import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.CarFreeCarrierBillStartDto;
+import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.BillRecordPo;
 import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
+import com.jkcredit.invoice.hub.model.vo.record.BillRecordVo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.util.BeanUtil;
@@ -14,6 +19,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -127,4 +133,22 @@ public class CarFreeCarrierBillStartServiceImpl extends BaseService implements C
         }
         return nums;
     }
+
+    @Override
+    public IPage<BillRecordVo> getBillRecord(Page page, BillRecordDto dto) {
+        try {
+            IPage<BillRecordPo> billRecords = mapper.getBillRecord(page, dto);
+            return billRecords.convert(this::convert);
+        } catch (Exception e) {
+            log.error("获取运单详情记录失败,失败原因：{}", e.getMessage());
+            throw new ServiceException("获取运单详情记录失败");
+        }
+    }
+
+    private BillRecordVo convert(BillRecordPo po) {
+        BillRecordVo vo = new BillRecordVo();
+        BeanUtil.copyProperties(vo, po);
+        // 将数据库存储的decimal转double
+        return vo;
+    }
 }

src/main/java/com/jkcredit/invoice/hub/service/rolePermission/RolePermissionServiceImpl.java

@@ -72,7 +72,7 @@ public class RolePermissionServiceImpl extends BaseService implements RolePermis
         List<Long> permissions = rolePermissionMapper.getPermissionIdByRoleId(rolePermissionDto.getRoleId());
         if (permissions.size() == 0) {
             // 没有为角色添加过权限，所以直接新增即可
-            addRolePermissions(permissions, rolePermissionDto);
+            addRolePermissions(rolePermissionDto.getPermissionIds(), rolePermissionDto);
         } else {
             // 角色已经添加过权限，判断传入权限，哪些是新增，哪些需要删除
 

src/main/resources/mapper/CarFreeCarrierBillStartMapper.xml

@@ -38,4 +38,39 @@
     <select id="getNoSearchNums" resultType="java.lang.String">
         select num from h_car_free_carrier_bill_start where activated = 1 and is_search = 1 and user_id = #{userId}
     </select>
+
+    <select id="getBillRecord" resultType="com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.BillRecordPo">
+        select
+        start.num,
+        start.plate_number as plateNumber,
+        start.start_time as startBillStartTime,
+        start.status,
+        start.is_history as isHistory,
+        start.create_time as startBillCreateTime,
+        end.real_dest_addr as realDestAddr,
+        end.create_time as endBillCreateTime,
+        user.app_key as appKey,
+        user.company
+        from h_car_free_carrier_bill_start start
+        left join h_car_free_carrier_bill_end end on start.num = end.num
+        left join h_user user on start.user_id = user.id
+        <where>
+            start.activated = 1 and user.activated = 1
+            <if test="query.appKey != null and query.appKey != ''">
+                and user.app_key = #{query.appKey}
+            </if>
+            <if test="query.num != null and query.num != ''">
+                and start.num = #{query.num}
+            </if>
+            <if test="query.status != null and query.status != ''">
+                and start.status = #{query.status}
+            </if>
+            <if test="query.isHistory != null and query.isHistory != ''">
+                and start.is_history = #{query.isHistory}
+            </if>
+            <if test="query.plateNumber != null and query.plateNumber != ''">
+                and start.plate_number = #{query.plateNumber}
+            </if>
+        </where>
+    </select>
 </mapper>