Browse Source

Merge remote-tracking branch 'outside/master' into release-sy-v1.0.0

release-sy-v1.0.0
“lyd” 3 weeks ago
parent
commit
103f50c650
  1. 2
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDsjController.java
  2. 3
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java
  3. 3
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java
  4. 1
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGzscController.java
  5. 12
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java
  6. 12
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java
  7. 17
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDsj.java
  8. 17
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGltz.java
  9. 16
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGzsc.java
  10. 13
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java
  11. 18
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDsjMapper.java
  12. 18
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGltzMapper.java
  13. 18
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGzscMapper.java
  14. 3
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java
  15. 7
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java
  16. 5
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
  17. 8
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java
  18. 15
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java
  19. 7
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
  20. 26
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDsjService.java
  21. 3
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java
  22. 6
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
  23. 26
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGltzService.java
  24. 26
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGzscService.java
  25. 9
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java
  26. 6
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java
  27. 6
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java
  28. 3
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDsjController.java
  29. 4
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java
  30. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGltzController.java
  31. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.java
  32. 13
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzhjs.java
  33. 13
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java
  34. 17
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDsj.java
  35. 17
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGltz.java
  36. 16
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGzsc.java
  37. 13
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJfgl.java
  38. 19
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDsjMapper.java
  39. 17
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGltzMapper.java
  40. 19
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGzscMapper.java
  41. 3
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java
  42. 4
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java
  43. 6
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java
  44. 3
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
  45. 9
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java
  46. 16
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java
  47. 27
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDsjService.java
  48. 6
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java
  49. 8
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  50. 24
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGltzService.java
  51. 26
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGzscService.java
  52. 8
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java
  53. 6
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
  54. 6
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java
  55. 5
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
  56. 65
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml
  57. 60
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml
  58. 59
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGzscMapper.xml
  59. 4
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml
  60. 65
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml
  61. 60
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml
  62. 59
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGzscMapper.xml
  63. 3
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml

2
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDsjController.java

@ -53,7 +53,7 @@ public class BsSgcDfDsjController extends BaseController
@ApiOperation("堤防工程大事记列表")
public IPage list(@RequestBody SearchParam<BsSgcDfDsj> sp)
{
return bsSgcDfDsjService.selectPage(sp);
return bsSgcDfDsjService.getPage(sp);
}
/**

3
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java

@ -67,6 +67,9 @@ public class BsSgcDfFxzzController extends BaseController
public IPage list(@RequestBody SearchParam<BsSgcDfFxzz> sp)
{
BsSgcDfFxzz data = sp.getData();
if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return new Page(sp.getPageNum(),sp.getPageSize());
}
LambdaQueryWrapper<BsSgcDfFxzz>lw=new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(data.getDikeName())){
lw.eq(BsSgcDfFxzz::getDikeName,data.getDikeName());

3
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java

@ -61,11 +61,10 @@ public class BsSgcDfFzrController extends BaseController {
@GetMapping("/getHistogram")
public HashMap<String, HashMap<String, String>> getHistogram() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
HashMap<String, HashMap<String, String>> dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
return dto;
}

1
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGzscController.java

@ -53,6 +53,7 @@ public class BsSgcDfGzscController extends BaseController
@ApiOperation("堤防工作手册列表")
public IPage list(@RequestBody SearchParam<BsSgcDfGzsc> sp)
{
return bsSgcDfGzscService.selectPage(sp);
}

12
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java

@ -2,12 +2,14 @@ package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.util.StringUtils;
/**
@ -19,7 +21,7 @@ import lombok.Data;
@TableName("bs_sgc_df_bzhjs")
@Data
@ApiModel("堤防标准化建设")
public class BsSgcDfBzhjs extends BaseEntity
public class BsSgcDfBzhjs extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -71,4 +73,10 @@ public class BsSgcDfBzhjs extends BaseEntity
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

12
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java

@ -2,12 +2,14 @@ package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.util.StringUtils;
/**
@ -19,7 +21,7 @@ import lombok.Data;
@TableName("bs_sgc_df_dagl")
@Data
@ApiModel("堤防档案管理")
public class BsSgcDfDagl extends BaseEntity
public class BsSgcDfDagl extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -71,4 +73,10 @@ public class BsSgcDfDagl extends BaseEntity
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

17
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDsj.java

@ -1,14 +1,18 @@
package com.kms.yg.df.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -20,7 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_df_dsj")
@Data
@ApiModel("堤防工程大事记")
public class BsSgcDfDsj extends BaseEntity
public class BsSgcDfDsj extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -77,4 +81,13 @@ public class BsSgcDfDsj extends BaseEntity
@ApiModelProperty("督促和稽查情况")
private String owerDept;
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

17
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGltz.java

@ -1,12 +1,15 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_df_gltz")
@Data
@ApiModel("堤防管理体制")
public class BsSgcDfGltz extends BaseEntity
public class BsSgcDfGltz extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -54,4 +57,14 @@ public class BsSgcDfGltz extends BaseEntity
@ApiModelProperty("附件")
private String owerDept;
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

16
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGzsc.java

@ -1,12 +1,15 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_df_gzsc")
@Data
@ApiModel("堤防工作手册")
public class BsSgcDfGzsc extends BaseEntity
public class BsSgcDfGzsc extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -49,4 +52,13 @@ public class BsSgcDfGzsc extends BaseEntity
@ApiModelProperty("操作手册附件")
private String owerDept;
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

13
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java

@ -2,12 +2,14 @@ package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.util.StringUtils;
/**
@ -19,7 +21,7 @@ import lombok.Data;
@TableName("bs_sgc_df_jfgl")
@Data
@ApiModel("经费管理")
public class BsSgcDfJfgl extends BaseEntity
public class BsSgcDfJfgl extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -85,4 +87,11 @@ public class BsSgcDfJfgl extends BaseEntity
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

18
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDsjMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.df.mapper;
import com.kms.yg.sz.domain.BsSgcSzDsj;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfDsj;
import java.util.List;
/**
* 堤防工程大事记Mapper接口
*
@ -12,5 +16,19 @@ import com.kms.yg.df.domain.BsSgcDfDsj;
*/
@Repository
public interface BsSgcDfDsjMapper extends BaseMapper<BsSgcDfDsj> {
List<BsSgcDfDsj> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeName") String dikeName,
@Param("adcd") String adcd,
@Param("dikeCode") String dikeCode
);
List<BsSgcDfDsj>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeName") String dikeName,
@Param("adcd") String adcd,
@Param("dikeCode") String dikeCode
);
}

18
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGltzMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.df.mapper;
import com.kms.yg.sz.domain.BsSgcSzGltz;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfGltz;
import java.util.List;
/**
* 堤防管理体制Mapper接口
*
@ -12,5 +16,19 @@ import com.kms.yg.df.domain.BsSgcDfGltz;
*/
@Repository
public interface BsSgcDfGltzMapper extends BaseMapper<BsSgcDfGltz> {
List<BsSgcDfGltz> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeName") String dikeName,
@Param("adcd") String adcd,
@Param("dikeCode") String dikeCode
);
List<BsSgcDfGltz>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeName") String dikeName,
@Param("adcd") String adcd,
@Param("dikeCode") String dikeCode
);
}

18
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGzscMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.df.mapper;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfGzsc;
import java.util.List;
/**
* 堤防工作手册Mapper接口
*
@ -12,5 +16,19 @@ import com.kms.yg.df.domain.BsSgcDfGzsc;
*/
@Repository
public interface BsSgcDfGzscMapper extends BaseMapper<BsSgcDfGzsc> {
List<BsSgcDfGzsc> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeName") String dikeName,
@Param("adcd") String adcd,
@Param("dikeCode") String dikeCode
);
List<BsSgcDfGzsc>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeName") String dikeName,
@Param("adcd") String adcd,
@Param("dikeCode") String dikeCode
);
}

3
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java

@ -24,6 +24,7 @@ public interface BsSgcDfJfglMapper extends BaseMapper<BsSgcDfJfgl> {
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode);
}

7
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java

@ -6,8 +6,10 @@ import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfBydy;
import com.kms.yg.df.domain.BsSgcDfBydyzb;
import com.kms.yg.df.mapper.BsSgcDfBydyzbMapper;
import com.kms.yg.sz.domain.BsSgcSzBydyzb;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -31,6 +33,10 @@ public class BsSgcDfBydyzbService extends BaseService<BsSgcDfBydyzbMapper, BsSgc
public Page getPage(SearchParam<BsSgcDfBydyzb> sp){
BsSgcDfBydyzb data = sp.getData();
Page<BsSgcDfBydyzb>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcDfBydyzb> list = bsSgcDfBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeCode(), data.getDikeName(), data.getPowerType(), data.getAdcdQx());
for (BsSgcDfBydyzb zb:list){
@ -41,7 +47,6 @@ public class BsSgcDfBydyzbService extends BaseService<BsSgcDfBydyzbMapper, BsSgc
Integer size = bsSgcDfBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeCode(), data.getDikeName(), data.getPowerType(), data.getAdcdQx()).size();
Page<BsSgcDfBydyzb>page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setTotal(size);
page.setRecords(list);
return page;

5
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java

@ -7,6 +7,7 @@ import com.kms.yg.df.domain.BsSgcDfBzbp;
import com.kms.yg.df.mapper.BsSgcDfBzbpMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -53,6 +54,10 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
Page<BsSgcDfBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(projectInfo.getDikeCode())){
return page;
}
List<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper
.selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd,projectInfo.getDikeCode());
Page<BsSgcDfBzbp> bsSgcDfBzbpPage = new Page<>();

8
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java

@ -7,6 +7,7 @@ import com.kms.yg.df.domain.BsSgcDfBzhjs;
import com.kms.yg.df.mapper.BsSgcDfBzhjsMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -35,11 +36,14 @@ public class BsSgcDfBzhjsService extends BaseService<BsSgcDfBzhjsMapper, BsSgcDf
public IPage selectPage(SearchParam<BsSgcDfBzhjs> sp) {
BsSgcDfBzhjs data = sp.getData();
Page<BsSgcDfBzhjs> page = new Page<>();
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
List<BsSgcDfBzhjs> list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize());
Page<BsSgcDfBzhjs> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());

15
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java

@ -7,6 +7,7 @@ import com.kms.yg.df.domain.BsSgcDfDagl;
import com.kms.yg.df.mapper.BsSgcDfDaglMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -32,12 +33,20 @@ public class BsSgcDfDaglService extends BaseService<BsSgcDfDaglMapper, BsSgcDfDa
public IPage selectPage(SearchParam<BsSgcDfDagl> sp) {
BsSgcDfDagl data = sp.getData();
Page<BsSgcDfDagl> page = new Page<>();
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())){
adcd= sysXzqhService.getSubString(data.getAdcd());
}else {
adcd=data.getAdcdQx();
}
List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),data.getDikeName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit());
adcd, "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit());
Page<BsSgcDfDagl> page = new Page<>();
page.setTotal(list.size());
page.setRecords(list);
return page;

7
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java

@ -14,6 +14,7 @@ import com.kms.yg.df.domain.dto.DfrwDto;
import com.kms.yg.df.mapper.BsSgcDfAqrwMapper;
import com.kms.yg.df.mapper.BsSgcDfDfrwMapper;
import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
@ -47,7 +48,11 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
if (StringUtils.isNotBlank(sp.getData().getDikeCode())){
wrapper.eq("dike_code",sp.getData().getDikeCode());
}
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
Page page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isBlank(sp.getData().getDikeCode())&&StringUtils.isBlank(new BsSgcDfSafeJbxx().getAdcdQx())){
return page;
}
page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
List<BsSgcDfDfrw> records = page.getRecords();

26
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDsjService.java

@ -1,9 +1,18 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import com.kms.yg.sz.mapper.BsSgcSzGzscMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.df.mapper.BsSgcDfDsjMapper;
import com.kms.yg.df.domain.BsSgcDfDsj;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 堤防工程大事记Service接口
*
@ -12,5 +21,22 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcDfDsjService extends BaseService<BsSgcDfDsjMapper, BsSgcDfDsj>{
@Autowired
private BsSgcDfDsjMapper bsSgcDfDsjMapper;
public Page<BsSgcDfDsj> getPage(SearchParam<BsSgcDfDsj> sp){
BsSgcDfDsj data = sp.getData();
Page<BsSgcDfDsj> page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
List<BsSgcDfDsj> list = bsSgcDfDsjMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeName(), data.getAdcdQx(), data.getDikeCode());
Integer size = bsSgcDfDsjMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeName(), data.getAdcdQx(), data.getDikeCode()).size();
page.setTotal(size);
page.setRecords(list);
return page;
}
}

3
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java

@ -35,6 +35,9 @@ public class BsSgcDfFxwzService extends BaseService<BsSgcDfFxwzMapper, BsSgcDfFx
adcd=data.getAdcdQx();
}
Page<BsSgcDfFxwz>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcDfFxwz> list = bsSgcDfFxwzMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(),
data.getPersonName(), adcd,data.getMaterialName());
Integer count = bsSgcDfFxwzMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(),

6
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java

@ -89,7 +89,6 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
public IPage selectPage(SearchParam<BsSgcDfFzr> sp) {
BsSgcDfFzr data = sp.getData();
Map<String, Object> params = sp.getParams();
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())) {
@ -97,11 +96,14 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
}else {
adcd=data.getAdcdQx();
}
Page<BsSgcSzFzr> page = new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
List<BsSgcSzFzr> list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), adcd,
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),data.getDikeName());
Page<BsSgcSzFzr> page = new Page<>();
page.setRecords(list);

26
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGltzService.java

@ -1,9 +1,18 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzGltz;
import com.kms.yg.sz.mapper.BsSgcSzGltzMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.df.mapper.BsSgcDfGltzMapper;
import com.kms.yg.df.domain.BsSgcDfGltz;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 堤防管理体制Service接口
*
@ -12,5 +21,22 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcDfGltzService extends BaseService<BsSgcDfGltzMapper, BsSgcDfGltz>{
@Autowired
private BsSgcDfGltzMapper bsSgcDfGltzMapper;
public Page<BsSgcDfGltz> getPage(SearchParam<BsSgcDfGltz> sp){
BsSgcDfGltz data = sp.getData();
Page<BsSgcDfGltz> page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
List<BsSgcDfGltz> list = bsSgcDfGltzMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeName(), data.getAdcdQx(), data.getDikeCode());
Integer size = bsSgcDfGltzMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeName(), data.getAdcdQx(), data.getDikeCode()).size();
page.setTotal(size);
page.setRecords(list);
return page;
}
}

26
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGzscService.java

@ -1,9 +1,18 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import com.kms.yg.sz.mapper.BsSgcSzGzscMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.df.mapper.BsSgcDfGzscMapper;
import com.kms.yg.df.domain.BsSgcDfGzsc;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 堤防工作手册Service接口
*
@ -12,5 +21,22 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcDfGzscService extends BaseService<BsSgcDfGzscMapper, BsSgcDfGzsc>{
@Autowired
private BsSgcDfGzscMapper bsSgcDfGzscMapper;
public Page<BsSgcDfGzsc> getPage(SearchParam<BsSgcDfGzsc> sp){
BsSgcDfGzsc data = sp.getData();
Page<BsSgcDfGzsc> page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
List<BsSgcDfGzsc> list = bsSgcDfGzscMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeName(), data.getAdcdQx(), data.getDikeCode());
Integer size = bsSgcDfGzscMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeName(), data.getAdcdQx(), data.getDikeName()).size();
page.setTotal(size);
page.setRecords(list);
return page;
}
}

9
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java

@ -8,6 +8,7 @@ import com.kms.yg.df.domain.BsSgcDfJfgl;
import com.kms.yg.df.mapper.BsSgcDfJfglMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -34,11 +35,15 @@ public class BsSgcDfJfglService extends BaseService<BsSgcDfJfglMapper, BsSgcDfJf
public IPage selectPage(SearchParam<BsSgcDfJfgl> sp) {
BsSgcDfJfgl data = sp.getData();
Page<BsSgcDfJfgl> page = new Page<>();
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
return page;
}
List<BsSgcDfJfgl> list= bsSgcDfJfglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getDikeCode());
Page<BsSgcDfJfgl> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());

6
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java

@ -7,6 +7,7 @@ import com.kms.yg.sz.domain.BsSgcSzYaxx;
import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -25,11 +26,14 @@ public class BsSgcDfYaxxService extends BaseService<BsSgcDfYaxxMapper, BsSgcDfYa
public Page<BsSgcDfYaxx> getPage(SearchParam<BsSgcDfYaxx> sp){
BsSgcDfYaxx data = sp.getData();
Page<BsSgcDfYaxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcDfYaxx> list = bsSgcDfYaxxMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(),
data.getDikeName(), data.getType(), data.getAdcdQx());
Integer count = bsSgcDfYaxxMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(),
data.getDikeName(), data.getType(), data.getAdcdQx()).size();
Page<BsSgcDfYaxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setRecords(list);
page.setTotal(count);
return page;

6
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java

@ -9,6 +9,7 @@ import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -59,11 +60,14 @@ public class BsSgcDfYhxxService extends BaseService<BsSgcDfYhxxMapper, BsSgcDfYh
public Page<BsSgcDfYhxx> getPage(SearchParam<BsSgcDfYhxx> sp){
BsSgcDfYhxx data = sp.getData();
Page<BsSgcDfYhxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcDfYhxx> list = bsSgcSzYhxxMapper.getList(sp.getPageNum(),sp.getPageSize(),
data.getDikeName(),data.getDikeName(), data.getInspectionType(),data.getAdcdQx());
int size = bsSgcSzYhxxMapper.getCount(sp.getPageNum(),sp.getPageSize(),
data.getDikeName(),data.getDikeName(), data.getInspectionType(),data.getAdcdQx()).size();
Page<BsSgcDfYhxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setRecords(list);
page.setTotal(size);
return page;

3
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDsjController.java

@ -53,7 +53,8 @@ public class BsSgcSzDsjController extends BaseController
@ApiOperation("水闸工程大事记列表")
public IPage list(@RequestBody SearchParam<BsSgcSzDsj> sp)
{
return bsSgcSzDsjService.selectPage(sp);
return bsSgcSzDsjService.getPage(sp);
}
/**

4
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.common.utils.BaseEntityUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
@ -68,6 +69,9 @@ public class BsSgcSzFxzzController extends BaseController
{
BsSgcSzFxzz data = sp.getData();
LambdaQueryWrapper<BsSgcSzFxzz> lw=new LambdaQueryWrapper<>();
if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return new Page(sp.getPageNum(),sp.getPageSize());
}
if (StringUtils.isNotEmpty(data.getWagaName())){
lw.eq(BsSgcSzFxzz::getWagaName,data.getWagaName());
}

2
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGltzController.java

@ -53,7 +53,7 @@ public class BsSgcSzGltzController extends BaseController
@ApiOperation("堤防管理体制列表")
public IPage list(@RequestBody SearchParam<BsSgcSzGltz> sp)
{
return bsSgcSzGltzService.selectPage(sp);
return bsSgcSzGltzService.getPage(sp);
}
/**

2
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.java

@ -53,7 +53,7 @@ public class BsSgcSzGzscController extends BaseController
@ApiOperation("水闸工作手册列表")
public IPage list(@RequestBody SearchParam<BsSgcSzGzsc> sp)
{
return bsSgcSzGzscService.selectPage(sp);
return bsSgcSzGzscService.getPage(sp);
}
/**

13
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzhjs.java

@ -1,13 +1,15 @@
package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -19,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_bzhjs")
@Data
@ApiModel("水闸标准化建设")
public class BsSgcSzBzhjs extends BaseEntity
public class BsSgcSzBzhjs extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -71,5 +73,10 @@ public class BsSgcSzBzhjs extends BaseEntity
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

13
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java

@ -2,12 +2,14 @@ package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.util.StringUtils;
/**
@ -19,7 +21,7 @@ import lombok.Data;
@TableName("bs_sgc_sz_dagl")
@Data
@ApiModel("水闸档案管理")
public class BsSgcSzDagl extends BaseEntity
public class BsSgcSzDagl extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -70,6 +72,11 @@ public class BsSgcSzDagl extends BaseEntity
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

17
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDsj.java

@ -1,14 +1,18 @@
package com.kms.yg.sz.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -20,7 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_dsj")
@Data
@ApiModel("水闸工程大事记")
public class BsSgcSzDsj extends BaseEntity
public class BsSgcSzDsj extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -77,4 +81,13 @@ public class BsSgcSzDsj extends BaseEntity
@ApiModelProperty("督促和稽查情况")
private String owerDept;
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

17
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGltz.java

@ -1,12 +1,15 @@
package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_gltz")
@Data
@ApiModel("堤防管理体制")
public class BsSgcSzGltz extends BaseEntity
public class BsSgcSzGltz extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -54,4 +57,14 @@ public class BsSgcSzGltz extends BaseEntity
@ApiModelProperty("附件")
private String owerDept;
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

16
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGzsc.java

@ -1,12 +1,15 @@
package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_gzsc")
@Data
@ApiModel("水闸工作手册")
public class BsSgcSzGzsc extends BaseEntity
public class BsSgcSzGzsc extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -49,4 +52,13 @@ public class BsSgcSzGzsc extends BaseEntity
@ApiModelProperty("操作手册附件")
private String owerDept;
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

13
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJfgl.java

@ -1,13 +1,15 @@
package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -19,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_jfgl")
@Data
@ApiModel("经费管理")
public class BsSgcSzJfgl extends BaseEntity
public class BsSgcSzJfgl extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -86,6 +88,11 @@ public class BsSgcSzJfgl extends BaseEntity
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

19
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDsjMapper.java

@ -1,9 +1,14 @@
package com.kms.yg.sz.mapper;
import com.kms.yg.df.domain.BsSgcDfGzsc;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzDsj;
import java.util.List;
/**
* 水闸工程大事记Mapper接口
*
@ -12,5 +17,19 @@ import com.kms.yg.sz.domain.BsSgcSzDsj;
*/
@Repository
public interface BsSgcSzDsjMapper extends BaseMapper<BsSgcSzDsj> {
List<BsSgcSzDsj> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaName") String wagaName,
@Param("adcd") String adcd,
@Param("wagaCode") String wagaCode
);
List<BsSgcSzDsj>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaName") String wagaName,
@Param("adcd") String adcd,
@Param("wagaCode") String wagaCode
);
}

17
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGltzMapper.java

@ -1,9 +1,12 @@
package com.kms.yg.sz.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzGltz;
import java.util.List;
/**
* 堤防管理体制Mapper接口
*
@ -12,5 +15,19 @@ import com.kms.yg.sz.domain.BsSgcSzGltz;
*/
@Repository
public interface BsSgcSzGltzMapper extends BaseMapper<BsSgcSzGltz> {
List<BsSgcSzGltz>getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaName") String wagaName,
@Param("adcd") String adcd,
@Param("wagaCode") String wagaCode
);
List<BsSgcSzGltz>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaName") String wagaName,
@Param("adcd") String adcd,
@Param("wagaCode") String wagaCode
);
}

19
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGzscMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.BsSgcSzGltz;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import java.util.List;
/**
* 水闸工作手册Mapper接口
*
@ -12,5 +16,20 @@ import com.kms.yg.sz.domain.BsSgcSzGzsc;
*/
@Repository
public interface BsSgcSzGzscMapper extends BaseMapper<BsSgcSzGzsc> {
List<BsSgcSzGzsc> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaName") String wagaName,
@Param("adcd") String adcd,
@Param("wagaCode") String wagaCode
);
List<BsSgcSzGzsc>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaName") String wagaName,
@Param("adcd") String adcd,
@Param("wagaCode") String wagaCode
);
}

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

@ -22,5 +22,6 @@ public interface BsSgcSzJfglMapper extends BaseMapper<BsSgcSzJfgl> {
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode);
}

4
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java

@ -20,7 +20,7 @@ public interface BsSgcSzYaxxMapper extends BaseMapper<BsSgcSzYaxx> {
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("inspectionType")String inspectionType,
@Param("type")String type,
@Param("adcd")String adcd
);
@ -29,7 +29,7 @@ public interface BsSgcSzYaxxMapper extends BaseMapper<BsSgcSzYaxx> {
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("inspectionType")String inspectionType,
@Param("type")String type,
@Param("adcd")String adcd
);
}

6
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java

@ -11,6 +11,7 @@ import com.kms.yg.sz.domain.BsSgcSzBydyzb;
import com.kms.yg.sz.mapper.BsSgcSzBydyzbMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -30,6 +31,10 @@ public class BsSgcSzBydyzbService extends BaseService<BsSgcSzBydyzbMapper, BsSgc
private BsSgcSzBydyService bsSgcSzBydyService;
public Page getPage(SearchParam<BsSgcSzBydyzb> sp){
BsSgcSzBydyzb data = sp.getData();
Page<BsSgcSzBydyzb>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcSzBydyzb> list = bsSgcSzBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getWagaCode(), data.getPowerType(), data.getAdcdQx());
for (BsSgcSzBydyzb zb:list){
@ -40,7 +45,6 @@ public class BsSgcSzBydyzbService extends BaseService<BsSgcSzBydyzbMapper, BsSgc
Integer size = bsSgcSzBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getWagaCode(), data.getPowerType(), data.getAdcdQx()).size();
Page<BsSgcSzBydyzb>page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setTotal(size);
page.setRecords(list);
return page;

3
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java

@ -56,6 +56,9 @@ public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBz
Page<BsSgcSzBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(projectInfo.getWagaCode())){
return page;
}
List<BsSgcSzBzbp> infoPage = bsSgcSzBzbpMapper.selectList1(sp.getPageNum(),sp.getPageSize(),
projectInfo.getWagaName(),adcd,projectInfo.getWagaCode());

9
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java

@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzJfgl;
import com.kms.yg.sz.mapper.BsSgcSzBzhjsMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -34,11 +35,15 @@ public class BsSgcSzBzhjsService extends BaseService<BsSgcSzBzhjsMapper, BsSgcSz
public IPage selectPage(SearchParam<BsSgcSzBzhjs> sp) {
BsSgcSzBzhjs data = sp.getData();
Page<BsSgcSzJfgl> page = new Page<>();
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
List<BsSgcSzJfgl> list= bsSgcSzBzhjsMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode());
data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode());
Page<BsSgcSzJfgl> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());

16
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java

@ -7,6 +7,7 @@ import com.kms.yg.sz.domain.BsSgcSzDagl;
import com.kms.yg.sz.mapper.BsSgcSzDaglMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -31,12 +32,19 @@ public class BsSgcSzDaglService extends BaseService<BsSgcSzDaglMapper, BsSgcSzDa
public IPage selectPage(SearchParam<BsSgcSzDagl> sp) {
BsSgcSzDagl data = sp.getData();
Page<BsSgcSzDagl> page = new Page<>();
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())){
adcd= sysXzqhService.getSubString(data.getAdcd());
}else {
adcd=data.getAdcdQx();
}
List<BsSgcSzDagl> list = bsSgcSzDaglMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode(),data.getUnit());
adcd, "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode(),data.getUnit());
Page<BsSgcSzDagl> page = new Page<>();
page.setTotal(list.size());
page.setRecords(list);
return page;

27
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDsjService.java

@ -1,9 +1,18 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import com.kms.yg.sz.mapper.BsSgcSzGzscMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.sz.mapper.BsSgcSzDsjMapper;
import com.kms.yg.sz.domain.BsSgcSzDsj;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 水闸工程大事记Service接口
*
@ -13,4 +22,22 @@ import org.springframework.stereotype.Service;
@Service
public class BsSgcSzDsjService extends BaseService<BsSgcSzDsjMapper, BsSgcSzDsj>{
@Autowired
private BsSgcSzDsjMapper bsSgcSzDsjMapper;
public Page<BsSgcSzDsj> getPage(SearchParam<BsSgcSzDsj> sp){
BsSgcSzDsj data = sp.getData();
Page<BsSgcSzDsj> page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
List<BsSgcSzDsj> list = bsSgcSzDsjMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getAdcdQx(), data.getWagaCode());
Integer size = bsSgcSzDsjMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getAdcdQx(), data.getWagaCode()).size();
page.setTotal(size);
page.setRecords(list);
return page;
}
}

6
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java

@ -33,11 +33,15 @@ public class BsSgcSzFxwzService extends BaseService<BsSgcSzFxwzMapper, BsSgcSzFx
}else {
adcd=data.getAdcdQx();
}
Page page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcSzFxwz> list = bsSgcSzFxwzMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(), data.getWagaName(), data.getPersonName()
, adcd, data.getMaterialName());
Integer count = bsSgcSzFxwzMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(), data.getWagaName(), data.getPersonName()
, adcd, data.getMaterialName()).size();
Page page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setRecords(list);
page.setTotal(count);
return page;

8
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java

@ -96,10 +96,16 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
}else {
adcd=data.getAdcdQx();
}
Page<BsSgcSzFzr> page = new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
List<BsSgcSzFzr> list = bsSgcSzFzrMapper.getList(data.getId(), data.getWagaName(), adcd, sp.getData().getWagaCode(),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzFzr> page = new Page<>();
page.setRecords(list);

24
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGltzService.java

@ -1,9 +1,16 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.sz.mapper.BsSgcSzGltzMapper;
import com.kms.yg.sz.domain.BsSgcSzGltz;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 堤防管理体制Service接口
*
@ -12,5 +19,22 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcSzGltzService extends BaseService<BsSgcSzGltzMapper, BsSgcSzGltz>{
@Autowired
private BsSgcSzGltzMapper bsSgcSzGltzMapper;
public Page<BsSgcSzGltz>getPage(SearchParam<BsSgcSzGltz> sp){
BsSgcSzGltz data = sp.getData();
Page<BsSgcSzGltz> page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
List<BsSgcSzGltz> list = bsSgcSzGltzMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getAdcdQx(), data.getWagaCode());
Integer size = bsSgcSzGltzMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getAdcdQx(), data.getWagaCode()).size();
page.setTotal(size);
page.setRecords(list);
return page;
}
}

26
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGzscService.java

@ -1,9 +1,18 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.df.domain.BsSgcDfGltz;
import com.kms.yg.df.mapper.BsSgcDfGltzMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.sz.mapper.BsSgcSzGzscMapper;
import com.kms.yg.sz.domain.BsSgcSzGzsc;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 水闸工作手册Service接口
*
@ -12,5 +21,22 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcSzGzscService extends BaseService<BsSgcSzGzscMapper, BsSgcSzGzsc>{
@Autowired
private BsSgcSzGzscMapper bsSgcSzGzscMapper;
public Page<BsSgcSzGzsc> getPage(SearchParam<BsSgcSzGzsc> sp){
BsSgcSzGzsc data = sp.getData();
Page<BsSgcSzGzsc> page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
List<BsSgcSzGzsc> list = bsSgcSzGzscMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getAdcdQx(), data.getWagaCode());
Integer size = bsSgcSzGzscMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getAdcdQx(), data.getWagaCode()).size();
page.setTotal(size);
page.setRecords(list);
return page;
}
}

8
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java

@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzJfgl;
import com.kms.yg.sz.mapper.BsSgcSzJfglMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -33,11 +34,14 @@ public class BsSgcSzJfglService extends BaseService<BsSgcSzJfglMapper, BsSgcSzJf
public IPage selectPage(SearchParam<BsSgcSzJfgl> sp) {
BsSgcSzJfgl data = sp.getData();
Page<BsSgcSzJfgl> page = new Page<>();
if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
return page;
}
List<BsSgcSzJfgl> list= bsSgcSzJfglMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode());
Page<BsSgcSzJfgl> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());

6
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java

@ -45,7 +45,11 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
if (StringUtils.isNotBlank(sp.getData().getWagaCode())){
wrapper.eq("waga_code",sp.getData().getWagaCode());
}
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
Page page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isBlank(sp.getData().getWagaCode())&&StringUtils.isBlank(new BsSgcSzSafeJbxx().getAdcdQx())){
return page;
}
page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
List<BsSgcSzSzrw> records = page.getRecords();

6
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java

@ -5,6 +5,7 @@ import com.kms.yg.sz.domain.BsSgcSzYaxx;
import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -23,11 +24,14 @@ public class BsSgcSzYaxxService extends BaseService<BsSgcSzYaxxMapper, BsSgcSzYa
public Page<BsSgcSzYaxx>getPage(SearchParam<BsSgcSzYaxx> sp){
BsSgcSzYaxx data = sp.getData();
Page<BsSgcSzYaxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcSzYaxx> list = bsSgcSzYaxxMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(),
data.getWagaName(), data.getType(), data.getAdcdQx());
Integer count = bsSgcSzYaxxMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(),
data.getWagaName(), data.getType(), data.getAdcdQx()).size();
Page<BsSgcSzYaxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setRecords(list);
page.setTotal(count);
return page;

5
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java

@ -32,11 +32,14 @@ public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYh
public Page<BsSgcSzYhxx> getPage(SearchParam<BsSgcSzYhxx> sp){
BsSgcSzYhxx data = sp.getData();
Page<BsSgcSzYhxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){
return page;
}
List<BsSgcSzYhxx> list = bsSgcSzYhxxMapper.getList(sp.getPageNum(),sp.getPageSize(),
data.getWagaCode(),data.getWagaName(), data.getInspectionType(),data.getAdcdQx());
int size = bsSgcSzYhxxMapper.getCount(sp.getPageNum(),sp.getPageSize(),
data.getWagaCode(),data.getWagaName(), data.getInspectionType(),data.getAdcdQx()).size();
Page<BsSgcSzYhxx>page=new Page<>(sp.getPageNum(),sp.getPageSize());
page.setRecords(list);
page.setTotal(size);
return page;

65
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.df.mapper.BsSgcDfDsjMapper">
<sql id="info">
select sd.id,sd. dike_code,sd. dike_name,sd.year,sd. highest_level, sd.discharge_volume,
sd.abnormal_condition, sd.conclusion, sd.Supervise,
sj.adcd
from bs_sgc_df_dsj sd
left join att_dike_base sj on sd.dike_code = sj.dike_CODE
</sql>
<resultMap id="col" type="BsSgcDfDsj">
<id property="id" column="id"/>
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="year" column="year"/>
<result property="adcd" column="adcd"/>
<result property="highestLevel" column="highest_level"/>
<result property="dischargeVolume" column="discharge_volume"/>
<result property="abnormalCondition" column="abnormal_condition"/>
<result property="conclusion" column="conclusion"/>
<result property="Supervise" column="Supervise"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE = #{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE = #{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

60
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.df.mapper.BsSgcDfGltzMapper">
<sql id="info">
select sd.id,sd.dike_code,sd. dike_name,sd. type, sd.file,
sj.adcd
from bs_sgc_df_gltz sd
left join att_dike_base sj on sd.dike_code = sj.dike_CODE
</sql>
<resultMap id="col" type="BsSgcDfYaxx">
<id property="id" column="id"/>
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="type" column="type"/>
<result property="file" column="file"/>
<result property="adcd" column="adcd"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE = #{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE = #{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

59
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGzscMapper.xml

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.df.mapper.BsSgcDfGzscMapper">
<sql id="info">
select sd.id,sd. dike_code,sd. dike_name, sd.file,
sj.adcd
from bs_sgc_df_gzsc sd
left join att_dike_base sj on sd.dike_code = sj.dike_CODE
</sql>
<resultMap id="col" type="BsSgcDfGzsc">
<id property="id" column="id"/>
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="file" column="file"/>
<result property="adcd" column="adcd"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE = #{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE = #{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

4
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml

@ -33,7 +33,9 @@
<if test="dikeName!=null and dikeName!=''">
and sj.dike_name LIKE concat('%',#{dikeName},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE=#{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>

65
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzDsjMapper">
<sql id="info">
select sd.id,sd. waga_code,sd. waga_name,sd.year,sd. highest_level, sd.discharge_volume,
sd.abnormal_condition, sd.conclusion, sd.Supervise,
sj.adcd
from bs_sgc_sz_dsj sd
left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE
</sql>
<resultMap id="col" type="BsSgcSzDsj">
<id property="id" column="id"/>
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="year" column="year"/>
<result property="adcd" column="adcd"/>
<result property="highestLevel" column="highest_level"/>
<result property="dischargeVolume" column="discharge_volume"/>
<result property="abnormalCondition" column="abnormal_condition"/>
<result property="conclusion" column="conclusion"/>
<result property="Supervise" column="Supervise"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

60
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzGltzMapper">
<sql id="info">
select sd.id,sd. waga_code,sd. waga_name,sd. type, sd.file,
sj.adcd
from bs_sgc_sz_gltz sd
left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE
</sql>
<resultMap id="col" type="BsSgcSzYaxx">
<id property="id" column="id"/>
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="type" column="type"/>
<result property="file" column="file"/>
<result property="adcd" column="adcd"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

59
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGzscMapper.xml

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzGzscMapper">
<sql id="info">
select sd.id,sd. waga_code,sd. waga_name, sd.file,
sj.adcd
from bs_sgc_sz_gzsc sd
left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE
</sql>
<resultMap id="col" type="BsSgcSzGzsc">
<id property="id" column="id"/>
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="file" column="file"/>
<result property="adcd" column="adcd"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

3
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml

@ -30,6 +30,9 @@
<if test="wagaType!=null and wagaType!=''">
and sj.waga_type = #{wagaType}
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE=#{wagaCode}
</if>
<if test="wagaName!=null and wagaName!=''">
and sj.waga_name LIKE concat('%',#{wagaName},'%')
</if>

Loading…
Cancel
Save