Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 months ago
parent
commit
858fbf0c83
  1. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java
  3. 24
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java
  4. 44
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java
  5. 38
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java
  6. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
  7. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
  8. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml
  9. 159
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
  10. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java
  11. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java
  12. 13
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java
  13. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java
  14. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java
  15. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
  16. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  17. 273
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  18. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  19. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  20. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
  21. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
  22. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyFeign.java
  23. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java
  24. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java
  25. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyFeign.java
  26. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyFeign.java
  27. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java
  28. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java
  29. 53
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetLedgerRest.java
  30. 53
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetRest.java
  31. 56
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
  32. 54
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAsset.java
  33. 58
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetDto.java
  34. 44
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.java
  35. 12
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.xml
  36. 63
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetQuery.java
  37. 94
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetService.java
  38. 59
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetVo.java
  39. 62
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedger.java
  40. 66
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerDto.java
  41. 44
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.java
  42. 12
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.xml
  43. 67
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerQuery.java
  44. 94
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerService.java
  45. 68
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerVo.java
  46. 20
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApply.java
  47. 24
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyDto.java
  48. 13
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyMapper.java
  49. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyMapper.xml
  50. 177
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
  51. 28
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
  52. 41
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetails.java
  53. 45
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsDto.java
  54. 18
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsMapper.java
  55. 28
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsMapper.xml
  56. 66
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java
  57. 48
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsVo.java
  58. 12
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/Extra.java
  59. 25
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/FormCommon.java
  60. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
  61. 5
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
  62. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java
  63. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java

12
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java

@ -52,17 +52,17 @@ public class FinPaymentDto implements Dto {
private String sid; // sid
private String remarks;
@ApiModelProperty("单位编码")
@ApiModelProperty("单位编码")
private String companyCode; // 单位编码
@ApiModelProperty("单位名称")
@ApiModelProperty("单位名称")
private String companyName; // 单位名称
@ApiModelProperty("开户行")
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("业务类型key")
@ApiModelProperty("业务类型key")
private String businessTypeKey; // 业务类型key
@ApiModelProperty("业务类型value")
@ApiModelProperty("业务类型value")
private String businessTypeValue; // 业务类型value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java

@ -67,4 +67,8 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity {
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

24
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java

@ -55,32 +55,38 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto {
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

44
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java

@ -51,32 +51,26 @@ import java.math.BigDecimal;
@ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件")
public class FinPaymentapplyDetailsBelowEveQuery implements Query {
@ApiModelProperty("付款单位名称")
private String payCompany;
@ApiModelProperty("融资付款开通日期")
private String openStartDate;
private String openEndDate;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
private String exePayStartDate;
private String exePayEndDate;
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("支付状态")
private String state;
private String orgPath;
private String userSid;
private String menuUrl;
}

38
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java

@ -53,32 +53,26 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo {
private String sid; // sid
@ApiModelProperty("支付状态")
private String state;
@ApiModelProperty("平仓款名称")
private String costTitleValue;
@ApiModelProperty("款项类别,数据字典")
private String costTypeKey;
@ApiModelProperty("款项类别")
private String costTypeValue;
@ApiModelProperty("付款申请明细的明细sid")
private String detailSid; // 付款申请明细的明细sid
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款单位sid")
private String payCompanySid; // 付款单位sid
@ApiModelProperty("付款单位名称")
private String payCompany; // 付款单位名称
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("融资付款开通日期")
private String openDate;
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("付款单位名称")
private String payCompany;
@ApiModelProperty("收款单位名称")
private String receiveCompany;
@ApiModelProperty("开户行")
private String bank;
@ApiModelProperty("收款银行账号")
private String receivingAccount;
@ApiModelProperty("平仓付款日期")
private String exePayDate;
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice;
@ApiModelProperty("备注")
private String remarks;
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java

@ -111,13 +111,13 @@ public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinP
}
}
if (StringUtils.isNotBlank(query.getCompanyName())) {
qw.like("fp.companyName", query.getCompanyName());
qw.like("companyName", query.getCompanyName());
}
if (StringUtils.isNotBlank(query.getReceivingAccount())) {
qw.like("fp.receivingAccount", query.getReceivingAccount());
qw.like("receivingAccount", query.getReceivingAccount());
}
if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
qw.like("fp.businessTypeValue", query.getBusinessTypeValue());
qw.like("businessTypeValue", query.getBusinessTypeValue());
}
IPage<FinPayment> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@ -54,16 +54,8 @@ import java.util.List;
@Mapper
public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaymentapplyDetailsBelowEve> {
//@Update("update fin_paymentapply_details_below_eve set name=#{msg} where id=#{id}")
//IPage<FinPaymentapplyDetailsBelowEveVo> voPage(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) QueryWrapper<FinPaymentapplyDetailsBelowEve> qw);
IPage<FinPaymentapplyDetailsBelowEveVo> selectPageVo(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
List<FinPaymentapplyDetailsBelowEveVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
@Select("select * from fin_paymentapply_details_below_eve")
List<FinPaymentapplyDetailsBelowEveVo> selectListVo();
@Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
}

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml

@ -4,10 +4,9 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
SELECT * FROM fin_paymentapply_details_below_eve <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
SELECT * FROM fin_paymentapply_details_below_eve <where> ${ew.sqlSegment} </where>
SELECT * FROM fin_paymentapply_details_below_eve
<!--LEFT JOIN anrui_portal.sys_organization as s ON ab.deptSid = s.sid-->
<where> ${ew.sqlSegment} </where>
ORDER BY createTime DESC
</select>
</mapper>

159
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
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.fin.api.finpaymentapply.FinPaymentapplyVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -60,55 +64,120 @@ import java.util.List;
*/
@Service
public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<FinPaymentapplyDetailsBelowEveMapper, FinPaymentapplyDetailsBelowEve> {
private QueryWrapper<FinPaymentapplyDetailsBelowEve> createQueryWrapper(FinPaymentapplyDetailsBelowEveQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = createQueryWrapper(query);
IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto){
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
//========================================数据授权开始
/*if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (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("fp.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fp.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("fp.createBySid", query.getUserSid());
} else {
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
return p;
}
}*/
if (StringUtils.isNotBlank(query.getPayCompany())) {
qw.like("payCompany", query.getPayCompany());
}
if (StringUtils.isNotBlank(query.getCostTitleValue())) {
qw.like("costTitleValue", query.getCostTitleValue());
}
if (StringUtils.isNotBlank(query.getReceiveCompany())) {
qw.like("receiveCompany", query.getReceiveCompany());
}
if (StringUtils.isNotBlank(query.getPeriod())) {
qw.like("period", query.getPeriod());
}
if (StringUtils.isNotBlank(query.getRemarks())) {
qw.eq("remarks", query.getRemarks());
}
if (StringUtils.isNotBlank(query.getPayCompany())) {
qw.like("fp.payCompany", query.getPayCompany());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("fp.state", query.getState());
}
//融资付款开通日期
qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
);
//平仓付款日期
qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"
);
IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(FinPaymentapplyDetailsBelowEveDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto){
FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto){
String dtoSid = dto.getSid();
return;
}
this.updateByDto(dto);
}
public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto) {
FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid){
FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid);
FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid) {
FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid);
FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
}

24
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java

@ -28,6 +28,8 @@ package com.yxt.anrui.scm.api.scmspecialrebate;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ScmSpecialRebateExcelVo {
@ -49,8 +51,12 @@ public class ScmSpecialRebateExcelVo {
private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost")
private String expectCost;
@ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
private String expectItureCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
@ -65,8 +71,18 @@ public class ScmSpecialRebateExcelVo {
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost")
private BigDecimal onceItureCost;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost")
private BigDecimal secondItureCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")

24
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java

@ -29,6 +29,8 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class SpecialRebateCheckExcelVo {
@ -48,8 +50,12 @@ public class SpecialRebateCheckExcelVo {
private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
private String withholdCost;
@ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
private String expectItureCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
@ -62,8 +68,18 @@ public class SpecialRebateCheckExcelVo {
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost")
private BigDecimal onceItureCost;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost")
private BigDecimal secondItureCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")

13
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java

@ -26,8 +26,11 @@
package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.common.core.utils.ExportEntityMap;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ScmVehRebateExcelVo {
@ -83,8 +86,14 @@ public class ScmVehRebateExcelVo {
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java

@ -54,10 +54,16 @@ public class VehRebateCheckExcelVo {
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue")
private String calculationModeValue;
@ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
private String calculationStandard;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
private String withholdCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
@ -70,8 +76,14 @@ public class VehRebateCheckExcelVo {
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java

@ -56,6 +56,8 @@ public class ExcelVo {
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue")
private String calculationModeValue;
@ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
private String calculationStandard;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml

@ -141,10 +141,7 @@
<select id="excelList" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo">
SELECT
*,
@row_number := @row_number + 1 AS rankNo,
expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
expectItureCost + expectTreatCost + expectSuppCost AS withholdCost,
onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
@row_number := @row_number + 1 AS rankNo
FROM scm_special_rebate,(
SELECT
@row_number := 0

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@ -373,6 +373,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
scmSpecialRebateDto.setAdjustmentRemarks(dto.getAdjustmentRemarks());
scmSpecialRebateDto.setAdjustmentMoney(dto.getAdjustmentMoney());
scmSpecialRebateDto.setIsAdjustment("是");
scmSpecialRebateDto.setDiffAmount(new BigDecimal(scmSpecialRebate.getUploadMoney()).add(new BigDecimal(dto.getSecondaryUploadMoney())).subtract(scmSpecialRebateDto.getOnceItureCost()).subtract(scmSpecialRebateDto.getOnceTreatCost()).subtract(scmSpecialRebateDto.getOnceSuppCost()).subtract(scmSpecialRebateDto.getSecondItureCost()).subtract(scmSpecialRebateDto.getSecondTreatCost()).subtract(scmSpecialRebateDto.getSecondSuppCost()).subtract(new BigDecimal(scmSpecialRebate.getEstimateRebate())).add(scmSpecialRebate.getExpectItureCost()).add(scmSpecialRebate.getExpectTreatCost().add(scmSpecialRebate.getExpectSuppCost())));
updateBySid(scmSpecialRebateDto, sid);
return rb.success().setMsg("调整成功");
}

273
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@ -448,7 +448,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
*
* @param sid,tag (0代表核对申请通过推送1代表重推功能)
*/
public void pushSpecialRebateWithVoucher(String sid, String tag, Map<String,Integer> mapCheckState) {
public void pushSpecialRebateWithVoucher(String sid, String tag, Map<String, Integer> mapCheckState) {
String format = scmVehRebateWithApplyService.returnBusDate(new Date());
String summaryTag = "";//摘要前缀
ScmSpecialrebateCheckapply entity = fetchBySid(sid);
@ -480,6 +480,78 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
if (!v.isEmpty()) {
for (ScmSpecialRebate rebate : v) {
BigDecimal yt = BigDecimal.ZERO;//预提
BigDecimal ytfl = BigDecimal.ZERO;//其中返利
BigDecimal ytqzzz = BigDecimal.ZERO;//其中支出费用
BigDecimal ytqzdzz = BigDecimal.ZERO;//其中待支付
BigDecimal ytqzdd = BigDecimal.ZERO;//其中抵顶费用
BigDecimal ysc = BigDecimal.ZERO;//一次上传
BigDecimal yfl = BigDecimal.ZERO;//一次返利
BigDecimal yzz = BigDecimal.ZERO;//一次支出费用
BigDecimal ydzf = BigDecimal.ZERO;//一次待支付
BigDecimal ydd = BigDecimal.ZERO;//一次抵顶
BigDecimal ydqd = BigDecimal.ZERO;//一次待确定
BigDecimal esc = BigDecimal.ZERO;//二次上传
BigDecimal efpfl = BigDecimal.ZERO;//二次分配返利
BigDecimal edfpfl = BigDecimal.ZERO;//二次待分配返利
BigDecimal efpzc = BigDecimal.ZERO;//二次分配支出
BigDecimal edfpzc = BigDecimal.ZERO;//二次待分配支出
BigDecimal efpdzf = BigDecimal.ZERO;//二次分配待支付
BigDecimal edfpdzf = BigDecimal.ZERO;//二次待分配待支付
BigDecimal efpdd = BigDecimal.ZERO;//二次分配抵顶
BigDecimal edfpdd = BigDecimal.ZERO;//二次待分配抵顶
if (StringUtils.isNotBlank(rebate.getEstimateRebate())) {
yt = new BigDecimal(rebate.getEstimateRebate());
}
if (null != rebate.getExpectItureCost()) {
ytqzzz = rebate.getExpectItureCost();
}
if (null != rebate.getExpectTreatCost()) {
ytqzdzz = rebate.getExpectTreatCost();
}
if (null != rebate.getExpectSuppCost()) {
ytqzdd = rebate.getExpectSuppCost();
}
ytfl = yt.subtract(ytqzzz).subtract(ytqzdzz).subtract(ytqzdd);
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {
ysc = new BigDecimal(rebate.getUploadMoney());
}
if (null != rebate.getOnceItureCost()) {
yzz = rebate.getOnceItureCost();
}
if (null != rebate.getOnceTreatCost()) {
ydzf = rebate.getOnceTreatCost();
}
if (null != rebate.getOnceSuppCost()) {
ydd = rebate.getOnceTreatCost();
}
if (StringUtils.isNotBlank(rebate.getStayDetermineMoneyNew())) {
ydqd = new BigDecimal(rebate.getStayDetermineMoneyNew());
}
yfl = ysc.subtract(yzz).subtract(ydzf).subtract(ydd).subtract(ydqd);
if (StringUtils.isNotBlank(rebate.getSecondaryUploadMoney())) {
esc = new BigDecimal(rebate.getSecondaryUploadMoney());
}
if (null != rebate.getSecondItureCost()) {
efpzc = rebate.getOnceItureCost();
}
if (null != rebate.getTempItureCost()) {
edfpzc = rebate.getTempItureCost();
}
if (null != rebate.getSecondTreatCost()) {
efpdzf = rebate.getSecondTreatCost();
}
if (null != rebate.getTempItureCost()) {
edfpdzf = rebate.getTempItureCost();
}
if (null != rebate.getSecondSuppCost()) {
efpdd = rebate.getSecondSuppCost();
}
if (null != rebate.getTempSuppCost()) {
edfpdd = rebate.getTempSuppCost();
}
efpfl = esc.subtract(efpzc).subtract(efpdzf).subtract(efpdd);
edfpfl = ydqd.subtract(edfpzc).subtract(edfpdzf).subtract(edfpdd);
Integer onceState = 0;
if (tag.equals("0") && mapCheckState.size() > 0) {
onceState = mapCheckState.get(rebate.getSid());
@ -514,39 +586,25 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (!rebate.getRebateTypeValue().equals("行销政策")) {
if (onceState.intValue() == 2 || tag.equals("1")) {
//没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
BigDecimal yicifanli = BigDecimal.ZERO;//一次应收返利返利
BigDecimal yicididing = BigDecimal.ZERO;//一次抵顶费用
BigDecimal yizhichufeiyong = BigDecimal.ZERO;//一次支出费用
BigDecimal feiyong = BigDecimal.ZERO;//一次合计费用
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {
oneMoney = new BigDecimal(rebate.getUploadMoney());
if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("非行销");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(oneMoney);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
}
if (null != rebate.getOnceItureCost()) {
yizhichufeiyong = rebate.getOnceItureCost();
}
if (null != rebate.getOnceSuppCost()) {
yicididing = rebate.getOnceSuppCost();
if (ysc.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("非行销");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(ysc);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
yicifanli = oneMoney.subtract(yicididing).subtract(yizhichufeiyong);
if (yicifanli.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal ysfl = yfl.add(ydzf).add(ydqd);
if (ysfl.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("非行销");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yicifanli);
voucherDetail.setAmount(ysfl);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
@ -558,7 +616,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
feiyong = yizhichufeiyong.add(yicididing);
BigDecimal feiyong = yzz.add(ydd);
if (feiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
@ -571,32 +629,18 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetails.add(voucherDetail);
}
}
BigDecimal twoMoney = BigDecimal.ZERO;//二次次上传金额
BigDecimal ercifanli = BigDecimal.ZERO;//二次应收返利返利
BigDecimal ercididing = BigDecimal.ZERO;//二次抵顶费用
BigDecimal erzhichufeiyong = BigDecimal.ZERO;//一次支出费用
BigDecimal erfeiyong = BigDecimal.ZERO;//二次合计费用
if (StringUtils.isNotBlank(rebate.getSecondaryUploadMoney())) {
twoMoney = new BigDecimal(rebate.getSecondaryUploadMoney());
if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("非行销");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(twoMoney);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
}
if (null != rebate.getSecondItureCost()) {
erzhichufeiyong = rebate.getSecondItureCost();
}
if (null != rebate.getSecondSuppCost()) {
ercididing = rebate.getSecondSuppCost();
if (esc.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("非行销");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(esc);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
ercifanli = twoMoney.subtract(ercididing).subtract(erzhichufeiyong);
BigDecimal ercifanli = efpfl.add(efpdzf).subtract(edfpzc).subtract(edfpdd);
if (ercifanli.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
@ -615,8 +659,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
erfeiyong = erzhichufeiyong.add(ercididing);
if (ercididing.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal erfeiyong = efpzc.add(edfpzc).add(efpdd).add(edfpdd);
if (erfeiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("非行销");
voucherDetail.setTimeFlag(finalSummaryTag);
@ -630,29 +674,16 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
//确认调整时
if (StringUtils.isNotBlank(rebate.getIsAdjustment())) {
if (rebate.getIsAdjustment().equals("是")) {
BigDecimal adMoney = BigDecimal.ZERO;//返利差额
BigDecimal daizhifuchaMoney = BigDecimal.ZERO;//待支付差额
BigDecimal yingshouMoney = BigDecimal.ZERO;//应收返利
if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) {
adMoney = new BigDecimal(rebate.getAdjustmentMoney());
}
if (null != rebate.getOnceTreatCost()) {
daizhifuchaMoney = daizhifuchaMoney.add(rebate.getOnceTreatCost());
}
if (null != rebate.getSecondTreatCost()) {
daizhifuchaMoney = daizhifuchaMoney.add(rebate.getSecondTreatCost());
}
if (null != rebate.getExpectTreatCost()) {
daizhifuchaMoney = daizhifuchaMoney.subtract(rebate.getExpectTreatCost());
}
yingshouMoney = adMoney.add(daizhifuchaMoney);
if (yingshouMoney.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal flce = yfl.add(efpfl).add(edfpfl).subtract(ytfl);
BigDecimal dzfce = efpdzf.add(edfpdzf).add(ydzf).subtract(ytqzdzz);
BigDecimal ysMoney = flce.add(dzfce);
if (ysMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setType("非行销");
voucherDetail1.setTimeFlag(finalSummaryTag);
voucherDetail1.setDeptCode(deptCode); //部门编码赋值
voucherDetail1.setManufacturer(gysCode);
voucherDetail1.setAmount(yingshouMoney);
voucherDetail1.setAmount(ysMoney);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
@ -664,22 +695,22 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetail1.setRemarks("返利调整");
voucherDetails.add(voucherDetail1);
}
if (adMoney.compareTo(BigDecimal.ZERO) != 0) {
if (flce.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setType("非行销");
voucherDetail1.setTimeFlag(finalSummaryTag);
voucherDetail1.setDeptCode(deptCode); //部门编码赋值
voucherDetail1.setAmount(adMoney);
voucherDetail1.setAmount(flce);
voucherDetail1.setSceneCode("6401.13");
voucherDetail1.setRemarks("返利调整");
voucherDetails.add(voucherDetail1);
}
if (daizhifuchaMoney.compareTo(BigDecimal.ZERO) != 0) {
if (dzfce.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setType("非行销");
voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
voucherDetail2.setAmount(daizhifuchaMoney);
voucherDetail2.setAmount(dzfce);
voucherDetail2.setSceneCode("2181.07.00");
voucherDetail2.setRemarks("返利调整");
voucherDetails.add(voucherDetail2);
@ -689,69 +720,51 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
} else {
if (onceState.intValue() == 2 || tag.equals("1")) {
//没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
BigDecimal yicidaizhifu = BigDecimal.ZERO;//一次待支付金额
BigDecimal yicididing = BigDecimal.ZERO;//一次抵顶费用
BigDecimal yizhichufeiyong = BigDecimal.ZERO;//一次支出费用
BigDecimal feiyong = BigDecimal.ZERO;//一次合计费用
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {
oneMoney = new BigDecimal(rebate.getUploadMoney());
}
if (null != rebate.getOnceItureCost()) {
yizhichufeiyong = rebate.getOnceItureCost();
}
if (null != rebate.getOnceSuppCost()) {
yicididing = rebate.getOnceSuppCost();
}
if (null != rebate.getOnceTreatCost()) {
yicidaizhifu = rebate.getOnceTreatCost();
}
feiyong = oneMoney.subtract(yicidaizhifu).subtract(yizhichufeiyong).subtract(yicididing);
if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
if (ysc.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(oneMoney);
voucherDetail.setAmount(ysc);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
if (yicidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
if (ydzf.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setCustomerCode("DZFCJFL");
voucherDetail.setSceneCode("2181.07.00");
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yicidaizhifu);
voucherDetail.setAmount(ydzf);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
if (yizhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
if (yzz.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yizhichufeiyong);
voucherDetail.setAmount(yzz);
voucherDetail.setSceneCode("1161.03.00");
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
if (yicididing.compareTo(BigDecimal.ZERO) != 0) {
if (ydd.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yicididing);
voucherDetail.setAmount(ydd);
voucherDetail.setSceneCode("1161.04.00");
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
BigDecimal feiyong = yzz.add(ydzf).add(ydd).subtract(ysc);
if (feiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
@ -763,35 +776,18 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetails.add(voucherDetail);
}
}
BigDecimal twoMoney = BigDecimal.ZERO;//二次上传金额
BigDecimal ercidaizhifu = BigDecimal.ZERO;//二次待支付金额
BigDecimal ercididing = BigDecimal.ZERO;//二次抵顶费用
BigDecimal erzhichufeiyong = BigDecimal.ZERO;//二次支出费用
BigDecimal erfeiyong = BigDecimal.ZERO;//二次合计费用
if (StringUtils.isNotBlank(rebate.getSecondaryUploadMoney())) {
twoMoney = new BigDecimal(rebate.getSecondaryUploadMoney());
}
if (null != rebate.getSecondItureCost()) {
erzhichufeiyong = rebate.getSecondItureCost();
}
if (null != rebate.getSecondSuppCost()) {
ercididing = rebate.getSecondSuppCost();
}
if (null != rebate.getSecondTreatCost()) {
ercidaizhifu = rebate.getSecondTreatCost();
}
erfeiyong = twoMoney.subtract(ercidaizhifu).subtract(erzhichufeiyong).subtract(ercididing);
if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
if (esc.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(twoMoney);
voucherDetail.setAmount(esc);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
BigDecimal ercidaizhifu = efpdzf.add(edfpdzf);
if (ercidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销政策");
@ -803,6 +799,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
BigDecimal erzhichufeiyong = efpzc.add(edfpzc);
if (erzhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
@ -814,6 +811,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
BigDecimal ercididing = efpdd.add(edfpdd);
if (ercididing.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
@ -825,6 +823,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
BigDecimal erfeiyong = efpzc.add(edfpzc).add(efpdzf).add(edfpdzf).add(efpdd).add(edfpdd).subtract(esc);
if (erfeiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
@ -838,16 +837,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
//确认调整时
if (StringUtils.isNotBlank(rebate.getIsAdjustment())) {
if (rebate.getIsAdjustment().equals("是")) {
BigDecimal daizhifuchaMoney = BigDecimal.ZERO;//待支付差额
if (null != rebate.getOnceItureCost()) {
daizhifuchaMoney = daizhifuchaMoney.add(rebate.getOnceItureCost());
}
if (null != rebate.getSecondItureCost()) {
daizhifuchaMoney = daizhifuchaMoney.add(rebate.getSecondItureCost());
}
if (null != rebate.getExpectItureCost()) {
daizhifuchaMoney = daizhifuchaMoney.subtract(rebate.getExpectItureCost());
}
BigDecimal daizhifuchaMoney = efpzc.add(edfpzc).add(yzz).subtract(ytqzzz);
if (daizhifuchaMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setTimeFlag(finalSummaryTag);
@ -885,7 +875,6 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());
@ -906,10 +895,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
Map<String,Integer> mapCheckState = new HashMap<>();
Map<String, Integer> mapCheckState = new HashMap<>();
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
mapCheckState.put(scmSpecialRebate.getSid(),scmSpecialRebate.getOnceCheckState());
mapCheckState.put(scmSpecialRebate.getSid(), scmSpecialRebate.getOnceCheckState());
if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
@ -919,7 +908,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
}
pushSpecialRebateWithVoucher(bv.getBusinessSid(),"0",mapCheckState);
pushSpecialRebateWithVoucher(bv.getBusinessSid(), "0", mapCheckState);
}
return rb.success().setData(resultBean.getData());
} else {
@ -1107,7 +1096,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails = scmSpecialrebateCheckapplyDetailsVo.getScmWhenSpecialrebateCheckapplydetailDetails();
Map<String, Object> dataMap = new HashMap<String, Object>();
//标题
dataMap.put("title",scmSpecialrebateCheckapplyDetailsVo.getCheckApply() + "专项返利核对审批");
dataMap.put("title", scmSpecialrebateCheckapplyDetailsVo.getCheckApply() + "专项返利核对审批");
//分公司
dataMap.put("useOrgName", scmSpecialrebateCheckapplyDetailsVo.getCreateOrgName());
//创建部门
@ -1231,11 +1220,11 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
List<AppSpecialrebateCheckapplydetailDetailsVo> when = scmSpecialrebateCheckapplydetailService.fetchByMainSid(sid);
List<AppSpecialrebateCheckapplydetailDetailsVo> last = scmSpecialrebateCheckapplydetailService.fetchByMainSid(sid);
for (AppSpecialrebateCheckapplydetailDetailsVo appSpecialrebateCheckapplydetailDetailsVo : when) {
List<AppSpecialrebateCheckapplydetailDetailssVo> type = scmSpecialrebateCheckapplydetailService.fetchByMainSidType(sid,appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appSpecialrebateCheckapplydetailDetailsVo.getBrandName());
List<AppSpecialrebateCheckapplydetailDetailssVo> type = scmSpecialrebateCheckapplydetailService.fetchByMainSidType(sid, appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(), appSpecialrebateCheckapplydetailDetailsVo.getBrandName());
appSpecialrebateCheckapplydetailDetailsVo.setDetails(type);
}
for (AppSpecialrebateCheckapplydetailDetailsVo appSpecialrebateCheckapplydetailDetailsVo : last) {
List<AppSpecialrebateCheckapplydetailDetailssVo> date = scmSpecialrebateCheckapplydetailService.fetchByMainSidDate(sid,appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appSpecialrebateCheckapplydetailDetailsVo.getBrandName());
List<AppSpecialrebateCheckapplydetailDetailssVo> date = scmSpecialrebateCheckapplydetailService.fetchByMainSidDate(sid, appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(), appSpecialrebateCheckapplydetailDetailsVo.getBrandName());
appSpecialrebateCheckapplydetailDetailsVo.setDetails(date);
}
appSpecialrebateCheckapplyDetailsVo.setScmWhenSpecialrebateCheckapplydetailDetails(when);

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@ -110,7 +110,6 @@
*,
@row_number := @row_number + 1 AS rankNo,
sid AS vehRebateSid,
onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
FROM
scm_veh_rebate,(
SELECT

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@ -575,6 +575,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
scmVehRebateVehDto.setAdjustmentRemarks(dto.getAdjustmentRemarks());
scmVehRebateVehDto.setAdjustmentMoney(dto.getAdjustmentMoney());
scmVehRebateVehDto.setIsAdjustment("是");
scmVehRebateVehDto.setDiffAmount(new BigDecimal(scmVehRebate.getUploadMoney()).add(new BigDecimal(dto.getSecondaryUploadMoney())).subtract(scmVehRebateVehDto.getOnceTreatCost()).subtract(scmVehRebateVehDto.getOnceSuppCost()).subtract(scmVehRebateVehDto.getSecondTreatCost()).subtract(scmVehRebateVehDto.getSecondSuppCost()).subtract(new BigDecimal(scmVehRebate.getEstimateRebate())).add(scmVehRebate.getExpectTreatCost().add(scmVehRebate.getExpectSuppCost())));
updateBySid(scmVehRebateVehDto, sid);
return rb.success().setMsg("调整成功");
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@ -134,6 +134,9 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
if ("比例".equals(datum.getCalculationModeValue())){
excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%");
}
i = i + 1;
excelVos.add(excelVo);
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java

@ -122,6 +122,9 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
if ("比例".equals(datum.getCalculationModeValue())){
excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%");
}
i = i + 1;
excelVos.add(excelVo);
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyFeign.java

@ -19,7 +19,6 @@ import java.util.List;
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppSpecialRebateWithApply",
name = "anrui-terminal",

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java

@ -20,7 +20,6 @@ import java.util.List;
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppCollectionrebateCheckapply",
name = "anrui-terminal",

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java

@ -21,7 +21,6 @@ import java.util.List;
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppSpecialrebatedistribute",
name = "anrui-terminal",

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyFeign.java

@ -19,7 +19,6 @@ import java.util.List;
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppVehrebateCheckapply",
name = "anrui-terminal",

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyFeign.java

@ -21,7 +21,6 @@ import java.util.List;
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppVehRebateWithApply",
name = "anrui-terminal",

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java

@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppOtherOutApply",
name = "anrui-terminal",

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java

@ -25,23 +25,18 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.wms.inventoryprofitin;
import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinDetailsVo;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinFeign;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInDto;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInTaskQuery;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(tags = "售后盘盈入库")
@RestController
@RequestMapping("v1/inventorysurplus")

53
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetLedgerRest.java

@ -0,0 +1,53 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerDto;
import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerQuery;
import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerService;
import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerVo;
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.*;
@Api(tags = "固定资产台账管理")
@RestController
@RequestMapping("v1/adfixedassetledger")
public class AdFixedAssetLedgerRest {
@Autowired
private AdFixedAssetLedgerService adFixedAssetLedgerService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<AdFixedAssetLedgerVo>> listPage(@RequestBody PagerQuery<AdFixedAssetLedgerQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AdFixedAssetLedgerVo> pv = adFixedAssetLedgerService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AdFixedAssetLedgerDto dto) {
return adFixedAssetLedgerService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
adFixedAssetLedgerService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AdFixedAssetLedgerVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
AdFixedAssetLedgerVo vo = adFixedAssetLedgerService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

53
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFixedAssetRest.java

@ -0,0 +1,53 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetDto;
import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetQuery;
import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetService;
import com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetVo;
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.*;
@Api(tags = "固定资产管理")
@RestController
@RequestMapping("v1/adfixedasset")
public class AdFixedAssetRest {
@Autowired
private AdFixedAssetService adFixedAssetService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<AdFixedAssetVo>> listPage(@RequestBody PagerQuery<AdFixedAssetQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AdFixedAssetVo> pv = adFixedAssetService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AdFixedAssetDto dto) {
return adFixedAssetService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
adFixedAssetService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AdFixedAssetVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
AdFixedAssetVo vo = adFixedAssetService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

56
yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java

@ -0,0 +1,56 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyService;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@RestController
@RequestMapping("v1/HrHireApply")
public class HrHireApplyRest {
@Autowired
private HrHireApplyService hrHireApplyService;
@ApiOperation("新增初始化")
@GetMapping("/getInit")
ResultBean<HrHireApplyVo> getSaveInit(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) {
return hrHireApplyService.getSaveInit(userSid, orgPath);
}
@ApiOperation("修改初始化")
@GetMapping("/getInit/{sid}")
ResultBean<HrHireApplyVo> getUpdateInit(@PathVariable("sid") String sid) {
return hrHireApplyService.getUpdateInit(sid);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> saveOrUpdate(@RequestBody HrHireApplyDto dto) {
return hrHireApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody HrHireApplyDto dto) {
return hrHireApplyService.submit(dto);
}
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return hrHireApplyService.reject(dto);
}
}

54
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAsset.java

@ -0,0 +1,54 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedasset;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "固定资产表", description = "固定资产表")
@TableName("ad_fixed_asset")
public class AdFixedAsset extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
}

58
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetDto.java

@ -0,0 +1,58 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedasset;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "固定资产表 数据传输对象", description = "固定资产表 数据传输对象")
public class AdFixedAssetDto extends OaFormDto {
private String sid; // sid
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
@ApiModelProperty("备注")
private String remarks;
}

44
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.java

@ -0,0 +1,44 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedasset;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AdFixedAssetMapper extends BaseMapper<AdFixedAsset> {
IPage<AdFixedAssetVo> selectPageVo(IPage<AdFixedAsset> page, @Param(Constants.WRAPPER) Wrapper<AdFixedAsset> qw);
}

12
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetMapper.xml

@ -0,0 +1,12 @@
<?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.adfixedasset.AdFixedAssetMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.adfixedasset.AdFixedAssetVo">
SELECT * from ad_fixed_asset
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

63
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetQuery.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedasset;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: oa(驻外人员认定申请) <br/>
* File: AdExpatriatesApplyQuery.java <br/>
* Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyQuery <br/>
* Description: 驻外人员认定申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-01-16 15:22:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "驻外人员认定申请 查询条件", description = "驻外人员认定申请 查询条件")
public class AdFixedAssetQuery implements Query {
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
}

94
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetService.java

@ -0,0 +1,94 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedasset;
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.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.biz.oaform.OaFormService;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class AdFixedAssetService extends MybatisBaseService<AdFixedAssetMapper, AdFixedAsset> {
@Autowired
private OaAppendixService oaAppendixService;
@Autowired
private OaFormService oaFormService;
public PagerVo<AdFixedAssetVo> listPageVo(PagerQuery<AdFixedAssetQuery> pq) {
AdFixedAssetQuery query = pq.getParams();
QueryWrapper<AdFixedAsset> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getAssetName())) {
qw.like("assetName", query.getAssetName());
}
if (StringUtils.isNotBlank(query.getAssetNumber())) {
qw.like("assetNumber", query.getAssetNumber());
}
}
IPage<AdFixedAsset> page = PagerUtil.queryToPage(pq);
IPage<AdFixedAssetVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AdFixedAssetVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdateDto(AdFixedAssetDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdFixedAsset entity = new AdFixedAsset();
BeanUtil.copyProperties(dto, entity, "sid");
baseMapper.insert(entity);
sid = entity.getSid();
} else {
// 更新操作
AdFixedAsset entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
return rb.success().setData(sid);
}
public AdFixedAssetVo fetchDetailsVoBySid(String sid) {
AdFixedAsset entity = fetchBySid(sid);
AdFixedAssetVo vo = new AdFixedAssetVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

59
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedasset/AdFixedAssetVo.java

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedasset;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "驻外人员认定申请 视图数据对象", description = "驻外人员认定申请 视图数据对象")
public class AdFixedAssetVo implements Vo {
private String sid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
}

62
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedger.java

@ -0,0 +1,62 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedassetledger;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "固定资产台账", description = "固定资产台账")
@TableName("ad_fixed_asset_ledger")
public class AdFixedAssetLedger extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 使用组织sid
@ApiModelProperty("数量")
private BigDecimal num; // 数量
@ApiModelProperty("采购单价")
private BigDecimal price; // 采购单价
}

66
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerDto.java

@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedassetledger;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "固定资产台账 数据传输对象", description = "固定资产台账 数据传输对象")
public class AdFixedAssetLedgerDto extends OaFormDto {
private String sid; // sid
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 使用组织sid
@ApiModelProperty("数量")
private String num; // 数量
@ApiModelProperty("采购单价")
private String price; // 采购单价
@ApiModelProperty("备注")
private String remarks;
}

44
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.java

@ -0,0 +1,44 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedassetledger;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AdFixedAssetLedgerMapper extends BaseMapper<AdFixedAssetLedger> {
IPage<AdFixedAssetLedgerVo> selectPageVo(IPage<AdFixedAssetLedger> page, @Param(Constants.WRAPPER) Wrapper<AdFixedAssetLedger> qw);
}

12
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerMapper.xml

@ -0,0 +1,12 @@
<?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.adfixedassetledger.AdFixedAssetLedgerMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerVo">
SELECT * from ad_fixed_asset_ledger
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

67
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerQuery.java

@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedassetledger;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: oa(驻外人员认定申请) <br/>
* File: AdExpatriatesApplyQuery.java <br/>
* Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyQuery <br/>
* Description: 驻外人员认定申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-01-16 15:22:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "驻外人员认定申请 查询条件", description = "驻外人员认定申请 查询条件")
public class AdFixedAssetLedgerQuery implements Query {
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 使用组织sid
}

94
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerService.java

@ -0,0 +1,94 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedassetledger;
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.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.biz.oaform.OaFormService;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class AdFixedAssetLedgerService extends MybatisBaseService<AdFixedAssetLedgerMapper, AdFixedAssetLedger> {
@Autowired
private OaAppendixService oaAppendixService;
@Autowired
private OaFormService oaFormService;
public PagerVo<AdFixedAssetLedgerVo> listPageVo(PagerQuery<AdFixedAssetLedgerQuery> pq) {
AdFixedAssetLedgerQuery query = pq.getParams();
QueryWrapper<AdFixedAssetLedger> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getAssetName())) {
qw.like("assetName", query.getAssetName());
}
if (StringUtils.isNotBlank(query.getAssetNumber())) {
qw.like("assetNumber", query.getAssetNumber());
}
}
IPage<AdFixedAssetLedger> page = PagerUtil.queryToPage(pq);
IPage<AdFixedAssetLedgerVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AdFixedAssetLedgerVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdateDto(AdFixedAssetLedgerDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdFixedAssetLedger entity = new AdFixedAssetLedger();
BeanUtil.copyProperties(dto, entity, "sid");
baseMapper.insert(entity);
sid = entity.getSid();
} else {
// 更新操作
AdFixedAssetLedger entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
return rb.success().setData(sid);
}
public AdFixedAssetLedgerVo fetchDetailsVoBySid(String sid) {
AdFixedAssetLedger entity = fetchBySid(sid);
AdFixedAssetLedgerVo vo = new AdFixedAssetLedgerVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

68
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfixedassetledger/AdFixedAssetLedgerVo.java

@ -0,0 +1,68 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adfixedassetledger;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "固定资产台账 视图数据对象", description = "固定资产台账 视图数据对象")
public class AdFixedAssetLedgerVo implements Vo {
private String sid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("固定资产名称")
private String assetName; // 固定资产名称
@ApiModelProperty("编号")
private String assetNumber; // 编号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("规格")
private String specification; // 规格
@ApiModelProperty("固定资产类别key")
private String assetTypeKey; // 固定资产类别key
@ApiModelProperty("固定资产类别")
private String assetTypeValue; // 固定资产类别
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 使用组织sid
@ApiModelProperty("数量")
private String num; // 数量
@ApiModelProperty("采购单价")
private String price; // 采购单价
}

20
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApply.java

@ -0,0 +1,20 @@
package com.yxt.anrui.oa.biz.hrhireapply;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class HrHireApply extends BaseEntity {
private static final long serialVersionUID = 3495800881939563210L;
@ApiModelProperty("是否是财务")
private String isFinanceKey;
private String isFinanceValue;
private String formSid;
}

24
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyDto.java

@ -0,0 +1,24 @@
package com.yxt.anrui.oa.biz.hrhireapply;
import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsDto;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class HrHireApplyDto extends OaFormDto {
private static final long serialVersionUID = 4255707952292859284L;
private String userSid;
@ApiModelProperty("是否是财务")
private String isFinanceKey;
private String isFinanceValue;
private List<HrHireDetailsDto> list = new ArrayList<>();
}

13
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyMapper.java

@ -0,0 +1,13 @@
package com.yxt.anrui.oa.biz.hrhireapply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Mapper
public interface HrHireApplyMapper extends BaseMapper<HrHireApply> {
}

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyMapper.xml

@ -0,0 +1,4 @@
<?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.hrhireapply.HrHireApplyMapper">
</mapper>

177
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java

@ -0,0 +1,177 @@
package com.yxt.anrui.oa.biz.hrhireapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsDto;
import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsService;
import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.anrui.oa.biz.oaform.OaForm;
import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
import com.yxt.anrui.oa.biz.oaform.OaFormService;
import com.yxt.anrui.oa.biz.oaform.flowable.SubmitDto;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Service
public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, HrHireApply> {
@Autowired
private OaFormService oaFormService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private HrHireDetailsService hiHireDetailsService;
@Autowired
private OaAppendixService oaAppendixService;
public ResultBean<HrHireApplyVo> getSaveInit(String userSid, String orgPath) {
ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
HrHireApplyVo hrHireApplyVo = new HrHireApplyVo();
hrHireApplyVo.setUserSid(userSid);
hrHireApplyVo.setOrgPath(orgPath);
return rb.success().setData(hrHireApplyVo);
}
public ResultBean<HrHireApplyVo> getUpdateInit(String sid) {
ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
HrHireApplyVo hrHireApplyVo = new HrHireApplyVo();
HrHireApply hrHireApply = fetchBySid(sid);
if (hrHireApply == null) {
return rb.setMsg("该申请不存在");
}
OaForm oaForm = oaFormService.fetchBySid(sid);
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
hrHireApplyVo.setOrgPath(orgSidPath);
hrHireApplyVo.setUserSid(oaForm.getCreateBySid());
BeanUtil.copyProperties(hrHireApply, hrHireApplyVo);
FormCommon isFinanceObj = FormCommon.of(hrHireApply.getIsFinanceKey(), hrHireApply.getIsFinanceValue());
hrHireApplyVo.setIsFinanceObj(isFinanceObj);
List<HrHireDetailsVo> list = hiHireDetailsService.getUpdateInit(sid);
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
list.stream().forEach(details -> {
FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue());
details.setDeptObj(deptObj);
FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue());
details.setJobObj(jobObj);
FormCommon educationObj = FormCommon.of(details.getEducationKey(), details.getEducationValue());
details.setEducationObj(educationObj);
List<String> files = oaAppendixService.selectByLinkSid(details.getSid());
details.setFiles(files);
});
}
hrHireApplyVo.setList(list);
hrHireApplyVo.setSid(sid);
return rb.success().setData(hrHireApplyVo);
}
public ResultBean<String> saveOrUpdateDto(HrHireApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
List<HrHireDetailsDto> list = dto.getList();
if (StringUtils.isBlank(sid)) {
// 新建操作
HrHireApply entity = new HrHireApply();
BeanUtil.copyProperties(dto, entity, "sid");
dto.setBillNo("ZPXQ");
dto.setSid(entity.getSid());
dto.setCreateBySid(dto.getUserSid());
ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
if (!resultBean.getSuccess()) {
return rb;
}
entity.setFormSid(resultBean.getData());
entity.setCreateBySid(dto.getUserSid());
baseMapper.insert(entity);
sid = entity.getSid();
} else {
// 更新操作
HrHireApply entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
hiHireDetailsService.saveDetails(list, sid);
return rb.success().setData(sid);
}
/**
* 提交
*
* @param dto
* @return
*/
public ResultBean submit(HrHireApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
if (!stringResultBean.getSuccess()) {
return rb.setMsg(stringResultBean.getData());
}
String businessSid = stringResultBean.getData();
SubmitDto submitDto = new SubmitDto();
submitDto.setUserSid(dto.getCreateBySid());
submitDto.setBusinessSid(businessSid);
Map<String, Object> formVariables = new HashMap<>();
formVariables = getMap(formVariables, businessSid);
submitDto.setFormVariables(formVariables);
submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
submitDto.setNextTaskId(dto.getTaskId());
submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
return oaFormService.submit(submitDto);
}
/**
* 驳回
*
* @param dto
* @return
*/
public ResultBean reject(TaskDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
return oaFormService.reject(dto);
}
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", sid);
appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid);
appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid);
formVariables.put("app", appMap);
//根据组织查询是否是分公司
OaForm oaForm = oaFormService.fetchBySid(sid);
HrHireApply hrHireApply = fetchBySid(sid);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
//是否是分公司
formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
//是否是财务岗
formVariables.put("isFin", "1".equals(hrHireApply.getIsFinanceKey()));
return formVariables;
}
}

28
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java

@ -0,0 +1,28 @@
package com.yxt.anrui.oa.biz.hrhireapply;
import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class HrHireApplyVo {
private String sid;
private String userSid;
private String orgPath;
@ApiModelProperty("是否是财务")
private FormCommon isFinanceObj;
private String isFinanceKey;
private String isFinanceValue;
private List<HrHireDetailsVo> list = new ArrayList<>();
}

41
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetails.java

@ -0,0 +1,41 @@
package com.yxt.anrui.oa.biz.hrhiredetails;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class HrHireDetails extends BaseEntity {
private static final long serialVersionUID = 4980172913356706485L;
@ApiModelProperty("主表sid")
private String mainSid;
@ApiModelProperty("招聘部门sid")
private String deptSid;
@ApiModelProperty("招聘部门名称")
private String deptName;
@ApiModelProperty("招聘岗位sid")
private String postSid;
@ApiModelProperty("招聘岗位名称")
private String postName;
@ApiModelProperty("招聘人数")
private Integer memberCount;
@ApiModelProperty("学历key")
private String educationKey;
@ApiModelProperty("学历value")
private String educationValue;
@ApiModelProperty("薪资待遇")
private String formalWages;
@ApiModelProperty("职位福利")
private String benefits;
@ApiModelProperty("职位描述")
private String describes;
@ApiModelProperty("任职要求")
private String demand;
@ApiModelProperty("工作地址")
private String address;
}

45
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsDto.java

@ -0,0 +1,45 @@
package com.yxt.anrui.oa.biz.hrhiredetails;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/17
**/
@Data
public class HrHireDetailsDto {
@ApiModelProperty("招聘部门")
private FormCommon deptObj;
private String deptKey;
private String deptValue;
@ApiModelProperty("招聘岗位")
private FormCommon jobObj;
private String jobKey;
private String jobValue;
@ApiModelProperty("人数")
private String memberCount;
@ApiModelProperty("学历")
private FormCommon educationObj;
private String educationKey;
private String educationValue;
@ApiModelProperty("薪资待遇")
private String formalWages;
@ApiModelProperty("职位福利")
private String benefits;
@ApiModelProperty("职位描述")
private String describes;
@ApiModelProperty("职位要求")
private String demand;
@ApiModelProperty("地址")
private String address;
private String remarks;
private List<String> files = new ArrayList<>();
}

18
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsMapper.java

@ -0,0 +1,18 @@
package com.yxt.anrui.oa.biz.hrhiredetails;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/17
**/
@Mapper
public interface HrHireDetailsMapper extends BaseMapper<HrHireDetails> {
List<HrHireDetailsVo> getUpdateInit(String sid);
List<HrHireDetails> selectByMainSid(String sid);
}

28
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsMapper.xml

@ -0,0 +1,28 @@
<?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.hrhiredetails.HrHireDetailsMapper">
<select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo">
select deptSid deptKey,
deptName deptValue,
postSid jobKey,
postName jobValue,
memberCount,
educationKey,
educationValue,
formalWages,
benefits,
describes,
demand,
address,
sid,
remarks
from hr_hire_details
where mainSid = #{sid}
</select>
<select id="selectByMainSid" resultType="com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetails">
select *
from hr_hire_details
where mainSid = #{sid}
</select>
</mapper>

66
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java

@ -0,0 +1,66 @@
package com.yxt.anrui.oa.biz.hrhiredetails;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixMapper;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.feign.file.OaFileEnum;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/17
**/
@Service
public class HrHireDetailsService extends MybatisBaseService<HrHireDetailsMapper, HrHireDetails> {
@Autowired
private OaAppendixMapper oaAppendixMapper;
@Autowired
private OaAppendixService oaAppendixService;
public List<HrHireDetailsVo> getUpdateInit(String sid) {
return baseMapper.getUpdateInit(sid);
}
public void saveDetails(List<HrHireDetailsDto> list, String sid) {
//根据sid查询明细并删除
List<HrHireDetails> list2 = baseMapper.selectByMainSid(sid);
list2.removeAll(Collections.singleton(null));
if (!list2.isEmpty()) {
list2.stream().forEach(v -> {
oaAppendixMapper.deleteByLinkSid(v.getSid());
deleteBySid(v.getSid());
});
}
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
list.stream().forEach(details -> {
HrHireDetails hrHireDetails = new HrHireDetails();
BeanUtil.copyProperties(details, hrHireDetails);
hrHireDetails.setDeptSid(details.getDeptKey());
hrHireDetails.setDeptName(details.getDeptValue());
hrHireDetails.setPostSid(details.getJobKey());
hrHireDetails.setPostName(details.getJobValue());
hrHireDetails.setMainSid(sid);
baseMapper.insert(hrHireDetails);
List<String> files = details.getFiles();
// 处理附件
saveFiles(hrHireDetails.getSid(), files, OaFileEnum.HIHIREAPPLY.getAttachType(), "文件");
});
}
}
// 保存文件
private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null));
oaAppendixService.saveFile(sid, files, attachType, fileType);
}
}

48
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsVo.java

@ -0,0 +1,48 @@
package com.yxt.anrui.oa.biz.hrhiredetails;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class HrHireDetailsVo implements Vo {
private static final long serialVersionUID = -3330232160961910852L;
private String sid;
@ApiModelProperty("招聘部门")
private FormCommon deptObj;
private String deptKey;
private String deptValue;
@ApiModelProperty("招聘岗位")
private FormCommon jobObj;
private String jobKey;
private String jobValue;
@ApiModelProperty("人数")
private String memberCount;
@ApiModelProperty("学历")
private FormCommon educationObj;
private String educationKey;
private String educationValue;
@ApiModelProperty("薪资待遇")
private String formalWages;
@ApiModelProperty("职位福利")
private String benefits;
@ApiModelProperty("职位描述")
private String describes;
@ApiModelProperty("职位要求")
private String demand;
@ApiModelProperty("地址")
private String address;
@ApiModelProperty("备注")
private String remarks;
private List<String> files = new ArrayList<>();
}

12
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/Extra.java

@ -0,0 +1,12 @@
package com.yxt.anrui.oa.biz.oaform;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class Extra {
}

25
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/FormCommon.java

@ -0,0 +1,25 @@
package com.yxt.anrui.oa.biz.oaform;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/1/16
**/
@Data
public class FormCommon {
private String id;
private String dictValue;
private Extra extra;
// 静态方法,直接通过方法创建对象并赋值
public static FormCommon of(String id, String dictValue) {
FormCommon formCommon = new FormCommon();
formCommon.setId(id);
formCommon.setDictValue(dictValue);
return formCommon;
}
}

2
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java

@ -20,7 +20,7 @@ public class OaFormDto implements Dto {
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("组织机构全路径")
private String orgSidPath;
private String orgPath;
@ApiModelProperty("申请单编号的字母")
private String billNo;
@ApiModelProperty("sid")

5
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

@ -75,10 +75,11 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
// 创建OA表单对象
OaForm oaForm = new OaForm();
// 将DTO中部分属性复制到oaForm中,忽略不需要的字段(如billNo, orgSidPath)
BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath");
BeanUtil.copyProperties(dto, oaForm, "billNo", "orgPath");
try {
String orgSidPath = dto.getOrgPath();
// 获取组织信息,根据orgSidPath字段调用外部服务
OrgVo orgVo = sysOrganizationFeign.getOrgByPath(dto.getOrgSidPath()).getData();
OrgVo orgVo = sysOrganizationFeign.getOrgByPath(orgSidPath).getData();
// 如果组织信息为空,返回失败信息
if (orgVo == null) {
return rb.setMsg("未找到对应的组织信息");

1
yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java

@ -10,6 +10,7 @@ public enum OaFileEnum {
OALEAVEAPPLY("001", "请假申请附件"),
OAMENDAPPLY("002", "补卡申请附件"),
ADEXPATRIATESAPPLY("003", "驻外人员认定附件"),
HIHIREAPPLY("004", "招聘需求附件"),
;

1
yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java

@ -9,6 +9,7 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
OALEAVEAPPLY("请假申请", "process_su0yph7n:1:15957504"),
OAMENDAPPLY("补卡申请", "process_9suucr96:1:16072504"),
HIHIREAPPLY("招聘需求", "process_zy0m4jrp:1:16802504"),
;

Loading…
Cancel
Save