Browse Source

更改

master
ligaode 5 months ago
parent
commit
69a3ed7c61
  1. 44
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java
  2. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java
  3. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java
  4. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
  5. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java
  6. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java
  7. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java
  8. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java
  9. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java
  10. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java
  11. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java
  12. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java
  13. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyService.java
  14. 70
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaHireApplyRest.java
  15. 78
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyFeign.java
  16. 72
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyFeignFallback.java
  17. 15
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.java
  18. 19
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.xml
  19. 89
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyService.java
  20. 11
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireType.java

44
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java

@ -57,53 +57,57 @@ public class ScmCollectionRebate extends BaseEntity {
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("回款方式key")
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")
@ApiModelProperty("回款方式value")
private String collectionTypeValue; // 回款方式value
@ApiModelProperty("厂家销售通路key")
@ApiModelProperty("厂家销售通路key")
private String manufaSaleChannel; // 厂家销售通路key
@ApiModelProperty("厂家销售通路value")
private String manufaSaleChannelValue; // 厂家销售通路value
@ApiModelProperty("回款金额")
@ApiModelProperty("回款金额")
private BigDecimal collectionMoney; // 回款金额
@ApiModelProperty("运费")
@ApiModelProperty("运费")
private BigDecimal freight; // 运费
@ApiModelProperty("回款日期")
private String collectionDate; // 回款日期
@ApiModelProperty("上装金额")
private BigDecimal topAmount;
@ApiModelProperty("回款日期")
private String collectionDate; // 回款日期
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("返利名称")
private String rebateName;
@ApiModelProperty("计算标准")
@ApiModelProperty("计算标准")
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
@ApiModelProperty("预计返利")
private BigDecimal estimateRebate; // 预计返利
@ApiModelProperty("预提日期")
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
@ApiModelProperty("上传金额")
private BigDecimal uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
@ApiModelProperty("调整金额")
private BigDecimal adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("是否减运费")
private String isReduceFreight; // 是否减运费

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java

@ -75,6 +75,10 @@ public class ScmCollectionRebateDetailsVo implements Vo {
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java

@ -72,6 +72,10 @@ public class ScmCollectionRebateDto implements Dto {
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@ -77,6 +77,10 @@ public class ScmCollectionRebateVo implements Vo {
private String brandSid;
@ApiModelProperty("品牌名称")
private String brandName;
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey;
@ApiModelProperty("回款方式value")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java

@ -64,6 +64,10 @@ public class ScmCollectionrebateCheckapplydetail extends BaseEntity {
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java

@ -66,6 +66,10 @@ public class ScmCollectionrebateCheckapplydetailDto implements Dto {
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java

@ -66,6 +66,10 @@ public class ScmCollectionrebateCheckapplydetailVo implements Vo {
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("款项名称key")
private String costTitleKey;
@ApiModelProperty("款项名称value")
private String costTitleValue;
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-scm(回款返利车辆) <br/>
* File: ScmCollectionRebateVeh.java <br/>
@ -56,6 +58,10 @@ public class ScmCollectionRebateVeh extends BaseEntity {
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("运费")
private BigDecimal freight;
@ApiModelProperty("上装金额")
private BigDecimal topAmount;
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-scm(回款返利车辆) <br/>
* File: ScmCollectionRebateVehVo.java <br/>
@ -57,6 +59,10 @@ public class ScmCollectionRebateVehDetailsVo implements Vo {
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("运费")
private BigDecimal freight;
@ApiModelProperty("上装金额")
private BigDecimal topAmount;
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-scm(回款返利车辆) <br/>
* File: ScmCollectionRebateVehDto.java <br/>
@ -57,6 +59,10 @@ public class ScmCollectionRebateVehDto implements Dto {
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("运费")
private BigDecimal freight;
@ApiModelProperty("上装金额")
private BigDecimal topAmount;
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java

@ -49,15 +49,15 @@ import lombok.Data;
@ApiModel(value = "回款返利车辆表 查询条件", description = "回款返利车辆表 查询条件")
public class ScmCollectionRebateVehQuery implements Query {
@ApiModelProperty("回款返利sid")
@ApiModelProperty("回款返利sid")
private String mainSid; // 回款返利sid
@ApiModelProperty("车辆sid")
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("预计返利")
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-scm(回款返利车辆) <br/>
* File: ScmCollectionRebateVehVo.java <br/>
@ -57,6 +59,10 @@ public class ScmCollectionRebateVehVo implements Vo {
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("运费")
private BigDecimal freight;
@ApiModelProperty("上装金额")
private BigDecimal topAmount;
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyService.java

@ -31,7 +31,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateFeign;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeign;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.ScmVehRebateCheckApplyCompleteDto;
@ -58,6 +60,8 @@ public class AppVehrebateCheckapplyService {
@Resource
private ScmVehrebateCheckapplydetailFeign scmVehrebateCheckapplydetailFeign;
@Autowired
private ScmVehRebateFeign scmVehRebateFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
@ -95,7 +99,7 @@ public class AppVehrebateCheckapplyService {
public ResultBean<AppVehRebateDetailsVo> vehRebateDetail(String sid) {
ResultBean rb = ResultBean.fireFail();
AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo();
ScmVehrebateCheckapplyDetailsVo data = scmVehrebateCheckapplyFeign.fetchDetailsBySid(sid).getData();
ScmVehRebateDetailsVo data = scmVehRebateFeign.fetchDetailsBySid(sid).getData();
BeanUtil.copyProperties(data,appVehRebateDetailsVo);
return rb.success().setData(appVehRebateDetailsVo);
}

70
yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaHireApplyRest.java

@ -34,14 +34,6 @@ 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.oa.api.oahireapply.OaHireApply;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyQuery;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyVo;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyDetailsVo;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyDto;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyFeign;
/**
* Project: yxt-oa(招聘需求) <br/>
* File: OaHireApplyFeignFallback.java <br/>
@ -56,46 +48,34 @@ import com.yxt.anrui.oa.api.oahireapply.OaHireApplyFeign;
* @since 1.0
*/
@Api(tags = "招聘需求申请")
@RestController("com.yxt.anrui.oa.biz.oahireapply.OaHireApplyRest")
@RestController
@RequestMapping("v1/oahireapply")
public class OaHireApplyRest implements OaHireApplyFeign {
@Autowired
private OaHireApplyService oaHireApplyService;
public class OaHireApplyRest {
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<OaHireApplyVo>> listPage(@RequestBody PagerQuery<OaHireApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<OaHireApplyVo> pv = oaHireApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Autowired
private OaHireApplyService oaHireApplyService;
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody OaHireApplyDto dto){
ResultBean rb = ResultBean.fireFail();
oaHireApplyService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody OaHireApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
oaHireApplyService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
oaHireApplyService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<OaHireApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
OaHireApplyDetailsVo vo = oaHireApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
public ResultBean<OaHireApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
OaHireApplyDetailsVo vo = oaHireApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("查询招聘需求")
@GetMapping("/dict")
public ResultBean<OaHireType> dict(@RequestParam("orgPath") String orgPath, @RequestParam("name") String name) {
ResultBean rb = ResultBean.fireFail();
OaHireType vo = oaHireApplyService.dict(orgPath, name);
return rb.success().setData(vo);
}
}

78
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyFeign.java

@ -1,78 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.oahireapply;
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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: yxt-oa(招聘需求) <br/>
* File: OaHireApplyFeign.java <br/>
* Class: com.yxt.anrui.oa.api.oahireapply.OaHireApplyFeign <br/>
* Description: 招聘需求申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-05 11:51:52 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "招聘需求申请")
@FeignClient(
contextId = "yxt-oa-OaHireApply",
name = "yxt-oa",
path = "v1/oahireapply",
fallback = OaHireApplyFeignFallback.class)
public interface OaHireApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<OaHireApplyVo>> listPage(@RequestBody PagerQuery<OaHireApplyQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody OaHireApplyDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<OaHireApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyFeignFallback.java

@ -1,72 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.oahireapply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: yxt-oa(招聘需求) <br/>
* File: OaHireApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.oa.api.oahireapply.OaHireApplyFeignFallback <br/>
* Description: 招聘需求申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-05 11:51:52 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class OaHireApplyFeignFallback implements OaHireApplyFeign {
@Override
public ResultBean<PagerVo<OaHireApplyVo>> listPage(PagerQuery<OaHireApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口yxt-oa/oahireapply/listPage无法访问");
}
@Override
public ResultBean save(OaHireApplyDto dto){
return ResultBean.fireFail().setMsg("接口yxt-oa/oahireapply/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口yxt-oa/oahireapply/delBySids无法访问");
}
@Override
public ResultBean<OaHireApplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口yxt-oa/oahireapply/fetchDetailsBySid无法访问");
}
}

15
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.java

@ -31,11 +31,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.oa.api.oahireapply.OaHireApply;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyVo;
import java.util.List;
/**
* Project: yxt-oa(招聘需求) <br/>
@ -53,13 +48,5 @@ import java.util.List;
@Mapper
public interface OaHireApplyMapper extends BaseMapper<OaHireApply> {
//@Update("update oa_hire_apply set name=#{msg} where id=#{id}")
//IPage<OaHireApplyVo> voPage(IPage<OaHireApply> page, @Param(Constants.WRAPPER) QueryWrapper<OaHireApply> qw);
IPage<OaHireApplyVo> selectPageVo(IPage<OaHireApply> page, @Param(Constants.WRAPPER) Wrapper<OaHireApply> qw);
List<OaHireApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<OaHireApply> qw);
@Select("select * from oa_hire_apply")
List<OaHireApplyVo> selectListVo();
OaHireType dict(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
}

19
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.xml

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.oa.biz.oahireapply.OaHireApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.api.oahireapply.OaHireApplyVo">
SELECT * FROM oa_hire_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.oa.api.oahireapply.OaHireApplyVo">
SELECT * FROM oa_hire_apply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="dict" resultType="com.yxt.anrui.oa.biz.oahireapply.OaHireType">
SELECT sid AS dictKey,
title AS dictValue
FROM oa_hire_apply
WHERE useOrgSid = #{useOrgSid}
AND title LIKE CONCAT('%', #{name}, '%')
</select>
</mapper>

89
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyService.java

@ -28,23 +28,16 @@ package com.yxt.anrui.oa.biz.oahireapply;
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.oa.feign.portal.sysstafforg.SysStaffOrgFeign;
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.oa.api.oahireapply.OaHireApply;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyQuery;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyVo;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyDetailsVo;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyDto;
import com.yxt.anrui.oa.api.oahireapply.OaHireApplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: yxt-oa(招聘需求) <br/>
* File: OaHireApplyService.java <br/>
@ -60,51 +53,45 @@ import java.util.List;
*/
@Service
public class OaHireApplyService extends MybatisBaseService<OaHireApplyMapper, OaHireApply> {
private QueryWrapper<OaHireApply> createQueryWrapper(OaHireApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<OaHireApply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<OaHireApplyVo> listPageVo(PagerQuery<OaHireApplyQuery> pq) {
OaHireApplyQuery query = pq.getParams();
QueryWrapper<OaHireApply> qw = createQueryWrapper(query);
IPage<OaHireApply> page = PagerUtil.queryToPage(pq);
IPage<OaHireApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<OaHireApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(OaHireApplyDto dto){
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public void saveOrUpdateDto(OaHireApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(OaHireApplyDto dto){
OaHireApply entity = new OaHireApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(OaHireApplyDto dto){
String dtoSid = dto.getSid();
return;
}
this.updateByDto(dto);
}
public void insertByDto(OaHireApplyDto dto) {
OaHireApply entity = new OaHireApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(OaHireApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
OaHireApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public OaHireApplyDetailsVo fetchDetailsVoBySid(String sid){
OaHireApply entity = fetchBySid(sid);
OaHireApplyDetailsVo vo = new OaHireApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
OaHireApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public OaHireApplyDetailsVo fetchDetailsVoBySid(String sid) {
OaHireApply entity = fetchBySid(sid);
OaHireApplyDetailsVo vo = new OaHireApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public OaHireType dict(String orgPath, String name) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
OaHireType oaHireType = baseMapper.dict(useOrgSid, name);
return oaHireType;
}
}

11
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireType.java

@ -0,0 +1,11 @@
package com.yxt.anrui.oa.biz.oahireapply;
import lombok.Data;
@Data
public class OaHireType {
private String dictKey; //数据字典key
private String dictValue; //数据字典value
private String extra; //额外追加字符串
}
Loading…
Cancel
Save