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
cd5af31e16
  1. 11
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java
  2. 48
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
  3. 22
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java
  4. 18
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java
  5. 3
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java
  6. 2
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java
  7. 16
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java
  8. 9
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java
  9. 16
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java
  10. 13
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java
  11. 12
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java
  12. 15
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java
  13. 15
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java
  14. 20
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java
  15. 4
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java
  16. 21
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxwzMapper.java
  17. 21
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java
  18. 21
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java
  19. 33
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java
  20. 4
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
  21. 13
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
  22. 30
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java
  23. 9
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
  24. 20
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java
  25. 16
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java
  26. 10
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java
  27. 90
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
  28. 19
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java
  29. 16
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java
  30. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  31. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java
  32. 3
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java
  33. 3
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java
  34. 16
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java
  35. 12
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java
  36. 15
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java
  37. 12
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java
  38. 15
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
  39. 2
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
  40. 9
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java
  41. 17
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYaxx.java
  42. 16
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYhxx.java
  43. 21
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java
  44. 4
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
  45. 19
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java
  46. 19
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java
  47. 21
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java
  48. 31
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java
  49. 7
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
  50. 31
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java
  51. 10
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  52. 13
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
  53. 18
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java
  54. 14
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
  55. 65
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBydyzbMapper.xml
  56. 6
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
  57. 78
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFxwzMapper.xml
  58. 3
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
  59. 71
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYaxxMapper.xml
  60. 75
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
  61. 65
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBydyzbMapper.xml
  62. 6
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
  63. 77
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFxwzMapper.xml
  64. 3
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
  65. 71
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYaxxMapper.xml
  66. 75
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

11
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java

@ -2,6 +2,7 @@ package com.kms.yg.df.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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;
@ -55,15 +56,9 @@ public class BsSgcDfBydyzbController extends BaseController
@ApiOperation("堤防备用电源主列表")
public IPage list(@RequestBody SearchParam<BsSgcDfBydyzb> sp)
{
IPage<BsSgcDfBydyzb> bsSgcDfBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp);
List<BsSgcDfBydyzb> records = bsSgcDfBydyzbIPage.getRecords();
for (BsSgcDfBydyzb zb:records){
LambdaQueryWrapper<BsSgcDfBydy> lw=new LambdaQueryWrapper<>();
int count = bsSgcDfBydyService.count(lw.eq(BsSgcDfBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
return bsSgcDfBydyzbIPage;
Page page = bsSgcSzBydyzbService.getPage(sp);
return page;
}
/**

48
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java

@ -89,15 +89,9 @@ public class BsSgcDfBzbpController extends BaseController
{
BsSgcDfBzbp projectInfo = sp.getData();
String adcd = null;
if (projectInfo != null) {
adcd = projectInfo.getAdcd();
}
String infoAdcd = null;
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
if (projectInfo != null && projectInfo.getAdcd() != null) {
String infoAdcd = projectInfo.getAdcd();
if (StringUtils.isNotEmpty(projectInfo.getAdcd())) {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
@ -112,43 +106,7 @@ public class BsSgcDfBzbpController extends BaseController
}
return bsSgcDfBzbpService.getStatistics(sp, infoAdcd);
}else {
return bsSgcDfBzbpService.getStatistics(sp,null);
}
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer()==5) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==4) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return bsSgcDfBzbpService.getStatistics(sp,substring);
}else {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==4) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
adcd = xzqh.getXzqhdm();
}
return bsSgcDfBzbpService.getStatistics(sp, adcd);
return bsSgcDfBzbpService.getStatistics(sp, projectInfo.getAdcdQx());
}
}

22
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java

@ -1,11 +1,13 @@
package com.kms.yg.df.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
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;
import com.kms.yg.df.domain.BsSgcDfFxwz;
import com.kms.yg.df.service.BsSgcDfFxwzService;
import com.kms.yg.sz.domain.BsSgcSzFxwz;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
@ -50,24 +52,8 @@ public class BsSgcDfFxwzController extends BaseController
@ApiOperation("水闸防汛物资列表")
public IPage list(@RequestBody SearchParam<BsSgcDfFxwz> sp)
{
List<ConditionView> conditionViews = new ArrayList<>();
ConditionView conditionView = new ConditionView();
ConditionView cv = new ConditionView();
BsSgcDfFxwz data = sp.getData();
if(data!=null&&StringUtils.isNotEmpty(data.getPersonName())){
cv.setName("person_name");
cv.setValue(data.getPersonName());
cv.setType(MongoOperType.LIKE);
}
if(data!=null&&StringUtils.isNotEmpty(data.getMaterialName())){
conditionView.setName("material_name");
conditionView.setValue(data.getMaterialName());
conditionView.setType(MongoOperType.LIKE);
}
conditionViews.add(conditionView);
conditionViews.add(cv);
sp.setConditionViews(conditionViews);
return bsSgcSzFxwzService.selectPage(sp);
Page<BsSgcDfFxwz> page = bsSgcSzFxwzService.getPage(sp);
return page;
}
/**

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

@ -1,8 +1,10 @@
package com.kms.yg.df.controller;
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;
@ -18,6 +20,7 @@ import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.enums.BusinessType;
import com.shuili.common.utils.StringUtils;
import com.shuili.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -63,7 +66,20 @@ public class BsSgcDfFxzzController extends BaseController
@ApiOperation("防汛组织列表")
public IPage list(@RequestBody SearchParam<BsSgcDfFxzz> sp)
{
return bsSgcSzFxzzService.selectPage(sp);
BsSgcDfFxzz data = sp.getData();
LambdaQueryWrapper<BsSgcDfFxzz>lw=new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(data.getDikeName())){
lw.eq(BsSgcDfFxzz::getDikeName,data.getDikeName());
}
if (StringUtils.isNotEmpty(data.getDikeCode())){
lw.eq(BsSgcDfFxzz::getDikeCode,data.getDikeCode());
}
if (StringUtils.isNotEmpty(data.getAdcd())){
lw.likeRight(BsSgcDfFxzz::getAdcd,sysXzqhService.getSubString(data.getAdcd()));
}else {
lw.likeRight(BsSgcDfFxzz::getAdcd,data.getAdcdQx());
}
return bsSgcSzFxzzService.page(new Page<>(sp.getPageNum(),sp.getPageSize()),lw);
}
/**

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

@ -48,7 +48,8 @@ public class BsSgcDfYaxxController extends BaseController
@ApiOperation("水闸预案列表")
public IPage list(@RequestBody SearchParam<BsSgcDfYaxx> sp)
{
return bsSgcSzYaxxService.selectPage(sp);
return bsSgcSzYaxxService.getPage(sp);
}
/**

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

@ -87,7 +87,7 @@ public class BsSgcDfYhxxController extends BaseController
@ApiOperation("水闸隐患信息列表")
public IPage list(@RequestBody SearchParam<BsSgcDfYhxx> sp)
{
return bsSgcSzYhxxService.selectPage(sp);
return bsSgcSzYhxxService.getPage(sp);
}
/**

16
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.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_bydyzb")
@Data
@ApiModel("水闸备用电源主")
public class BsSgcDfBydyzb extends BaseEntity
public class BsSgcDfBydyzb extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -60,4 +62,14 @@ public class BsSgcDfBydyzb extends BaseEntity
@TableField(exist = false)
private String total;
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

9
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java

@ -2,6 +2,7 @@ package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.util.StringUtils;
import java.util.Date;
@ -71,5 +73,10 @@ public class BsSgcDfDfrw extends BaseEntity
private String relation;
private String status;
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/BsSgcDfFxwz.java

@ -1,12 +1,16 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
@ -19,7 +23,7 @@ import java.util.Date;
@TableName("bs_sgc_df_fxwz")
@Data
@ApiModel("水闸防汛物资")
public class BsSgcDfFxwz extends BaseEntity
public class BsSgcDfFxwz extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -91,4 +95,14 @@ public class BsSgcDfFxwz extends BaseEntity
@ApiModelProperty("保质期")
private String shelfLife;
@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/BsSgcDfFxzz.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_fxzz")
@Data
@ApiModel("防汛组织")
public class BsSgcDfFxzz extends BaseEntity
public class BsSgcDfFxzz extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -93,5 +95,10 @@ public class BsSgcDfFxzz extends BaseEntity
private String dikeCode;
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/BsSgcDfFzr.java

@ -3,11 +3,14 @@ package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
@ -22,7 +25,7 @@ import java.util.Date;
@TableName("bs_sgc_df_fzr")
@Data
@ApiModel("水闸负责人")
public class BsSgcDfFzr extends BaseEntity
public class BsSgcDfFzr extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -121,7 +124,12 @@ public class BsSgcDfFzr extends BaseEntity
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}

15
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java

@ -1,12 +1,16 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
@ -21,7 +25,7 @@ import java.util.Date;
@TableName("bs_sgc_df_yaxx")
@Data
@ApiModel("水闸预案")
public class BsSgcDfYaxx extends BaseEntity
public class BsSgcDfYaxx extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -96,4 +100,13 @@ public class BsSgcDfYaxx extends BaseEntity
@ApiModelProperty("图片")
private String relation;
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

15
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java

@ -1,12 +1,16 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.math.BigDecimal;
import java.util.Date;
@ -21,7 +25,7 @@ import java.util.Date;
@TableName("bs_sgc_df_yhxx")
@Data
@ApiModel("水闸隐患信息")
public class BsSgcDfYhxx extends BaseEntity
public class BsSgcDfYhxx extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -121,4 +125,13 @@ public class BsSgcDfYhxx extends BaseEntity
@ApiModelProperty("水闸类型")
private String relation;
@TableField(exist = false)
private String adcd;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.dikeCode;
}
}

20
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java

@ -2,8 +2,11 @@ package com.kms.yg.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfBydyzb;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 水闸备用电源主Mapper接口
*
@ -12,5 +15,22 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface BsSgcDfBydyzbMapper extends BaseMapper<BsSgcDfBydyzb> {
List<BsSgcDfBydyzb>getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("powerType")String powerType,
@Param("adcd")String adcd
);
List<BsSgcDfBydyzb>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("powerType")String powerType,
@Param("adcd")String adcd
);
}

4
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java

@ -17,6 +17,6 @@ import java.util.Map;
@Repository
public interface BsSgcDfBzbpMapper extends BaseMapper<BsSgcDfBzbp> {
List<BsSgcDfBzbp> selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd);
List<Map<String,Object>> getStatistics(@Param("embankmentName") String embankmentCode,@Param("adcd")String adcd);
List<BsSgcDfBzbp> selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd,@Param("dikeCode")String dikeCode);
List<Map<String,Object>> getStatistics(@Param("embankmentName") String embankmentCode,@Param("adcd")String adcd,@Param("dikeCode")String dikeCode);
}

21
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxwzMapper.java

@ -1,10 +1,14 @@
package com.kms.yg.df.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.df.domain.BsSgcDfFxwz;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzFxwz;
import java.util.List;
/**
* 水闸防汛物资Mapper接口
*
@ -14,4 +18,21 @@ import com.kms.yg.sz.domain.BsSgcSzFxwz;
@Repository
public interface BsSgcDfFxwzMapper extends BaseMapper<BsSgcDfFxwz> {
List<BsSgcDfFxwz> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("personName")String personName,
@Param("adcd")String adcd,
@Param("materialName")String materialName);
List<BsSgcDfFxwz> getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("personName")String personName,
@Param("adcd")String adcd,
@Param("materialName")String materialName);
}

21
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java

@ -2,8 +2,12 @@ package com.kms.yg.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfYaxx;
import com.kms.yg.sz.domain.BsSgcSzYaxx;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 水闸预案Mapper接口
*
@ -13,4 +17,21 @@ import org.springframework.stereotype.Repository;
@Repository
public interface BsSgcDfYaxxMapper extends BaseMapper<BsSgcDfYaxx> {
List<BsSgcDfYaxx> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("type")String type,
@Param("adcd")String adcd
);
List<BsSgcDfYaxx>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("type")String type,
@Param("adcd")String adcd
);
}

21
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java

@ -2,6 +2,7 @@ package com.kms.yg.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfYhxx;
import com.kms.yg.sz.domain.BsSgcSzYhxx;
import com.kms.yg.sz.domain.dto.PieDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -22,4 +23,24 @@ public interface BsSgcDfYhxxMapper extends BaseMapper<BsSgcDfYhxx> {
List<PieDto> getHistogram(@Param("layer") Integer layer,
@Param("adcd") String xzqh);
List<BsSgcDfYhxx>getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("inspectionType")String inspectionType,
@Param("adcd")String adcd
);
List<BsSgcDfYhxx>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("dikeCode")String dikeCode,
@Param("dikeName") String dikeName,
@Param("inspectionType")String inspectionType,
@Param("adcd")String adcd
);
}

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

@ -1,10 +1,19 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 水闸备用电源主Service接口
*
@ -14,4 +23,28 @@ import org.springframework.stereotype.Service;
@Service
public class BsSgcDfBydyzbService extends BaseService<BsSgcDfBydyzbMapper, BsSgcDfBydyzb>{
@Autowired
private BsSgcDfBydyzbMapper bsSgcDfBydyzbMapper;
@Autowired
private BsSgcDfBydyService bsSgcDfBydyService;
public Page getPage(SearchParam<BsSgcDfBydyzb> sp){
BsSgcDfBydyzb data = sp.getData();
List<BsSgcDfBydyzb> list = bsSgcDfBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getDikeCode(), data.getDikeName(), data.getPowerType(), data.getAdcdQx());
for (BsSgcDfBydyzb zb:list){
LambdaQueryWrapper<BsSgcDfBydy> lw=new LambdaQueryWrapper<>();
int count = bsSgcDfBydyService.count(lw.eq(BsSgcDfBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
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;
}
}

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

@ -54,7 +54,7 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
Page<BsSgcDfBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
List<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper
.selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd);
.selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd,projectInfo.getDikeCode());
Page<BsSgcDfBzbp> bsSgcDfBzbpPage = new Page<>();
bsSgcDfBzbpPage.setRecords(infoPage);
@ -66,7 +66,7 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
public Map<String,Integer>getStatistics(SearchParam<BsSgcDfBzbp> sp, String adcd){
BsSgcDfBzbp projectInfo = sp.getData();
List<Map<String, Object>> statistics = bsSgcDfBzbpMapper.getStatistics(projectInfo.getDikeName(), adcd);
List<Map<String, Object>> statistics = bsSgcDfBzbpMapper.getStatistics(projectInfo.getDikeName(), adcd,projectInfo.getDikeCode());
Map<String,Integer>map=new HashMap<>();
for ( Map<String,Object>integerMap:statistics){
map.put((String) integerMap.get("name"), Math.toIntExact((Long) integerMap.get("num")));

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

@ -2,7 +2,9 @@ package com.kms.yg.df.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.df.domain.BsSgcDfAqrw;
@ -41,15 +43,20 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
private BsSgcDfAqrwMapper bsSgcDfAqrwMapper;
public IPage selectPage(SearchParam<BsSgcDfDfrw> sp) {
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
if (StringUtils.isNotBlank(sp.getData().getDikeCode())){
wrapper.eq("dike_code",sp.getData().getDikeCode());
}
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
List<BsSgcDfDfrw> records = page.getRecords();
List<DfrwDto> list = new ArrayList<>();
for (BsSgcDfDfrw record : records) {
String dikeCode = record.getDikeCode();
BsSgcDfSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
.eq(BsSgcDfSafeJbxx::getDikeCode,dikeCode));
BsSgcDfSafeJbxx bsSgcSzSafeJbxx=new BsSgcDfSafeJbxx();
bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
.eq(BsSgcDfSafeJbxx::getDikeCode,dikeCode).likeRight(BsSgcDfSafeJbxx::getAdcd,bsSgcSzSafeJbxx.getAdcdQx()));
if (ObjectUtil.isNull(bsSgcSzSafeJbxx)) {
continue;
}

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

@ -1,9 +1,18 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfFxwz;
import com.kms.yg.df.mapper.BsSgcDfFxwzMapper;
import com.kms.yg.sz.domain.BsSgcSzFxwz;
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;
import java.util.List;
/**
* 水闸防汛物资Service接口
*
@ -13,4 +22,25 @@ import org.springframework.stereotype.Service;
@Service
public class BsSgcDfFxwzService extends BaseService<BsSgcDfFxwzMapper, BsSgcDfFxwz>{
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private BsSgcDfFxwzMapper bsSgcDfFxwzMapper;
public Page<BsSgcDfFxwz> getPage(SearchParam<BsSgcDfFxwz> sp){
BsSgcDfFxwz data = sp.getData();
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())){
adcd=sysXzqhService.getSubString(adcd);
}else {
adcd=data.getAdcdQx();
}
Page<BsSgcDfFxwz>page=new Page<>(sp.getPageNum(),sp.getPageSize());
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(),
data.getPersonName(), adcd,data.getMaterialName()).size();
page.setRecords(list);
page.setTotal(count);
return page;
}
}

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

@ -12,6 +12,7 @@ import com.kms.yg.sz.domain.dto.PieDto;
import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper;
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;
@ -90,8 +91,14 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
BsSgcDfFzr data = sp.getData();
Map<String, Object> params = sp.getParams();
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())) {
adcd=sysXzqhService.getSubString(data.getAdcd());
}else {
adcd=data.getAdcdQx();
}
List<BsSgcSzFzr> list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), sysXzqhService.getSubString(data.getAdcd()),
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<>();

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

@ -1,10 +1,17 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.df.domain.BsSgcDfYaxx;
import com.kms.yg.df.mapper.BsSgcDfYaxxMapper;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 水闸预案Service接口
*
@ -13,5 +20,18 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcDfYaxxService extends BaseService<BsSgcDfYaxxMapper, BsSgcDfYaxx>{
@Autowired
private BsSgcDfYaxxMapper bsSgcDfYaxxMapper;
public Page<BsSgcDfYaxx> getPage(SearchParam<BsSgcDfYaxx> sp){
BsSgcDfYaxx data = sp.getData();
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;
}
}

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

@ -1,10 +1,13 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfYhxx;
import com.kms.yg.df.mapper.BsSgcDfYhxxMapper;
import com.kms.yg.sz.domain.BsSgcSzYhxx;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -52,4 +55,17 @@ public class BsSgcDfYhxxService extends BaseService<BsSgcDfYhxxMapper, BsSgcDfYh
return map;
}
public Page<BsSgcDfYhxx> getPage(SearchParam<BsSgcDfYhxx> sp){
BsSgcDfYhxx data = sp.getData();
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;
}
}

10
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java

@ -55,15 +55,7 @@ public class BsSgcSzBydyzbController extends BaseController
public IPage list(@RequestBody SearchParam<BsSgcSzBydyzb> sp)
{
IPage<BsSgcSzBydyzb> bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp);
List<BsSgcSzBydyzb> records = bsSgcSzBydyzbIPage.getRecords();
for (BsSgcSzBydyzb zb:records){
LambdaQueryWrapper<BsSgcSzBydy>lw=new LambdaQueryWrapper<>();
int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
IPage<BsSgcSzBydyzb> bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.getPage(sp);
return bsSgcSzBydyzbIPage;
}

90
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java

@ -19,6 +19,7 @@ import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDept;
import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.utils.StringUtils;
import com.shuili.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
@ -72,15 +73,9 @@ public class BsSgcSzBzbpController extends BaseController
public IPage list(@RequestBody SearchParam<BsSgcSzBzbp> sp)
{
BsSgcSzBzbp projectInfo = sp.getData();
String adcd = null;
if (projectInfo != null) {
adcd = projectInfo.getAdcd();
}
String infoAdcd = null;
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
if (projectInfo != null && projectInfo.getAdcd() != null) {
String infoAdcd = projectInfo.getAdcd();
if (StringUtils.isNotEmpty(projectInfo.getAdcd())) {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
@ -95,41 +90,9 @@ public class BsSgcSzBzbpController extends BaseController
}
return bsSgcSzBzbpService.selectPage(sp, infoAdcd);
}else {
return bsSgcSzBzbpService.selectPage(sp,null);
return bsSgcSzBzbpService.selectPage(sp, projectInfo.getAdcdQx());
}
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
SysDept dept = user.getDept();
SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId());
String substring = "";
if (xzqh.getLayer()==5) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==4) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return bsSgcSzBzbpService.selectPage(sp,substring);
}else {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==4) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
adcd = xzqh.getXzqhdm();
}
return bsSgcSzBzbpService.selectPage(sp, adcd);
}
}
@PostMapping("/statistics")
@ -137,15 +100,9 @@ public class BsSgcSzBzbpController extends BaseController
public Map<String,Integer> getStatistics(@RequestBody SearchParam<BsSgcSzBzbp> sp)
{
BsSgcSzBzbp projectInfo = sp.getData();
String adcd = null;
if (projectInfo != null) {
adcd = projectInfo.getAdcd();
}
String infoAdcd = null;
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
if (projectInfo != null && projectInfo.getAdcd() != null) {
String infoAdcd = projectInfo.getAdcd();
if (StringUtils.isNotEmpty(projectInfo.getAdcd())) {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
@ -160,40 +117,7 @@ public class BsSgcSzBzbpController extends BaseController
}
return bsSgcSzBzbpService.getStatistics(sp, infoAdcd);
}else {
return bsSgcSzBzbpService.getStatistics(sp,null);
}
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
SysDept dept = user.getDept();
SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId());
String substring = "";
if (xzqh.getLayer()==5) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==4) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return bsSgcSzBzbpService.getStatistics(sp,substring);
}else {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==4) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
adcd = xzqh.getXzqhdm();
}
return bsSgcSzBzbpService.getStatistics(sp, adcd);
return bsSgcSzBzbpService.getStatistics(sp, projectInfo.getAdcdQx());
}
}

19
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java

@ -3,6 +3,7 @@ package com.kms.yg.sz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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;
@ -22,6 +23,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -54,22 +56,9 @@ public class BsSgcSzFxwzController extends BaseController
@ApiOperation("水闸防汛物资列表")
public IPage list(@RequestBody SearchParam<BsSgcSzFxwz> sp)
{
IPage<BsSgcSzFxwz> bsSgcSzFxwzIPage = bsSgcSzFxwzService.selectPage(sp);
List<BsSgcSzFxwz> records = bsSgcSzFxwzIPage.getRecords();
Page<BsSgcSzFxwz> page = bsSgcSzFxwzService.getPage(sp);
for (BsSgcSzFxwz record : records) {
String wagaCode = record.getWagaCode();
BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
.eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode),false);
if (ObjectUtils.isNotEmpty(one)) {
record.setWagaName(one.getWagaName());
}
}
bsSgcSzFxwzIPage.setRecords(records);
return bsSgcSzFxwzIPage;
return page;
}
/**

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

@ -1,11 +1,13 @@
package com.kms.yg.sz.controller;
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.kms.common.utils.BaseEntityUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfFxzz;
import com.kms.yg.sz.domain.BsSgcSzFxzz;
import com.kms.yg.sz.domain.BsSgcSzFxzzcy;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
@ -18,6 +20,7 @@ import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.enums.BusinessType;
import com.shuili.common.utils.StringUtils;
import com.shuili.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -63,6 +66,19 @@ public class BsSgcSzFxzzController extends BaseController
@ApiOperation("防汛组织列表")
public IPage list(@RequestBody SearchParam<BsSgcSzFxzz> sp)
{
BsSgcSzFxzz data = sp.getData();
LambdaQueryWrapper<BsSgcSzFxzz> lw=new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(data.getWagaName())){
lw.eq(BsSgcSzFxzz::getWagaName,data.getWagaName());
}
if (StringUtils.isNotEmpty(data.getWagaCode())){
lw.eq(BsSgcSzFxzz::getWagaCode,data.getWagaCode());
}
if (StringUtils.isNotEmpty(data.getAdcd())){
lw.likeRight(BsSgcSzFxzz::getAdcd,sysXzqhService.getSubString(data.getAdcd()));
}else {
lw.likeRight(BsSgcSzFxzz::getAdcd,data.getAdcdQx());
}
return bsSgcSzFxzzService.selectPage(sp);
}

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

@ -123,7 +123,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
.eq(data.getAdcd()!=null,BsSgcSzSafeJbxx::getWagaCode,data.getWageCode())
.eq(data.getWagaCode()!=null,BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode())
.like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())

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

@ -48,6 +48,8 @@ public class BsSgcSzSzrwController extends BaseController
@ApiOperation("水闸鉴定任务关联列表")
public IPage list(@RequestBody SearchParam<BsSgcSzSzrw> sp)
{
return bsSgcSzSzrwService.selectPage(sp);
}

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

@ -48,7 +48,8 @@ public class BsSgcSzYaxxController extends BaseController
@ApiOperation("水闸预案列表")
public IPage list(@RequestBody SearchParam<BsSgcSzYaxx> sp)
{
return bsSgcSzYaxxService.selectPage(sp);
return bsSgcSzYaxxService.getPage(sp);
}
/**

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

@ -92,7 +92,8 @@ public class BsSgcSzYhxxController extends BaseController
@ApiOperation("水闸隐患信息列表")
public IPage list(@RequestBody SearchParam<BsSgcSzYhxx> sp)
{
return bsSgcSzYhxxService.selectPage(sp);
return bsSgcSzYhxxService.getPage(sp);
}
/**

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

@ -1,6 +1,8 @@
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 com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -8,7 +10,7 @@ import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -20,7 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_bydyzb")
@Data
@ApiModel("水闸备用电源主")
public class BsSgcSzBydyzb extends BaseEntity
public class BsSgcSzBydyzb extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -62,4 +64,14 @@ public class BsSgcSzBydyzb extends BaseEntity
@ApiModelProperty("水闸名称")
private String relation;
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode();
}
return this.wagaCode;
}
}

12
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java

@ -3,11 +3,14 @@ package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
@ -21,7 +24,7 @@ import java.util.Date;
@TableName("bs_sgc_sz_bzbp")
@Data
@ApiModel("水闸标识标牌")
public class BsSgcSzBzbp extends BaseEntity
public class BsSgcSzBzbp extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -105,4 +108,11 @@ public class BsSgcSzBzbp extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8")
private Date sortTime;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

15
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java

@ -1,12 +1,16 @@
package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
@ -19,7 +23,7 @@ import java.util.Date;
@TableName("bs_sgc_sz_fxwz")
@Data
@ApiModel("水闸防汛物资")
public class BsSgcSzFxwz extends BaseEntity
public class BsSgcSzFxwz extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -93,4 +97,13 @@ public class BsSgcSzFxwz extends BaseEntity
@ApiModelProperty("保质期")
private String shelfLife;
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

12
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.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_fxzz")
@Data
@ApiModel("防汛组织")
public class BsSgcSzFxzz extends BaseEntity
public class BsSgcSzFxzz extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -92,6 +94,12 @@ public class BsSgcSzFxzz extends BaseEntity
private String wagaType;
private String wagaCode;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

15
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java

@ -3,11 +3,14 @@ package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
@ -22,7 +25,7 @@ import java.util.Date;
@TableName("bs_sgc_sz_fzr")
@Data
@ApiModel("水闸负责人")
public class BsSgcSzFzr extends BaseEntity
public class BsSgcSzFzr extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -119,9 +122,11 @@ public class BsSgcSzFzr extends BaseEntity
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

2
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java

@ -310,7 +310,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
public String getWageCode() {
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}

9
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java

@ -2,6 +2,8 @@ package com.kms.yg.sz.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.common.dto.IAdcd;
import com.kms.yxgh.df.service.AuthorityDikeCodeService;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -11,6 +13,7 @@ import com.shuili.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.NoArgsConstructor;
import org.springframework.util.StringUtils;
/**
@ -72,4 +75,10 @@ public class BsSgcSzSzrw extends BaseEntity
private String status;
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/BsSgcSzYaxx.java

@ -1,7 +1,11 @@
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 com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -9,7 +13,7 @@ import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springframework.util.StringUtils;
/**
@ -21,7 +25,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_yaxx")
@Data
@ApiModel("水闸预案")
public class BsSgcSzYaxx extends BaseEntity
public class BsSgcSzYaxx extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -96,4 +100,13 @@ public class BsSgcSzYaxx extends BaseEntity
@ApiModelProperty("图片")
private String relation;
@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/BsSgcSzYhxx.java

@ -2,7 +2,11 @@ package com.kms.yg.sz.domain;
import java.math.BigDecimal;
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;
@ -10,6 +14,7 @@ import com.shuili.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.shuili.common.core.domain.BaseEntity;
import org.springframework.util.StringUtils;
/**
@ -21,7 +26,7 @@ import com.shuili.common.core.domain.BaseEntity;
@TableName("bs_sgc_sz_yhxx")
@Data
@ApiModel("水闸隐患信息")
public class BsSgcSzYhxx extends BaseEntity
public class BsSgcSzYhxx extends BaseEntity implements IAdcd
{
private static final long serialVersionUID = 1L;
@ -121,4 +126,13 @@ public class BsSgcSzYhxx extends BaseEntity
@ApiModelProperty("水闸类型")
private String relation;
@TableField(exist = false)
private String adcd;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {
this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
}
return this.wagaCode;
}
}

21
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfBydyzb;
import com.kms.yg.sz.domain.BsSgcSzBydyzb;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 水闸备用电源主Mapper接口
*
@ -12,5 +16,22 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface BsSgcSzBydyzbMapper extends BaseMapper<BsSgcSzBydyzb> {
List<BsSgcSzBydyzb> getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("powerType")String powerType,
@Param("adcd")String adcd
);
List<BsSgcSzBydyzb>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("powerType")String powerType,
@Param("adcd")String adcd
);
}

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

@ -17,7 +17,7 @@ import java.util.Map;
@Repository
public interface BsSgcSzBzbpMapper extends BaseMapper<BsSgcSzBzbp> {
List<BsSgcSzBzbp> selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("wagaName") String sluiceName, @Param("adcd") String adcd);
List<Map<String,Object>> getStatistics(@Param("wagaName") String sluiceName, @Param("adcd")String adcd);
List<BsSgcSzBzbp> selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("wagaName") String sluiceName, @Param("adcd") String adcd,@Param("wagaCode")String wagaCode);
List<Map<String,Object>> getStatistics(@Param("wagaName") String sluiceName, @Param("adcd")String adcd,@Param("wagaCode")String wagaCode);
}

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

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzFxwz;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 水闸防汛物资Mapper接口
*
@ -12,5 +16,20 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface BsSgcSzFxwzMapper extends BaseMapper<BsSgcSzFxwz> {
List<BsSgcSzFxwz> getList(@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("personName")String personName,
@Param("adcd")String adcd,
@Param("materialName")String materialName);
List<BsSgcSzFxwz> getCount(@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("personName")String personName,
@Param("adcd")String adcd,
@Param("materialName")String materialName);
}

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

@ -2,8 +2,11 @@ package com.kms.yg.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzYaxx;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 水闸预案Mapper接口
*
@ -12,5 +15,21 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface BsSgcSzYaxxMapper extends BaseMapper<BsSgcSzYaxx> {
List<BsSgcSzYaxx>getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("inspectionType")String inspectionType,
@Param("adcd")String adcd
);
List<BsSgcSzYaxx>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("inspectionType")String inspectionType,
@Param("adcd")String adcd
);
}

21
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java

@ -22,4 +22,25 @@ public interface BsSgcSzYhxxMapper extends BaseMapper<BsSgcSzYhxx> {
List<PieDto> getHistogram(@Param("layer") Integer layer,
@Param("adcd") String xzqh);
List<BsSgcSzYhxx>getList(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("inspectionType")String inspectionType,
@Param("adcd")String adcd
);
List<BsSgcSzYhxx>getCount(
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("wagaName") String wagaName,
@Param("inspectionType")String inspectionType,
@Param("adcd")String adcd
);
}

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

@ -1,10 +1,21 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.df.service.BsSgcDfBydyService;
import com.kms.yg.sz.domain.BsSgcSzBydy;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 水闸备用电源主Service接口
*
@ -13,5 +24,25 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcSzBydyzbService extends BaseService<BsSgcSzBydyzbMapper, BsSgcSzBydyzb>{
@Autowired
private BsSgcSzBydyzbMapper bsSgcSzBydyzbMapper;
@Autowired
private BsSgcSzBydyService bsSgcSzBydyService;
public Page getPage(SearchParam<BsSgcSzBydyzb> sp){
BsSgcSzBydyzb data = sp.getData();
List<BsSgcSzBydyzb> list = bsSgcSzBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(),
data.getWagaName(), data.getWagaCode(), data.getPowerType(), data.getAdcdQx());
for (BsSgcSzBydyzb zb:list){
LambdaQueryWrapper<BsSgcSzBydy> lw=new LambdaQueryWrapper<>();
int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
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;
}
}

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

@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzBzbp;
import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper;
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;
@ -37,6 +38,7 @@ public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBz
// String projectType = projectInfo.getEmbankmentType();
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
queryWrapper.eq(projectInfo.getId()!=null,"waga_code", projectInfo.getWagaCode());
queryWrapper.like(projectName != null, "waga_name", projectName);
// queryWrapper.like(projectType != null, "embankment_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
@ -55,7 +57,7 @@ public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBz
Page<BsSgcSzBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
List<BsSgcSzBzbp> infoPage = bsSgcSzBzbpMapper.selectList1(sp.getPageNum(),sp.getPageSize(),
projectInfo.getWagaName(),adcd);
projectInfo.getWagaName(),adcd,projectInfo.getWagaCode());
Page<BsSgcSzBzbp> bzbpPage = new Page<>();
@ -67,8 +69,7 @@ public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBz
public Map<String,Integer>getStatistics(SearchParam<BsSgcSzBzbp> sp, String adcd){
BsSgcSzBzbp projectInfo = sp.getData();
List<Map<String, Object>> statistics = bsSgcSzBzbpMapper.getStatistics(projectInfo.getWagaName(), adcd);
List<Map<String, Object>> statistics = bsSgcSzBzbpMapper.getStatistics(projectInfo.getWagaName(), adcd,projectInfo.getWagaCode());
Map<String,Integer>map=new HashMap<>();
for ( Map<String,Object>integerMap:statistics){

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

@ -1,9 +1,18 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzFxwz;
import com.kms.yg.sz.mapper.BsSgcSzFxwzMapper;
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;
import java.util.List;
/**
* 水闸防汛物资Service接口
*
@ -12,5 +21,25 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcSzFxwzService extends BaseService<BsSgcSzFxwzMapper, BsSgcSzFxwz>{
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private BsSgcSzFxwzMapper bsSgcSzFxwzMapper;
public Page<BsSgcSzFxwz>getPage(SearchParam<BsSgcSzFxwz> sp){
BsSgcSzFxwz data = sp.getData();
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())){
adcd=sysXzqhService.getSubString(adcd);
}else {
adcd=data.getAdcdQx();
}
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;
}
}

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

@ -11,6 +11,7 @@ import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper;
import com.kms.yg.sz.mapper.BsSgcSzFzrMapper;
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;
@ -89,8 +90,13 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
BsSgcSzFzr data = sp.getData();
Map<String, Object> params = sp.getParams();
List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),sp.getData().getWagaCode(),
String adcd=null;
if (StringUtils.isNotEmpty(data.getAdcd())) {
adcd = sysXzqhService.getSubString(data.getAdcd());
}else {
adcd=data.getAdcdQx();
}
List<BsSgcSzFzr> list = bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), adcd, sp.getData().getWagaCode(),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzFzr> page = new Page<>();

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

@ -2,7 +2,9 @@ package com.kms.yg.sz.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzAqrw;
@ -39,15 +41,20 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
@Autowired
private BsSgcSzAqrwMapper bsSgcSzAqrwMapper;
public IPage selectPage(SearchParam<BsSgcSzSzrw> sp) {
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
QueryWrapper wrapper = BeanToWrapper.getWrapper(sp);
if (StringUtils.isNotBlank(sp.getData().getWagaCode())){
wrapper.eq("waga_code",sp.getData().getWagaCode());
}
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
List<BsSgcSzSzrw> records = page.getRecords();
List<SzrwDto> list = new ArrayList<>();
for (BsSgcSzSzrw record : records) {
String wagaId = record.getWagaCode();
BsSgcSzSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
.eq(BsSgcSzSafeJbxx::getWagaCode, wagaId));
BsSgcSzSafeJbxx bsSgcSzSafeJbxx=new BsSgcSzSafeJbxx();
bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
.eq(BsSgcSzSafeJbxx::getWagaCode, wagaId).likeRight(BsSgcSzSafeJbxx::getAdcd,bsSgcSzSafeJbxx.getAdcdQx()));
LambdaQueryWrapper<BsSgcSzAqrw>lw=new LambdaQueryWrapper<>();
BsSgcSzAqrw bsSgcSzAqrw = bsSgcSzAqrwMapper.selectOne(lw.eq(BsSgcSzAqrw::getId, record.getTaskId()));

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

@ -1,10 +1,15 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 水闸预案Service接口
*
@ -13,5 +18,18 @@ import org.springframework.stereotype.Service;
*/
@Service
public class BsSgcSzYaxxService extends BaseService<BsSgcSzYaxxMapper, BsSgcSzYaxx>{
@Autowired
private BsSgcSzYaxxMapper bsSgcSzYaxxMapper;
public Page<BsSgcSzYaxx>getPage(SearchParam<BsSgcSzYaxx> sp){
BsSgcSzYaxx data = sp.getData();
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;
}
}

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

@ -1,10 +1,12 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzYhxx;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper;
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;
@ -28,6 +30,18 @@ public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYh
@Autowired
private SysXzqhService sysXzqhService;
public Page<BsSgcSzYhxx> getPage(SearchParam<BsSgcSzYhxx> sp){
BsSgcSzYhxx data = sp.getData();
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;
}
public List<PieDto> getPie(Integer layer, String xzqh) {
return bsSgcSzYhxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh));

65
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBydyzbMapper.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.BsSgcDfBydyzbMapper">
<sql id="info">
select sd.id, sd.dike_code, sd.power_type, sd.dike_name, sd.create_uid, sd.update_uid, sd.create_time,
sd.update_time, sd.ower_dept, sd.remark, sd.relation,
sj.*
from bs_sgc_df_bydyzb sd
left join att_dike_base sj on sd.dike_code = sj.dike_code
</sql>
<resultMap id="col" type="BsSgcDfBydyzb">
<id property="id" column="id"/>
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="powerType" column="power_type"/>
</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>
<if test="powerType != null and powerType != ''">
and sd.power_type like concat(#{powerType},'%')
</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>
<if test="powerType != null and powerType != ''">
and sd.power_type like concat(#{powerType},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

6
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@ -33,6 +33,9 @@
<if test="adcd != null and adcd != ''">
and adcd like concat(#{adcd},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and embankment_code=#{dikeCode}
</if>
</where>
GROUP BY embankment_code
ORDER BY create_time DESC
@ -51,6 +54,9 @@
<if test="adcd != null and adcd != ''">
and adcd like concat(#{adcd},'%')
</if>
<if test="dikeCode != null and dikeCode != ''">
and embankment_code=#{dikeCode}
</if>
</where>
GROUP BY adcd
</select>

78
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFxwzMapper.xml

@ -0,0 +1,78 @@
<?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.BsSgcDfFxwzMapper">
<sql id="info">
select sd.id, sd.material_name, sd.person_name, sd.person_phone,sd.person_level,
sd.material_number, sd.procurement_time, sd.material_type,sd.shelf_life,
sj.*
from bs_sgc_df_fxwz sd
left join att_dike_base sj on sd.dike_code = sj.dike_code
</sql>
<resultMap id="col" type="BsSgcDfFxwz">
<id property="id" column="id"/>
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="materialName" column="material_name"/>
<result property="personName" column="person_name"/>
<result property="personPhone" column="person_phone"/>
<result property="personLevel" column="person_level"/>
<result property="materialNumber" column="material_number"/>
<result property="procurementTime" column="procurement_time"/>
<result property="materialType" column="material_type"/>
<result property="shelfLife" column="shelf_life"/>
</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>
<if test="materialName != null and materialName != ''">
and sd.material_name like concat(#{materialName},'%')
</if>
<if test="personName != null and personName != ''">
and sd.person_name like concat(#{personName},'%')
</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>
<if test="materialName != null and materialName != ''">
and sd.material_name like concat(#{materialName},'%')
</if>
<if test="personName != null and personName != ''">
and sd.person_name like concat(#{personName},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

3
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml

@ -71,6 +71,9 @@
<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>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};

71
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYaxxMapper.xml

@ -0,0 +1,71 @@
<?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.BsSgcDfYaxxMapper">
<sql id="info">
select sd.id, sd.dike_id, sd.dike_code, sd.dike_name, sd.dike_type,
sd.engineer_scale, sd.person_name, sd.type, sd.implementation_time, sd.plan_content, sd.photo,
sj.*
from bs_sgc_df_yaxx 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="dikeType" column="dike_type"/>
<result property="engineerScale" column="engineer_scale"/>
<result property="personName" column="person_name"/>
<result property="type" column="type"/>
<result property="implementationTime" column="implementation_time"/>
<result property="planContent" column="plan_content"/>
<result property="photo" column="photo"/>
</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>
<if test="type != null and type != ''">
and sd.type like concat(#{type},'%')
</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>
<if test="type != null and type != ''">
and sd.type like concat(#{type},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

75
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml

@ -91,4 +91,79 @@
</if>
GROUP BY sy.`status`
</select>
<sql id="pageInfo">
select sd.id, sd.dike_code, proposer, find_time, address, inspection_type, instrument,
danger_detail, photo, sd.status, cost, finish_method, result, sd.dike_name, sd.dike_type,
head,
processing_time,
sj.*
from bs_sgc_df_yhxx sd
left join att_dike_base sj on sd.dike_code = sj.dike_CODE
</sql>
<resultMap id="col" type="BsSgcDfYhxx">
<id property="id" column="id"/>
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="dikeType" column="dike_type"/>
<result property="proposer" column="proposer"/>
<result property="findTime" column="find_time"/>
<result property="address" column="address"/>
<result property="inspectionType" column="inspection_type"/>
<result property="instrument" column="instrument"/>
<result property="photo" column="photo"/>
<result property="dangerDetail" column="danger_detail"/>
<result property="status" column="status"/>
<result property="cost" column="cost"/>
<result property="finishMethod" column="finish_method"/>
<result property="result" column="result"/>
<result property="head" column="head"/>
<result property="processingTime" column="processing_time"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="pageInfo"></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>
<if test="inspectionType != null and inspectionType != ''">
and sd.inspection_type = #{inspectionType}
</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="pageInfo"></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>
<if test="inspectionType != null and inspectionType != ''">
and sd.inspection_type = #{inspectionType}
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

65
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBydyzbMapper.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.BsSgcSzBydyzbMapper">
<sql id="info">
select sd.id, sd.waga_code, sd.power_type, sd.waga_name, sd.create_uid, sd.update_uid, sd.create_time,
sd.update_time, sd.ower_dept, sd.remark, sd.relation,
sj.*
from bs_sgc_sz_bydyzb sd
left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE
</sql>
<resultMap id="col" type="BsSgcSzBydyzb">
<id property="id" column="id"/>
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="powerType" column="power_type"/>
</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>
<if test="powerType != null and powerType != ''">
and sd.power_type like concat(#{powerType},'%')
</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>
<if test="powerType != null and powerType != ''">
and sd.power_type like concat(#{powerType},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

6
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml

@ -33,6 +33,9 @@
<if test="adcd != null and adcd != ''">
and adcd like concat(#{adcd},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and waga_code=#{wagaCode}
</if>
</where>
GROUP BY waga_code
ORDER BY create_time DESC
@ -51,6 +54,9 @@
<if test="adcd != null and adcd != ''">
and adcd like concat(#{adcd},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and adcd =#{wagaCode}
</if>
</where>
GROUP BY adcd
</select>

77
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFxwzMapper.xml

@ -0,0 +1,77 @@
<?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.BsSgcSzFxwzMapper">
<sql id="info">
select sd.id, sd.material_name, sd.person_name, sd.person_phone,sd.person_level,
sd.material_number, sd.procurement_time, sd.material_type,sd.shelf_life,
sj.*
from bs_sgc_sz_fxwz sd
left join att_waga_base sj on sd.waga_code = sj.waga_code
</sql>
<resultMap id="col" type="BsSgcSzFxwz">
<id property="id" column="id"/>
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="materialName" column="material_name"/>
<result property="personName" column="person_name"/>
<result property="personPhone" column="person_phone"/>
<result property="personLevel" column="person_level"/>
<result property="materialNumber" column="material_number"/>
<result property="procurementTime" column="procurement_time"/>
<result property="materialType" column="material_type"/>
<result property="shelfLife" column="shelf_life"/>
</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>
<if test="materialName != null and materialName != ''">
and sd.material_name like concat(#{materialName},'%')
</if>
<if test="personName != null and personName != ''">
and sd.person_name like concat(#{personName},'%')
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getCount" resultMap="col">
<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>
<if test="materialName != null and materialName != ''">
and sd.material_name like concat(#{materialName},'%')
</if>
<if test="personName != null and personName != ''">
and sd.person_name like concat(#{personName},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

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

@ -71,6 +71,9 @@
<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>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};

71
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYaxxMapper.xml

@ -0,0 +1,71 @@
<?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.BsSgcSzYaxxMapper">
<sql id="info">
select sd.id, sd.waga_id, sd.waga_code, sd.waga_name, sd.waga_type,
sd.engineer_scale, sd.person_name, sd.type, sd.implementation_time, sd.plan_content, sd.photo,
sj.*
from bs_sgc_sz_yaxx 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="wagaType" column="waga_type"/>
<result property="engineerScale" column="engineer_scale"/>
<result property="personName" column="person_name"/>
<result property="type" column="type"/>
<result property="implementationTime" column="implementation_time"/>
<result property="planContent" column="plan_content"/>
<result property="photo" column="photo"/>
</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>
<if test="type != null and type != ''">
and sd.type like concat(#{type},'%')
</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>
<if test="type != null and type != ''">
and sd.type like concat(#{type},'%')
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

75
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

@ -90,4 +90,79 @@
</if>
GROUP BY sy.`status`
</select>
<sql id="pageInfo">
select sd.id, sd.waga_code, proposer, find_time, address, inspection_type, instrument,
danger_detail, photo, sd.status, cost, finish_method, result, sd.waga_name, sd.waga_type,
head,
processing_time,
sj.*
from bs_sgc_sz_yhxx sd
left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE
</sql>
<resultMap id="col" type="BsSgcSzYhxx">
<id property="id" column="id"/>
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="wagaType" column="waga_type"/>
<result property="proposer" column="proposer"/>
<result property="findTime" column="find_time"/>
<result property="address" column="address"/>
<result property="inspectionType" column="inspection_type"/>
<result property="instrument" column="instrument"/>
<result property="photo" column="photo"/>
<result property="dangerDetail" column="danger_detail"/>
<result property="status" column="status"/>
<result property="cost" column="cost"/>
<result property="finishMethod" column="finish_method"/>
<result property="result" column="result"/>
<result property="head" column="head"/>
<result property="processingTime" column="processing_time"/>
</resultMap>
<select id="getList" resultMap="col">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="pageInfo"></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>
<if test="inspectionType != null and inspectionType != ''">
and sd.inspection_type = #{inspectionType}
</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="pageInfo"></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>
<if test="inspectionType != null and inspectionType != ''">
and sd.inspection_type = #{inspectionType}
</if>
and sj.EXPR_DATE is null
</where>
</select>
</mapper>

Loading…
Cancel
Save