更新

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()));
+    }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionFileRecordMapper.java

@@ -23,4 +23,6 @@ public interface InspectionFileRecordMapper extends BaseMapper<InspectionFileRec
     List<InspectionFileRecord> getRecordList(Long id);
 
     long queryCount(@Param("servicePackageId") String servicePackageId,@Param("startTime") String startTime,  @Param("endTime") String endTime);
+
+    List<InspectionFileRecord> query(@Param("servicePackageId") String servicePackageId, @Param("startTime") String startTime,  @Param("endTime") String endTime);
 }

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

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;

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionFileRecordService.java

@@ -21,4 +21,6 @@ public interface InspectionFileRecordService extends IService<InspectionFileReco
     List<InspectionFileRecord> getRecordList(Long id);
 
     long queryCount(String servicePackageId, String startTime, String endTime);
+
+    List<InspectionFileRecord> query(String servicePackageId, String startTime, String endTime);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java

@@ -2412,7 +2412,9 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         result.put("insertFile", insertFile);
 
         // 根据开始时间与结束时间查询修改文件
+        List<InspectionFileRecord> query = inspectionFileRecordService.query(servicePackageId, startTime, endTime);
+        result.put("updateFile", query);
 
-        return null;
+        return result;
     }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileRecordServiceImpl.java

@@ -39,4 +39,15 @@ public class InspectionFileRecordServiceImpl extends ServiceImpl<InspectionFileR
     public long queryCount(String servicePackageId, String startTime, String endTime) {
         return baseMapper.queryCount(servicePackageId, startTime, endTime);
     }
+
+    /**
+     * @param servicePackageId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Override
+    public List<InspectionFileRecord> query(String servicePackageId, String startTime, String endTime) {
+        return baseMapper.query(servicePackageId, startTime, endTime);
+    }
 }

dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml

@@ -265,7 +265,7 @@ where sig.partner_id =#{partnerId}
 
         <!-- 待复检 -->
         <if test="status == 4">
-            AND iwn.status = '3'
+            AND iwn.type = '0'
             AND info.status != '1'
         </if>
 

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}
         </if>
     </select>
+    <select id="query" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionFileRecord">
+        select record.*
+        from inspection_file_record record
+        INNER JOIN inspection_file file on record.file_id = file.id
+        where record.deleted = 0
+          AND file.service_package_id = #{servicePackageId}
+        <if test="startTime != null">
+            AND record.create_time between #{startTime} and #{endTime}
+        </if>
+        order by record.create_time desc
+    </select>
 </mapper>