小程序bug

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorderitemreport/PipeAppReportTemplateController.java

@@ -105,11 +105,10 @@ public class PipeAppReportTemplateController {
     @Resource
     private FileApi fileApi;
 
-    @PostMapping("/image/{imageUrl}")
+    @PostMapping("/image")
     @Operation(summary = "通用文件获取（图片/视频/PDF等）")
     @PermitAll
-    @RateLimiter
-    public void printFromPdf(HttpServletResponse response, @PathVariable String imageUrl) throws Exception {
+    public void printFromPdf(HttpServletResponse response, @RequestParam("imageUrl") String imageUrl) throws Exception {
         CommonResult<byte[]> file = fileApi.getFileByPath(imageUrl);
         byte[] data = file.getData();
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/taskordernontaxrecord/TaskOrderNonTaxRecordMapper.java

@@ -150,4 +150,90 @@ public interface TaskOrderNonTaxRecordMapper extends BaseMapperX<TaskOrderNonTax
         return selectJoinPage(reqVO,TaskOrderNonTaxRecordRespVO.class, recordDOMPJLambdaWrapper);
     }
 
+    default PageResult<TaskOrderNonTaxRecordRespVO> selectPageJoinApp(TaskOrderNonTaxRecordPageReqVO reqVO) {
+        MPJLambdaWrapperX<TaskOrderNonTaxRecordDO> recordDOMPJLambdaWrapper = new MPJLambdaWrapperX<>();
+
+        recordDOMPJLambdaWrapper = (MPJLambdaWrapperX<TaskOrderNonTaxRecordDO>)recordDOMPJLambdaWrapper.
+                selectAll(TaskOrderNonTaxRecordDO.class).
+                selectAs(TaskOrderNonTaxRecordDO::getEquipMainType, TaskOrderNonTaxRecordRespVO::getEquipMainType).
+                selectAs(BoilerTaskOrderDO::getId, TaskOrderNonTaxRecordRespVO::getOrderId).
+                leftJoin(TaskOrderNonTaxRecordItemDO.class, TaskOrderNonTaxRecordItemDO::getRecordId, TaskOrderNonTaxRecordDO::getId).
+                leftJoin(BoilerTaskOrderDO.class, BoilerTaskOrderDO::getId, TaskOrderNonTaxRecordItemDO::getOrderId).
+                leftJoin(TaskOrderNonTaxApplyDO.class, TaskOrderNonTaxApplyDO::getOrderId, BoilerTaskOrderDO::getId).
+                groupBy(TaskOrderNonTaxRecordDO::getId);
+
+        recordDOMPJLambdaWrapper
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getPayer, reqVO.getPayer())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getContactPhone, reqVO.getContactPhone())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getEmail, reqVO.getEmail())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getTotalAmount, reqVO.getTotalAmount())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getActualAmount, reqVO.getActualAmount())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getPayStatus, reqVO.getPayStatus())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(TaskOrderNonTaxRecordDO::getProcessInstanceId, reqVO.getProcessInstanceIds())
+                .betweenIfPresent(TaskOrderNonTaxRecordDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getCreator, reqVO.getCreator())
+                .eqIfPresent(TaskOrderNonTaxRecordDO::getEquipMainType, reqVO.getEquipMainType())
+                .isNotNull(TaskOrderNonTaxRecordDO::getNoticePdfUrl)
+                .orderByDesc(TaskOrderNonTaxRecordDO::getCreateTime);
+
+        if(StringUtils.isNotBlank(reqVO.getOrderNo())){
+            recordDOMPJLambdaWrapper.like(BoilerTaskOrderDO::getOrderNo, reqVO.getOrderNo());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getOrderId())){
+            recordDOMPJLambdaWrapper.eq(BoilerTaskOrderDO::getId, reqVO.getOrderId());
+        }
+
+        if(reqVO.getStatus() != null && !reqVO.getStatus().isEmpty()){
+            recordDOMPJLambdaWrapper.in(TaskOrderNonTaxRecordDO::getStatus, reqVO.getStatus());
+        }
+
+        if(CollUtil.isNotEmpty(reqVO.getIds())){
+            recordDOMPJLambdaWrapper.in(TaskOrderNonTaxRecordDO::getId, reqVO.getIds());
+        }
+
+        if(reqVO.getPayTime() != null){
+            recordDOMPJLambdaWrapper.between(TaskOrderNonTaxRecordDO::getPayDate, reqVO.getPayTime(),reqVO.getPayTime().plusDays(1));
+        }
+
+        if(reqVO.getPayDate() != null){
+            recordDOMPJLambdaWrapper.between(TaskOrderNonTaxRecordDO::getPayDate, reqVO.getPayDate(),reqVO.getPayDate().plusDays(1));
+        }
+
+        if(reqVO.getCreateTime() != null && reqVO.getCreateTime().length == 1){
+            List<LocalDate> dates = new ArrayList<>();
+            LocalDate localDate = reqVO.getCreateTime()[0].toLocalDate();
+            dates.add(localDate);
+            dates.add(localDate.plusDays(1));
+            recordDOMPJLambdaWrapper .betweenIfPresent(TaskOrderNonTaxRecordDO::getCreateTime,dates.toArray());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getHandledBy())){
+            recordDOMPJLambdaWrapper.eq(TaskOrderNonTaxRecordDO::getHandledBy, reqVO.getHandledBy());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getCreator())){
+            recordDOMPJLambdaWrapper.eq(TaskOrderNonTaxRecordDO::getCreator, reqVO.getCreator());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getUnitName())){
+            recordDOMPJLambdaWrapper.like(TaskOrderNonTaxRecordDO::getUnitName,reqVO.getUnitName());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getUseUnitName())){
+            recordDOMPJLambdaWrapper.like(TaskOrderNonTaxRecordDO::getUseUnitName,reqVO.getUseUnitName());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getPaymentInstructionNo())){
+            recordDOMPJLambdaWrapper.like(TaskOrderNonTaxRecordDO::getPaymentInstructionNo,reqVO.getPaymentInstructionNo());
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getUseUnitId())){
+            recordDOMPJLambdaWrapper.eq(BoilerTaskOrderDO::getUseUnitId,reqVO.getUseUnitId());
+        }
+
+        return selectJoinPage(reqVO,TaskOrderNonTaxRecordRespVO.class, recordDOMPJLambdaWrapper);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxrecord/TaskOrderNonTaxRecordServiceImpl.java

@@ -330,7 +330,7 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
             }
         }
 
-        PageResult<TaskOrderNonTaxRecordRespVO> pageResult = taskOrderNonTaxRecordMapper.selectPageJoin(pageReqVO);
+        PageResult<TaskOrderNonTaxRecordRespVO> pageResult = taskOrderNonTaxRecordMapper.selectPageJoinApp(pageReqVO);
         if (CollectionUtils.isAnyEmpty(pageResult.getList())) {
             return pageResult;
         }