diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index d9149ff3..f935354b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.module.inspection.query.FileByTypeQuery; import cn.iocoder.yudao.module.inspection.query.OrderTableQuery; import cn.iocoder.yudao.module.inspection.vo.*; import cn.iocoder.yudao.module.label.vo.LabelRespVO; @@ -922,4 +923,14 @@ public class PartnerOwnController extends BaseController { @RequestParam(value = "endTime", required = false) String endTime){ return success(partnerList.fileStatistics(servicePackageId,startTime, endTime)); } + + /** + * 文件统计 + * @param fileByTypeQuery + * @return + */ + @GetMapping("/getFileByType") + public CommonResult getFileByType(FileByTypeQuery fileByTypeQuery){ + return success(partnerList.fileStatisticsList(fileByTypeQuery.getServicePackageId(),fileByTypeQuery.getStartTime(),fileByTypeQuery.getEndTime())); + } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileRecordMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileRecordMapper.java index a36c37af..31fe7eb6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileRecordMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileRecordMapper.java @@ -23,4 +23,6 @@ public interface InspectionFileRecordMapper extends BaseMapper getRecordList(Long id); long queryCount(@Param("servicePackageId") String servicePackageId,@Param("startTime") String startTime, @Param("endTime") String endTime); + + List query(@Param("servicePackageId") String servicePackageId, @Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/FileByTypeQuery.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/FileByTypeQuery.java new file mode 100644 index 00000000..b7a8d54b --- /dev/null +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/FileByTypeQuery.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.inspection.query; + +import lombok.Data; + +@Data +public class FileByTypeQuery { + + /** + * 服务包id + */ + private String servicePackageId; + + /** + * 查询类型 add-新增 update-修改 + */ + private String type; + + /** + * 开始时间 + */ + private String startTime; + + /** + * 结束时间 + */ + private String endTime; +} diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java index 4535adf5..165c15ce 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.inspection.service; +import cn.iocoder.yudao.module.inspection.query.FileByTypeQuery; import cn.iocoder.yudao.module.inspection.query.OrderTableQuery; import cn.iocoder.yudao.module.label.vo.LabelPageReqVO; import cn.iocoder.yudao.module.label.vo.LabelRespVO; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionFileRecordService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionFileRecordService.java index f89b882e..bb1312da 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionFileRecordService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionFileRecordService.java @@ -21,4 +21,6 @@ public interface InspectionFileRecordService extends IService getRecordList(Long id); long queryCount(String servicePackageId, String startTime, String endTime); + + List query(String servicePackageId, String startTime, String endTime); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 725b38e1..ec04096a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -2412,7 +2412,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl query = inspectionFileRecordService.query(servicePackageId, startTime, endTime); + result.put("updateFile", query); - return null; + return result; } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileRecordServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileRecordServiceImpl.java index e5f078ec..eed17181 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileRecordServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileRecordServiceImpl.java @@ -39,4 +39,15 @@ public class InspectionFileRecordServiceImpl extends ServiceImpl query(String servicePackageId, String startTime, String endTime) { + return baseMapper.query(servicePackageId, startTime, endTime); + } } diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml index 17306856..718c2a76 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -265,7 +265,7 @@ where sig.partner_id =#{partnerId} - AND iwn.status = '3' + AND iwn.type = '0' AND info.status != '1' diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileRecordMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileRecordMapper.xml index fda021c7..6715e7de 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileRecordMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileRecordMapper.xml @@ -20,4 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND record.create_time between #{startTime} and #{endTime} +