diff --git a/pom.xml b/pom.xml
index 7c4b97d..53e2f5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
com.bonus
gz_gqj
0.0.1-SNAPSHOT
- aqd
- aqd
+ gz_gqj
+ gz_gqj
org.springframework.boot
diff --git a/src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java b/src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java
deleted file mode 100644
index f47fb12..0000000
--- a/src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.bonus.gzgqj.business.aqgqj;
-
-import lombok.Data;
-
-/**
- * 工器具类型
- * @author 黑子
- */
-@Data
-public class MaTypeVo extends ParentVo {
-
- private String id;
- /**
- * 父节点id
- */
- private String parentId;
- /**
- * 名称
- */
- private String name;
- /**
- * 库存数量
- */
- private String storageNum;
- /**
- * 单位
- */
- private String unitName;
-
- private String isActive;
- /**
- * 备注
- */
- private String remark;
-
- private String level;
- /**
- * 周期
- */
- private String cycle;
-
-
-
-
-}
diff --git a/src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java b/src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java
deleted file mode 100644
index be96217..0000000
--- a/src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.bonus.gzgqj.business.aqgqj;
-
-import lombok.Data;
-
-/**
- * @author 黑子
- */
-@Data
-public class ParentVo {
-
- /**
- * 创建人
- */
- private String creator;
-
- private String createTime;
- /**
- * 修改人
- */
- private String updater;
-
- private String updateTime;
- /**
- * 是否有效 0 正常 1无效
- */
- private String isActive;
- /**
- * 状态
- */
- private String status;
- /**
- * 关键字
- */
- private String keyWord;
-
-}
diff --git a/src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java b/src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java
deleted file mode 100644
index 6f4be01..0000000
--- a/src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.bonus.gzgqj.business.aqgqj;
-
-import lombok.Data;
-
-/**
- * 供应商 管理
- * @author 黑子
- */
-@Data
-public class SupplierVo extends ParentVo{
-
- private String id;
- /**
- * 名称
- */
- private String name;
- /**
- * 编码
- */
- private String code;
- /**
- * 联系人
- */
- private String link;
- /**
- * 联系电话
- */
- private String phone;
-
- private String remark;
-
-
-
-}
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
index a74cfb8..82537a2 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
@@ -68,7 +68,7 @@ public class PartInputController {
List list = service.findByPage(dto);
final int[] num = {1};
list.forEach(vo->{
- if("0".equals(vo.equals(vo.getIsFlag()))){
+ if("0".equals(vo.getIsFlag())){
vo.setIsFlag("否");
}else{
vo.setIsFlag("是");
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyAuditBean.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyAuditBean.java
index d6fcdc0..4588490 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyAuditBean.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyAuditBean.java
@@ -30,7 +30,7 @@ public class PlanApplyAuditBean {
/**
* 工程id
*/
- @Excel(name = "工程名称", width = 12.0, orderNum = "2")
+
private String projectId;
/**
@@ -85,7 +85,8 @@ public class PlanApplyAuditBean {
private String statusType;
-
+
+ @Excel(name = "工程名称", width = 12.0, orderNum = "2")
private String proName;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2bd0ae8..fddd7d2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 配置端口
server:
- port: 21995
+ port: 21520
# servlet:
# context-path: /aqd_screen
max-http-header-size: 10240
@@ -8,22 +8,22 @@ spring:
# 配置数据源
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-# username: root
-# password: zhzadmin@gzimtcs14!
- url: jdbc:mysql://127.0.0.1:3306/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
- username: mroot
- password: bonus@admin123
+ url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+ username: root
+ password: zhzadmin@gzimtcs14!
+# url: jdbc:mysql://127.0.0.1:3306/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+# username: mroot
+# password: bonus@admin123
type: com.alibaba.druid.pool.DruidDataSource
-# redis:
-# host: 192.168.0.14
-# port: 2003
-# password: Fyzbns@Redis123!
-# database: 7
- redis:
- host: 127.0.0.1
- port: 6379
- database: 7
+ redis:
+ host: 192.168.0.14
+ port: 2003
+ password: Fyzbns@Redis123!
+ database: 7
+# redis:
+# host: 127.0.0.1
+# port: 6379
+# database: 7
servlet:
multipart:
max-file-size: -1
diff --git a/src/main/resources/mappers/bases/PaTypeMapper.xml b/src/main/resources/mappers/bases/PaTypeMapper.xml
index 2212b4e..80f5464 100644
--- a/src/main/resources/mappers/bases/PaTypeMapper.xml
+++ b/src/main/resources/mappers/bases/PaTypeMapper.xml
@@ -25,11 +25,11 @@
WHERE is_active=1