张延森 3 年前
父节点
当前提交
75d078a51e

+ 16
- 0
src/main/java/com/yunzhi/marketing/controller/TaBuildingProjectTypeController.java 查看文件

4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.yunzhi.marketing.base.ResponseBean;
6
 import com.yunzhi.marketing.base.ResponseBean;
7
+import com.yunzhi.marketing.common.CommConstant;
7
 import com.yunzhi.marketing.entity.TaBuildingProjectType;
8
 import com.yunzhi.marketing.entity.TaBuildingProjectType;
9
+import com.yunzhi.marketing.entity.TdBuildingType;
8
 import com.yunzhi.marketing.service.ITaBuildingProjectTypeService;
10
 import com.yunzhi.marketing.service.ITaBuildingProjectTypeService;
9
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
11
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
10
 import com.yunzhi.marketing.service.ITaPersonService;
12
 import com.yunzhi.marketing.service.ITaPersonService;
11
 import com.yunzhi.marketing.base.BaseController;
13
 import com.yunzhi.marketing.base.BaseController;
14
+import com.yunzhi.marketing.service.ITdBuildingTypeService;
12
 import org.slf4j.Logger;
15
 import org.slf4j.Logger;
13
 import org.slf4j.LoggerFactory;
16
 import org.slf4j.LoggerFactory;
14
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.beans.factory.annotation.Autowired;
43
     @Autowired
46
     @Autowired
44
     private ITaPersonService iTaPersonService;
47
     private ITaPersonService iTaPersonService;
45
 
48
 
49
+    @Autowired
50
+    private ITdBuildingTypeService iTdBuildingTypeService;
51
+
46
 
52
 
47
     /**
53
     /**
48
      * 分页查询列表
54
      * 分页查询列表
78
     public ResponseBean taBuildingProjectTypeAdd(@RequestBody TaBuildingProjectType taBuildingProjectType){
84
     public ResponseBean taBuildingProjectTypeAdd(@RequestBody TaBuildingProjectType taBuildingProjectType){
79
         ResponseBean responseBean = new ResponseBean();
85
         ResponseBean responseBean = new ResponseBean();
80
         try {
86
         try {
87
+            TdBuildingType dict = iTdBuildingTypeService.getById(taBuildingProjectType.getBuildingTypeId());
88
+            if (dict != null) {
89
+                taBuildingProjectType.setBuildingTypeName(dict.getBuildingTypeName());
90
+            }
91
+
81
             if (iTaBuildingProjectTypeService.save(taBuildingProjectType)){
92
             if (iTaBuildingProjectTypeService.save(taBuildingProjectType)){
82
                 responseBean.addSuccess(taBuildingProjectType);
93
                 responseBean.addSuccess(taBuildingProjectType);
83
             }else {
94
             }else {
122
                                         @RequestBody TaBuildingProjectType taBuildingProjectType){
133
                                         @RequestBody TaBuildingProjectType taBuildingProjectType){
123
         ResponseBean responseBean = new ResponseBean();
134
         ResponseBean responseBean = new ResponseBean();
124
         try {
135
         try {
136
+            TdBuildingType dict = iTdBuildingTypeService.getById(taBuildingProjectType.getBuildingTypeId());
137
+            if (dict != null) {
138
+                taBuildingProjectType.setBuildingTypeName(dict.getBuildingTypeName());
139
+            }
140
+
125
             if (iTaBuildingProjectTypeService.updateById(taBuildingProjectType)){
141
             if (iTaBuildingProjectTypeService.updateById(taBuildingProjectType)){
126
                 responseBean.addSuccess(taBuildingProjectType);
142
                 responseBean.addSuccess(taBuildingProjectType);
127
             }else {
143
             }else {

+ 1
- 1
src/main/resources/application-prod.yml 查看文件

6
   datasource:
6
   datasource:
7
     username: marketing
7
     username: marketing
8
     password: u@cSFJ5*kS9hGP7a
8
     password: u@cSFJ5*kS9hGP7a
9
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
9
+    url: jdbc:mysql://210.13.107.60:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10
     driver-class-name: com.mysql.cj.jdbc.Driver
10
     driver-class-name: com.mysql.cj.jdbc.Driver
11
     initial-size: 10 # 初始化连接数
11
     initial-size: 10 # 初始化连接数
12
     max-active: 20 # 最大连接数
12
     max-active: 20 # 最大连接数