bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算增加退料备注字段

This commit is contained in:
liang.chao 2024-11-07 17:57:01 +08:00
parent 889168e79d
commit 460ff3f287
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
View File

@ -211,6 +211,7 @@ public class SltAgreementInfo {
*/ */
private String outSourceCosts; private String outSourceCosts;
private String remark; private String remark;
private String outRemark;
private String beginTime; private String beginTime;
private String offTime; private String offTime;
private String partModelName; private String partModelName;

9
sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml
View File

@ -33,7 +33,8 @@ sgzb:
job: job:
settlementJobDay: 21 settlementJobDay: 21
settlementJobCron: "0 0 1 21 * ?" settlementJobCron: "0 0 1 21 * ?"
zlptUrl: zlptUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications
intelligentUrl: updateItemStatusUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/updateItemStatus
intelligentAppKey: intelligentUrl: https://sit.zhgkxt.com/api/clientapi/public/externalApi/acceptExternalMechanical
intelligentAesKey: intelligentAppKey: abc123
intelligentAesKey: abcdefghijklmnop

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -334,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sai.lease_price as leasePrice, sai.lease_price as leasePrice,
sai.num as num, sai.num as num,
lai.remark, lai.remark,
bb.remark as outRemark,
sai.is_slt as isSlt, sai.is_slt as isSlt,
sai.trim_day as trimDay, sai.trim_day as trimDay,
DATE(sai.start_time) as startTime, DATE(sai.start_time) as startTime,
@ -341,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays
from slt_agreement_info sai from slt_agreement_info sai
LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id
LEFT JOIN back_apply_info bb on sai.back_id = bb.id
LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id
LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
@ -363,12 +365,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sai.lease_price as leasePrice, sai.lease_price as leasePrice,
sai.num as num, sai.num as num,
lai.remark, lai.remark,
bb.remark as outRemark,
sai.is_slt as isSlt, sai.is_slt as isSlt,
DATE(sai.start_time) as startTime, DATE(sai.start_time) as startTime,
DATE(sai.end_time) as endTime, DATE(sai.end_time) as endTime,
DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays
from slt_agreement_info sai from slt_agreement_info sai
LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id
LEFT JOIN back_apply_info bb on sai.back_id = bb.id
LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id
LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id