bug修复

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;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/record/mapper/DerateRecordQueryMapper.java

@@ -56,4 +56,6 @@ public interface DerateRecordQueryMapper {
      * @return
      */
     List<SltAgreementReduce> getDetailList(Long id);
+
+    SltAgreementReduce getAuditPrice(Long id);
 }

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<SltAgreementReduce> 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());

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
-
         <if test="userId != null and userId != ''">
             AND swc.config_value = #{userId}
         </if>
@@ -182,4 +168,30 @@
         GROUP BY sra.id
         ORDER BY sra.create_time DESC
     </select>
+    <select id="getAuditPrice" resultType="com.bonus.material.settlement.domain.SltAgreementReduce">
+        SELECT
+            sra.id as id,
+            sra.create_time as createTime,
+            SUM(srd.lease_price * srd.num) as leasePrice,
+            SUM(srd.lease_money) as leaseMoney,
+            a.leaseMoneyAll as leaseMoneyAll
+        FROM
+            slt_reduce_apply sra
+                LEFT JOIN slt_reduce_details srd on sra.id=srd.apply_id
+                LEFT JOIN bm_agreement_info bai on bai.agreement_id=sra.agreement_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 sra.id = #{id}
+        GROUP BY sra.id
+        ORDER BY sra.create_time DESC
+
+    </select>
 </mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml

@@ -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'
         <if test="taskList != null and taskList.size() > 0">
             and rc.task_id in
             <foreach item="task" collection="taskList" open="(" separator="," close=")">

bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml

@@ -59,6 +59,9 @@
             </if>
             <if test="isApp != null and taskStatus==0">and dai.status = 0 </if>
             <if test="isApp != null and taskStatus==1">and (dai.status = 1 or dai.status = 2)</if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND DATE_FORMAT( dai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            </if>
         </where>
         GROUP BY swr.task_id order by dai.create_time desc
     </select>