Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 3 months ago
parent
commit
c85bfe2cdc
  1. 118
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
  4. 9
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  5. 44
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  6. 45
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
  7. 39
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
  8. 40
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
  9. 44
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
  10. 33
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
  11. 44
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
  12. 85
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdJdPermissionApplyRest.java
  13. 69
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPermissionApplyRest.java
  14. 85
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPlatformPermissionApplyRest.java
  15. 7
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApply.java
  16. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyDto.java
  17. 14
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyMapper.java
  18. 6
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyMapper.xml
  19. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyQuery.java
  20. 71
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java
  21. 11
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyVo.java
  22. 15
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyMapper.java
  23. 25
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApply.java
  24. 31
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyDto.java
  25. 14
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyMapper.java
  26. 12
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyMapper.xml
  27. 14
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyQuery.java
  28. 232
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java
  29. 38
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyVo.java
  30. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java
  31. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java
  32. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java
  33. 20
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml
  34. 58
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailQuery.java
  35. 57
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java
  36. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java

118
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -543,9 +543,9 @@
bvm.vehicleAlias, bvm.vehicleAlias,
bvm.departmentValue, bvm.departmentValue,
bvm.emissionStandardValue, bvm.emissionStandardValue,
bmc.sid as configSid, bmc.sid as configSid,
bvm.sid as modelSid, bvm.sid as modelSid,
bvm.carBrand as brandSid, bvm.carBrand as brandSid,
bvm.vehicleTypeCode, bvm.vehicleTypeCode,
bmc.configCode, bmc.configCode,
concat_ws('、', bvm.vehicleVersionValue, bvm.fuelTypeValue, bvm.gearboxTypeValue, concat_ws('、', bvm.vehicleVersionValue, bvm.fuelTypeValue, bvm.gearboxTypeValue,
@ -610,9 +610,9 @@
bvm.vehicleAlias, bvm.vehicleAlias,
bvm.departmentValue, bvm.departmentValue,
bvm.emissionStandardValue, bvm.emissionStandardValue,
bmc.sid as configSid, bmc.sid as configSid,
bvm.sid as modelSid, bvm.sid as modelSid,
bvm.carBrand as brandSid, bvm.carBrand as brandSid,
bvm.vehicleTypeCode, bvm.vehicleTypeCode,
bmc.configCode, bmc.configCode,
concat_ws('、', bvm.vehicleVersionValue, bvm.fuelTypeValue, bvm.gearboxTypeValue, concat_ws('、', bvm.vehicleVersionValue, bvm.fuelTypeValue, bvm.gearboxTypeValue,
@ -761,7 +761,7 @@
resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo"> resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo">
SELECT convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price, SELECT convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bvc.guidedPrice as prices, bvc.guidedPrice as prices,
bvc.priceValidity AS date, bvc.priceValidity AS date,
bvm.vehicleAlias AS model, bvm.vehicleAlias AS model,
bvm.brandName AS brand, bvm.brandName AS brand,
bvm.carBrand AS brandSid, bvm.carBrand AS brandSid,
@ -781,8 +781,9 @@
bvm.vehicleTypeCode, bvm.vehicleTypeCode,
bmc.configCode bmc.configCode
FROM base_vehmodel_config bvc FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg} AND bvc.useOrgSid = #{useOrg}
@ -1057,7 +1058,7 @@
ON bvc.sid = bvcl.vehmodelConfigSid ON bvc.sid = bvcl.vehmodelConfigSid
WHERE bvc.modelSid = bvm.sid WHERE bvc.modelSid = bvm.sid
AND bvc.configurationItemsSid = bmc.sid AND bvc.configurationItemsSid = bmc.sid
AND bvc.useOrgSid = #{useOrg}) AS labelName AND bvc.useOrgSid = #{useOrg}) AS labelName
FROM base_vehmodel_config bc FROM base_vehmodel_config bc
LEFT JOIN base_vehicle_model bvm ON bc.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm ON bc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.sid LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.sid
@ -1105,11 +1106,12 @@
and bv.useOrgSid = #{orgSid} and bv.useOrgSid = #{orgSid}
and bv.lockedState = #{state} and bv.lockedState = #{state}
AND ( AND (
bv.vehicleStateValue = '库存' bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入' or bv.vehicleStateValue = '调入'
) )
and bv.isDelete = 0 and length(bv.vinNo)>8 and bv.isDelete = 0
and length(bv.vinNo) > 8
order by isFictitious, bv.locationName, bv.vinNo desc order by isFictitious, bv.locationName, bv.vinNo desc
</select> </select>
@ -1304,7 +1306,7 @@
<select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle"> <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
SELECT * SELECT *
FROM base_vehicle FROM base_vehicle
WHERE vinNo like concat('%',#{vinNo},'%') WHERE vinNo like concat('%', #{vinNo}, '%')
AND useOrgSid = #{useOrgSid} AND useOrgSid = #{useOrgSid}
AND isDelete = 0 AND isDelete = 0
AND vehicleState != "0004" AND vehicleState != "0004"
@ -1313,21 +1315,18 @@
<select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo"> <select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">
SELECT SELECT
bv.sid, bv.sid,
bvm.carBrand, bv.carBrandSid AS carBrand,
bvm.brandName, bv.carBrandName AS brandName,
bv.purchaseSystemSid, bv.purchaseSystemSid,
bv.purchaseSystemName, bv.purchaseSystemName,
bvm.vehicleAlias, bv.modelName AS vehicleAlias,
bvm.sid AS modelSid, bv.modelSid,
bv.vinNo, bv.vinNo,
bv.freight, bv.freight,
bv.costPrice, bv.costPrice,
IFNULL(bs.costPrice, 0) AS topAmount IFNULL(bs.costPrice, 0) AS topAmount
FROM FROM
base_vehicle bv base_vehicle bv
LEFT JOIN base_vehicle_model bvm
ON bv.modelSid = bvm.sid
AND bv.createOrgSid = bvm.createOrg
LEFT JOIN base_vehinstall bs LEFT JOIN base_vehinstall bs
ON RIGHT(bv.vinNo, 8) = RIGHT(bs.vinNo, 8) ON RIGHT(bv.vinNo, 8) = RIGHT(bs.vinNo, 8)
<where> <where>
@ -1338,10 +1337,10 @@
<select id="specialRebateDisGetVehPageList" <select id="specialRebateDisGetVehPageList"
resultType="com.yxt.anrui.base.api.basevehicle.BaseSpecialRebateDisGetVehVo"> resultType="com.yxt.anrui.base.api.basevehicle.BaseSpecialRebateDisGetVehVo">
SELECT SELECT
bvm.brandName, bv.carBrandName AS brandName,
bmc.carColor color, bmc.carColor color,
bv.locationName location, bv.locationName location,
bv.sid as vehSid, bv.sid AS vehSid,
bv.modelSid, bv.modelSid,
bv.modelName, bv.modelName,
bv.vinNo, bv.vinNo,
@ -1351,37 +1350,33 @@
bv.solidDate bv.solidDate
FROM FROM
base_vehicle bv base_vehicle bv
LEFT JOIN base_vehicle_model bvm LEFT JOIN base_model_config bmc
ON bv.modelSid = bvm.sid ON bv.modelConfigSid = bmc.sid
AND bv.createOrgSid = bvm.createOrg
LEFT JOIN base_vehicle_brand bvb
ON bvm.carBrand = bvb.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="getVehBySpecialRebateSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseSpecialRebateDisGetVehVo"> <select id="getVehBySpecialRebateSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseSpecialRebateDisGetVehVo">
SELECT bvm.brandName, SELECT
bmc.carColor color, bv.carBrandName AS brandName,
bv.locationName location, bmc.carColor color,
ssv.vehSid, bv.locationName location,
ssv.sid as specialRebateVehSid, ssv.vehSid,
bv.modelSid, ssv.sid AS specialRebateVehSid,
bv.modelName, bv.modelSid,
ssv.vinNo, bv.modelName,
bv.costPrice, ssv.vinNo,
bv.priceDate, bv.costPrice,
bv.salesDate, bv.priceDate,
bv.solidDate bv.salesDate,
FROM anrui_scm.scm_specialrebate_vehs ssv bv.solidDate
LEFT JOIN anrui_base.base_vehicle bv FROM
ON ssv.vehSid = bv.sid anrui_scm.scm_specialrebate_vehs ssv
LEFT JOIN base_vehicle_model bvm LEFT JOIN anrui_base.base_vehicle bv
ON bv.modelSid = bvm.sid ON ssv.vehSid = bv.sid
AND bv.createOrgSid = bvm.createOrg LEFT JOIN base_model_config bmc
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid ON bv.modelConfigSid = bmc.sid
WHERE ssv.specialRebateSid = #{specialRebateSid} WHERE ssv.specialRebateSid = #{specialRebateSid}
</select> </select>
@ -1536,18 +1531,14 @@
<select id="vehicleCollectionPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseChoiceVehicleVo"> <select id="vehicleCollectionPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseChoiceVehicleVo">
SELECT bv.sid, SELECT bv.sid,
bvm.vehicleAlias, bv.modelName AS vehicleAlias,
bvm.sid as carModelSid, bv.modelSid AS carModelSid,
LEFT(bv.vinNo,8) as vinNo, RIGHT(bv.vinNo,8) AS vinNo,
bv.costPrice as guidedPrice, bv.costPrice AS guidedPrice,
bv.priceDate, bv.priceDate,
bv.salesDate, bv.salesDate,
bv.solidDate bv.solidDate
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.modelSid = bvm.sid AND bvc.configurationItemsSid = bmc.sid AND bvc.useOrgSid = bv.createOrgSid
<where> <where>
(bv.solidDate IS NULL AND bv.salesDate IS NOT NULL OR bv.salesDate IS NOT NULL) AND (bv.solidDate IS NULL AND bv.salesDate IS NOT NULL OR bv.salesDate IS NOT NULL) AND
${ew.sqlSegment} ${ew.sqlSegment}
@ -1644,7 +1635,7 @@
ON bvc.sid = bvcl.vehmodelConfigSid ON bvc.sid = bvcl.vehmodelConfigSid
WHERE bvc.modelSid = bvm.sid WHERE bvc.modelSid = bvm.sid
AND bvc.configurationItemsSid = bmc.sid AND bvc.configurationItemsSid = bmc.sid
AND bvc.useOrgSid = #{useOrg}) AS labelName AND bvc.useOrgSid = #{useOrg}) AS labelName
from base_vehmodel_config bvc from base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
@ -1823,19 +1814,16 @@
</select> </select>
<select id="selectVinNo" resultType="int"> <select id="selectVinNo" resultType="int">
SELECT SELECT COUNT(*)
COUNT(*) FROM base_vehicle
FROM
base_vehicle
WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%') WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
AND isDelete = 0 AND isDelete = 0
AND vehicleState != "0004" AND vehicleState != "0004"
</select> </select>
<select id="selOneByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle"> <select id="selOneByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
SELECT SELECT *
* FROM base_vehicle bv
FROM WHERE bv.isDelete = '0'
base_vehicle bv AND bv.vinNo LIKE CONCAT('%', #{substringVinNo}, '%')
WHERE bv.isDelete = '0' AND bv.vinNo LIKE CONCAT( '%', #{substringVinNo}, '%' )
</select> </select>
</mapper> </mapper>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -3335,7 +3335,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')"
); );
qw.eq("bvb.sid", params.getBrandSid()); qw.eq("bv.carBrandSid", params.getBrandSid());
qw.eq("bv.purchaseSystemSid", params.getPurchaseSystemSid()); qw.eq("bv.purchaseSystemSid", params.getPurchaseSystemSid());
qw.eq("bv.isDelete", 0); qw.eq("bv.isDelete", 0);
qw.eq("bv.createOrgSid", params.getCreateOrgSid()); qw.eq("bv.createOrgSid", params.getCreateOrgSid());

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml

@ -20,11 +20,11 @@
<select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo"> <select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo">
SELECT svr.rebateTypeKey, SELECT svr.rebateTypeKey,
svr.rebateTypeValue, svr.rebateTypeValue,
SUM(svr.estimateRebate) as withRebate, SUM(CAST(svr.estimateRebate AS DECIMAL(10, 2))) as withRebate,
SUM(svr.expectTreatCost) as expectTreatCost, SUM(svr.expectTreatCost) as expectTreatCost,
SUM(svr.expectSuppCost) as expectSuppCost, SUM(svr.expectSuppCost) as expectSuppCost,
COUNT(*) as num, COUNT(*) as num,
GROUP_CONCAT(svrw.vehRebateSid) as vehRebateSid, GROUP_CONCAT(svrw.vehRebateSid) as vehRebateSid,
svr.purchaseSystemName, svr.purchaseSystemName,
svr.brandName svr.brandName
FROM scm_veh_rebate_with svrw FROM scm_veh_rebate_with svrw

9
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -280,3 +280,12 @@ export function fetchDetailsBySid(data) {
method: 'get' method: 'get'
}) })
} }
// 获取系统管理 -- 财务参数 -- 参数值
export function fetchByParNo(data) {
return request({
url: '/portal/v1/sysparameter/fetchByParNo',
method: 'post',
params: data
})
}

44
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@ -101,7 +101,7 @@
<script> <script>
import req from '@/api/bikerebate/bicyclerebatecheck' import req from '@/api/bikerebate/bicyclerebatecheck'
import { fetchBySid } from '@/api/cheliang/dictcommons' import { fetchByParNo, fetchBySid } from '@/api/cheliang/dictcommons'
import yiheduidanchefanli from './relation/yiheduidanchefanli' import yiheduidanchefanli from './relation/yiheduidanchefanli'
import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd' import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
@ -145,24 +145,6 @@ export default {
} }
}, },
methods: { methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < 7) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < 7) {
month = date.getMonth() //
}
this.formobj.checkApply = year + '年' + month + '月'
},
init() { init() {
fetchBySid(this.formobj.createOrgSid).then((res) => { fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) { if (res.success) {
@ -175,7 +157,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
this.init() this.init()
this.newDate()
}) })
this.formobj.createOrgSid = createOrgSid this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid
@ -185,12 +166,31 @@ export default {
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date() var nowDate = new Date()
var date = { var time = {
year: nowDate.getFullYear(), year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1, month: nowDate.getMonth() + 1,
day: nowDate.getDate() day: nowDate.getDate()
} }
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.checkApply = year + '年' + month + '月'
}
})
this.viewTitle = '【新增】单车返利核对审核申请' this.viewTitle = '【新增】单车返利核对审核申请'
}, },
showEdit(row) { showEdit(row) {

45
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue

@ -81,7 +81,7 @@
<script> <script>
import req from '@/api/bikerebate/bicyclerebatewithholding' import req from '@/api/bikerebate/bicyclerebatewithholding'
import { fetchBySid } from '@/api/cheliang/dictcommons' import { fetchBySid, fetchByParNo } from '@/api/cheliang/dictcommons'
import danchefanliselect from './relation/danchefanliselect' import danchefanliselect from './relation/danchefanliselect'
import danchefanliAdd from './relation/danchefanliAdd' import danchefanliAdd from './relation/danchefanliAdd'
@ -131,31 +131,11 @@ export default {
} }
}) })
}, },
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < 7) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < 7) {
month = date.getMonth() //
}
this.formobj.withApply = year + '年' + month + '月'
},
showAdd(createOrgSid) { showAdd(createOrgSid) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
this.init() this.init()
this.newDate()
}) })
this.formobj.createOrgSid = createOrgSid this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid
this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@ -164,12 +144,31 @@ export default {
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date() var nowDate = new Date()
var date = { var time = {
year: nowDate.getFullYear(), year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1, month: nowDate.getMonth() + 1,
day: nowDate.getDate() day: nowDate.getDate()
} }
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.withApply = year + '年' + month + '月'
}
})
this.viewTitle = '【新增】预提申请' this.viewTitle = '【新增】预提申请'
}, },
showEdit(row) { showEdit(row) {

39
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue

@ -68,7 +68,7 @@
<script> <script>
import req from '@/api/manufacturerrebates/collectionrebatecheck' import req from '@/api/manufacturerrebates/collectionrebatecheck'
import { fetchBySid } from '@/api/cheliang/dictcommons' import { fetchByParNo, fetchBySid } from '@/api/cheliang/dictcommons'
import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli' import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli'
import heduishenpiAdd from './relation/heduishenpiAdd' import heduishenpiAdd from './relation/heduishenpiAdd'
@ -110,24 +110,6 @@ export default {
} }
}, },
methods: { methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < 7) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < 7) {
month = date.getMonth() //
}
this.formobj.checkApply = year + '年' + month + '月'
},
init() { init() {
fetchBySid(this.formobj.createOrgSid).then((res) => { fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) { if (res.success) {
@ -149,6 +131,25 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.checkApply = year + '年' + month + '月'
}
})
this.viewTitle = '【新增】回款返利核对审核申请' this.viewTitle = '【新增】回款返利核对审核申请'
}, },
showEdit(row) { showEdit(row) {

40
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue

@ -68,7 +68,7 @@
<script> <script>
import req from '@/api/manufacturerrebates/collectionrebatewithholding' import req from '@/api/manufacturerrebates/collectionrebatewithholding'
import { fetchBySid } from '@/api/cheliang/dictcommons' import { fetchByParNo, fetchBySid } from '@/api/cheliang/dictcommons'
import huikuanfanliselect from './relation/huikuanfanliselect' import huikuanfanliselect from './relation/huikuanfanliselect'
import huikuanfanliAdd from './relation/huikuanfanliAdd' import huikuanfanliAdd from './relation/huikuanfanliAdd'
@ -116,29 +116,10 @@ export default {
} }
}) })
}, },
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < 7) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < 7) {
month = date.getMonth() //
}
this.formobj.collectionApply = year + '年' + month + '月'
},
showAdd(createOrgSid) { showAdd(createOrgSid) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
this.init() this.init()
this.newDate()
}) })
this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.createOrgSid = createOrgSid this.formobj.createOrgSid = createOrgSid
@ -147,6 +128,25 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.collectionApply = year + '年' + month + '月'
}
})
this.viewTitle = '【新增】回款返利预提申请' this.viewTitle = '【新增】回款返利预提申请'
}, },
showEdit(row) { showEdit(row) {

44
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@ -101,7 +101,7 @@
<script> <script>
import req from '@/api/specialrebate/specialrebatecheck' import req from '@/api/specialrebate/specialrebatecheck'
import { fetchBySid } from '@/api/cheliang/dictcommons' import { fetchBySid, fetchByParNo} from '@/api/cheliang/dictcommons'
import yiheduizhuanxiangfanli from './relation/yiheduizhuanxiangfanli' import yiheduizhuanxiangfanli from './relation/yiheduizhuanxiangfanli'
import specialrebatetobecheckedAdd from './relation/specialrebatetobecheckedAdd' import specialrebatetobecheckedAdd from './relation/specialrebatetobecheckedAdd'
@ -144,24 +144,6 @@ export default {
} }
}, },
methods: { methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < 7) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < 7) {
month = date.getMonth() //
}
this.formobj.checkApply = year + '年' + month + '月'
},
init() { init() {
fetchBySid(this.formobj.createOrgSid).then((res) => { fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) { if (res.success) {
@ -174,7 +156,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
this.init() this.init()
this.newDate()
}) })
this.formobj.createOrgSid = createOrgSid this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid
@ -184,12 +165,31 @@ export default {
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date() var nowDate = new Date()
var date = { var time = {
year: nowDate.getFullYear(), year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1, month: nowDate.getMonth() + 1,
day: nowDate.getDate() day: nowDate.getDate()
} }
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.checkApply = year + '年' + month + '月'
}
})
this.viewTitle = '【新增】专项返利核对审核申请' this.viewTitle = '【新增】专项返利核对审核申请'
}, },
showEdit(row) { showEdit(row) {

33
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue

@ -72,7 +72,7 @@
<script> <script>
import req from '@/api/specialrebate/specialrebatedistribution' import req from '@/api/specialrebate/specialrebatedistribution'
import daifeipeizhuanxiang from './relation/daifeipeizhuanxiang' import daifeipeizhuanxiang from './relation/daifeipeizhuanxiang'
import { fetchBySid } from '@/api/cheliang/dictcommons' import { fetchByParNo, fetchBySid } from '@/api/cheliang/dictcommons'
export default { export default {
name: 'SpecialRebateDistributionAdd', name: 'SpecialRebateDistributionAdd',
@ -119,18 +119,10 @@ export default {
} }
}) })
}, },
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
this.formobj.title = year + '年' + month + '月'
},
showAdd(createOrgSid) { showAdd(createOrgSid) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
this.init() this.init()
this.newDate()
}) })
this.formobj.createOrgSid = createOrgSid this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid
@ -140,12 +132,31 @@ export default {
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date() var nowDate = new Date()
var date = { var time = {
year: nowDate.getFullYear(), year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1, month: nowDate.getMonth() + 1,
day: nowDate.getDate() day: nowDate.getDate()
} }
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.title = year + '年' + month + '月'
}
})
this.viewTitle = '【新增】专项返利分配申请' this.viewTitle = '【新增】专项返利分配申请'
}, },
showEdit(row) { showEdit(row) {

44
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue

@ -81,7 +81,7 @@
<script> <script>
import req from '@/api/specialrebate/specialrebatewithholding' import req from '@/api/specialrebate/specialrebatewithholding'
import {fetchBySid, getOrgSidByPath} from '@/api/cheliang/dictcommons' import { fetchBySid, getOrgSidByPath, fetchByParNo } from '@/api/cheliang/dictcommons'
import zhuanxiangfanliselect from './relation/zhuanxiangfanliselect' import zhuanxiangfanliselect from './relation/zhuanxiangfanliselect'
import zhuanxiangfanliAdd from './relation/zhuanxiangfanliAdd' import zhuanxiangfanliAdd from './relation/zhuanxiangfanliAdd'
@ -123,28 +123,9 @@ export default {
} }
}, },
methods: { methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < 7) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > 6) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < 7) {
month = date.getMonth() //
}
this.formobj.withApply = year + '年' + month + '月'
},
showAdd() { showAdd() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
this.newDate()
}) })
this.dialogStatus = 'add' this.dialogStatus = 'add'
this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@ -153,12 +134,31 @@ export default {
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date() var nowDate = new Date()
var date = { var time = {
year: nowDate.getFullYear(), year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1, month: nowDate.getMonth() + 1,
day: nowDate.getDate() day: nowDate.getDate()
} }
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
if (res.success) {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() //
let day = date.getDate() //
if (month < 1 && day < res.data) {
month = 12
year = date.getFullYear() - 1
} else if (month < 1 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day > res.data) {
month = date.getMonth() + 1 //
} else if (month > 0 && day < res.data) {
month = date.getMonth() //
}
this.formobj.withApply = year + '年' + month + '月'
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) { if (resp.success) {
this.formobj.createOrgSid = resp.data this.formobj.createOrgSid = resp.data

85
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdJdPermissionApplyRest.java

@ -0,0 +1,85 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adjdpermissionapply.AdJdPermissionApplyDto;
import com.yxt.anrui.oa.biz.adjdpermissionapply.AdJdPermissionApplyService;
import com.yxt.anrui.oa.biz.adjdpermissionapply.AdJdPermissionApplyVo;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* @author wangpengfei
* @date 2025/1/22 17:12
*/
@Api(tags = "金蝶账号权限申请")
@RestController
@RequestMapping("v1/adjdpermissionapply")
public class AdJdPermissionApplyRest {
@Autowired
AdJdPermissionApplyService adJdPermissionApplyService;
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> saveOrUpdate(@RequestBody AdJdPermissionApplyDto dto) {
return adJdPermissionApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("初始化(新增或修改)")
@GetMapping({"/getInit", "/getInit/{sid}"})
public ResultBean<AdJdPermissionApplyVo> getInit(
@PathVariable(value = "sid", required = false) String sid,
@RequestParam(value = "userSid", required = false) String userSid,
@RequestParam(value = "orgPath", required = false) String orgPath) {
ResultBean<AdJdPermissionApplyVo> rb = ResultBean.fireFail();
if (sid == null || sid.isEmpty()) {
// 执行新增初始化
if (userSid == null || orgPath == null) {
return rb.setMsg("userSid和orgPath不能为空");
}
return adJdPermissionApplyService.getSaveInit(userSid, orgPath);
} else {
// 执行修改初始化
return adJdPermissionApplyService.getUpdateInit(sid);
}
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AdJdPermissionApplyVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
AdJdPermissionApplyVo vo = adJdPermissionApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody AdJdPermissionApplyDto dto) {
return adJdPermissionApplyService.submit(dto);
}
@ApiOperation(value = "驳回任务")
@PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adJdPermissionApplyService.reject(dto);
}
@ApiOperation(value = "办理(同意)")
@PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return adJdPermissionApplyService.complete(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return adJdPermissionApplyService.getFlowOperateTitle(query);
}
}

69
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPermissionApplyRest.java

@ -1,69 +0,0 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adexpatriatesapply.AdExpatriatesApplyVo;
import com.yxt.anrui.oa.biz.adpermissionapply.AdPermissionApply;
import com.yxt.anrui.oa.biz.adpermissionapply.AdPermissionApplyDto;
import com.yxt.anrui.oa.biz.adpermissionapply.AdPermissionApplyService;
import com.yxt.anrui.oa.biz.adpermissionapply.AdPermissionApplyVo;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* @author wangpengfei
* @date 2025/1/22 17:12
*/
@Api(tags = "金蝶账号权限申请")
@RestController
@RequestMapping("v1/adpermissionapply")
public class AdPermissionApplyRest {
@Autowired
AdPermissionApplyService adPermissionApplyService;
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> saveOrUpdate(@RequestBody AdPermissionApplyDto dto) {
return adPermissionApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AdPermissionApplyVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
AdPermissionApplyVo vo = adPermissionApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody AdPermissionApplyDto dto) {
return adPermissionApplyService.submit(dto);
}
@ApiOperation(value = "驳回任务")
@PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adPermissionApplyService.reject(dto);
}
@ApiOperation(value = "办理(同意)")
@PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return adPermissionApplyService.complete(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return adPermissionApplyService.getFlowOperateTitle(query);
}
}

85
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPlatformPermissionApplyRest.java

@ -0,0 +1,85 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adjdpermissionapply.AdJdPermissionApplyVo;
import com.yxt.anrui.oa.biz.adplatformpermissionapply.AdPlatformPermissionApplyDto;
import com.yxt.anrui.oa.biz.adplatformpermissionapply.AdPlatformPermissionApplyService;
import com.yxt.anrui.oa.biz.adplatformpermissionapply.AdPlatformPermissionApplyVo;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* @author wangpengfei
* @date 2025/1/24 17:12
*/
@Api(tags = "信息化平台权限和数据调整申请")
@RestController
@RequestMapping("v1/adplatformpermissionapply")
public class AdPlatformPermissionApplyRest {
@Autowired
AdPlatformPermissionApplyService adPlatformPermissionApplyService;
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> saveOrUpdate(@RequestBody AdPlatformPermissionApplyDto dto) {
return adPlatformPermissionApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AdPlatformPermissionApplyVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
AdPlatformPermissionApplyVo vo = adPlatformPermissionApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("初始化(新增或修改)")
@GetMapping({"/getInit", "/getInit/{sid}"})
public ResultBean<AdPlatformPermissionApplyVo> getInit(
@PathVariable(value = "sid", required = false) String sid,
@RequestParam(value = "userSid", required = false) String userSid,
@RequestParam(value = "orgPath", required = false) String orgPath) {
ResultBean<AdPlatformPermissionApplyVo> rb = ResultBean.fireFail();
if (sid == null || sid.isEmpty()) {
// 执行新增初始化
if (userSid == null || orgPath == null) {
return rb.setMsg("userSid和orgPath不能为空");
}
return adPlatformPermissionApplyService.getSaveInit(userSid, orgPath);
} else {
// 执行修改初始化
return adPlatformPermissionApplyService.getUpdateInit(sid);
}
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody AdPlatformPermissionApplyDto dto) {
return adPlatformPermissionApplyService.submit(dto);
}
@ApiOperation(value = "驳回任务")
@PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adPlatformPermissionApplyService.reject(dto);
}
@ApiOperation(value = "办理(同意)")
@PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return adPlatformPermissionApplyService.complete(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return adPlatformPermissionApplyService.getFlowOperateTitle(query);
}
}

7
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApply.java → yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApply.java

@ -1,4 +1,4 @@
package com.yxt.anrui.oa.biz.adpermissionapply; package com.yxt.anrui.oa.biz.adjdpermissionapply;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
@ -12,8 +12,8 @@ import lombok.Data;
*/ */
@Data @Data
@ApiModel(value = "金蝶账号权限申请", description = "金蝶账号权限申请") @ApiModel(value = "金蝶账号权限申请", description = "金蝶账号权限申请")
@TableName("ad_permission_apply") @TableName("ad_jd_permission_apply")
public class AdPermissionApply extends BaseEntity { public class AdJdPermissionApply extends BaseEntity {
@ApiModelProperty("申请权限类别Key") @ApiModelProperty("申请权限类别Key")
private String permissionTypeKey; private String permissionTypeKey;
@ApiModelProperty("申请权限类别") @ApiModelProperty("申请权限类别")
@ -22,4 +22,5 @@ public class AdPermissionApply extends BaseEntity {
private String permissionDetails; private String permissionDetails;
@ApiModelProperty("基础表单sid") @ApiModelProperty("基础表单sid")
private String formSid; private String formSid;
} }

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyDto.java → yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyDto.java

@ -1,4 +1,4 @@
package com.yxt.anrui.oa.biz.adpermissionapply; package com.yxt.anrui.oa.biz.adjdpermissionapply;
import com.yxt.anrui.oa.biz.oaform.OaFormDto; import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -14,7 +14,7 @@ import java.util.List;
*/ */
@Data @Data
@ApiModel(value = "金蝶账号权限申请 数据传输对象", description = "金蝶账号权限申请 数据传输对象") @ApiModel(value = "金蝶账号权限申请 数据传输对象", description = "金蝶账号权限申请 数据传输对象")
public class AdPermissionApplyDto extends OaFormDto { public class AdJdPermissionApplyDto extends OaFormDto {
private String sid; private String sid;
@ApiModelProperty("申请权限类别Key") @ApiModelProperty("申请权限类别Key")
private String permissionTypeKey; private String permissionTypeKey;

14
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyMapper.java

@ -0,0 +1,14 @@
package com.yxt.anrui.oa.biz.adjdpermissionapply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @author wangpengfei
* @date 2025/1/23 9:18
*/
@Mapper
public interface AdJdPermissionApplyMapper extends BaseMapper<AdJdPermissionApply> {
AdJdPermissionApplyVo fetchDetailsVoBySid(String sid);
}

6
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyMapper.xml → yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyMapper.xml

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!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.adpermissionapply.AdPermissionApplyMapper"> <mapper namespace="com.yxt.anrui.oa.biz.adjdpermissionapply.AdJdPermissionApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.adpermissionapply.AdPermissionApplyVo"> <select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.adjdpermissionapply.AdJdPermissionApplyVo">
SELECT * from ad_fixed_asset_ledger SELECT * from ad_Jd_permission_apply
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyQuery.java → yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyQuery.java

@ -1,4 +1,4 @@
package com.yxt.anrui.oa.biz.adpermissionapply; package com.yxt.anrui.oa.biz.adjdpermissionapply;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -10,5 +10,5 @@ import lombok.Data;
*/ */
@Data @Data
@ApiModel(value = "金蝶账号权限申请 查询条件", description = "金蝶账号权限申请 查询条件") @ApiModel(value = "金蝶账号权限申请 查询条件", description = "金蝶账号权限申请 查询条件")
public class AdPermissionApplyQuery implements Query { public class AdJdPermissionApplyQuery implements Query {
} }

71
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyService.java → yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java

@ -1,18 +1,14 @@
package com.yxt.anrui.oa.biz.adpermissionapply; package com.yxt.anrui.oa.biz.adjdpermissionapply;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.adexpatriatesapply.AdExpatriatesApplyVo;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedger;
import com.yxt.anrui.oa.biz.adfixedassetledger.AdFixedAssetLedgerMapper;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApply; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApply;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo;
import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsDto; import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; 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.OaForm;
import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum; import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
import com.yxt.anrui.oa.biz.oaform.OaFormService; import com.yxt.anrui.oa.biz.oaform.OaFormService;
import com.yxt.anrui.oa.biz.oaform.OaFormUrlEnum;
import com.yxt.anrui.oa.biz.oaform.flowable.*; import com.yxt.anrui.oa.biz.oaform.flowable.*;
import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.anrui.oa.feign.file.OaFileEnum;
import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
@ -34,7 +30,7 @@ import java.util.Map;
* @date 2025/1/23 9:17 * @date 2025/1/23 9:17
*/ */
@Service @Service
public class AdPermissionApplyService extends MybatisBaseService<AdPermissionApplyMapper, AdPermissionApply> { public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissionApplyMapper, AdJdPermissionApply> {
@Autowired @Autowired
OaFormService oaFormService; OaFormService oaFormService;
@Autowired @Autowired
@ -42,14 +38,14 @@ public class AdPermissionApplyService extends MybatisBaseService<AdPermissionApp
@Autowired @Autowired
OaAppendixService oaAppendixService; OaAppendixService oaAppendixService;
public ResultBean<String> saveOrUpdateDto(AdPermissionApplyDto dto) { public ResultBean<String> saveOrUpdateDto(AdJdPermissionApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid(); String sid = dto.getSid();
List<String> files = dto.getFiles(); List<String> files = dto.getFiles();
List<String> appes = dto.getAppes(); List<String> appes = dto.getAppes();
if (StringUtils.isBlank(sid)) { if (StringUtils.isBlank(sid)) {
// 新建操作 // 新建操作
AdPermissionApply entity = new AdPermissionApply(); AdJdPermissionApply entity = new AdJdPermissionApply();
BeanUtil.copyProperties(dto, entity, "sid"); BeanUtil.copyProperties(dto, entity, "sid");
dto.setBillNo("JDZHQX"); dto.setBillNo("JDZHQX");
dto.setSid(entity.getSid()); dto.setSid(entity.getSid());
@ -64,7 +60,7 @@ public class AdPermissionApplyService extends MybatisBaseService<AdPermissionApp
sid = entity.getSid(); sid = entity.getSid();
} else { } else {
// 更新操作 // 更新操作
AdPermissionApply entity = fetchBySid(sid); AdJdPermissionApply entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
@ -72,14 +68,49 @@ public class AdPermissionApplyService extends MybatisBaseService<AdPermissionApp
saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
return rb.success().setData(sid); return rb.success().setData(sid);
} }
public ResultBean<AdJdPermissionApplyVo> getSaveInit(String userSid, String orgPath) {
ResultBean<AdJdPermissionApplyVo> rb = ResultBean.fireFail();
AdJdPermissionApplyVo adJdPermissionApplyVo = new AdJdPermissionApplyVo();
adJdPermissionApplyVo.setCreateBySid(userSid);
adJdPermissionApplyVo.setOrgSidPath(orgPath);
return rb.success().setData(adJdPermissionApplyVo);
}
public ResultBean<AdJdPermissionApplyVo> getUpdateInit(String sid) {
ResultBean<AdJdPermissionApplyVo> rb = ResultBean.fireFail();
AdJdPermissionApplyVo adJdPermissionApplyVo = new AdJdPermissionApplyVo();
AdJdPermissionApply adJdPermissionApply = fetchBySid(sid);
if (adJdPermissionApply == null) {
return rb.setMsg("该申请不存在");
}
// hrHireApplyVo.setTestPage(hrHireApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adJdPermissionApplyVo.setTaskId(oaForm.getTaskId());
adJdPermissionApplyVo.setProcInsId(oaForm.getProcInstId());
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
adJdPermissionApplyVo.setOrgSidPath(orgSidPath);
adJdPermissionApplyVo.setCreateBySid(oaForm.getCreateBySid());
BeanUtil.copyProperties(adJdPermissionApply, adJdPermissionApplyVo);
// FormCommon isFinanceObj = FormCommon.of(adJdPermissionApply.getIsFinanceKey(), adJdPermissionApply.getIsFinanceValue());
// adJdPermissionApplyVo.setIsFinanceObj(isFinanceObj);
FormCommon deptObj = FormCommon.of(adJdPermissionApply.getPermissionTypeKey(), adJdPermissionApply.getPermissionTypeValue());
adJdPermissionApplyVo.setPermissionObj(deptObj);
List<String> files = oaAppendixService.selectByLinkSid(sid);
adJdPermissionApplyVo.setFiles(files);
adJdPermissionApplyVo.setSid(sid);
return rb.success().setData(adJdPermissionApplyVo);
}
// 保存文件 // 保存文件
private void saveFiles(String sid, List<String> files, String attachType, String fileType) { private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null)); files.removeAll(Collections.singleton(null));
oaAppendixService.saveFile(sid, files, attachType, fileType); oaAppendixService.saveFile(sid, files, attachType, fileType);
} }
public AdPermissionApplyVo fetchDetailsVoBySid(String sid) { public AdJdPermissionApplyVo fetchDetailsVoBySid(String sid) {
AdPermissionApplyVo vo = baseMapper.fetchDetailsVoBySid(sid); AdJdPermissionApplyVo vo = baseMapper.fetchDetailsVoBySid(sid);
List<String> files = oaAppendixService.selectByLinkSid(sid); List<String> files = oaAppendixService.selectByLinkSid(sid);
vo.setFiles(files); vo.setFiles(files);
return vo; return vo;
@ -90,7 +121,7 @@ public class AdPermissionApplyService extends MybatisBaseService<AdPermissionApp
* @param dto * @param dto
* @return * @return
*/ */
public ResultBean submit(AdPermissionApplyDto dto) { public ResultBean submit(AdJdPermissionApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
ResultBean<String> stringResultBean = saveOrUpdateDto(dto); ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
if (!stringResultBean.getSuccess()) { if (!stringResultBean.getSuccess()) {
@ -193,11 +224,11 @@ public class AdPermissionApplyService extends MybatisBaseService<AdPermissionApp
// appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl()); // appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
// formVariables.put("app", appMap); // formVariables.put("app", appMap);
// //根据组织查询是否是分公司 // //根据组织查询是否是分公司
// OaForm oaForm = oaFormService.fetchBySid(sid); OaForm oaForm = oaFormService.fetchBySid(sid);
// AdPermissionApply adPermissionApply = fetchBySid(sid); AdJdPermissionApply adPermissionApply = fetchBySid(sid);
// SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData(); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
// //是否是分公司 //是否是分公司
// formVariables.put("isTrue", sysOrganization.getIsDept() == 0); formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
return formVariables; return formVariables;
} }

11
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyVo.java → yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.oa.biz.adpermissionapply; package com.yxt.anrui.oa.biz.adjdpermissionapply;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -14,7 +15,7 @@ import java.util.List;
*/ */
@Data @Data
@ApiModel(value = "金蝶账号权限申请 视图数据对象", description = "金蝶账号权限申请 视图数据对象") @ApiModel(value = "金蝶账号权限申请 视图数据对象", description = "金蝶账号权限申请 视图数据对象")
public class AdPermissionApplyVo implements Vo { public class AdJdPermissionApplyVo implements Vo {
private String sid; private String sid;
@ApiModelProperty("申请权限类别Key") @ApiModelProperty("申请权限类别Key")
private String permissionTypeKey; private String permissionTypeKey;
@ -28,4 +29,10 @@ public class AdPermissionApplyVo implements Vo {
private List<String> files = new ArrayList<>(); private List<String> files = new ArrayList<>();
@ApiModelProperty("附件") @ApiModelProperty("附件")
private List<String> appes = new ArrayList<>(); private List<String> appes = new ArrayList<>();
private String orgSidPath;
private String createBySid;
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
private FormCommon permissionObj;
} }

15
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpermissionapply/AdPermissionApplyMapper.java

@ -1,15 +0,0 @@
package com.yxt.anrui.oa.biz.adpermissionapply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.oa.biz.adexpatriatesapply.AdExpatriatesApplyVo;
import org.apache.ibatis.annotations.Mapper;
/**
* @author wangpengfei
* @date 2025/1/23 9:18
*/
@Mapper
public interface AdPermissionApplyMapper extends BaseMapper<AdPermissionApply> {
AdPermissionApplyVo fetchDetailsVoBySid(String sid);
}

25
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApply.java

@ -0,0 +1,25 @@
package com.yxt.anrui.oa.biz.adplatformpermissionapply;
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;
/**
* @author wangpengfei
* @date 2025/1/24 9:18
*/
@Data
@ApiModel(value = "信息化平台权限和数据调整申请", description = "信息化平台权限和数据调整申请")
@TableName("ad_platform_permission_apply")
public class AdPlatformPermissionApply extends BaseEntity {
@ApiModelProperty("申请权限类别Key")
private String permissionTypeKey;
@ApiModelProperty("申请权限类别")
private String permissionTypeValue;
@ApiModelProperty("权限详情")
private String permissionDetails;
@ApiModelProperty("基础表单sid")
private String formSid;
}

31
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyDto.java

@ -0,0 +1,31 @@
package com.yxt.anrui.oa.biz.adplatformpermissionapply;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author wangpengfei
* @date 2025/1/24 9:18
*/
@Data
@ApiModel(value = "信息化平台权限和数据调整申请 数据传输对象", description = "信息化平台权限和数据调整申请 数据传输对象")
public class AdPlatformPermissionApplyDto extends OaFormDto {
private String sid;
@ApiModelProperty("申请权限类别Key")
private String permissionTypeKey;
@ApiModelProperty("申请权限类别")
private String permissionTypeValue;
@ApiModelProperty("权限详情")
private String permissionDetails;
@ApiModelProperty("基础表单sid")
private String formSid;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("文件")
private List<String> appes = new ArrayList<>();
}

14
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyMapper.java

@ -0,0 +1,14 @@
package com.yxt.anrui.oa.biz.adplatformpermissionapply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @author wangpengfei
* @date 2025/1/24 9:18
*/
@Mapper
public interface AdPlatformPermissionApplyMapper extends BaseMapper<AdPlatformPermissionApply> {
AdPlatformPermissionApplyVo fetchDetailsVoBySid(String sid);
}

12
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyMapper.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.adplatformpermissionapply.AdPlatformPermissionApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.adplatformpermissionapply.AdPlatformPermissionApplyVo">
SELECT * from ad_platform_permission_apply
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

14
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyQuery.java

@ -0,0 +1,14 @@
package com.yxt.anrui.oa.biz.adplatformpermissionapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2025/1/24 9:18
*/
@Data
@ApiModel(value = "信息化平台权限和数据调整申请 查询条件", description = "信息化平台权限和数据调整申请 查询条件")
public class AdPlatformPermissionApplyQuery implements Query {
}

232
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyService.java

@ -0,0 +1,232 @@
package com.yxt.anrui.oa.biz.adplatformpermissionapply;
import cn.hutool.core.bean.BeanUtil;
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.*;
import com.yxt.anrui.oa.feign.file.OaFileEnum;
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;
/**
* @author wangpengfei
* @date 2025/1/24 9:17
*/
@Service
public class AdPlatformPermissionApplyService extends MybatisBaseService<AdPlatformPermissionApplyMapper, AdPlatformPermissionApply> {
@Autowired
OaFormService oaFormService;
@Autowired
SysOrganizationFeign sysOrganizationFeign;
@Autowired
OaAppendixService oaAppendixService;
public ResultBean<String> saveOrUpdateDto(AdPlatformPermissionApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
List<String> files = dto.getFiles();
List<String> appes = dto.getAppes();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdPlatformPermissionApply entity = new AdPlatformPermissionApply();
BeanUtil.copyProperties(dto, entity, "sid");
dto.setBillNo("PlatformZHQX");
dto.setSid(entity.getSid());
dto.setCreateBySid(dto.getCreateBySid());
ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
if (!resultBean.getSuccess()) {
return rb;
}
entity.setFormSid(resultBean.getData());
entity.setCreateBySid(dto.getCreateBySid());
baseMapper.insert(entity);
sid = entity.getSid();
} else {
// 更新操作
AdPlatformPermissionApply entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
return rb.success().setData(sid);
}
// 保存文件
private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null));
oaAppendixService.saveFile(sid, files, attachType, fileType);
}
public AdPlatformPermissionApplyVo fetchDetailsVoBySid(String sid) {
AdPlatformPermissionApplyVo vo = baseMapper.fetchDetailsVoBySid(sid);
List<String> files = oaAppendixService.selectByLinkSid(sid);
vo.setFiles(files);
return vo;
}
public ResultBean<AdPlatformPermissionApplyVo> getSaveInit(String userSid, String orgPath) {
ResultBean<AdPlatformPermissionApplyVo> rb = ResultBean.fireFail();
AdPlatformPermissionApplyVo adPlatformPermissionApplyVo = new AdPlatformPermissionApplyVo();
adPlatformPermissionApplyVo.setCreateBySid(userSid);
adPlatformPermissionApplyVo.setOrgSidPath(orgPath);
return rb.success().setData(adPlatformPermissionApplyVo);
}
public ResultBean<AdPlatformPermissionApplyVo> getUpdateInit(String sid) {
ResultBean<AdPlatformPermissionApplyVo> rb = ResultBean.fireFail();
AdPlatformPermissionApplyVo adPlatformPermissionApplyVo = new AdPlatformPermissionApplyVo();
AdPlatformPermissionApply adPlatformPermissionApply = fetchBySid(sid);
if (adPlatformPermissionApply == null) {
return rb.setMsg("该申请不存在");
}
// hrHireApplyVo.setTestPage(hrHireApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adPlatformPermissionApplyVo.setTaskId(oaForm.getTaskId());
adPlatformPermissionApplyVo.setProcInsId(oaForm.getProcInstId());
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
adPlatformPermissionApplyVo.setOrgSidPath(orgSidPath);
adPlatformPermissionApplyVo.setCreateBySid(oaForm.getCreateBySid());
BeanUtil.copyProperties(adPlatformPermissionApply, adPlatformPermissionApplyVo);
// FormCommon isFinanceObj = FormCommon.of(adPlatformPermissionApply.getIsFinanceKey(), adPlatformPermissionApply.getIsFinanceValue());
// adPlatformPermissionApplyVo.setIsFinanceObj(isFinanceObj);
FormCommon deptObj = FormCommon.of(adPlatformPermissionApply.getPermissionTypeKey(), adPlatformPermissionApply.getPermissionTypeValue());
adPlatformPermissionApplyVo.setPermissionObj(deptObj);
List<String> files = oaAppendixService.selectByLinkSid(sid);
adPlatformPermissionApplyVo.setFiles(files);
adPlatformPermissionApplyVo.setSid(sid);
return rb.success().setData(adPlatformPermissionApplyVo);
}
/**
* 提交
*
* @param dto
* @return
*/
public ResultBean submit(AdPlatformPermissionApplyDto 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<>();
Map<String, Object> appMap = new HashMap<>();
// appMap.put("sid", businessSid);
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);
}
/**
* 办理同意
*
* @param dto
* @return
*/
public ResultBean complete(CompleteDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
BeanUtil.copyProperties(dto, businessVariablesDto);
return oaFormService.complete(businessVariablesDto);
}
public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
formVariables = getMap(formVariables, query.getBusinessSid());
query.setFormVariables(formVariables);
String data = "";
if (next == 0) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
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);
appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle");
appMap.put("agreeUrl", "oa/v1/HrHireApply/complete");
appMap.put("stopUrl", "oa/v1/oaform/breakProcess");
appMap.put("rejectUrl", "oa/v1/HrHireApply/reject");
appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
appMap.put("signUrl", "oa/v1/oaform/delegate");
appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
// appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + sid);
// appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + sid);
// appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl());
// appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl());
// appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());
// appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl());
// appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl());
// appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl());
// appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
// formVariables.put("app", appMap);
// //根据组织查询是否是分公司
OaForm oaForm = oaFormService.fetchBySid(sid);
AdPlatformPermissionApply adPermissionApply = fetchBySid(sid);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
//是否是分公司
formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
return formVariables;
}
}

38
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adplatformpermissionapply/AdPlatformPermissionApplyVo.java

@ -0,0 +1,38 @@
package com.yxt.anrui.oa.biz.adplatformpermissionapply;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author wangpengfei
* @date 2025/1/23 9:19
*/
@Data
@ApiModel(value = "信息化平台权限和数据调整申请 视图数据对象", description = "信息化平台权限和数据调整申请 视图数据对象")
public class AdPlatformPermissionApplyVo implements Vo {
private String sid;
@ApiModelProperty("申请权限类别Key")
private String permissionTypeKey;
@ApiModelProperty("申请权限类别")
private String permissionTypeValue;
@ApiModelProperty("权限详情")
private String permissionDetails;
@ApiModelProperty("基础表单sid")
private String formSid;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("附件")
private List<String> appes = new ArrayList<>();
private String orgSidPath;
private String createBySid;
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
private FormCommon permissionObj;
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java

@ -89,5 +89,6 @@ public class WmsInitialDetail extends BaseEntity {
private BigDecimal listNum; // 已上架数量 private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)") @ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否) private Integer isYwym; // 是否为一物一码(0是,1否)
@ApiModelProperty("是否已上传商品标签(0是,1否)")
private Integer isScbq;
} }

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java

@ -75,10 +75,9 @@ public class WmsInitialDetailDetailsVo implements Vo {
private BigDecimal inCost; // 入库单价 private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率") @ApiModelProperty("税率")
private String taxRate; // 税率 private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("首次入库日期") @ApiModelProperty("首次入库日期")
private Date firstInDateStart; // 首次入库日期 private Date firstInDate;
private Date firstInDateEnd; // 首次入库日期
@ApiModelProperty("商品类别sid") @ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码") @ApiModelProperty("商品类别编码")
@ -89,5 +88,6 @@ public class WmsInitialDetailDetailsVo implements Vo {
private BigDecimal listNum; // 已上架数量 private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)") @ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否) private Integer isYwym; // 是否为一物一码(0是,1否)
@ApiModelProperty("是否已上传商品标签(0是,1否)")
private Integer isScbq;
} }

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java

@ -77,10 +77,9 @@ public class WmsInitialDetailDto implements Dto {
private BigDecimal inCost; // 入库单价 private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率") @ApiModelProperty("税率")
private String taxRate; // 税率 private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("首次入库日期") @ApiModelProperty("首次入库日期")
private Date firstInDateStart; // 首次入库日期 private Date firstInDate;
private Date firstInDateEnd; // 首次入库日期
@ApiModelProperty("商品类别sid") @ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码") @ApiModelProperty("商品类别编码")
@ -91,5 +90,6 @@ public class WmsInitialDetailDto implements Dto {
private BigDecimal listNum; // 已上架数量 private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)") @ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否) private Integer isYwym; // 是否为一物一码(0是,1否)
@ApiModelProperty("是否已上传商品标签(0是,1否)")
private Integer isScbq;
} }

20
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml

@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailMapper"> <mapper namespace="com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo"> <select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo">
SELECT * FROM wms_initial_detail <where> ${ew.sqlSegment} </where> SELECT
</select> wid.*
FROM
wms_initial_detail wid
LEFT JOIN wms_initial wi
ON wid.billSid = wi.sid
LEFT JOIN anrui_portal.sys_organization AS s
ON wi.deptSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>

58
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailQuery.java

@ -26,10 +26,6 @@
package com.yxt.wms.biz.inventory.wmsinitialdetail; package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -39,55 +35,15 @@ import lombok.Data;
@ApiModel(value = "期初上架-明细 查询条件", description = "期初上架-明细 查询条件") @ApiModel(value = "期初上架-明细 查询条件", description = "期初上架-明细 查询条件")
public class WmsInitialDetailQuery implements Query { public class WmsInitialDetailQuery implements Query {
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品spuSid")
private String goodsSpuSid; // 商品spuSid
@ApiModelProperty("商品spu名称") @ApiModelProperty("商品spu名称")
private String goodsSpuName; // 商品spu名称 private String goodsSpuName;
@ApiModelProperty("商品skuSid")
private String goodsSkuSid; // 商品skuSid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("图号") @ApiModelProperty("图号")
private String goodsSkuCode; // 图号 private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("数量")
private BigDecimal num; // 数量
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("厂家sid")
private String manufacturerSid; // 厂家sid
@ApiModelProperty("厂家名称")
private String manufacturerName; // 厂家名称
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("销售指导价")
private BigDecimal saleGuidePrice; // 销售指导价
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率")
private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("首次入库日期")
private Date firstInDateStart; // 首次入库日期
private Date firstInDateEnd; // 首次入库日期
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode; // 商品类别编码
@ApiModelProperty("商品类别名称") @ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称 private String goodsTypeName;
@ApiModelProperty("已上架数量")
private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否)
private String userSid;
private String orgPath;
private String menuUrl;
private String menuSid;
} }

57
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java

@ -30,15 +30,72 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetailMapper, WmsInitialDetail> { public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetailMapper, WmsInitialDetail> {
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<WmsInitialDetailVo> listPageVo(PagerQuery<WmsInitialDetailQuery> pq) { public PagerVo<WmsInitialDetailVo> listPageVo(PagerQuery<WmsInitialDetailQuery> pq) {
WmsInitialDetailQuery query = pq.getParams(); WmsInitialDetailQuery query = pq.getParams();
QueryWrapper<WmsInitialDetail> qw = new QueryWrapper<>(); QueryWrapper<WmsInitialDetail> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<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("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("wi.createBySid", query.getUserSid());
} else {
PagerVo<WmsInitialDetailVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<WmsInitialDetailVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("wid.goodsSpuName", query.getGoodsSpuName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("wid.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsTypeName())) {
qw.like("wid.goodsTypeName", query.getGoodsTypeName());
}
IPage<WmsInitialDetail> page = PagerUtil.queryToPage(pq); IPage<WmsInitialDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInitialDetailVo> pagging = baseMapper.selectPageVo(page, qw); IPage<WmsInitialDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInitialDetailVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<WmsInitialDetailVo> p = PagerUtil.pageToVo(pagging, null);

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java

@ -70,5 +70,6 @@ public class WmsInitialDetailVo implements Vo {
private BigDecimal listNum; private BigDecimal listNum;
@ApiModelProperty("是否为一物一码(0是,1否)") @ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; private Integer isYwym;
@ApiModelProperty("是否已上传商品标签(0是,1否)")
private Integer isScbq;
} }

Loading…
Cancel
Save