Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -25,4 +27,6 @@ public class AsBusrepairBwBillPageListQuery implements Query {
     @ApiModelProperty("结算日期")
     private String settleTimeStart;
     private String settleTimeEnd;
+
+    private List<String> sids;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1656,6 +1656,11 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         String deptSid = query.getDeptSid();
         SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
+        if (query.getSids() != null) {
+            if (query.getSids().size() > 0) {
+                qw.notIn("a.sid", query.getSids());
+            }
+        }
         //维修工单编号
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("a.billNo", query.getBillNo());

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyRest.java

@@ -48,88 +48,86 @@ import java.util.List;
 @RequestMapping("v1/asbwinvoiceapply")
 public class AsBwinvoiceapplyRest {
 
-	@Autowired
-	private AsBwinvoiceapplyService asBwinvoiceapplyService;
-
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsBwinvoiceapplyVo>> listPage(@RequestBody PagerQuery<AsBwinvoiceapplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsBwinvoiceapplyVo> pv = asBwinvoiceapplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody AsBwinvoiceapplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asBwinvoiceapplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@ApiOperation("根据sid批量删除")
+    @Autowired
+    private AsBwinvoiceapplyService asBwinvoiceapplyService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<AsBwinvoiceapplyVo>> listPage(@RequestBody PagerQuery<AsBwinvoiceapplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsBwinvoiceapplyVo> pv = asBwinvoiceapplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AsBwinvoiceapplyDto dto) {
+        return asBwinvoiceapplyService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		return asBwinvoiceapplyService.delAll(sids);
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return asBwinvoiceapplyService.delAll(sids);
+    }
 
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		AsBwinvoiceapplyDetailsVo vo = asBwinvoiceapplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
-	@ApiOperation("提交")
-	@PostMapping("/submitApply")
-	public ResultBean submitApply(@Valid @RequestBody SubmitBwinvoiceApplyDto dto) {
-		return asBwinvoiceapplyService.submitApply(dto);
-	}
-
-	@ApiOperation(value = "办理（同意）")
-	@PostMapping("/complete")
-	public ResultBean complete(@Valid @RequestBody CompleteBwinvoiceApplyDto query) {
-		BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
-		bv.setModelId("");
-		return asBwinvoiceapplyService.complete(bv);
-	}
-
-	@ApiOperation(value = "获取上一个环节")
-	@GetMapping(value = "/getPreviousNodesForReject")
-	ResultBean<List<BwinvoiceApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
-		return asBwinvoiceapplyService.getPreviousNodesForReject(query);
-	}
-
-	@ApiOperation(value = "获取下一个环节")
-	@GetMapping(value = "/getNextNodesForSubmit")
-	ResultBean<List<BwinvoiceApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
-		return asBwinvoiceapplyService.getNextNodesForSubmit(query);
-	}
-
-	@ApiOperation(value = "驳回任务")
-	@PostMapping(value = "/reject")
-	public ResultBean taskReject(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
-		return asBwinvoiceapplyService.taskReject(query);
-	}
-
-	@ApiOperation(value = "撤回流程")
-	@PostMapping(value = "/revokeProcess")
-	public ResultBean revokeProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
-		return asBwinvoiceapplyService.revokeProcess(query);
-	}
-
-	@ApiOperation(value = "终止任务")
-	@PostMapping(value = "/breakProcess")
-	public ResultBean breakProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
-		return asBwinvoiceapplyService.breakProcess(query);
-	}
-
-	@ApiOperation(value = "加签")
-	@PostMapping(value = "/delegate")
-	@ResponseBody
-	public ResultBean delegate(@RequestBody BwinvoiceApplyDelegateQuery query) {
-		return asBwinvoiceapplyService.delegate(query);
-	}
+    public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsBwinvoiceapplyDetailsVo vo = asBwinvoiceapplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @ApiOperation("提交")
+    @PostMapping("/submitApply")
+    public ResultBean submitApply(@Valid @RequestBody SubmitBwinvoiceApplyDto dto) {
+        return asBwinvoiceapplyService.submitApply(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteBwinvoiceApplyDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId("");
+        return asBwinvoiceapplyService.complete(bv);
+    }
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<BwinvoiceApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
+        return asBwinvoiceapplyService.getPreviousNodesForReject(query);
+    }
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<BwinvoiceApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
+        return asBwinvoiceapplyService.getNextNodesForSubmit(query);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
+        return asBwinvoiceapplyService.taskReject(query);
+    }
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
+        return asBwinvoiceapplyService.revokeProcess(query);
+    }
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
+        return asBwinvoiceapplyService.breakProcess(query);
+    }
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody BwinvoiceApplyDelegateQuery query) {
+        return asBwinvoiceapplyService.delegate(query);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailMapper.java

@@ -59,4 +59,7 @@ public interface AsBwinvoiceapplyDetailMapper extends BaseMapper<AsBwinvoiceappl
 
     @Select("select * from as_bwinvoiceapply_detail where mainSid = #{mainSid}")
     List<AsBwinvoiceapplyDetailDetailsVo> fetchByMainSid(String mainSid);
+
+    @Select("select count(*) from as_bwinvoiceapply_detail where sourceBillSid = #{sourceBillSid}")
+    int selBySourceBillSid(String sourceBillSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailService.java

@@ -92,4 +92,8 @@ public class AsBwinvoiceapplyDetailService extends MybatisBaseService<AsBwinvoic
     public List<AsBwinvoiceapplyDetailDetailsVo> fetchByMainSid(String mainSid) {
         return baseMapper.fetchByMainSid(mainSid);
     }
+
+    public int selBySourceBillSid(String sourceBillSid) {
+        return baseMapper.selBySourceBillSid(sourceBillSid);
+    }
 }