Browse Source

fix: 添加水雨情统计水闸类型查询条件

master_tdsql
hxh 1 year ago
parent
commit
a879dbad85
  1. 3
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
  2. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java
  3. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqProjectQueDto.java

3
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java

@ -89,6 +89,9 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
"LEFT JOIN bs_sgc_sz_gcgl pj ON pj.waga_code = df.waga_code and pj.expr_date is null " +
"WHERE 1=1 " +
"and df.expr_date is null " +
"<if test='szProject.wagaType != null and szProject.wagaType != \"\"'>" +
"AND df.waga_type = #{szProject.wagaType} " +
"</if>" +
"<if test='szProject.wagaCode != null and szProject.wagaCode != \"\"'>" +
"AND df.waga_code = #{szProject.wagaCode} " +
"</if>" +

2
shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
*/
@RestController
@AllArgsConstructor
@RequestMapping("/run/df/dangerousGrouping")
@RequestMapping("/run/sz/dangerousGrouping")
@Api(tags = "水闸病险工程分组")
public class SzDangerousGroupingController {

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

@ -17,6 +17,8 @@ import lombok.Data;
@ApiModel(value = "SzYqProjectQueDto", description = "水闸水雨情工程查询参数")
public class SzYqProjectQueDto {
@ApiModelProperty(value = "水闸类型")
private String wagaType;
@ApiModelProperty(value = "水闸代码")
private String wagaCode;
@ApiModelProperty(value = "水闸名称")

Loading…
Cancel
Save