diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 91fdb049ce..8ab050e01a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -596,7 +596,7 @@ + + + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerRest.java new file mode 100644 index 0000000000..4b50017a2c --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysflowpower; + +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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDetailsVo; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDto; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerFeign; + +/** + * Project: anrui-portal(流程权限)
+ * File: SysFlowPowerFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerRest
+ * Description: 流程权限.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-27 14:31:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "流程权限") +@RestController("com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerRest") +@RequestMapping("v1/sysflowpower") +public class SysFlowPowerRest implements SysFlowPowerFeign { + + @Autowired + private SysFlowPowerService sysFlowPowerService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestParam("flowKey") String flowKey){ + ResultBean rb = ResultBean.fireFail(); + List pv = sysFlowPowerService.listPageVo(flowKey); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SysFlowPowerDto dto){ + return sysFlowPowerService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestParam("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + sysFlowPowerService.delAll(sid); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + SysFlowPowerDetailsVo vo = sysFlowPowerService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerService.java new file mode 100644 index 0000000000..cb550d3fde --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerService.java @@ -0,0 +1,143 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysflowpower; + +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.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo; +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto; +import com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailService; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiModelProperty; +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.vo.PagerVo; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPower; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDetailsVo; +import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Project: anrui-portal(流程权限)
+ * File: SysFlowPowerService.java
+ * Class: com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerService
+ * Description: 流程权限 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-27 14:31:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysFlowPowerService extends MybatisBaseService { + + @Autowired + private SysFlowPowerDetailService sysFlowPowerDetailService; + + public List listPageVo(String flowKey) { + List sysFlowPowerVoList = baseMapper.selectPageVo(flowKey); + return sysFlowPowerVoList; + } + + public ResultBean saveOrUpdateDto(SysFlowPowerDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List sysFlowPowerDetailList = dto.getSysFlowPowerDetailList(); + if (StringUtils.isBlank(dtoSid)) { + List useOrgSids = baseMapper.selById(dto.getProcInstId(),dto.getUseOrgSids()); + if (useOrgSids.size() > 0){ + return rb.setMsg("选择的分公司已存在"); + } + String sid = this.insertByDto(dto); + for (SysFlowPowerDetailDto sysFlowPowerDetailDto : sysFlowPowerDetailList) { + sysFlowPowerDetailDto.setMainSid(sid); + sysFlowPowerDetailService.insertByDto(sysFlowPowerDetailDto); + } + return rb.success(); + } + this.updateByDto(dto); + sysFlowPowerDetailService.delByMainSid(dtoSid); + for (SysFlowPowerDetailDto sysFlowPowerDetailDto : sysFlowPowerDetailList) { + sysFlowPowerDetailDto.setMainSid(dtoSid); + sysFlowPowerDetailService.insertByDto(sysFlowPowerDetailDto); + } + return rb.success(); + } + + public String insertByDto(SysFlowPowerDto dto) { + SysFlowPower entity = new SysFlowPower(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + List useOrgSids = dto.getUseOrgSids(); + List useOrgNames = dto.getUseOrgNames(); + entity.setUseOrgSids(StringUtils.join(useOrgSids, ",")); + entity.setUseOrgNames(StringUtils.join(useOrgNames, ",")); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(SysFlowPowerDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + SysFlowPower entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid", "useOrgSids", "useOrgNames"); + List useOrgSids = dto.getUseOrgSids(); + List useOrgNames = dto.getUseOrgNames(); + entity.setUseOrgSids(StringUtils.join(useOrgSids, ",")); + entity.setUseOrgNames(StringUtils.join(useOrgNames, ",")); + baseMapper.updateById(entity); + } + + public SysFlowPowerDetailsVo fetchDetailsVoBySid(String sid) { + SysFlowPower entity = fetchBySid(sid); + SysFlowPowerDetailsVo vo = new SysFlowPowerDetailsVo(); + BeanUtil.copyProperties(entity, vo); + vo.setUseOrgSids(Arrays.asList(entity.getUseOrgSids().split(","))); + vo.setUseOrgNames(Arrays.asList(entity.getUseOrgNames().split(","))); + List sysFlowPowerDetailDetailsVos = sysFlowPowerDetailService.selByMainSid(sid); + vo.setSysFlowPowerDetailList(sysFlowPowerDetailDetailsVos); + return vo; + } + + public void delAll(String sid) { + sysFlowPowerDetailService.delByMainSid(sid); + String[] sids = StringUtils.stripAll(sid); + delBySids(sids); + } +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.java new file mode 100644 index 0000000000..7585fce9b5 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysflowpowerdetail; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetail; + +import java.util.List; + +/** + * Project: anrui-portal(流程权限)
+ * File: SysFlowPowerDetailMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailMapper
+ * Description: 流程权限列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-27 14:31:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysFlowPowerDetailMapper extends BaseMapper { + + @Delete("delete from sys_flow_power_detail where mainSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from sys_flow_power_detail where mainSid = #{dtoSid}") + List selByMainSid(String mainSid); +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.xml new file mode 100644 index 0000000000..9eecebe804 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailRest.java new file mode 100644 index 0000000000..17664179cc --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailRest.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysflowpowerdetail; + +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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo; +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto; + +/** + * Project: anrui-portal(流程权限)
+ * File: SysFlowPowerDetailFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailRest
+ * Description: 流程权限列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-27 14:31:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "流程权限列表") +@RestController +@RequestMapping("v1/sysflowpowerdetail") +public class SysFlowPowerDetailRest { +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailService.java new file mode 100644 index 0000000000..8c0978ff76 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailService.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysflowpowerdetail; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.vo.PagerVo; +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetail; +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo; +import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-portal(流程权限)
+ * File: SysFlowPowerDetailService.java
+ * Class: com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailService
+ * Description: 流程权限列表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-27 14:31:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysFlowPowerDetailService extends MybatisBaseService { + + public void insertByDto(SysFlowPowerDetailDto dto){ + SysFlowPowerDetail entity = new SysFlowPowerDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusRepairBillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusRepairBillFeign.java new file mode 100644 index 0000000000..0040fd4a1c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusRepairBillFeign.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.terminal.api.as.busrepairbill; + +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "站长出厂确认") +@FeignClient( + contextId = "terminal-AppBusRepairBill", + name = "anrui-terminal", + path = "v1/busrepair") +public interface AppBusRepairBillFeign { + + @PostMapping("/listPageConfirm") + @ApiOperation("工单查询列表-站长出厂确认") + ResultBean> listPageConfirm(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/statConfirmOut") + @ApiOperation("维修工单-站长出厂确认-确认出厂") + ResultBean statConfirmOut(@RequestParam("sid") String sid); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillQuery.java new file mode 100644 index 0000000000..7311b72ba8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.as.busrepairbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 13:33 + */ +@Data +public class AppBusrepairBillQuery implements Query { + + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("查询条件") + private String name; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillVo.java new file mode 100644 index 0000000000..102989982c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.as.busrepairbill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Fan + * @description + * @date 2024/4/18 13:33 + */ +@Data +public class AppBusrepairBillVo implements Vo { + + private String sid; + @ApiModelProperty("维修单编号") + private String repairId; + @ApiModelProperty("维修单类型") + private String billType; + @ApiModelProperty("环节名称") + private String state; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("车架号/车牌号") + private String carCodeInfo; + @ApiModelProperty("进厂时间") + private String entryTime; + @ApiModelProperty("是否外出") + private String isGoOut2; + @ApiModelProperty("是否显示确认按钮") + private Boolean isConfirm; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/AppBusrepairBillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/AppBusrepairBillRest.java new file mode 100644 index 0000000000..1f462ae3bb --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/AppBusrepairBillRest.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.biz.as; + +import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusRepairBillFeign; +import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillQuery; +import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("v1/busrepair") +public class AppBusrepairBillRest implements AppBusRepairBillFeign { + + @Autowired + private AppBusrepairBillService asBusrepairBillService; + + @Override + public ResultBean> listPageConfirm(PagerQuery pagerQuery) { + return asBusrepairBillService.listPageConfirm(pagerQuery); + } + + @Override + public ResultBean statConfirmOut(String sid) { + return asBusrepairBillService.statConfirmOut(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/AppBusrepairBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/AppBusrepairBillService.java new file mode 100644 index 0000000000..45931f98aa --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/AppBusrepairBillService.java @@ -0,0 +1,65 @@ +package com.yxt.anrui.terminal.biz.as; + +import cn.hutool.core.date.DateUtil; +import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillQuery; +import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillVo; +import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsBusrepairBillQuery; +import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsBusrepairBillVo; +import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsbusrepairBillFegin; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +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 java.util.ArrayList; +import java.util.List; + +@Service +public class AppBusrepairBillService { + + @Autowired + private AsbusrepairBillFegin asbusrepairBillFegin; + + public ResultBean> listPageConfirm(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerQuery pagerQuery1 = new PagerQuery<>(); + AsBusrepairBillQuery params = new AsBusrepairBillQuery(); + AppBusrepairBillQuery params1 = pagerQuery.getParams(); + params.setUserSid(params1.getUserSid()); + params.setOrgPath(params1.getOrgPath()); + params.setMenuSid(params1.getMenuSid()); + params.setName(params1.getName()); + pagerQuery1.setParams(params); + PagerVo data = asbusrepairBillFegin.listPageConfirm(pagerQuery1).getData(); + PagerVo appBusrepairBillVoPagerVo = new PagerVo<>(); + List records = new ArrayList<>(); + List records1 = data.getRecords(); + for (AsBusrepairBillVo asBusrepairBillVo : records1) { + AppBusrepairBillVo appBusrepairBillVo = new AppBusrepairBillVo(); + appBusrepairBillVo.setSid(asBusrepairBillVo.getSid()); + appBusrepairBillVo.setRepairId(asBusrepairBillVo.getBillNo()); + appBusrepairBillVo.setBillType(asBusrepairBillVo.getBillType()); + appBusrepairBillVo.setState(asBusrepairBillVo.getNodeName()); + appBusrepairBillVo.setCustomerName(asBusrepairBillVo.getCustomerName()); + appBusrepairBillVo.setSubject(asBusrepairBillVo.getSubject()); + appBusrepairBillVo.setCarCodeInfo(asBusrepairBillVo.getVinNo() + "/" + asBusrepairBillVo.getVehMark()); + appBusrepairBillVo.setEntryTime(DateUtil.formatDate(asBusrepairBillVo.getEntryTime())); + appBusrepairBillVo.setIsGoOut2(asBusrepairBillVo.getIsGoOut()); + if ("1".equals(asBusrepairBillVo.getIsOutFactory())){ + appBusrepairBillVo.setIsConfirm(false); + }else { + appBusrepairBillVo.setIsConfirm(true); + } + records.add(appBusrepairBillVo); + } + appBusrepairBillVoPagerVo.setRecords(records); + return rb.success().setData(appBusrepairBillVoPagerVo); + } + + public ResultBean statConfirmOut(String sid) { + String[] sids = StringUtils.stripAll(sid); + return asbusrepairBillFegin.statConfirmOut(sids); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillQuery.java new file mode 100644 index 0000000000..b4e091e14b --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillQuery.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.terminal.fegin.asbusrepairbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 13:33 + */ +@Data +public class AsBusrepairBillQuery implements Query { + + @ApiModelProperty("使用组织sid") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; + private String menuSid; + private String name; + + private String nodeCode; + + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("制单部门") + private String dept; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + private String startTime;//制单开始时间 + private String endTime;//制单结束时间 + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("进厂开始时间") + private String entryStartTime; + @ApiModelProperty("进厂结束时间") + private String entryEndTime; + @ApiModelProperty("预计完工开始时间") + private String finishStartTime; + @ApiModelProperty("预计完工结束时间") + private String finishEndTime; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("客户单位") + private String customerOrg; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("服务顾问姓名") + private String waitorName; + @ApiModelProperty("班组名称") + private String groupName; + @ApiModelProperty("主修人（可多选）销售单") + private String mainRepairers; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillVo.java new file mode 100644 index 0000000000..c3eb48d763 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillVo.java @@ -0,0 +1,71 @@ +package com.yxt.anrui.terminal.fegin.asbusrepairbill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Fan + * @description + * @date 2024/4/18 13:33 + */ +@Data +public class AsBusrepairBillVo implements Vo { + + private String sid; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("当前环节") + private String nodeName; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("制单部门") + private String dept; + @ApiModelProperty("制单人姓名") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("制单日期") + private Date createTime; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("科目") + private String subject; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("进厂时间") + private Date entryTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计完工时间-工单") + private Date estimatedFinishTime; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("客户单位") + private String customerOrg; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("服务顾问姓名") + private String waitorName; + @ApiModelProperty("班组名称") + private String groupName; + @ApiModelProperty("主修人（可多选）销售单") + private String mainRepairers; + private String remarks; //备注 + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("是否外出（1是，2否）") + private String isGoOut; + + /* + * 工单查询列表-出厂 + * */ + @ApiModelProperty("是否可出厂") + private String isOutFactory; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java index cb49dcdbb9..5035893ccf 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java @@ -23,7 +23,16 @@ import org.springframework.web.bind.annotation.RequestBody; path = "v1/AsBusrepairBill" ) public interface AsbusrepairBillFegin { + @PostMapping("/appRepairs") @ApiOperation("app工单查询列表") ResultBean> appRepairs(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/listPageConfirm") + @ApiOperation("工单查询列表-站长出厂确认") + ResultBean> listPageConfirm(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/statConfirmOut") + @ApiOperation("维修工单-站长出厂确认-确认出厂") + ResultBean statConfirmOut(@RequestBody String[] sids); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java index 886ea7b661..12fb8c4f15 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java @@ -17,6 +17,9 @@ public class AsBusrepairBillQuery implements Query { private String userSid; @ApiModelProperty("菜单url") private String menuUrl; + private String menuSid; + private String name; + private String nodeCode; @ApiModelProperty("科目") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index ae582b9f72..c6e85d9bda 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -1002,10 +1002,11 @@ public class AsBusrepairBillService extends MybatisBaseService listPageConfirm(PagerQuery pagerQuery) { AsBusrepairBillQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { @@ -1076,7 +1077,7 @@ public class AsBusrepairBillService extends MybatisBaseService wrapper.like("b.billNo", query.getName()).or().like("b.billType", query.getName()).or().like("b.subject", query.getName()).or().like("b.customerName", query.getName()).or().like("v.vinNo", query.getName()).or().like("v.vehMark", query.getName()).or().like("b.nodeName", query.getName())); + } qw.eq("b.outDoorState",2); qw.eq("b.isOutFactory",0); qw.orderByDesc("b.createTime");