出库申请删除、批量删除接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java

@@ -28,7 +28,9 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,16 +54,20 @@ import lombok.Data;
 public class BusDeliveredApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
     private Date applyDate; // 申请日期
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String name; // 客户名称
-	@ApiModelProperty("车型别名")
+    @ApiModelProperty("车型别名")
     private String modelName; // 车型别名
-	@ApiModelProperty("是否是终端:1是，0不是")
+    @ApiModelProperty("是否是终端:1是，0不是")
     private Integer isTerminal; // 是否是终端:1是，0不是
+    @ApiModelProperty(value = "申请人")
+    private String applyName;
+    @ApiModelProperty(value = "申请人sid")
+    private String applySid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java

@@ -56,6 +56,10 @@ public class BusDeliveredApplyDto implements Dto {
     private String sid;
     @ApiModelProperty("合同编号")
     private String contractNo;
+    @ApiModelProperty(value = "申请人")
+    private String applyName;
+    @ApiModelProperty(value = "申请人sid")
+    private String applySid;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("车型别名")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -53,8 +53,13 @@ import org.springframework.web.bind.annotation.*;
         path = "v1/busdeliveredapply",
         fallback = BusDeliveredApplyFeignFallback.class)
 public interface BusDeliveredApplyFeign {
-
-    @ApiOperation("根据条件分页查询数据的列表")
+    /**
+     * 出库申请分页列表
+     *
+     * @param pq 查询条件
+     * @return
+     */
+    @ApiOperation("出库申请分页列表")
     @PostMapping("/listPage")
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listPage(@RequestBody PagerQuery<BusDeliveredApplyQuery> pq);
@@ -86,6 +91,12 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     ResultBean submit(@RequestBody BusDeliveredApplyDto dto);
 
+    /**
+     * 列表上的提交
+     *
+     * @param sid 出库申请sid
+     * @return
+     */
     @ApiOperation("列表上的提交")
     @PutMapping("/submitBySid")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -67,6 +67,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return null;
     }
 
+    @Override
+    public ResultBean submitBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(BusDeliveredApplyDetailQuery query) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java

@@ -27,13 +27,12 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 
 import com.yxt.common.core.query.Query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyQuery.java <br/>
@@ -51,17 +50,15 @@ import lombok.Data;
 @ApiModel(value = "出库申请 查询条件", description = "出库申请 查询条件")
 public class BusDeliveredApplyQuery implements Query {
 
-	@ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("申请日期")
-    private Date applyDateStart; // 申请日期
-    private Date applyDateEnd; // 申请日期
-	@ApiModelProperty("客户名称")
-    private String name; // 客户名称
-	@ApiModelProperty("车型别名")
-    private String modelName; // 车型别名
-	@ApiModelProperty("是否是终端:1是，0不是")
-    private Integer isTerminal; // 是否是终端:1是，0不是
+    private static final long serialVersionUID = -2879951585312709905L;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("申请日期")
+    private String applyDateStart;
+    private Date applyDateEnd;
+    @ApiModelProperty(value = "申请人")
+    private String applyName;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java

@@ -27,9 +27,6 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 
 import com.yxt.common.core.vo.Vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,19 +48,18 @@ import lombok.Data;
 @ApiModel(value = "出库申请 视图数据对象", description = "出库申请 视图数据对象")
 public class BusDeliveredApplyVo implements Vo {
 
-    private String sid; // sid
+    private static final long serialVersionUID = -5288930043107860764L;
+    private String sid;
+    @ApiModelProperty(value = "状态")
+    private String state;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty(value = "申请人")
+    private String applyName;
 
-	@ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("申请日期")
-    private Date applyDateStart; // 申请日期
-    private Date applyDateEnd; // 申请日期
-	@ApiModelProperty("客户名称")
-    private String name; // 客户名称
-	@ApiModelProperty("车型别名")
-    private String modelName; // 车型别名
-	@ApiModelProperty("是否是终端:1是，0不是")
-    private Integer isTerminal; // 是否是终端:1是，0不是
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredapplydetails;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyDetailsFeign.java <br/>
@@ -61,16 +59,11 @@ public interface BusDeliveredApplyDetailsFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredApplyDetailsVo>> listPage(@RequestBody PagerQuery<BusDeliveredApplyDetailsQuery> pq);
 
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusDeliveredApplyDetailsDto dto);
-        
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyDetailsFeignFallback.java <br/>
@@ -48,25 +46,20 @@ import java.util.List;
 @Component
 public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyDetailsFeign {
 
-	@Override
-	public ResultBean<PagerVo<BusDeliveredApplyDetailsVo>> listPage(PagerQuery<BusDeliveredApplyDetailsQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busdeliveredapplydetails/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusDeliveredApplyDetailsDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredapplydetails/save无法访问");
-	}
+    @Override
+    public ResultBean<PagerVo<BusDeliveredApplyDetailsVo>> listPage(PagerQuery<BusDeliveredApplyDetailsQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busdeliveredapplydetails/listPage无法访问");
+    }
 
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredapplydetails/delBySids无法访问");
-	}
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdeliveredapplydetails/delBySids无法访问");
+    }
 
-	@Override
-	public ResultBean<BusDeliveredApplyDetailsDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busdeliveredapplydetails/fetchDetailsBySid无法访问");
-	}
+    @Override
+    public ResultBean<BusDeliveredApplyDetailsDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busdeliveredapplydetails/fetchDetailsBySid无法访问");
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -65,4 +65,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
     List<BusDeliveredApplyVo> selectListVo();
 
     int updateStateBySid(@Param("state") int i, @Param("sid") String sid, @Param("today") Date today);
+
+    List<Boolean> selectState(@Param("sidsList") List<String> sidsList);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -24,4 +24,12 @@
         set state = #{state} and applyDate = #{today}
         where sid = #{sid}
     </update>
+
+    <select id="selectState" resultType="java.lang.Boolean">
+        select if(state = '1', 'true', 'false')
+        from bus_delivered_apply where sid in
+        <foreach item="vinNo" collection="sidsList" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -59,7 +59,7 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     private BusDeliveredApplyService busDeliveredApplyService;
 
     @Override
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("出库申请分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listPage(@RequestBody PagerQuery<BusDeliveredApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -67,27 +67,45 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return rb.success().setData(pv);
     }
 
+    /**
+     * 新增或修改
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     @Override
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
     public ResultBean save(@RequestBody BusDeliveredApplyDto dto) {
         return busDeliveredApplyService.saveOrUpdateDto(dto);
     }
 
+    /**
+     * 批量删除车辆出库申请
+     *
+     * @param sids 出库申请的sid集合
+     * @return
+     */
     @Override
-    @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
-        busDeliveredApplyService.delBySids(sids);
-        return rb.success();
+        return busDeliveredApplyService.delete(sids);
     }
 
+    /**
+     * 提交申请
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     @Override
     public ResultBean submit(BusDeliveredApplyDto dto) {
         return busDeliveredApplyService.submit(dto);
     }
 
+    /**
+     * 出库申请管理列表的提交
+     *
+     * @param sid 出库申请sid
+     * @return
+     */
     @Override
     public ResultBean submitBySid(String sid) {
         return busDeliveredApplyService.submitBySid(sid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -44,7 +44,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -73,6 +75,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BusDeliveredApply> qw = new QueryWrapper<>();
+        if (query != null) {
+            //合同编号
+            if (StringUtils.isNotBlank(query.getContractNo())) {
+                qw.eq("bd.contractNo", query.getContractNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(query.getName())) {
+                qw.eq("bd.name", query.getName());
+            }
+        }
         return qw;
     }
 
@@ -183,4 +195,29 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         baseMapper.updateStateBySid(2, sid, DateUtil.date());
         return rb.success().setMsg("提交成功");
     }
+
+    /**
+     * 删除
+     *
+     * @param sids 出库申请的数组sid
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean delete(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> sidsList = Arrays.asList(sids);
+        List<Boolean> stateList = baseMapper.selectState(sidsList);
+        if (stateList.contains(false)) {
+            return rb.setMsg("已提交的申请不允许删除");
+        }
+        if (sidsList.size() > 0) {
+            for (int i = 0; i < sidsList.size(); i++) {
+                busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
+                busDeliveredUseMessageService.deleteByApplySid(sidsList.get(i));
+                deleteBySid(sidsList.get(i));
+            }
+        }
+        return rb.success().setMsg("删除成功");
+
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java

@@ -71,15 +71,6 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei
 		return rb.success().setData(pv);
 	}
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusDeliveredApplyDetailsDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		busDeliveredApplyDetailsService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
 	@Override
 	@ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")

doc/databases/bus-center_tables.sql

@@ -214,6 +214,8 @@ CREATE TABLE `bus_delivered_apply`
     `applyDate`   timestamp   null     DEFAULT NULL COMMENT '申请日期',
     `name`        VARCHAR(64)          DEFAULT NULL COMMENT '客户名称',
     `modelName`   VARCHAR(64)          DEFAULT NULL COMMENT '车型别名',
+    `applyName`   VARCHAR(64)          DEFAULT NULL COMMENT '申请人',
+    `applySid`    VARCHAR(64)          DEFAULT NULL COMMENT '申请人sid',
     `isTerminal`  int(32)              DEFAULT NULL COMMENT '是否是终端:1是，0不是',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)