Merge remote-tracking branch 'origin/master' into master

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -975,13 +975,13 @@ public class TaskController extends BladeController {
         //获取具体业务数据
         TaskApprovalVO taskApprovalVO = this.taskService.queryBusinessData(vo);
         /** 任务审批查看时，把节点附件列表跟在上报文件后面*/
-        if(Func.isNull(approvalType) && approvalType==1){
-            List<TaskApprovalVO.ApprovalFile> files = jdbcTemplate.query("select name as fileName,domain_url as fileUrl from m_table_file where is_deleted = 0 and tab_id = ?",new BeanPropertyRowMapper<>(TaskApprovalVO.ApprovalFile.class),formDataId);
-            if (ObjectUtil.isNotEmpty(files)){
-                List<TaskApprovalVO.ApprovalFile> fileList = vo.getApprovalFileList();
-                fileList.addAll(files);
-            }
-        }
+//        if(Func.isNotEmpty(approvalType) && approvalType==1){
+//            List<TaskApprovalVO.ApprovalFile> files = jdbcTemplate.query("select name as fileName,domain_url as fileUrl from m_table_file where is_deleted = 0 and tab_id = (select wbs_id from u_information_query WHERE id = ?)",new BeanPropertyRowMapper<>(TaskApprovalVO.ApprovalFile.class),formDataId);
+//            if (ObjectUtil.isNotEmpty(files)){
+//                List<TaskApprovalVO.ApprovalFile> fileList = taskApprovalVO.getApprovalFileList();
+//                fileList.addAll(files);
+//            }
+//        }
         return R.data(taskApprovalVO);
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -255,7 +255,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     }
 
                     //资料填报原始pdf
-                    String approvalPdf = StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl();
+//                    String approvalPdf = StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl();
+                    /** 修改需求，任务查看时，附件不在列表中显示，需要拼接在电签后面。如果此处修改影响其他地方，则到时候再说*/
+                    String approvalPdf = StringUtils.isNotEmpty(query.getNodePdfUrl()) ? query.getNodePdfUrl() : query.getPdfUrl();
                     vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf));
 
                     //试验关联文件合并pdf
@@ -1127,7 +1129,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         try {
             System.out.println("----- 电签成功--------");
             //添加nodePdf的值
-            List<Map<String, Object>> mapList = jdbcTemplate.queryForList("select *,domain_url as url from m_table_file where is_deleted = 0 and type in (10,11,12) and tab_id = " + formDataId + "");
+            List<Map<String, Object>> mapList = jdbcTemplate.queryForList("select *,domain_url as url from m_table_file where is_deleted = 0 and type in (10,11,12) and tab_id = (select wbs_id from u_information_query WHERE id = + "+formDataId+")");
             if(Func.isNotEmpty(mapList)&&mapList.size()>=1){
                 String file_path = org.springblade.business.utils.FileUtils.getSysLocalFileUrl();
                 List<String> datainfo = new ArrayList<>();

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MiddleMeterApplyController.java

@@ -220,7 +220,7 @@ public class MiddleMeterApplyController extends BladeController {
             @ApiImplicitParam(name = "contractPeriodId", value = "合同计量期id", required = true)
     })
     public R<BigDecimal> getCurrentMeterMoney(MiddleMeterApply middleMeterApply) {
-        return R.data(middleMeterApplyService.getCurrentMeterMoney(middleMeterApply));
+        return R.data(middleMeterApplyService.getCurrentMeterMoney(middleMeterApply,"小计"));
     }
 
     @GetMapping("/test")

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2611,7 +2611,7 @@ public class TaskController extends BladeController {
                     MiddleMeterApply middleMeterApply = new MiddleMeterApply();
                     middleMeterApply.setContractId(Func.toLong(task.getContractId()));
                     middleMeterApply.setContractPeriodId(Func.toLong(task.getFormDataId()));
-                    BigDecimal currentMeterMoney = middleMeterApplyService.getCurrentMeterMoney(middleMeterApply);
+                    BigDecimal currentMeterMoney = middleMeterApplyService.getCurrentMeterMoney(middleMeterApply,"实际支付金额");
 
                     InterimPayCertificate inData = interimPayCertificateService.getBaseMapper().selectOne(Wrappers.<InterimPayCertificate>lambdaQuery().eq(InterimPayCertificate::getContractId, task.getContractId()).eq(InterimPayCertificate::getContractPeriodId, task.getFormDataId()));
                     if (inData == null || Func.isNull(inData)) {

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.java

@@ -72,7 +72,7 @@ public interface MiddleMeterApplyMapper extends BaseMapper<MiddleMeterApply> {
 
     List<Long> getNodeOtherFormId(@Param("middleId") Long id,@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId,@Param("nodeId") Long nodeId);
 
-    BigDecimal getCurrentMeterMoney(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId);
+    BigDecimal getCurrentMeterMoney(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId,@Param("seq") String seq);
 
     List<MiddleMeterApply> getAllAPPly(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId);
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -223,7 +223,7 @@
 
     <select id="getCurrentMeterMoney" resultType="java.math.BigDecimal">
         select current_period_pay
-        from s_interim_pay_certificate_item where  chapter_seq='实际支付' and is_deleted = 0
+        from s_interim_pay_certificate_item where  chapter_seq=#{seq} and is_deleted = 0
                                               and certificate_id =
                                                   (select id from s_interim_pay_certificate
                                                    WHERE contract_id = #{contractId} and contract_period_id = #{contractPeriodId} and is_deleted = 0

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IMiddleMeterApplyService.java

@@ -61,7 +61,7 @@ public interface IMiddleMeterApplyService extends BaseService<MiddleMeterApply>
 
     String getMeterNumber(MiddleMeterApply middleMeterApply);
 
-    BigDecimal getCurrentMeterMoney(MiddleMeterApply middleMeterApply);
+    BigDecimal getCurrentMeterMoney(MiddleMeterApply middleMeterApply,String seq);
 
     //异步重新计算受变更影响的中间计量申请附件,ids为中间计量申请和清单表的id，需要重新获取
     void asyncCalculateMiddleMeter(List<Long> ids);

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -727,8 +727,8 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
      * 获取本期计量总金额
      */
     @Override
-    public BigDecimal getCurrentMeterMoney(MiddleMeterApply middleMeterApply) {
-        return baseMapper.getCurrentMeterMoney(middleMeterApply.getContractId(),middleMeterApply.getContractPeriodId());
+    public BigDecimal getCurrentMeterMoney(MiddleMeterApply middleMeterApply,String seq) {
+        return baseMapper.getCurrentMeterMoney(middleMeterApply.getContractId(),middleMeterApply.getContractPeriodId(),seq);
     }
 
     /**