admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

问题记录调整

Browse Source
This commit is contained in:
pengjie 2024-10-31 15:09:55 +08:00
parent 4d212dff1b
commit fd4b472d1c
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordDraftController.java
View File

@ -74,6 +74,7 @@ public class QualityInspectionRecordDraftController {
public Result<IPage<QualityInspectionRecordDraft>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<QualityInspectionRecordDraft> queryWrapper = QueryGenerator.initPageQueryWrapper(QualityInspectionRecordDraft.class, map);
Page<QualityInspectionRecordDraft> page = PageUtil.getPage(map);
queryWrapper.lambda().orderByDesc(QualityInspectionRecordDraft::getCreateTime);
IPage<QualityInspectionRecordDraft> pageList = qualityInspectionRecordDraftService.page(page, queryWrapper);
return Result.success(pageList);
}
@ -89,6 +90,7 @@ public class QualityInspectionRecordDraftController {
@PostMapping(value = "/list")
public Result<List<QualityInspectionRecordDraft>> queryList(@RequestBody QualityInspectionRecordDraft qualityInspectionRecordDraft) {
QueryWrapper<QualityInspectionRecordDraft> queryWrapper = QueryGenerator.initQueryWrapper(qualityInspectionRecordDraft);
queryWrapper.lambda().orderByDesc(QualityInspectionRecordDraft::getCreateTime);
List<QualityInspectionRecordDraft> list = qualityInspectionRecordDraftService.list(queryWrapper);
return Result.success(list);
}

6
src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java
View File

@ -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;
}

3
src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java
View File

@ -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<IPage<XzSecurityQualityInspectionRecordDraft>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<XzSecurityQualityInspectionRecordDraft> queryWrapper = QueryGenerator.initPageQueryWrapper(XzSecurityQualityInspectionRecordDraft.class, map);
Page<XzSecurityQualityInspectionRecordDraft> page = PageUtil.getPage(map);
queryWrapper.lambda().orderByDesc(XzSecurityQualityInspectionRecordDraft::getCreateTime);
IPage<XzSecurityQualityInspectionRecordDraft> pageList = xzSecurityQualityInspectionRecordDraftService.page(page, queryWrapper);
return Result.success(pageList);
}
@ -88,6 +90,7 @@ public class XzSecurityQualityInspectionRecordDraftController {
@PostMapping(value = "/list")
public Result<List<XzSecurityQualityInspectionRecordDraft>> queryList(@RequestBody XzSecurityQualityInspectionRecordDraft xzSecurityQualityInspectionRecordDraft) {
QueryWrapper<XzSecurityQualityInspectionRecordDraft> queryWrapper = QueryGenerator.initQueryWrapper(xzSecurityQualityInspectionRecordDraft);
queryWrapper.lambda().orderByDesc(XzSecurityQualityInspectionRecordDraft::getCreateTime);
List<XzSecurityQualityInspectionRecordDraft> list = xzSecurityQualityInspectionRecordDraftService.list(queryWrapper);
return Result.success(list);
}

6
src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecordDraft.java
View File

@ -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;
}

2
src/main/resources/application-gsx-t-dev.properties
View File

@ -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==)