bug修改

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

@@ -69,10 +69,10 @@ public class BsSgcDfJbxxController extends BaseController
                 QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
                 sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
                 SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-                if (xzqh.getLayer()==1) {
+                if (xzqh.getLayer()==5) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 2);
 
-                } else if (xzqh.getLayer()==2) {
+                } else if (xzqh.getLayer()==4) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 4);
 
                 }else {
@@ -90,10 +90,10 @@ public class BsSgcDfJbxxController extends BaseController
             String xzqhId = sysDept.getXzqhId();
             SysXzqh xzqh = sysXzqhService.getById(xzqhId);
             String substring = "";
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 substring = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 substring = xzqh.getXzqhdm().substring(0, 4);
 
             }else {
@@ -107,10 +107,10 @@ public class BsSgcDfJbxxController extends BaseController
             sysXzqhQueryWrapper.eq("XZQHDM", adcd);
 
             SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 adcd = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 adcd = xzqh.getXzqhdm().substring(0, 4);
 
             }else {

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

@@ -137,6 +137,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                             .eq(BsSgcDfSafeJbxx::getMnun,name)
                             .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                             .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
+                            .eq(data.getDikeGrad() != null, BsSgcDfSafeJbxx::getDikeGrad, data.getDikeGrad())
                             .likeRight(data.getAdcd()!=null,BsSgcDfSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId))
                             .isNull(BsSgcDfSafeJbxx::getExprDate)
                             .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
@@ -146,6 +147,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                 Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
                         .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                         .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
+                        .eq(data.getDikeGrad() != null, BsSgcDfSafeJbxx::getDikeGrad, data.getDikeGrad())
                         .isNull(BsSgcDfSafeJbxx::getExprDate)
                         .likeRight(data.getAdcd()!= null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
                         .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)

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

@@ -127,6 +127,8 @@ public class BsSgcDfJbxx extends BaseEntity
     @ApiModelProperty("工程任务")
     private String engTask;
 
+    private String status;
+
     /** 堤防级别 */
     @Excel(name = "堤防级别")
     @ApiModelProperty("堤防级别")

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

@@ -31,7 +31,7 @@ public class BsSgcDfJyjl extends BaseEntity
     private String dikeId;
 
     /** 决溢时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "决溢时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("决溢时间")
     private Date brspDatetime;

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

@@ -37,6 +37,7 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
         if (projectInfo != null) {
             String projectName = projectInfo.getDikeName();
             String projectType = projectInfo.getDikeType();
+            String status = projectInfo.getStatus();
 
             queryWrapper.eq(StringUtils.isNotBlank(projectInfo.getAdcdStart()), "ADCD_START", projectInfo.getAdcdStart());
             queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
@@ -44,6 +45,7 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
             queryWrapper.like(projectType != null, "dike_type", projectType);
             queryWrapper.likeRight(adcd != null, "ADCD", adcd);
             queryWrapper.isNull("EXPR_DATE");
+            queryWrapper.eq(status!=null,"status",status);
         }
 
 

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

@@ -70,10 +70,10 @@ public class BsSgcSzGcdaController extends BaseController
                 QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
                 sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
                 SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-                if (xzqh.getLayer()==1) {
+                if (xzqh.getLayer()==5) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 2);
 
-                } else if (xzqh.getLayer()==2) {
+                } else if (xzqh.getLayer()==4) {
                     infoAdcd = xzqh.getXzqhdm().substring(0, 4);
 
                 }else {
@@ -91,10 +91,10 @@ public class BsSgcSzGcdaController extends BaseController
             String xzqhId = sysDept.getXzqhId();
             SysXzqh xzqh = sysXzqhService.getById(xzqhId);
             String substring = "";
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 substring = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 substring = xzqh.getXzqhdm().substring(0, 4);
 
             }else {
@@ -108,10 +108,10 @@ public class BsSgcSzGcdaController extends BaseController
             sysXzqhQueryWrapper.eq("XZQHDM", adcd);
 
             SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==1) {
+            if (xzqh.getLayer()==5) {
                 adcd = xzqh.getXzqhdm().substring(0, 2);
 
-            } else if (xzqh.getLayer()==2) {
+            } else if (xzqh.getLayer()==4) {
                 adcd = xzqh.getXzqhdm().substring(0, 4);
 
             }else {

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

@@ -138,18 +138,20 @@ public class BsSgcSzSafeJbxxController extends BaseController {
                             .eq(BsSgcSzSafeJbxx::getMnun,name)
                             .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                             .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
+                            .eq(data.getEngScal()!=null,BsSgcSzSafeJbxx::getEngScal,data.getEngScal())
                             .likeRight(xzqhId!=null,BsSgcSzSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId))
                             .isNull(BsSgcSzSafeJbxx::getExprDate)
-                            .orderByDesc(BsSgcSzSafeJbxx::getEngScal)
+                            .last("ORDER BY CASE WHEN eng_scal IS NULL OR eng_scal = '' THEN 1 ELSE 0 END, eng_scal ASC")
             );
         }else {
           page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                     Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
                             .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                             .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
+                            .eq(data.getEngScal()!=null,BsSgcSzSafeJbxx::getEngScal,data.getEngScal())
                             .isNull(BsSgcSzSafeJbxx::getExprDate)
                             .likeRight(data.getAdcd() != null , BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
-                            .orderByDesc(BsSgcSzSafeJbxx::getEngScal)
+                            .last("ORDER BY CASE WHEN eng_scal IS NULL OR eng_scal = '' THEN 1 ELSE 0 END, eng_scal ASC")
           );
         }
         return page;

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

@@ -60,6 +60,8 @@ public class BsSgcSzGcda extends BaseEntity
     @ApiModelProperty("除险加固情况")
     private String riskEliminationStatus;
 
+    private String status;
+
     /** 是否为枢纽工程 */
     @Excel(name = "是否为枢纽工程")
     @ApiModelProperty("是否为枢纽工程")

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

@@ -304,6 +304,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
     private String ifSge;
     private String freqin;
     private String wagaOv;
+    private String updateDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date checkDate;

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

@@ -36,13 +36,14 @@ public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGc
         if (projectInfo != null) {
             String projectName = projectInfo.getWagaName();
             String projectType = projectInfo.getWagaType();
-
+            String status = projectInfo.getStatus();
             queryWrapper.isNull("EXPR_DATE");
             queryWrapper.eq(StringUtils.isNotBlank(projectInfo.getAdcd()), "adcd", projectInfo.getAdcd());
             queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
             queryWrapper.like(projectName != null, "waga_name", projectName);
             queryWrapper.like(projectType != null, "waga_type", projectType);
             queryWrapper.likeRight(adcd != null, "ADCD", adcd);
+            queryWrapper.eq(status!=null,"status",status);
 
         }