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

@@ -53,7 +53,7 @@ public class AsBwinvoiceapplyRest {
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<AsBwinvoiceapplyVo>> listPage(@RequestBody PagerQuery<AsBwinvoiceapplyQuery> pq){
+    public ResultBean<PagerVo<AsBwinvoiceapplyVo>> listPage(@RequestBody PagerQuery<AsBwinvoiceapplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<AsBwinvoiceapplyVo> pv = asBwinvoiceapplyService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -61,21 +61,19 @@ public class AsBwinvoiceapplyRest {
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody AsBwinvoiceapplyDto dto){
+    public ResultBean save(@RequestBody AsBwinvoiceapplyDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        return asBwinvoiceapplyService.saveOrUpdateDto(dto);
-		asBwinvoiceapplyService.saveOrUpdateDto(dto);
-		return rb.success();
     }
 
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return asBwinvoiceapplyService.delAll(sids);
     }
 
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         AsBwinvoiceapplyDetailsVo vo = asBwinvoiceapplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

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

@@ -170,11 +170,11 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("ab.billNo", query.getBillNo());
         }
-		if (StringUtils.isNotBlank(query.getInvoiceTitle())){
+        if (StringUtils.isNotBlank(query.getInvoiceTitle())) {
-			qw.like("ab.invoiceTitle",query.getInvoiceTitle());
+            qw.like("ab.invoiceTitle", query.getInvoiceTitle());
         }
-		if (StringUtils.isNotBlank(query.getInvoiceTypeKey())){
+        if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) {
-			qw.eq("ab.invoiceTypeKey",query.getInvoiceTypeKey());
+            qw.eq("ab.invoiceTypeKey", query.getInvoiceTypeKey());
         }
         String createTimeStart = query.getCreateTimeStart();
         String createTimeEnd = query.getCreateTimeEnd();
@@ -203,7 +203,8 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
         return p;
     }
 
-	public String saveOrUpdateDto(AsBwinvoiceapplyDto dto){
+    public ResultBean<String> saveOrUpdateDto(AsBwinvoiceapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<AsBwinvoiceapplyFile> fileList = dto.getFileList();
         List<AsBwinvoiceapplyDetailDto> asBwinvoiceapplyDetailList = dto.getAsBwinvoiceapplyDetailList();
@@ -214,6 +215,13 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
         dto.setUseOrgSid(useOrgSid);
         dto.setUseOrgName(organizationVo.getName());
         if (StringUtils.isBlank(dtoSid)) {
+            for (AsBwinvoiceapplyDetailDto asBwinvoiceapplyDetailDto : asBwinvoiceapplyDetailList) {
+                String sourceBillSid = asBwinvoiceapplyDetailDto.getSourceBillSid();
+                int i = asBwinvoiceapplyDetailService.selBySourceBillSid(sourceBillSid);
+                if (i > 0){
+                    return rb.setMsg("维修单编号" + asBwinvoiceapplyDetailDto.getSourceBillNo() + "已存在");
+                }
+            }
             //生成单据编号
             String billNo = "";
             String date = DateUtil.format(DateUtil.date(), "yyyyMM");
@@ -238,7 +246,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
                 asBwinvoiceapplyDetailDto.setMainSid(sid);
                 asBwinvoiceapplyDetailService.insertByDto(asBwinvoiceapplyDetailDto);
             }
-			return sid;
+            return rb.success().setData(sid);
         }
         this.updateByDto(dto);
         asAppendixService.delByLinkSid(dtoSid);
@@ -255,10 +263,10 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
             asBwinvoiceapplyDetailDto.setMainSid(dtoSid);
             asBwinvoiceapplyDetailService.insertByDto(asBwinvoiceapplyDetailDto);
         }
-		return dtoSid;
+        return rb.success().setData(dtoSid);
     }
 
-	public String insertByDto(AsBwinvoiceapplyDto dto){
+    public String insertByDto(AsBwinvoiceapplyDto dto) {
         AsBwinvoiceapply entity = new AsBwinvoiceapply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
@@ -266,7 +274,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
         return entity.getSid();
     }
 
-	public void updateByDto(AsBwinvoiceapplyDto dto){
+    public void updateByDto(AsBwinvoiceapplyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -276,7 +284,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
         baseMapper.updateById(entity);
     }
 
-	public AsBwinvoiceapplyDetailsVo fetchDetailsVoBySid(String sid){
+    public AsBwinvoiceapplyDetailsVo fetchDetailsVoBySid(String sid) {
         AsBwinvoiceapply entity = fetchBySid(sid);
         AsBwinvoiceapplyDetailsVo vo = new AsBwinvoiceapplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
@@ -319,7 +327,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
-		String businessSid = saveOrUpdateDto(dto);
+        String businessSid = saveOrUpdateDto(dto).getData();
         asBwinvoiceapply = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();

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);
+    }
 }