fix：修复bug

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java

@@ -6,6 +6,8 @@ import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -50,14 +52,14 @@ public class DfYhPlan extends SyBaseEntity {
    */
   @Excel(name = "国补资金")
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @Excel(name = "自筹资金")
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java

@@ -81,4 +81,10 @@ public class DfDangerousTaskSearchDto  {
 
     @ApiModelProperty(value = "是否排序")
     private String isOrder;
+
+    /**
+     * 病险工程核查分组ID
+     */
+    @ApiModelProperty(value = "病险工程核查分组ID")
+    private String groupId;
 }

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java

@@ -3,6 +3,8 @@ package com.kms.yxgh.df.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -43,13 +45,13 @@ public class DfYhPlanDetailDto {
    * 国补资金
    */
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository;
 public interface DfDangerousGroupingMapper extends BaseMapper<DfDangerousGrouping> {
 
      @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," +
-             "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " +
+             "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_df_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " +
              " FROM bs_sgc_df_bxgcfz a " +
              " LEFT JOIN sys_dept b ON a.dept_id = b.id " +
              " order by a.create_time desc")

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java

@@ -56,6 +56,9 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
             "<if test='dto.state != null and dto.state != \"\"'>" +
             "AND rw.state = #{dto.state} " +
             "</if>" +
+            "<if test='dto.groupId != null and dto.groupId != \"\"'>" +
+            "AND rw.GROUP_ID = #{dto.groupId} " +
+            "</if>" +
             "<if test='dto.isOrder != null and dto.isOrder != \"\"'>" +
             "ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC " +
             "</if>" +

shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalRecordService.java

@@ -69,7 +69,7 @@ public class DfAnimalRecordService extends BaseService<DfAnimalRecordMapper, DfA
         DfAnimalRecord dfAnimalRecord = BeanCopyUtils.copy(dto, DfAnimalRecord.class);
         if (dfAnimalRecord != null) {
             dfAnimalRecord.setId(null);
-            if (!existRecord(dto.getPlanId())) {
+            if (existRecord(dto.getPlanId())) {
                 getBaseMapper().insert(dfAnimalRecord);
                 dto.setId(dfAnimalRecord.getId());
                 if (CollectionUtil.isNotEmpty(dto.getImages())) {

shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseTaskService.java

@@ -32,7 +32,10 @@ public class DfSuperviseTaskService extends BaseService<DfSuperviseTaskMapper, D
 
     public IPage<DfSuperviseTaskDto> list(SearchParam<DfSuperviseTaskDto> sp){
         Page<DfSuperviseTaskDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        return this.getBaseMapper().selectPage(page, sp.getData());
+        //根据创建时间倒序排列
+        IPage<DfSuperviseTaskDto> pageData = this.getBaseMapper().selectPage(page, sp.getData());
+        pageData.getRecords().sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime()));
+        return pageData;
     }
 
     @Transactional(rollbackFor = Exception.class)

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java

@@ -6,6 +6,8 @@ import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -50,14 +52,14 @@ public class SzYhPlan extends SyBaseEntity {
    */
   @Excel(name = "国补资金")
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @Excel(name = "自筹资金")
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java

@@ -73,4 +73,10 @@ public class SzDangerousTaskSearchDto {
 
     @ApiModelProperty(value = "是否排序")
     private String isOrder;
+
+    /**
+     * 病险工程核查分组ID
+     */
+    @ApiModelProperty(value = "病险工程核查分组ID")
+    private String groupId;
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java

@@ -3,6 +3,8 @@ package com.kms.yxgh.sz.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -43,13 +45,13 @@ public class SzYhPlanDetailDto {
    * 国补资金
    */
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java

@@ -56,6 +56,9 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
             "<if test='dto.state != null and dto.state != \"\"'>" +
             "AND rw.state = #{dto.state} " +
             "</if>" +
+            "<if test='dto.groupId != null and dto.groupId != \"\"'>" +
+            "AND rw.GROUP_ID = #{dto.groupId} " +
+            "</if>" +
             "<if test='dto.isOrder != null and dto.isOrder != \"\"'>" +
             "ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC " +
             "</if>" +

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseTaskService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.sz.domain.SzSuperviseTask;
 import com.kms.yxgh.sz.dto.SzSuperviseTaskCommonDto;
@@ -33,7 +32,10 @@ public class SzSuperviseTaskService extends BaseService<SzSuperviseTaskMapper, S
 
     public IPage<SzSuperviseTaskDto> list(SearchParam<SzSuperviseTaskDto> sp){
         Page<SzSuperviseTaskDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        return this.getBaseMapper().selectPage(page, sp.getData());
+        //根据创建时间倒序排列
+        IPage<SzSuperviseTaskDto> pageData = this.getBaseMapper().selectPage(page, sp.getData());
+        pageData.getRecords().sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime()));
+        return pageData;
     }
 
     @Transactional(rollbackFor = Exception.class)