From fd4b472d1c1baa22f2c0ee4b040178725768a85a Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 31 Oct 2024 15:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=AE=B0=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QualityInspectionRecordDraftController.java | 2 ++ .../quality/entity/QualityInspectionRecordDraft.java | 6 ++++++ .../XzSecurityQualityInspectionRecordDraftController.java | 3 +++ .../entity/XzSecurityQualityInspectionRecordDraft.java | 6 ++++++ src/main/resources/application-gsx-t-dev.properties | 2 +- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordDraftController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordDraftController.java index 0f8a379d3..ab2206c51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordDraftController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordDraftController.java @@ -74,6 +74,7 @@ public class QualityInspectionRecordDraftController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(QualityInspectionRecordDraft.class, map); Page page = PageUtil.getPage(map); + queryWrapper.lambda().orderByDesc(QualityInspectionRecordDraft::getCreateTime); IPage pageList = qualityInspectionRecordDraftService.page(page, queryWrapper); return Result.success(pageList); } @@ -89,6 +90,7 @@ public class QualityInspectionRecordDraftController { @PostMapping(value = "/list") public Result> queryList(@RequestBody QualityInspectionRecordDraft qualityInspectionRecordDraft) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(qualityInspectionRecordDraft); + queryWrapper.lambda().orderByDesc(QualityInspectionRecordDraft::getCreateTime); List list = qualityInspectionRecordDraftService.list(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java index 1e67f9a5a..767237be9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java @@ -241,4 +241,10 @@ public class QualityInspectionRecordDraft implements Serializable { @Excel(name = "合作单位id", width = 15) @ApiModelProperty(value = "合作单位id") private Long enterpriseId; + /** + * 状态（1：正常；2：已撤回） + */ + @Excel(name = "状态（1：正常；2：已撤回）", width = 15) + @ApiModelProperty(value = "状态（1：正常；2：已撤回）") + private Integer state; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java index 4fb0ede1f..7461f5429 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.xz.security.controller; import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecordDraft; import com.zhgd.xmgl.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -73,6 +74,7 @@ public class XzSecurityQualityInspectionRecordDraftController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzSecurityQualityInspectionRecordDraft.class, map); Page page = PageUtil.getPage(map); + queryWrapper.lambda().orderByDesc(XzSecurityQualityInspectionRecordDraft::getCreateTime); IPage pageList = xzSecurityQualityInspectionRecordDraftService.page(page, queryWrapper); return Result.success(pageList); } @@ -88,6 +90,7 @@ public class XzSecurityQualityInspectionRecordDraftController { @PostMapping(value = "/list") public Result> queryList(@RequestBody XzSecurityQualityInspectionRecordDraft xzSecurityQualityInspectionRecordDraft) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xzSecurityQualityInspectionRecordDraft); + queryWrapper.lambda().orderByDesc(XzSecurityQualityInspectionRecordDraft::getCreateTime); List list = xzSecurityQualityInspectionRecordDraftService.list(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecordDraft.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecordDraft.java index 3dfa5694c..a414f4cd0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecordDraft.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecordDraft.java @@ -253,4 +253,10 @@ public class XzSecurityQualityInspectionRecordDraft implements Serializable { @Excel(name = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路", width = 15) @ApiModelProperty(value = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路") private Integer type; + /** + * 状态（1：正常；2：已撤回） + */ + @Excel(name = "状态（1：正常；2：已撤回）", width = 15) + @ApiModelProperty(value = "状态（1：正常；2：已撤回）") + private Integer state; } diff --git a/src/main/resources/application-gsx-t-dev.properties b/src/main/resources/application-gsx-t-dev.properties index 46f4b415e..013fb9c7c 100644 --- a/src/main/resources/application-gsx-t-dev.properties +++ b/src/main/resources/application-gsx-t-dev.properties @@ -1,6 +1,6 @@ #http.port=30250 http.port=28887 -spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&rewriteBatchedStatements=true +spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_ml_dev?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&rewriteBatchedStatements=true spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)