Browse Source

app维修单查询

master
fanzongzhe 9 months ago
parent
commit
e4c68aa033
  1. 9
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java
  2. 7
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java
  3. 17
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankInfo.java
  4. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
  5. 9
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java
  6. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java
  7. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java
  8. 17
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java
  9. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppBusrepairBillVo.java
  10. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppInventorySearchFeign.java
  11. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
  12. 13
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorySearch/AppInventorySearchRest.java
  13. 29
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java
  14. 47
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AppBusrepairBillVo.java
  15. 20
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/InventorySearchQuery.java
  16. 7
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
  17. 25
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
  18. 8
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
  19. 58
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

9
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java

@ -55,9 +55,14 @@ import java.util.List;
path = "v1/loanfinopenbank",
fallback = LoanFinOpenBankFeignFallback.class)
public interface LoanFinOpenBankFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}
@ApiOperation("根据资方SID获取账户信息")
@GetMapping("/fetchListByBankSid")
@ResponseBody
public ResultBean<List<LoanFinOpenBankInfo>> fetchListByBankSid(@RequestParam("bankSid") String bankSid);
}

7
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java

@ -53,4 +53,9 @@ public class LoanFinOpenBankFeignFallback implements LoanFinOpenBankFeign {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-risk/loanfinopenbank/fetchDetailsBySid无法访问");
}
}
@Override
public ResultBean<List<LoanFinOpenBankInfo>> fetchListByBankSid(String bankSid) {
return null;
}
}

17
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankInfo.java

@ -0,0 +1,17 @@
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/26 10:05
*/
@Data
public class LoanFinOpenBankInfo {
private String accountName;//资方账户
private String bankAccount;//银行账号
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java

@ -18,6 +18,10 @@ public class LoanSettleApplyDetailsVo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("bankSid")
private String bankSid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请部门sid")

9
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java

@ -34,6 +34,13 @@ public class LoanSettleBankCostVo {
private String otherReceivableRemarks;
@ApiModelProperty("资方结清金额")
private String bankSettlePrice;
@ApiModelProperty("是否勾选减免,1勾选,0不勾选")
private boolean topping;
@ApiModelProperty("贷款保证金")
private String loanDeposit;
@ApiModelProperty("资方收款账号")
private String bankAccount;
@ApiModelProperty("资方收款账户")
private String dueBankValue;
private List<UrlQuery> filesList = new ArrayList<>();
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankInfo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -59,4 +60,7 @@ public interface LoanFinOpenBankMapper extends BaseMapper<LoanFinOpenBank> {
List<LoanFinOpenBankDetailsVo> selectByManSid(String sid);
void updateBySidIsDeletes(String s);
}
@Select("select * from loan_fin_open_bank where bankSid = #{bankSid} AND isDelete = 0")
List<LoanFinOpenBankInfo> fetchListByBankSid(@Param("bankSid") String bankSid);
}

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
/**
* Project: anrui-risk(资方开户行) <br/>
@ -70,4 +65,11 @@ public class LoanFinOpenBankRest implements LoanFinOpenBankFeign {
LoanFinOpenBankDetailsVo vo = loanFinOpenBankService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<LoanFinOpenBankInfo>> fetchListByBankSid(String bankSid) {
ResultBean rb = ResultBean.fireFail();
List<LoanFinOpenBankInfo> list = loanFinOpenBankService.fetchListByBankSid(bankSid);
return rb.success().setData(list);
}
}

17
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java

@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.*;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
import org.springframework.stereotype.Service;
@ -60,13 +55,13 @@ import java.util.List;
*/
@Service
public class LoanFinOpenBankService extends MybatisBaseService<LoanFinOpenBankMapper, LoanFinOpenBank> {
public void insertByDto(LoanFinOpenBankDto dto){
LoanFinOpenBank entity = new LoanFinOpenBank();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public LoanFinOpenBankDetailsVo fetchDetailsVoBySid(String sid){
LoanFinOpenBank entity = fetchBySid(sid);
LoanFinOpenBankDetailsVo vo = new LoanFinOpenBankDetailsVo();
@ -81,4 +76,8 @@ public class LoanFinOpenBankService extends MybatisBaseService<LoanFinOpenBankMa
public void updateBySidIsDeletes(String s) {
baseMapper.updateBySidIsDeletes(s);
}
}
public List<LoanFinOpenBankInfo> fetchListByBankSid(String bankSid) {
return baseMapper.fetchListByBankSid(bankSid);
}
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppBusrepairBillVo.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.wms.inventorySearch;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/26 14:10
*/
@Data
public class AppBusrepairBillVo implements Vo {
/**
* 维修单类型
*/
private String billType;
/**
* 车架号/车牌号
*/
private String carCodeInfo;
/**
* 客户名称
*/
private String customerName;
/**
* 进厂时间
*/
private String entryTime;
/**
* 是否外出
*/
private String isGoOut2;
/**
* 维修单编号
*/
private String repairId;
private String sid;
/**
* 环节名称
*/
private String state;
/**
* 科目
*/
private String subject;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppInventorySearchFeign.java

@ -35,5 +35,7 @@ public interface AppInventorySearchFeign {
@PostMapping("/oldParts")
public ResultBean<PagerVo<OldStorageVo>> appOldStorage(@RequestBody PagerQuery<InventorySearchQuery> pq);
@PostMapping("/repairs")
@ApiOperation("app工单查询列表")
ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery);
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.anrui.terminal",
"com.yxt.common.base.config"
},exclude = {DataSourceAutoConfiguration.class})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill"})
public class TerminalApplication {
public static void main(String[] args) {

13
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorySearch/AppInventorySearchRest.java

@ -25,16 +25,14 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.wms.inventorySearch;
import com.yxt.anrui.terminal.api.wms.inventorySearch.AppInventorySearchFeign;
import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery;
import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.*;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutDetailsVo;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutFeign;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutDto;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutTaskQuery;
import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsbusrepairBillFegin;
import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -53,6 +51,8 @@ public class AppInventorySearchRest implements AppInventorySearchFeign {
@Resource
private WmsInventoryFeign wmsInventoryFeign;
@Resource
private AsbusrepairBillFegin asbusrepairBillFegin;
@Override
public ResultBean<PagerVo<StorageVo>> appStorage(PagerQuery<InventorySearchQuery> pq) {
@ -63,4 +63,9 @@ public class AppInventorySearchRest implements AppInventorySearchFeign {
public ResultBean<PagerVo<OldStorageVo>> appOldStorage(PagerQuery<InventorySearchQuery> pq) {
return wmsInventoryFeign.appOldStorage(pq);
}
@Override
public ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(PagerQuery<InventorySearchQuery> pagerQuery) {
return asbusrepairBillFegin.appRepairs(pagerQuery);
}
}

29
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java

@ -0,0 +1,29 @@
package com.yxt.anrui.terminal.fegin.asbusrepairbill;
import com.yxt.anrui.terminal.api.wms.inventorySearch.AppBusrepairBillVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery;
import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo;
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.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @description: 商品基础信息
* @author: fzz
* @date: 2024/3/7
**/
@FeignClient(
contextId = "yxt-as-AsbusrepairBill",
name = "yxt-as",
path = "v1/AsBusrepairBill"
)
public interface AsbusrepairBillFegin {
@PostMapping("/appRepairs")
@ApiOperation("app工单查询列表")
ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery);
}

47
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AppBusrepairBillVo.java

@ -0,0 +1,47 @@
package com.yxt.anrui.as.api.asbusrepairbill.app;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/26 14:10
*/
@Data
public class AppBusrepairBillVo implements Vo {
/**
* 维修单类型
*/
private String billType;
/**
* 车架号/车牌号
*/
private String carCodeInfo;
/**
* 客户名称
*/
private String customerName;
/**
* 进厂时间
*/
private String entryTime;
/**
* 是否外出
*/
private String isGoOut2;
/**
* 维修单编号
*/
private String repairId;
private String sid;
/**
* 环节名称
*/
private String state;
/**
* 科目
*/
private String subject;
}

20
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/InventorySearchQuery.java

@ -0,0 +1,20 @@
package com.yxt.anrui.as.api.asbusrepairbill.app;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/23 8:50
*/
@Data
public class InventorySearchQuery implements Query {
private String name;
private String userSid;
private String menuSid;
private String orgPath;
}

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

@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asbusrepairbill.*;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.*;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -60,4 +57,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
IPage<GoodsConfrimListVo> notConfirmList2(IPage<AsBusrepairBill> page,@Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
List<GoodsConfrimDetailsVo> goodsConfrimInfoList(@Param("sid") String sid);
IPage<AppBusrepairBillVo> appRepairs(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER)QueryWrapper<AsBusrepairBill> qw);
}

25
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@ -272,4 +272,29 @@
LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
where i.sourceBillSid = #{sid}
</select>
<select id="appRepairs" resultType="com.yxt.anrui.as.api.asbusrepairbill.app.AppBusrepairBillVo">
SELECT
a.sid,
a.billNo repairId,
a.billType,
a.nodeName state,
a.customerName,
a.entryTime,
CASE
a.isGoOut
WHEN '1' THEN
'是'
WHEN '2' THEN
'否'
END AS isGoOut2,
concat(v.vinNo,'/',v.vehMark) carCodeInfo,
a.subject
FROM
as_busrepair_bill AS a
LEFT JOIN as_busrepair_bill_vech AS v ON a.sid = v.billSid
LEFT JOIN anrui_portal.sys_organization AS s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -50,7 +50,13 @@ public class AsBusrepairBillRest {
PagerVo<AsBusrepairBillVo> pv = asBusrepairBillService.listPage(pagerQuery);
return rb.success().setData(pv);
}
@PostMapping("/appRepairs")
@ApiOperation("app工单查询列表")
ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery) {
ResultBean<PagerVo<AppBusrepairBillVo>> rb = ResultBean.fireFail();
PagerVo<AppBusrepairBillVo> pv = asBusrepairBillService.appRepairs(pagerQuery);
return rb.success().setData(pv);
}
@PostMapping("/listPageCC")
@ApiOperation("工单查询列表-出厂")
ResultBean<PagerVo<AsBusrepairBillVo>> listPageCC(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery) {

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

@ -63,6 +63,7 @@ import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
import com.yxt.anrui.as.feign.sms.SmsGoods;
import com.yxt.anrui.as.feign.sms.SmsGoodsFeign;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventory;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryFeign;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryPush;
import com.yxt.common.base.config.component.DocPdfComponent;
@ -2283,4 +2284,61 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
return rb.success().setData(pdfName);
}
public PagerVo<AppBusrepairBillVo> appRepairs(PagerQuery<InventorySearchQuery> pq) {
InventorySearchQuery query = pq.getParams();
QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setUserSid(query.getUserSid());
privilegeQuery.setMenuSid(query.getMenuSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (com.yxt.common.base.utils.StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<AppBusrepairBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AppBusrepairBillVo> p = new PagerVo<>();
return p;
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("a.billNo", query.getName())
.or().like("a.billType", query.getName())
.or().like("a.subject", query.getName())
.or().like("a.customerName", query.getName())
.or().like("v.vinNo", query.getName())
.or().like("v.vehMark", query.getName())
.or().like("a.nodeName", query.getName())
);
}
qw.eq("a.isDelete",0);
qw.orderByDesc("a.id");
IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pq);
IPage<AppBusrepairBillVo> pagging = baseMapper.appRepairs(page, qw);
PagerVo<AppBusrepairBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

Loading…
Cancel
Save