Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -39,6 +39,12 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String deptId;
     private String deptId;
 
 
     /**
     /**
+     * 要车办事处名称
+     */
+    @ApiModelProperty("要车办事处名称")
+    private String deptName;
+
+    /**
      * 计划装货日期
      * 计划装货日期
      */
      */
     @ApiModelProperty("计划装货日期")
     @ApiModelProperty("计划装货日期")
@@ -52,6 +58,12 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String workshopId;
     private String workshopId;
 
 
     /**
     /**
+     * 装货厂别名称
+     */
+    @ApiModelProperty("装货厂别名称")
+    private String workshopName;
+
+    /**
      * 订单编号
      * 订单编号
      */
      */
     @ApiModelProperty("订单编号")
     @ApiModelProperty("订单编号")
@@ -106,6 +118,12 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String externalAuditor;
     private String externalAuditor;
 
 
     /**
     /**
+     * 外办审核人名称
+     */
+    @ApiModelProperty("外办审核人名称")
+    private String externalAuditorName;
+
+    /**
      * 装货时间
      * 装货时间
      */
      */
     @ApiModelProperty("装货时间")
     @ApiModelProperty("装货时间")
@@ -124,11 +142,29 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String businessOfficeAuditor;
     private String businessOfficeAuditor;
 
 
     /**
     /**
+     * 经营办审核人名称
+     */
+    @ApiModelProperty("经营办审核人名称")
+    private String businessOfficeAuditorName;
+
+    /**
      * 运作科审核人
      * 运作科审核人
      */
      */
     @ApiModelProperty("运作科审核人")
     @ApiModelProperty("运作科审核人")
     private String operationsDepartmentAuditor;
     private String operationsDepartmentAuditor;
 
 
+    /**
+     * 运作科审核人名称
+     */
+    @ApiModelProperty("运作科审核人名称")
+    private String operationsDepartmentAuditorName;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
     public GetRequestCarTicketBo() {
     public GetRequestCarTicketBo() {
 
 
     }
     }

@@ -85,7 +85,7 @@ public class RequestCarTicketController extends DefaultBaseController {
     @ApiOperation("新增")
     @ApiOperation("新增")
     @HasPermission({"requestCarTicket:requestcarticket:add"})
     @HasPermission({"requestCarTicket:requestcarticket:add"})
     @PostMapping
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateRequestCarTicketVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreateRequestCarTicketVo vo) {
 
 
         requestCarTicketService.create(vo);
         requestCarTicketService.create(vo);
 
 
@@ -98,7 +98,7 @@ public class RequestCarTicketController extends DefaultBaseController {
     @ApiOperation("修改")
     @ApiOperation("修改")
     @HasPermission({"requestCarTicket:requestcarticket:modify"})
     @HasPermission({"requestCarTicket:requestcarticket:modify"})
     @PutMapping
     @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateRequestCarTicketVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateRequestCarTicketVo vo) {
 
 
         requestCarTicketService.update(vo);
         requestCarTicketService.update(vo);
 
 
@@ -106,6 +106,19 @@ public class RequestCarTicketController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        requestCarTicketService.updateStatus(id, "CANCEL");
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID删除
      * 根据ID删除
      */
      */
     @ApiOperation("根据ID删除")
     @ApiOperation("根据ID删除")

@@ -40,6 +40,12 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String deptId;
     private String deptId;
 
 
     /**
     /**
+     * 要车办事处名称（非持久化字段）
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
      * 计划装货日期
      * 计划装货日期
      */
      */
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
@@ -50,6 +56,12 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String workshopId;
     private String workshopId;
 
 
     /**
     /**
+     * 装货厂别名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
      * 订单编号
      * 订单编号
      */
      */
     private String orderNo;
     private String orderNo;
@@ -95,6 +107,12 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String externalAuditor;
     private String externalAuditor;
 
 
     /**
     /**
+     * 外办审核人名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String externalAuditorName;
+
+    /**
      * 装货时间
      * 装货时间
      */
      */
     private String loadingTime;
     private String loadingTime;
@@ -110,11 +128,28 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String businessOfficeAuditor;
     private String businessOfficeAuditor;
 
 
     /**
     /**
+     * 经营办审核人名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String businessOfficeAuditorName;
+
+    /**
      * 运作科审核人
      * 运作科审核人
      */
      */
     private String operationsDepartmentAuditor;
     private String operationsDepartmentAuditor;
 
 
     /**
     /**
+     * 运作科审核人名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String operationsDepartmentAuditorName;
+
+    /**
+     * 审核状态
+     */
+    private String status;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -22,6 +22,7 @@ import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.UpdateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.UpdateRequestCarTicketVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -51,7 +52,7 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
     @Override
     @Override
     public RequestCarTicket findById(String id) {
     public RequestCarTicket findById(String id) {
 
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增要车单表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增要车单表，ID：{}", params = {"#id"})
@@ -112,6 +113,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         if (!StringUtil.isBlank(vo.getOperationsDepartmentAuditor())) {
         if (!StringUtil.isBlank(vo.getOperationsDepartmentAuditor())) {
             data.setOperationsDepartmentAuditor(vo.getOperationsDepartmentAuditor());
             data.setOperationsDepartmentAuditor(vo.getOperationsDepartmentAuditor());
         }
         }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -149,6 +153,7 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
                 .set(RequestCarTicket::getSpecialLoadingRequirement, StringUtil.isBlank(vo.getSpecialLoadingRequirement()) ? null : vo.getSpecialLoadingRequirement())
                 .set(RequestCarTicket::getSpecialLoadingRequirement, StringUtil.isBlank(vo.getSpecialLoadingRequirement()) ? null : vo.getSpecialLoadingRequirement())
                 .set(RequestCarTicket::getBusinessOfficeAuditor, StringUtil.isBlank(vo.getBusinessOfficeAuditor()) ? null : vo.getBusinessOfficeAuditor())
                 .set(RequestCarTicket::getBusinessOfficeAuditor, StringUtil.isBlank(vo.getBusinessOfficeAuditor()) ? null : vo.getBusinessOfficeAuditor())
                 .set(RequestCarTicket::getOperationsDepartmentAuditor, StringUtil.isBlank(vo.getOperationsDepartmentAuditor()) ? null : vo.getOperationsDepartmentAuditor())
                 .set(RequestCarTicket::getOperationsDepartmentAuditor, StringUtil.isBlank(vo.getOperationsDepartmentAuditor()) ? null : vo.getOperationsDepartmentAuditor())
+                .set(RequestCarTicket::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
                 .eq(RequestCarTicket::getId, vo.getId());
                 .eq(RequestCarTicket::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
@@ -157,6 +162,27 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "修改草稿要车单状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        RequestCarTicket data = getBaseMapper().findById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("草稿要车单不存在！");
+        }
+        LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
+                .set(RequestCarTicket::getStatus, status)
+                .eq(RequestCarTicket::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override

@@ -21,4 +21,13 @@ public interface RequestCarTicketMapper extends BaseMapper<RequestCarTicket> {
      * @return
      * @return
      */
      */
     List<RequestCarTicket> query(@Param("vo") QueryRequestCarTicketVo vo);
     List<RequestCarTicket> query(@Param("vo") QueryRequestCarTicketVo vo);
+
+
+    /**
+     * 草稿要车单
+     *
+     * @param id 主键
+     * @return RequestCarTicket
+     */
+    RequestCarTicket findById(@Param("id") String id);
 }
 }

@@ -47,6 +47,14 @@ public interface RequestCarTicketService extends BaseMpService<RequestCarTicket>
     void update(UpdateRequestCarTicketVo vo);
     void update(UpdateRequestCarTicketVo vo);
 
 
     /**
     /**
+     * 修改状态
+     *
+     * @param id     主键
+     * @param status 状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
      * 根据ID删除
      * 根据ID删除
      * @param id
      * @param id
      * @return
      * @return

@@ -135,4 +135,10 @@ public class CreateRequestCarTicketVo implements BaseVo, Serializable {
     @Length(message = "运作科审核人最多允许50个字符！")
     @Length(message = "运作科审核人最多允许50个字符！")
     private String operationsDepartmentAuditor;
     private String operationsDepartmentAuditor;
 
 
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
 }
 }

@@ -2,9 +2,7 @@ package com.lframework.xingyun.sc.vo.shipments.car;
 
 
 import lombok.Data;
 import lombok.Data;
 import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.PageVo;
-import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
@@ -14,11 +12,22 @@ public class QueryRequestCarTicketVo extends PageVo implements BaseVo, Serializa
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
-     * 要车日期
+     * 要车办事处名称
      */
      */
-    @ApiModelProperty("要车日期")
-    @TypeMismatch(message = "要车日期格式有误！")
-    private LocalDate requestCarData;
+    @ApiModelProperty("要车办事处名称")
+    private String deptName;
+
+    /**
+     * 要车日期开始
+     */
+    @ApiModelProperty("要车日期开始")
+    private String requestCarDataStart;
+
+    /**
+     * 要车日期结束
+     */
+    @ApiModelProperty("要车日期结束")
+    private String requestCarDataEnd;
 
 
     /**
     /**
      * 装货厂别
      * 装货厂别
@@ -38,4 +47,11 @@ public class QueryRequestCarTicketVo extends PageVo implements BaseVo, Serializa
     @ApiModelProperty("客户名称【简称】")
     @ApiModelProperty("客户名称【简称】")
     private String customerShortName;
     private String customerShortName;
 
 
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
 }
 }

@@ -143,4 +143,10 @@ public class UpdateRequestCarTicketVo implements BaseVo, Serializable {
     @Length(message = "运作科审核人最多允许50个字符！")
     @Length(message = "运作科审核人最多允许50个字符！")
     private String operationsDepartmentAuditor;
     private String operationsDepartmentAuditor;
 
 
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
 }
 }

@@ -6,8 +6,10 @@
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="request_car_data" property="requestCarData"/>
         <result column="request_car_data" property="requestCarData"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
         <result column="order_no" property="orderNo"/>
         <result column="order_no" property="orderNo"/>
         <result column="customer_short_name" property="customerShortName"/>
         <result column="customer_short_name" property="customerShortName"/>
         <result column="destination" property="destination"/>
         <result column="destination" property="destination"/>
@@ -17,10 +19,14 @@
         <result column="return_plan_arrangement" property="returnPlanArrangement"/>
         <result column="return_plan_arrangement" property="returnPlanArrangement"/>
         <result column="other" property="other"/>
         <result column="other" property="other"/>
         <result column="external_auditor" property="externalAuditor"/>
         <result column="external_auditor" property="externalAuditor"/>
+        <result column="external_auditor_name" property="externalAuditorName"/>
         <result column="loading_time" property="loadingTime"/>
         <result column="loading_time" property="loadingTime"/>
         <result column="special_loading_requirement" property="specialLoadingRequirement"/>
         <result column="special_loading_requirement" property="specialLoadingRequirement"/>
         <result column="business_office_auditor" property="businessOfficeAuditor"/>
         <result column="business_office_auditor" property="businessOfficeAuditor"/>
+        <result column="business_office_auditor_name" property="businessOfficeAuditorName"/>
         <result column="operations_department_auditor" property="operationsDepartmentAuditor"/>
         <result column="operations_department_auditor" property="operationsDepartmentAuditor"/>
+        <result column="operations_department_auditor_name" property="operationsDepartmentAuditorName"/>
+        <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -34,8 +40,10 @@
             tb.id,
             tb.id,
             tb.request_car_data,
             tb.request_car_data,
             tb.dept_id,
             tb.dept_id,
+            sd.name AS dept_name,
             tb.delivery_date,
             tb.delivery_date,
             tb.workshop_id,
             tb.workshop_id,
+            ws.name AS workshop_name,
             tb.order_no,
             tb.order_no,
             tb.customer_short_name,
             tb.customer_short_name,
             tb.destination,
             tb.destination,
@@ -45,10 +53,14 @@
             tb.return_plan_arrangement,
             tb.return_plan_arrangement,
             tb.other,
             tb.other,
             tb.external_auditor,
             tb.external_auditor,
+            su.name AS external_auditor_name,
             tb.loading_time,
             tb.loading_time,
             tb.special_loading_requirement,
             tb.special_loading_requirement,
             tb.business_office_auditor,
             tb.business_office_auditor,
+            su1.name AS business_office_auditor_name,
             tb.operations_department_auditor,
             tb.operations_department_auditor,
+            su2.name AS operations_department_auditor_name,
+            tb.status,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -56,24 +68,49 @@
             tb.create_time,
             tb.create_time,
             tb.update_time
             tb.update_time
         FROM request_car_ticket AS tb
         FROM request_car_ticket AS tb
+        left join sys_dept as sd on sd.id = tb.dept_id
+        left join base_data_workshop as ws on ws.id = tb.workshop_id
+        left join sys_user as su on su.id = tb.external_auditor
+        left join sys_user as su1 on su1.id = tb.business_office_auditor
+        left join sys_user as su2 on su2.id = tb.operations_department_auditor
     </sql>
     </sql>
 
 
     <select id="query" resultMap="RequestCarTicket">
     <select id="query" resultMap="RequestCarTicket">
         <include refid="RequestCarTicket_sql"/>
         <include refid="RequestCarTicket_sql"/>
         <where>
         <where>
-            <if test="vo.requestCarData != null">
-                AND tb.request_car_data = #{vo.requestCarData}
+            <if test="vo.requestCarDataStart != null">
+                AND tb.request_car_data >= #{vo.requestCarDataStart}
+            </if>
+            <if test="vo.requestCarDataEnd != null">
+                <![CDATA[
+               AND tb.request_car_data <= #{vo.requestCarDataEnd}
+                ]]>
             </if>
             </if>
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>
             <if test="vo.orderNo != null and vo.orderNo != ''">
             <if test="vo.orderNo != null and vo.orderNo != ''">
-                AND tb.order_no = #{vo.orderNo}
+                AND tb.order_no LIKE CONCAT('%', #{vo.orderNo},'%')
             </if>
             </if>
             <if test="vo.customerShortName != null and vo.customerShortName != ''">
             <if test="vo.customerShortName != null and vo.customerShortName != ''">
-                AND tb.customer_short_name LIKE CONCAT('%', #{vo.customerShortName})
+                AND tb.customer_short_name LIKE CONCAT('%', #{vo.customerShortName},'%')
+            </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND sd.name LIKE CONCAT('%', #{vo.deptName},'%')
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
             </if>
             </if>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.RequestCarTicket">
+        <include refid="RequestCarTicket_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>