Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/resources/templates/CommonCost/js/agentIndex.js

@@ -275,7 +275,6 @@
                     element.remove();
                     buildQjsjSeq();
                     isTimes.splice(i, 1)
-                    updateView()
                     jeSumInit(i)
                 },
                 onCancel: function () {

zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -300,7 +300,6 @@
           element.remove();
           buildQjsjSeq();
           isTimes.splice(i, 1)
-          updateView()
           jeSumInit(i)
         },
         onCancel: function () {

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/report/dto/report/ReportPageReqDTO.java

@@ -20,13 +20,10 @@ public class ReportPageReqDTO extends PageParam {
     @Schema(description = "daily:日报;weekly:周报", example = "2")
     private String reportType;
 
-    @Schema(description = "日报周报开始日期")
+    @Schema(description = "日报周报日期范围")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] reportStartDate;
+    private LocalDateTime[] reportDate;
 
-    @Schema(description = "日报周报结束日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] reportEndDate;
 
     @Schema(description = "填写日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/reportComment/ReportCommentController.java

@@ -41,4 +41,10 @@ public class ReportCommentController {
     public CommonResult<List<ReportCommentRespVO>> getList(@Valid @NotNull(message = "报告ID不能为空") Long reportId, @NotNull(message = "被回复用户ID不能为空") String uId){
         return success(reportCommentService.getReportCommentList(reportId, uId));
     }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除报告回复_获取报告列表")
+    public CommonResult deleteByIds(@RequestBody List<String> idList){
+        return CommonResult.success(reportCommentService.deleteByIdList(idList));
+    }
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/mysql/report/ReportMapper.java

@@ -25,8 +25,7 @@ public interface ReportMapper extends BaseMapperX<ReportDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<ReportDO>()
                 .eqIfPresent(ReportDO::getReportContent, reqVO.getReportContent())
                 .eqIfPresent(ReportDO::getReportType, reqVO.getReportType())
-                .betweenIfPresent(ReportDO::getReportStartDate, reqVO.getReportStartDate())
-                .betweenIfPresent(ReportDO::getReportEndDate, reqVO.getReportEndDate())
+                .betweenIfPresent(ReportDO::getReportStartDate, reqVO.getReportDate())
                 .betweenIfPresent(ReportDO::getFillingDate, reqVO.getFillingDate())
                 .eqIfPresent(ReportDO::getReportYear, reqVO.getReportYear())
                 .eqIfPresent(ReportDO::getReportMonth, reqVO.getReportMonth())

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportcomment/ReportCommentService.java

@@ -38,4 +38,12 @@ public interface ReportCommentService {
      * **/
     List<ReportCommentRespVO> getReportCommentListByRIds(List<Long> reportId);
 
+
+    /**
+     * 删除报告回复
+     * @param ids
+     * @return
+     */
+    int deleteByIdList(List<String> ids);
+
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportcomment/ReportCommentServiceImpl.java

@@ -85,4 +85,14 @@ public class ReportCommentServiceImpl implements ReportCommentService {
         return reportCommentList;
     }
 
+    /**
+     * 删除报告回复
+     * @param ids
+     * @return
+     */
+    @Override
+    public int deleteByIdList(List<String> ids) {
+        return this.reportCommentMapper.deleteBatchIds(ids);
+    }
+
 }