diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java index 042168a8..70fadc7c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java @@ -173,4 +173,10 @@ public class DirectApplyInfo extends BaseEntity { @ApiModelProperty(value = "流程节点签名方式 0:或签 1:会签") private Integer nodeSignType; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java index 64b9177a..b35d8ddd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java @@ -56,4 +56,6 @@ public interface DerateRecordQueryMapper { * @return */ List getDetailList(Long id); + + SltAgreementReduce getAuditPrice(Long id); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java index 939348ab..e7bf95db 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java @@ -57,6 +57,10 @@ public class DerateRecordQueryServiceImpl implements IDerateReocrdQueryService { List sltAgreementReduceList = mapper.getAuditList(bean); try { for (SltAgreementReduce sltAgreementReduceNew : sltAgreementReduceList) { + SltAgreementReduce sltAgreementReducePriceNew = mapper.getAuditPrice(sltAgreementReduceNew.getId()); + sltAgreementReduceNew.setLeasePrice(sltAgreementReducePriceNew.getLeasePrice()); + sltAgreementReduceNew.setLeaseMoney(sltAgreementReducePriceNew.getLeaseMoney()); + sltAgreementReduceNew.setLeaseMoneyAll(sltAgreementReducePriceNew.getLeaseMoneyAll()); log.info("当前节点为{}",sltAgreementReduceNew.getNodeId()); SysWorkflowRecordHistory sysWorkflowRecordHistory = sysWorkflowRecordHistoryMapper.getWorkflowRecordHistoryByRecordId(sltAgreementReduceNew.getRecordId()); sltAgreementReduceNew.setNodeId(sysWorkflowRecordHistory.getNodeId()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml index 3f27eed2..3eac7af8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml @@ -125,10 +125,7 @@ su.user_name as createBy, bu.unit_name as unitName, bp.pro_name as projectName, - SUM(srd.lease_price * srd.num) as leasePrice, - SUM(srd.lease_money) as leaseMoney, swr.workflow_status as status, - a.leaseMoneyAll as leaseMoneyAll, swrs.node_id AS nodeId, swrs.next_node_id AS nextNodeId, swrs.record_id AS recordId, @@ -145,18 +142,7 @@ LEFT JOIN sys_workflow_node swn on swt.id = swn.type_id LEFT JOIN sys_workflow_config swc on swn.id = swc.node_id left join sys_workflow_record_history swrs on swr.id = swrs.record_id - LEFT JOIN - ( - SELECT - sra.agreement_id as agreementId, - SUM(srd.lease_money) as leaseMoneyAll - FROM - slt_reduce_apply sra - LEFT JOIN slt_reduce_details srd on sra.id=srd.apply_id - GROUP BY sra.agreement_id - ) a on a.agreementId=sra.agreement_id where 1=1 - AND swc.config_value = #{userId} @@ -182,4 +168,30 @@ GROUP BY sra.id ORDER BY sra.create_time DESC + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index e9197d91..12505e8e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into slt_agreement_info @@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from slt_agreement_info where id in + delete from slt_agreement_info where id in #{id} @@ -337,7 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id left join ma_type mt on rc.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id - where rc.status in ('0','1') and rc.repair_type = '3' + where rc.status in ('0','1') and rc.repair_type = '1' and rc.task_id in @@ -667,4 +667,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND project_id = #{projectId} AND status = '1' - \ No newline at end of file + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml index 2acced0b..8178544c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml @@ -59,6 +59,9 @@ and dai.status = 0 and (dai.status = 1 or dai.status = 2) + + AND DATE_FORMAT( dai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + GROUP BY swr.task_id order by dai.create_time desc