diff --git a/docs/databases/supervise_crm.sql b/docs/databases/supervise_crm.sql
index 7cb62146..2c2eafb5 100644
--- a/docs/databases/supervise_crm.sql
+++ b/docs/databases/supervise_crm.sql
@@ -278,3 +278,75 @@ INSERT INTO `supplier_index` VALUES (64, '6151501', '河北君帅商贸有限公
INSERT INTO `supplier_index` VALUES (65, '5154001', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `industry_dictionary`;
+CREATE TABLE `industry_dictionary` (
+ `id` int(0) NOT NULL AUTO_INCREMENT,
+ `sid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL,
+ `industryName` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '行业名称',
+ `lockVersion` int(0) NOT NULL DEFAULT 0 COMMENT '版本锁',
+ `isEnable` int(0) NOT NULL DEFAULT 1 COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int(0) NOT NULL DEFAULT 0 COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `state` int(0) NOT NULL DEFAULT 1 COMMENT '记录状态值',
+ `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+ `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+ `createBySid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+ `updateBysid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+ `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '行业字典表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `project_type_dictionary`;
+CREATE TABLE `project_type_dictionary` (
+ `id` int(0) NOT NULL AUTO_INCREMENT,
+ `sid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL,
+ `projectType` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '项目类型',
+ `lockVersion` int(0) NOT NULL DEFAULT 0 COMMENT '版本锁',
+ `isEnable` int(0) NOT NULL DEFAULT 1 COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int(0) NOT NULL DEFAULT 0 COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `state` int(0) NOT NULL DEFAULT 1 COMMENT '记录状态值',
+ `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+ `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+ `createBySid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+ `updateBysid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+ `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '项目类字典表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `project_information`;
+CREATE TABLE `project_information` (
+ `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+ `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+ `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+ `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+ `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用:1可用,0不可用',
+ `state` int(0) NULL DEFAULT 1 COMMENT '状态',
+ `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目说明',
+ `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
+ `entryName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '项目名称',
+ `engaDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '接洽日期',
+ `creditLimit` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '授信额度',
+ `signingDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '签约日期',
+ `endDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '结束日期',
+ `regulatoryLeader` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '监管负责人',
+ `generalManager` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '事业部总经理',
+ `fillInDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '填表日期',
+ `bankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行sid',
+ `managerSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行负责人sid',
+ `enterpriseSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '企业sid',
+ `industrySid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '行业sid',
+ `typeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '项目类型sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '项目信息表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java
index 4f496631..73d3dbd3 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java
@@ -14,4 +14,5 @@ public class IndustryDictionaryDto implements Dto {
private String industryName;
private String id;
private String sid;
+ private String remarks;
}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java
index e211b0d9..00f45ca0 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java
@@ -14,4 +14,5 @@ public class IndustryDictionaryVo implements Vo {
private String industryName;
private String id;
private String sid;
+ private String remarks;
}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java
index e217237b..2f37cb7d 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java
@@ -14,4 +14,5 @@ public class ProjectTypeDictionaryDto implements Dto {
private String typeName;
private String id;
private String sid;
+ private String remarks;
}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java
index 29e3d566..e89f6be0 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java
@@ -14,4 +14,5 @@ public class ProjectTypeDictionaryVo implements Vo {
private String typeName;
private String id;
private String sid;
+ private String remarks;
}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml
index 642ef206..f2405543 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml
@@ -7,7 +7,7 @@
SELECT
*
FROM
- project_type_dictionary
+ industry_dictionary
${ew.sqlSegment}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java
index b77cab72..1b06a559 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -26,13 +27,9 @@ public class IndustryDictionaryService extends MybatisBaseService listPageVo(PagerQuery pq) {
IndustryDictionaryQuery query = pq.getParams();
QueryWrapper qw = new QueryWrapper<>();
-// if(StringUtils.isNotBlank(query.getEnterpriseName())){
-// qw.like("enterpriseName",query.getEnterpriseName());
-// }
-// if(StringUtils.isNotBlank(query.getTelephone())){
-// qw.like("telephone",query.getTelephone());
-// }
-
+ if(StringUtils.isNotBlank(query.getIndustryName())){
+ qw.like("industryName",query.getIndustryName());
+ }
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
PagerVo p = PagerUtil.pageToVo(pagging, null);
@@ -47,7 +44,7 @@ public class IndustryDictionaryService extends MybatisBaseService().eq("sid",sid));
- return rb.success().setMsg("删除仓库信息成功");
+ return rb.success().setMsg("删除项目所属行业成功");
}
}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml
index 181a1e52..a2c79877 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml
@@ -5,7 +5,7 @@