From 3e2efe16950340bd6c71605b0f1e036199659f69 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Thu, 29 Apr 2021 11:51:29 +0800 Subject: [PATCH 1/8] Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/resources/static/assets/images/backgrounds/1.jpg # src/main/resources/static/assets/images/backgrounds/2.jpg # src/main/resources/static/assets/images/backgrounds/3.jpg # src/main/resources/static/assets/images/backgrounds/4.jpg # src/main/resources/static/assets/images/backgrounds/5.jpg # src/main/resources/static/assets/images/backgrounds/6.jpg # src/main/resources/static/assets/images/backgrounds/7.jpg # src/main/resources/static/assets/images/backgrounds/8.jpg # src/main/resources/static/assets/images/backgrounds/9.jpg # src/main/resources/static/assets/js/dialog.js # src/main/resources/static/assets/js/vendor/ckplayer/ckplayer/ckplayer.js # src/main/resources/static/assets/js/vendor/ueditor/lang/zh-cn/images/localimage.png # src/main/resources/static/assets/js/vendor/ueditor/themes/default/css/ueditor.css # src/main/resources/static/assets/js/vendor/ueditor/themes/default/css/ueditor.min.css # src/main/resources/static/assets/js/vendor/ueditor/themes/iframe.css # src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js # src/main/resources/static/assets/layuiadmin/config.js # src/main/resources/static/assets/layuiadmin/layui/lay/modules/form.js # src/main/resources/static/assets/layuiadmin/lib/admin.js # src/main/resources/static/assets/layuiadmin/modules/common.js # src/main/resources/static/assets/layuiadmin/modules/dialog.js # src/main/resources/static/assets/layuiadmin/modules/restajax.js # src/main/resources/static/assets/layuiadmin/style/admin.css # src/main/resources/static/assets/layuiadmin/style/login.css # src/main/resources/static/default.html --- .../InstitutionRouteController.java | 4 + .../dao/institution/IInstitutionDao.java | 7 +- .../impl/InstitutionServiceImpl.java | 13 +- .../mapper/institution/institution-mapper.xml | 8 +- .../templates/baidumap/map-baidu.html | 275 ++++++++++++++++++ .../templates/institution/list.html | 0 .../templates/institution/save.html | 45 ++- .../templates/institution/update.html | 0 8 files changed, 323 insertions(+), 29 deletions(-) create mode 100644 module-institution-management/src/main/resources/templates/baidumap/map-baidu.html rename module-institution-management/src/main/resources/{mybatis => }/templates/institution/list.html (100%) rename module-institution-management/src/main/resources/{mybatis => }/templates/institution/save.html (93%) rename module-institution-management/src/main/resources/{mybatis => }/templates/institution/update.html (100%) diff --git a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/route/institution/InstitutionRouteController.java b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/route/institution/InstitutionRouteController.java index 47e965a..12aeaab 100644 --- a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/route/institution/InstitutionRouteController.java +++ b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/route/institution/InstitutionRouteController.java @@ -39,4 +39,8 @@ public class InstitutionRouteController extends DefaultBaseController { return new ModelAndView("institution/list"); } + @GetMapping("baidumap") + public ModelAndView baiDuMap(){return new ModelAndView("baidumap/map-baidu.html");} + + } \ No newline at end of file diff --git a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/dao/institution/IInstitutionDao.java b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/dao/institution/IInstitutionDao.java index b31d769..e5a720e 100644 --- a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/dao/institution/IInstitutionDao.java +++ b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/dao/institution/IInstitutionDao.java @@ -1,12 +1,13 @@ package cn.com.tenlion.institutionmanagement.dao.institution; +import cn.com.tenlion.institutionmanagement.pojo.bos.institution.InstitutionBO; +import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; +import cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.institution.InstitutionBO; -import cn.com.tenlion.pojo.pos.institution.InstitutionPO; -import cn.com.tenlion.pojo.dtos.institution.InstitutionDTO; + import org.springframework.stereotype.Repository; import java.util.List; diff --git a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java index fa1a9b1..11e55af 100644 --- a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java +++ b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java @@ -1,17 +1,18 @@ package cn.com.tenlion.institutionmanagement.service.institution.impl; +import cn.com.tenlion.institutionmanagement.dao.institution.IInstitutionDao; +import cn.com.tenlion.institutionmanagement.pojo.bos.institution.InstitutionBO; +import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; +import cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO; +import cn.com.tenlion.institutionmanagement.pojo.vos.institution.InstitutionVO; +import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import cn.com.tenlion.dao.institution.IInstitutionDao; -import cn.com.tenlion.pojo.dtos.institution.InstitutionDTO; -import cn.com.tenlion.pojo.vos.institution.InstitutionVO; -import cn.com.tenlion.pojo.bos.institution.InstitutionBO; -import cn.com.tenlion.pojo.pos.institution.InstitutionPO; -import cn.com.tenlion.service.institution.IInstitutionService; + import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml index a3c64ba..d8c6126 100644 --- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml +++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml @@ -1,8 +1,8 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/module-institution-management/src/main/resources/templates/baidumap/map-baidu.html b/module-institution-management/src/main/resources/templates/baidumap/map-baidu.html new file mode 100644 index 0000000..0137699 --- /dev/null +++ b/module-institution-management/src/main/resources/templates/baidumap/map-baidu.html @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + + + +
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + \ No newline at end of file diff --git a/module-institution-management/src/main/resources/mybatis/templates/institution/list.html b/module-institution-management/src/main/resources/templates/institution/list.html similarity index 100% rename from module-institution-management/src/main/resources/mybatis/templates/institution/list.html rename to module-institution-management/src/main/resources/templates/institution/list.html diff --git a/module-institution-management/src/main/resources/mybatis/templates/institution/save.html b/module-institution-management/src/main/resources/templates/institution/save.html similarity index 93% rename from module-institution-management/src/main/resources/mybatis/templates/institution/save.html rename to module-institution-management/src/main/resources/templates/institution/save.html index 864a713..588acbb 100644 --- a/module-institution-management/src/main/resources/mybatis/templates/institution/save.html +++ b/module-institution-management/src/main/resources/templates/institution/save.html @@ -10,6 +10,14 @@ +
@@ -64,22 +72,12 @@
-
+
- -
-
-
- -
- -
-
-
- -
- + + +
@@ -101,7 +99,7 @@
- +
@@ -367,7 +368,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.institution_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -385,6 +386,7 @@ #{institutionIds[${index}]} + ORDER BY t1.gmt_create DESC @@ -417,7 +419,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.institution_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -435,6 +437,7 @@ #{institutionIds[${index}]} + ORDER BY t1.gmt_create DESC diff --git a/module-institution-management/src/main/resources/templates/institution/list.html b/module-institution-management/src/main/resources/templates/institution/list.html index e3dcd0e..eb960f3 100644 --- a/module-institution-management/src/main/resources/templates/institution/list.html +++ b/module-institution-management/src/main/resources/templates/institution/list.html @@ -9,6 +9,7 @@ +
@@ -86,6 +87,26 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, + {field: 'institutionImage', width: 180, title: '机构图片', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + var value='
    '; + var datas = rowData.split(','); + for(var i = 0, item = datas[i]; item = datas[i++];) { + value += '
  • 图片1
    • '; + } + value += '
'; + setTimeout(function() { + new Viewer(document.getElementById("viewer"),{ + loop:true + }); + }, 50); + return value; + } + }, {field: 'institutionName', width: 180, title: '机构名称', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -104,24 +125,7 @@ return rowData; } }, - {field: 'institutionImage', width: 180, title: '机构图片', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - var downloadFile = ''; - var datas = rowData.split(','); - for(var i = 0, item = datas[i]; item = datas[i++];) { - if(downloadFile.length > 0) { - downloadFile += ' | '; - } - downloadFile += '点击下载' - } - return downloadFile; - } - }, - {field: 'institutionAddress', width: 180, title: '机构详情地址', align:'center', + {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -157,69 +161,6 @@ return rowData; } }, - {field: 'institutionRegionProvince', width: 180, title: '行政区划-省', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'institutionRegionCity', width: 180, title: '行政区化-市', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'institutionRegionArea', width: 180, title: '行政区化-区', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'institutionRegionVillage', width: 180, title: '行政区化-村', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'institutionRegionStreet', width: 180, title: '行政区化-街', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'creator', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtCreate', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, ] ], page: true, diff --git a/module-institution-management/src/main/resources/templates/institution/save.html b/module-institution-management/src/main/resources/templates/institution/save.html index 588acbb..2bf6464 100644 --- a/module-institution-management/src/main/resources/templates/institution/save.html +++ b/module-institution-management/src/main/resources/templates/institution/save.html @@ -12,10 +12,16 @@ @@ -72,14 +78,6 @@
-
- -
- - - -
-
@@ -101,31 +99,44 @@
-
-
-
- +
-
+
+ +
+ + + +
+
+
+
+
+
+
@@ -138,6 +149,7 @@
+ @@ -155,6 +167,7 @@ var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; + var dictId = 'cce46439-d5de-4687-8a9b-cb22817daad5'; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); @@ -276,6 +289,8 @@ function initData() { initInstitutionImageUploadFile(); initInstitutionFoundingTimeDateTime(); + initMap('109.85017859252311', '40.66017700460503'); + initDataDict(dictId,'institutionRegionProvince'); } initData(); @@ -312,20 +327,86 @@ closeBox(); }); - - $("#institutionAddress").on('click',function () { - layer.open({ - type: 2, - title: false, - closeBtn: 0, - area: ['50%', '50%'], - shadeClose: true, - anim: 2, - content: top.restAjax.path('route/institution/baidumap', []), - end: function() { - - } + //初始化百度地图 + function initMap(longitude, latitude) { + map = new BMap.Map("mapContainer", {enableMapClick: false,}); + var point = new BMap.Point(longitude, latitude); + map.centerAndZoom(point, 13); + map.disableDoubleClickZoom(); + map.addControl(new BMap.NavigationControl()); + map.addControl(new BMap.ScaleControl()); + map.addControl(new BMap.OverviewMapControl()); + map.addControl(new BMap.MapTypeControl()); + map.enableScrollWheelZoom();//启用地图滚轮放大缩小 + map.enableContinuousZoom();//开启缩放平滑 + // 点击获取地址 + var geocoder= new BMap.Geocoder(); + mapMarkPoint(map, point); + map.addEventListener("click", function(e) { + map.clearOverlays(); + $('#institutionX').val(e.point.lng); + $('#institutionY').val(e.point.lat); + point = new BMap.Point(e.point.lng, e.point.lat); + mapMarkPoint(map, point); + geocoder.getLocation(e.point, function(rs) { + $('#institutionAddress').val(rs.address); + }); }); + } + //地图标点 + function mapMarkPoint(map, point) { + var marker = new BMap.Marker(point); + map.addOverlay(marker); + } + + //c初始化数据字典 + function initDataDict(dictId,tabId){ + top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",[dictId]),{},null,function (code,data,args) { + $("#"+tabId).empty(); + var html = ''; + if ('institutionRegionProvince' === tabId){ + html += ''; + } + if ('institutionRegionCity' === tabId){ + html += ''; + } + if ('institutionRegionArea' === tabId){ + html += ''; + } + if ('institutionRegionVillage' === tabId){ + html += ''; + } + if ('institutionRegionStreet' === tabId){ + html += ''; + } + + $.each(data, function (index, item) { + html += ''; + }); + $("#"+tabId).append(html); + form.render('select'); + }); + } + + //省监听事件 + form.on('select(institutionRegionProvince)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionCity'); + }); + //市监听事件 + form.on('select(institutionRegionCity)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionArea'); + }); + //区监听事件 + form.on('select(institutionRegionArea)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionVillage'); + }); + //镇、村监听事件 + form.on('select(institutionRegionVillage)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionStreet'); }); // 校验 diff --git a/module-institution-management/src/main/resources/templates/institution/update.html b/module-institution-management/src/main/resources/templates/institution/update.html index 9dbb122..3e1f3ee 100644 --- a/module-institution-management/src/main/resources/templates/institution/update.html +++ b/module-institution-management/src/main/resources/templates/institution/update.html @@ -10,6 +10,20 @@ +
@@ -64,24 +78,6 @@
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
@@ -101,33 +97,44 @@
- -
- + +
+ +
+
+ +
+
+ +
+
+ +
+
+
- +
- + + +
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+
+
@@ -142,6 +149,7 @@
+ @@ -157,6 +165,7 @@ var laytpl = layui.laytpl; var laydate = layui.laydate; var institutionId = top.restAjax.params(window.location.href).institutionId; + var dictId = 'cce46439-d5de-4687-8a9b-cb22817daad5'; var wangEditor = window.wangEditor; var wangEditorObj = {}; @@ -269,11 +278,11 @@ } // 初始化机构成立时间时间戳 - function initInstitutionFoundingTimeDateTime() { + function initInstitutionFoundingTimeDateTime(v) { laydate.render({ elem: '#institutionFoundingTime', type: 'datetime', - value: new Date(), + value: v, trigger: 'click' }); } @@ -290,7 +299,13 @@ form.val('dataForm', dataFormData); form.render(null, 'dataForm'); initInstitutionImageUploadFile(); - initInstitutionFoundingTimeDateTime(); + initInstitutionFoundingTimeDateTime(data.institutionFoundingTime); + initMap(data.institutionX,data.institutionY); + initDataDict(dictId,'institutionRegionProvince',data.institutionRegionProvince); + initDataDict(data.institutionRegionProvince,'institutionRegionCity',data.institutionRegionCity); + initDataDict(data.institutionRegionCity,'institutionRegionArea',data.institutionRegionArea); + initDataDict(data.institutionRegionArea,'institutionRegionVillage',data.institutionRegionVillage); + initDataDict(data.institutionRegionVillage,'institutionRegionStreet',data.institutionRegionStreet); }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -334,6 +349,99 @@ closeBox(); }); + + //初始化百度地图 + function initMap(longitude, latitude) { + map = new BMap.Map("mapContainer", {enableMapClick: false,}); + var point = new BMap.Point(longitude, latitude); + map.centerAndZoom(point, 13); + map.disableDoubleClickZoom(); + map.addControl(new BMap.NavigationControl()); + map.addControl(new BMap.ScaleControl()); + map.addControl(new BMap.OverviewMapControl()); + map.addControl(new BMap.MapTypeControl()); + map.enableScrollWheelZoom();//启用地图滚轮放大缩小 + map.enableContinuousZoom();//开启缩放平滑 + // 点击获取地址 + var geocoder= new BMap.Geocoder(); + mapMarkPoint(map, point); + map.addEventListener("click", function(e) { + map.clearOverlays(); + $('#institutionX').val(e.point.lng); + $('#institutionY').val(e.point.lat); + point = new BMap.Point(e.point.lng, e.point.lat); + mapMarkPoint(map, point); + geocoder.getLocation(e.point, function(rs) { + $('#institutionAddress').val(rs.address); + }); + }); + } + //地图标点 + function mapMarkPoint(map, point) { + var marker = new BMap.Marker(point); + map.addOverlay(marker); + } + + + //c初始化数据字典 + function initDataDict(dictId,tabId,selectVelue){ + if(dictId == null || dictId == ''){ + return; + } + top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",[dictId]),{},null,function (code,data,args) { + $("#"+tabId).empty(); + var html = ''; + if ('institutionRegionProvince' === tabId){ + html += ''; + } + if ('institutionRegionCity' === tabId){ + html += ''; + } + if ('institutionRegionArea' === tabId){ + html += ''; + } + if ('institutionRegionVillage' === tabId){ + html += ''; + } + if ('institutionRegionStreet' === tabId){ + html += ''; + } + + $.each(data, function (index, item) { + if(selectVelue == item.dataId){ + html += ''; + }else{ + html += ''; + } + }); + $("#"+tabId).append(html); + form.render('select'); + }); + } + + //省监听事件 + form.on('select(institutionRegionProvince)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionCity'); + }); + //市监听事件 + form.on('select(institutionRegionCity)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionArea'); + }); + //区监听事件 + form.on('select(institutionRegionArea)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionVillage'); + }); + //镇、村监听事件 + form.on('select(institutionRegionVillage)', function(data){ + var v = data.value; + initDataDict(v,'institutionRegionStreet'); + }); + + + // 校验 form.verify({ }); diff --git a/module-organization-management/src/main/resources/templates/organization/list.html b/module-organization-management/src/main/resources/templates/organization/list.html index 76aafbc..8585685 100644 --- a/module-organization-management/src/main/resources/templates/organization/list.html +++ b/module-organization-management/src/main/resources/templates/organization/list.html @@ -9,6 +9,7 @@ +
@@ -86,6 +87,26 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, + {field: 'organizationImage', width: 180, title: '组织图片', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + var value='
    '; + var datas = rowData.split(','); + for(var i = 0, item = datas[i]; item = datas[i++];) { + value += '
  • 图片1
    • '; + } + value += '
'; + setTimeout(function() { + new Viewer(document.getElementById("viewer"),{ + loop:true + }); + }, 50); + return value; + } + }, {field: 'organizationName', width: 180, title: '组织名称', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -122,41 +143,7 @@ return rowData; } }, - {field: 'organizationImage', width: 180, title: '组织图片', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - var downloadFile = ''; - var datas = rowData.split(','); - for(var i = 0, item = datas[i]; item = datas[i++];) { - if(downloadFile.length > 0) { - downloadFile += ' | '; - } - downloadFile += '点击下载' - } - return downloadFile; - } - }, - {field: '创建人', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: '创建时间', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, + ] ], page: true, diff --git a/module-organization-management/src/main/resources/templates/organization/save.html b/module-organization-management/src/main/resources/templates/organization/save.html index a74efad..662c13a 100644 --- a/module-organization-management/src/main/resources/templates/organization/save.html +++ b/module-organization-management/src/main/resources/templates/organization/save.html @@ -10,6 +10,20 @@ +
diff --git a/module-organization-management/src/main/resources/templates/organization/update.html b/module-organization-management/src/main/resources/templates/organization/update.html index f6a56d2..1fce0ac 100644 --- a/module-organization-management/src/main/resources/templates/organization/update.html +++ b/module-organization-management/src/main/resources/templates/organization/update.html @@ -10,6 +10,20 @@ +
From 7feb7ef3c8c4e86e0598c6c8a4eef50e17ce4fbc Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 10:58:41 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/institution/InstitutionApi.java | 112 +++++++++++++++++ .../service/organization/OrganizationApi.java | 117 ++++++++++++++++++ module-institution-management/pom.xml | 3 + .../institution/IInstitutionService.java | 0 .../impl/InstitutionServiceImpl.java | 4 +- .../resources/templates/institution/list.html | 39 +++--- .../resources/templates/institution/save.html | 22 ++-- .../templates/institution/update.html | 30 +++-- .../organization/OrganizationController.java | 3 +- .../OrganizationRouteController.java | 6 - .../organization/IOrganizationService.java | 0 .../impl/OrganizationServiceImpl.java | 9 +- .../templates/organization/save.html | 4 +- .../templates/organization/update.html | 4 +- .../pojo/vos/institution/InstitutionVO.java | 1 - .../pojo/vos/organization/OrganizationVO.java | 1 - 16 files changed, 293 insertions(+), 62 deletions(-) create mode 100644 interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/InstitutionApi.java create mode 100644 interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/OrganizationApi.java rename {interface-institution-management => module-institution-management}/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java (100%) rename {interface-organization-management => module-organization-management}/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java (100%) diff --git a/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/InstitutionApi.java b/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/InstitutionApi.java new file mode 100644 index 0000000..cf613ef --- /dev/null +++ b/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/InstitutionApi.java @@ -0,0 +1,112 @@ +package cn.com.tenlion.institutionmanagement.service.institution; + +import cn.com.tenlion.institutionmanagement.pojo.bos.institution.InstitutionBO; +import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; +import cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO; +import cn.com.tenlion.institutionmanagement.pojo.vos.institution.InstitutionVO; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; + + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IInstitutionService + * @Description: 机构管理 + * @Author: CodeFactory + * @Date: 2021-04-28 17:58:49 + * @Version: 3.0 + **/ +public interface InstitutionApi { + + + /** + * 机构管理详情 + * + * @param params 参数Map + * @return + */ + InstitutionDTO get(Map params); + + /** + * 机构管理详情 + * + * @param institutionId + * @return + */ + InstitutionDTO get(String institutionId); + + /** + * 机构管理详情 + * + * @param params 参数Map + * @return + */ + InstitutionBO getBO(Map params); + + /** + * 机构管理详情 + * + * @param institutionId + * @return + */ + InstitutionBO getBO(String institutionId); + + /** + * 机构管理详情 + * + * @param params 参数Map + * @return + */ + InstitutionPO getPO(Map params); + + /** + * 机构管理详情 + * + * @param institutionId + * @return + */ + InstitutionPO getPO(String institutionId); + + /** + * 机构管理列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 机构管理列表 + * + * @param params + * @return + */ + List listBO(Map params); + + /** + * 机构管理列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 机构管理分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 机构管理统计 + * + * @param params + * @return + */ + Integer count(Map params); + +} \ No newline at end of file diff --git a/interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/OrganizationApi.java b/interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/OrganizationApi.java new file mode 100644 index 0000000..98a406c --- /dev/null +++ b/interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/OrganizationApi.java @@ -0,0 +1,117 @@ +package cn.com.tenlion.organizationmanagement.service.organization; + +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; +import cn.com.tenlion.organizationmanagement.pojo.vos.organization.OrganizationVO; +import cn.com.tenlion.organizationmanagement.pojo.bos.organization.OrganizationBO; +import cn.com.tenlion.organizationmanagement.pojo.pos.organization.OrganizationPO; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IOrganizationService + * @Description: 组织管理 + * @Author: CodeFactory + * @Date: 2021-04-28 11:06:42 + * @Version: 3.0 + **/ +public interface OrganizationApi { + + + + + + + + + /** + * 组织管理详情 + * + * @param params 参数Map + * @return + */ + OrganizationDTO get(Map params); + + /** + * 组织管理详情 + * + * @param organizationId + * @return + */ + OrganizationDTO get(String organizationId); + + /** + * 组织管理详情 + * + * @param params 参数Map + * @return + */ + OrganizationBO getBO(Map params); + + /** + * 组织管理详情 + * + * @param organizationId + * @return + */ + OrganizationBO getBO(String organizationId); + + /** + * 组织管理详情 + * + * @param params 参数Map + * @return + */ + OrganizationPO getPO(Map params); + + /** + * 组织管理详情 + * + * @param organizationId + * @return + */ + OrganizationPO getPO(String organizationId); + + /** + * 组织管理列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 组织管理列表 + * + * @param params + * @return + */ + List listBO(Map params); + + /** + * 组织管理列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 组织管理分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 组织管理统计 + * + * @param params + * @return + */ + Integer count(Map params); + +} \ No newline at end of file diff --git a/module-institution-management/pom.xml b/module-institution-management/pom.xml index a3b6b01..44c1e2e 100644 --- a/module-institution-management/pom.xml +++ b/module-institution-management/pom.xml @@ -18,6 +18,7 @@ interface-institution-management 1.0-SNAPSHOT + ink.wgink module-dictionary @@ -25,6 +26,8 @@ compile + + diff --git a/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java similarity index 100% rename from interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java rename to module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java diff --git a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java index 11e55af..c80b296 100644 --- a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java +++ b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java @@ -6,9 +6,9 @@ import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO import cn.com.tenlion.institutionmanagement.pojo.pos.institution.InstitutionPO; import cn.com.tenlion.institutionmanagement.pojo.vos.institution.InstitutionVO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; +import cn.com.tenlion.institutionmanagement.service.institution.InstitutionApi; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; @@ -29,7 +29,7 @@ import java.util.*; * @Version: 3.0 **/ @Service -public class InstitutionServiceImpl extends DefaultBaseService implements IInstitutionService { +public class InstitutionServiceImpl extends DefaultBaseService implements IInstitutionService,InstitutionApi { @Autowired private IInstitutionDao institutionDao; diff --git a/module-institution-management/src/main/resources/templates/institution/list.html b/module-institution-management/src/main/resources/templates/institution/list.html index eb960f3..e9be5b1 100644 --- a/module-institution-management/src/main/resources/templates/institution/list.html +++ b/module-institution-management/src/main/resources/templates/institution/list.html @@ -116,24 +116,6 @@ return rowData; } }, - {field: 'institutionDesc', width: 180, title: '机构描述', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'institutionFoundingTime', width: 180, title: '机构成立时间', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -152,7 +134,7 @@ return rowData; } }, - {field: 'institutionContact', width: 180, title: '机构联系方式', align:'center', + {field: 'institutionContact', width: 250, title: '机构联系方式', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -161,6 +143,25 @@ return rowData; } }, + {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, + {field: 'institutionDesc', width: 180, title: '机构描述', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, + ] ], page: true, diff --git a/module-institution-management/src/main/resources/templates/institution/save.html b/module-institution-management/src/main/resources/templates/institution/save.html index 2bf6464..4a895ce 100644 --- a/module-institution-management/src/main/resources/templates/institution/save.html +++ b/module-institution-management/src/main/resources/templates/institution/save.html @@ -39,7 +39,7 @@
- +
@@ -81,7 +81,7 @@
- +
@@ -110,7 +110,7 @@
@@ -120,12 +120,12 @@
- +
@@ -167,7 +167,7 @@ var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; - var dictId = 'cce46439-d5de-4687-8a9b-cb22817daad5'; + var dictId = '0'; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); @@ -361,7 +361,7 @@ //c初始化数据字典 function initDataDict(dictId,tabId){ - top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",[dictId]),{},null,function (code,data,args) { + top.restAjax.get(top.restAjax.path("api/area/listallbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) { $("#"+tabId).empty(); var html = ''; if ('institutionRegionProvince' === tabId){ @@ -371,17 +371,17 @@ html += ''; } if ('institutionRegionArea' === tabId){ - html += ''; + html += ''; } if ('institutionRegionVillage' === tabId){ - html += ''; + html += ''; } if ('institutionRegionStreet' === tabId){ - html += ''; + html += ''; } $.each(data, function (index, item) { - html += ''; + html += ''; }); $("#"+tabId).append(html); form.render('select'); diff --git a/module-institution-management/src/main/resources/templates/institution/update.html b/module-institution-management/src/main/resources/templates/institution/update.html index 3e1f3ee..a1f98ca 100644 --- a/module-institution-management/src/main/resources/templates/institution/update.html +++ b/module-institution-management/src/main/resources/templates/institution/update.html @@ -39,7 +39,7 @@
- +
@@ -81,7 +81,7 @@
- +
@@ -110,7 +110,7 @@
@@ -120,12 +120,12 @@
- +
@@ -165,7 +165,7 @@ var laytpl = layui.laytpl; var laydate = layui.laydate; var institutionId = top.restAjax.params(window.location.href).institutionId; - var dictId = 'cce46439-d5de-4687-8a9b-cb22817daad5'; + var dictId = '0'; var wangEditor = window.wangEditor; var wangEditorObj = {}; @@ -352,6 +352,10 @@ //初始化百度地图 function initMap(longitude, latitude) { + if (longitude == '' || latitude == ''){ + longitude = '109.85017859252311'; + latitude = '40.66017700460503'; + } map = new BMap.Map("mapContainer", {enableMapClick: false,}); var point = new BMap.Point(longitude, latitude); map.centerAndZoom(point, 13); @@ -388,7 +392,7 @@ if(dictId == null || dictId == ''){ return; } - top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",[dictId]),{},null,function (code,data,args) { + top.restAjax.get(top.restAjax.path("api/area/listallbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) { $("#"+tabId).empty(); var html = ''; if ('institutionRegionProvince' === tabId){ @@ -398,20 +402,20 @@ html += ''; } if ('institutionRegionArea' === tabId){ - html += ''; + html += ''; } if ('institutionRegionVillage' === tabId){ - html += ''; + html += ''; } if ('institutionRegionStreet' === tabId){ - html += ''; + html += ''; } $.each(data, function (index, item) { - if(selectVelue == item.dataId){ - html += ''; + if(selectVelue == item.areaId){ + html += ''; }else{ - html += ''; + html += ''; } }); $("#"+tabId).append(html); diff --git a/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/api/organization/OrganizationController.java b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/api/organization/OrganizationController.java index 178722b..ef9efcb 100644 --- a/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/api/organization/OrganizationController.java +++ b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/api/organization/OrganizationController.java @@ -1,5 +1,6 @@ package cn.com.tenlion.organizationmanagement.controller.api.organization; +import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; @@ -10,7 +11,7 @@ import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import cn.com.tenlion.organizationmanagement.pojo.vos.organization.OrganizationVO; -import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; +import cn.com.tenlion.organizationmanagement.service.organization.OrganizationApi; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/route/organization/OrganizationRouteController.java b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/route/organization/OrganizationRouteController.java index 476bf91..0ffd199 100644 --- a/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/route/organization/OrganizationRouteController.java +++ b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/controller/route/organization/OrganizationRouteController.java @@ -2,16 +2,10 @@ package cn.com.tenlion.organizationmanagement.controller.route.organization; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - /** * @ClassName: OrganizationController * @Description: 组织管理 diff --git a/interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java similarity index 100% rename from interface-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java rename to module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/IOrganizationService.java diff --git a/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/impl/OrganizationServiceImpl.java b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/impl/OrganizationServiceImpl.java index fbecee3..3cba978 100644 --- a/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/impl/OrganizationServiceImpl.java +++ b/module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/impl/OrganizationServiceImpl.java @@ -1,17 +1,18 @@ package cn.com.tenlion.organizationmanagement.service.organization.impl; +import cn.com.tenlion.organizationmanagement.dao.organization.IOrganizationDao; +import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import cn.com.tenlion.organizationmanagement.dao.organization.IOrganizationDao; + import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import cn.com.tenlion.organizationmanagement.pojo.vos.organization.OrganizationVO; import cn.com.tenlion.organizationmanagement.pojo.bos.organization.OrganizationBO; import cn.com.tenlion.organizationmanagement.pojo.pos.organization.OrganizationPO; -import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; +import cn.com.tenlion.organizationmanagement.service.organization.OrganizationApi; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; @@ -30,7 +31,7 @@ import java.util.*; **/ @Primary @Service -public class OrganizationServiceImpl extends DefaultBaseService implements IOrganizationService { +public class OrganizationServiceImpl extends DefaultBaseService implements IOrganizationService,OrganizationApi { @Autowired private IOrganizationDao organizationDao; diff --git a/module-organization-management/src/main/resources/templates/organization/save.html b/module-organization-management/src/main/resources/templates/organization/save.html index 662c13a..4edd1c6 100644 --- a/module-organization-management/src/main/resources/templates/organization/save.html +++ b/module-organization-management/src/main/resources/templates/organization/save.html @@ -39,13 +39,13 @@
- +
- +
diff --git a/module-organization-management/src/main/resources/templates/organization/update.html b/module-organization-management/src/main/resources/templates/organization/update.html index 1fce0ac..163dc52 100644 --- a/module-organization-management/src/main/resources/templates/organization/update.html +++ b/module-organization-management/src/main/resources/templates/organization/update.html @@ -39,13 +39,13 @@
- +
- +
diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java index cd0cea3..5d0e4d1 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java @@ -29,7 +29,6 @@ public class InstitutionVO { @ApiModelProperty(name = "institutionY", value = "机构纬度") private String institutionY; @ApiModelProperty(name = "institutionFoundingTime", value = "机构成立时间") - @CheckEmptyAnnotation(name = "机构成立时间", verifyType = "datetime") private String institutionFoundingTime; @ApiModelProperty(name = "institutionPrincipal", value = "机构负责人") private String institutionPrincipal; diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java index 679044c..fc7ed06 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java @@ -19,7 +19,6 @@ public class OrganizationVO { @ApiModelProperty(name = "organizationName", value = "组织名称") private String organizationName; @ApiModelProperty(name = "organizationUserNum", value = "组织人员数量") - @CheckNumberAnnotation(name = "组织人员数量") private Integer organizationUserNum; @ApiModelProperty(name = "organizationPrincipal", value = "组织负责人") private String organizationPrincipal; From e8c3742e368cdb99e0f99813d448844f0f013c0c Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 11:42:10 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=BA=93=E5=90=8D=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/institution/institution-mapper.xml | 25 +++++++++---------- .../organization/organization-mapper.xml | 22 ++++++++-------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml index 522c580..128b975 100644 --- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml +++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml @@ -70,7 +70,7 @@ - INSERT INTO institution( + INSERT INTO m_institution( institution_id, institution_name, institution_desc, @@ -118,7 +118,7 @@ UPDATE - institution + m_institution SET gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -133,7 +133,7 @@ DELETE FROM - institution + m_institution WHERE institution_id IN @@ -144,7 +144,7 @@ UPDATE - institution + m_institution SET institution_name = #{institutionName}, @@ -214,7 +214,7 @@ t1.institution_region_street, t1.institution_id FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 @@ -247,7 +247,7 @@ t1.gmt_modified, t1.is_delete FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 @@ -280,7 +280,7 @@ t1.gmt_modified, t1.is_delete FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 @@ -308,10 +308,9 @@ t1.institution_region_village, t1.institution_region_street, t1.creator, - t1.gmt_create, - 1 + t1.gmt_create FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 @@ -362,7 +361,7 @@ t1.gmt_modified, t1.is_delete FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 @@ -413,7 +412,7 @@ t1.gmt_modified, t1.is_delete FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 @@ -445,7 +444,7 @@ SELECT COUNT(*) FROM - institution t1 + m_institution t1 WHERE t1.is_delete = 0 diff --git a/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml b/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml index d6f3a9a..82dc51c 100644 --- a/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml +++ b/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml @@ -43,7 +43,7 @@ - INSERT INTO organization( + INSERT INTO m_organization( organization_id, organization_name, organization_user_num, @@ -73,7 +73,7 @@ UPDATE - organization + m_organization SET gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -88,7 +88,7 @@ DELETE FROM - organization + m_organization WHERE organization_id IN @@ -99,7 +99,7 @@ UPDATE - organization + m_organization SET organization_name = #{organizationName}, organization_user_num = #{organizationUserNum}, @@ -122,7 +122,7 @@ t1.organization_image, t1.organization_id FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 @@ -146,7 +146,7 @@ t1.gmt_modified, t1.is_delete FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 @@ -170,7 +170,7 @@ t1.gmt_modified, t1.is_delete FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 @@ -191,7 +191,7 @@ t1.creator, t1.gmt_create FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 @@ -233,7 +233,7 @@ t1.gmt_modified, t1.is_delete FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 @@ -275,7 +275,7 @@ t1.gmt_modified, t1.is_delete FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 @@ -307,7 +307,7 @@ SELECT COUNT(*) FROM - organization t1 + m_organization t1 WHERE t1.is_delete = 0 From 46092e1864b5c8a70be943a9033122bfff4cc514 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 15:19:34 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/institution/institution-mapper.xml | 25 +++++++++++++++++++ .../pojo/bos/institution/InstitutionBO.java | 8 ++++++ .../pojo/dtos/institution/InstitutionDTO.java | 12 +++++++-- .../pojo/pos/institution/InstitutionPO.java | 8 ++++++ .../pojo/vos/institution/InstitutionVO.java | 8 ++++++ 5 files changed, 59 insertions(+), 2 deletions(-) diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml index 128b975..48790d3 100644 --- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml +++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml @@ -18,6 +18,7 @@ + @@ -38,6 +39,7 @@ + @@ -61,6 +63,7 @@ + @@ -86,6 +89,7 @@ institution_region_area, institution_region_village, institution_region_street, + institution_type, creator, gmt_create, modifier, @@ -107,6 +111,7 @@ #{institutionRegionArea}, #{institutionRegionVillage}, #{institutionRegionStreet}, + #{institutionType} #{creator}, #{gmtCreate}, #{modifier}, @@ -187,6 +192,9 @@ institution_region_street = #{institutionRegionStreet}, + + + institution_type = #{institutionType}, gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -212,6 +220,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.institution_id FROM m_institution t1 @@ -241,6 +250,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create, t1.modifier, @@ -274,6 +284,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create, t1.modifier, @@ -307,6 +318,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create FROM @@ -334,6 +346,10 @@ #{institutionIds[${index}]} + + AND + t1.institution_type = #{institutionType} + ORDER BY t1.gmt_create DESC @@ -355,6 +371,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create, t1.modifier, @@ -385,6 +402,10 @@ #{institutionIds[${index}]} + + AND + t1.institution_type = #{institutionType} + ORDER BY t1.gmt_create DESC @@ -436,6 +457,10 @@ #{institutionIds[${index}]} + + AND + t1.institution_type = #{institutionType} + ORDER BY t1.gmt_create DESC diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java index efeeb71..f64a5b2 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java @@ -25,6 +25,7 @@ public class InstitutionBO { private String institutionRegionArea; private String institutionRegionVillage; private String institutionRegionStreet; + private String institutionType; private String creator; private String gmtCreate; private String modifier; @@ -192,4 +193,11 @@ public class InstitutionBO { } + public String getInstitutionType() { + return institutionType; + } + + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java index 141c49e..1d4cb6d 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java @@ -44,9 +44,11 @@ public class InstitutionDTO { private String institutionRegionVillage; @ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街") private String institutionRegionStreet; - @ApiModelProperty(name = "creator", value = "") + @ApiModelProperty(name = "institutionType", value = "机构类型") + private String institutionType; + @ApiModelProperty(name = "creator", value = "创建人") private String creator; - @ApiModelProperty(name = "gmtCreate", value = "") + @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; public String getInstitutionId() { @@ -185,5 +187,11 @@ public class InstitutionDTO { this.gmtCreate = gmtCreate; } + public String getInstitutionType() { + return institutionType; + } + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java index 8ed15b3..b1399af 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java @@ -25,6 +25,7 @@ public class InstitutionPO { private String institutionRegionArea; private String institutionRegionVillage; private String institutionRegionStreet; + private String institutionType; private String creator; private String gmtCreate; private String modifier; @@ -192,4 +193,11 @@ public class InstitutionPO { } + public String getInstitutionType() { + return institutionType; + } + + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java index 5d0e4d1..ce3747d 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java @@ -44,6 +44,8 @@ public class InstitutionVO { private String institutionRegionVillage; @ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街") private String institutionRegionStreet; + @ApiModelProperty(name = "institutionType", value = "机构类型") + private String institutionType; public String getInstitutionName() { return institutionName == null ? "" : institutionName.trim(); @@ -157,5 +159,11 @@ public class InstitutionVO { this.institutionRegionStreet = institutionRegionStreet; } + public String getInstitutionType() { + return institutionType; + } + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } From 9ae0b4306ac43aed56ec577a2535e427109e046a Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 16:13:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/institution/save.html | 5 ++++- .../src/main/resources/templates/institution/update.html | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/module-institution-management/src/main/resources/templates/institution/save.html b/module-institution-management/src/main/resources/templates/institution/save.html index 4a895ce..9262cc3 100644 --- a/module-institution-management/src/main/resources/templates/institution/save.html +++ b/module-institution-management/src/main/resources/templates/institution/save.html @@ -361,7 +361,10 @@ //c初始化数据字典 function initDataDict(dictId,tabId){ - top.restAjax.get(top.restAjax.path("api/area/listallbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) { + if(!dictId){ + return; + } + top.restAjax.get(top.restAjax.path("api/area/listbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) { $("#"+tabId).empty(); var html = ''; if ('institutionRegionProvince' === tabId){ diff --git a/module-institution-management/src/main/resources/templates/institution/update.html b/module-institution-management/src/main/resources/templates/institution/update.html index a1f98ca..2cdc2e6 100644 --- a/module-institution-management/src/main/resources/templates/institution/update.html +++ b/module-institution-management/src/main/resources/templates/institution/update.html @@ -389,10 +389,10 @@ //c初始化数据字典 function initDataDict(dictId,tabId,selectVelue){ - if(dictId == null || dictId == ''){ + if(!dictId){ return; } - top.restAjax.get(top.restAjax.path("api/area/listallbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) { + top.restAjax.get(top.restAjax.path("api/area/listbyparentid/{areaParentId}",[dictId]),{},null,function (code,data,args) { $("#"+tabId).empty(); var html = ''; if ('institutionRegionProvince' === tabId){ From 1d41114ea875e058fde4c7e0bec2dc6c3ede2818 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 16:29:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/institution/institution-mapper.xml | 2 +- .../resources/templates/institution/save.html | 27 +++++++++---------- .../templates/institution/update.html | 26 +++++++++--------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml index 48790d3..ac236f0 100644 --- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml +++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml @@ -111,7 +111,7 @@ #{institutionRegionArea}, #{institutionRegionVillage}, #{institutionRegionStreet}, - #{institutionType} + #{institutionType}, #{creator}, #{gmtCreate}, #{modifier}, diff --git a/module-institution-management/src/main/resources/templates/institution/save.html b/module-institution-management/src/main/resources/templates/institution/save.html index 9262cc3..76ee6cb 100644 --- a/module-institution-management/src/main/resources/templates/institution/save.html +++ b/module-institution-management/src/main/resources/templates/institution/save.html @@ -36,18 +36,6 @@
-
- -
- -
-
-
- -
- -
-
@@ -78,12 +66,24 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -195,7 +195,6 @@ } return; } - top.restAjax.get(top.restAjax.path('api/file/list', []), { ids: ids }, null, function(code, data) { @@ -279,7 +278,7 @@ function initInstitutionFoundingTimeDateTime() { laydate.render({ elem: '#institutionFoundingTime', - type: 'datetime', + type: 'date', trigger: 'click' }); } diff --git a/module-institution-management/src/main/resources/templates/institution/update.html b/module-institution-management/src/main/resources/templates/institution/update.html index 2cdc2e6..ae290e4 100644 --- a/module-institution-management/src/main/resources/templates/institution/update.html +++ b/module-institution-management/src/main/resources/templates/institution/update.html @@ -36,18 +36,6 @@
-
- -
- -
-
-
- -
- -
-
@@ -78,12 +66,24 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -281,7 +281,7 @@ function initInstitutionFoundingTimeDateTime(v) { laydate.render({ elem: '#institutionFoundingTime', - type: 'datetime', + type: 'date', value: v, trigger: 'click' }); From 1f86fc9a17c0f7b182b928c4543c8c2b7c4f3a90 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 17:47:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/institution/institution-mapper.xml | 55 +++++-------------- .../organization/organization-mapper.xml | 44 ++++++++++++--- .../pojo/bos/organization/OrganizationBO.java | 8 +++ .../dtos/organization/OrganizationDTO.java | 13 ++++- .../pojo/pos/organization/OrganizationPO.java | 8 +++ .../pojo/vos/organization/OrganizationVO.java | 8 +++ 6 files changed, 84 insertions(+), 52 deletions(-) diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml index ac236f0..30238c1 100644 --- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml +++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml @@ -154,51 +154,24 @@ institution_name = #{institutionName}, - - institution_desc = #{institutionDesc}, - - - institution_image = #{institutionImage}, - - - institution_address = #{institutionAddress}, - - - institution_x = #{institutionX}, - - - institution_y = #{institutionY}, - - - institution_founding_time = #{institutionFoundingTime}, - - - institution_principal = #{institutionPrincipal}, - - - institution_contact = #{institutionContact}, - - - institution_region_province = #{institutionRegionProvince}, - - - institution_region_city = #{institutionRegionCity}, - - - institution_region_area = #{institutionRegionArea}, - - - institution_region_village = #{institutionRegionVillage}, - - - institution_region_street = #{institutionRegionStreet}, - institution_type = #{institutionType}, + institution_desc = #{institutionDesc}, + institution_image = #{institutionImage}, + institution_address = #{institutionAddress}, + institution_x = #{institutionX}, + institution_y = #{institutionY}, + institution_founding_time = #{institutionFoundingTime}, + institution_principal = #{institutionPrincipal}, + institution_contact = #{institutionContact}, + institution_region_province = #{institutionRegionProvince}, + institution_region_city = #{institutionRegionCity}, + institution_region_area = #{institutionRegionArea}, + institution_region_village = #{institutionRegionVillage}, + institution_region_street = #{institutionRegionStreet}, gmt_modified = #{gmtModified}, - modifier = #{modifier}, - institution_id = institution_id + modifier = #{modifier} WHERE institution_id = #{institutionId} diff --git a/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml b/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml index 82dc51c..01726b0 100644 --- a/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml +++ b/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml @@ -9,6 +9,7 @@ + @@ -20,6 +21,7 @@ + @@ -34,6 +36,7 @@ + @@ -50,6 +53,7 @@ organization_principal, organization_desc, organization_image, + organization_type, creator, gmt_create, modifier, @@ -62,6 +66,7 @@ #{organizationPrincipal}, #{organizationDesc}, #{organizationImage}, + #{organizationType}, #{creator}, #{gmtCreate}, #{modifier}, @@ -106,6 +111,9 @@ organization_principal = #{organizationPrincipal}, organization_desc = #{organizationDesc}, organization_image = #{organizationImage}, + + organization_type = #{organizationType}, + gmt_modified = #{gmtModified}, modifier = #{modifier} WHERE @@ -120,15 +128,16 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.organization_id FROM m_organization t1 WHERE t1.is_delete = 0 - - AND + + AND t1.organization_id = #{organizationId} - + @@ -140,6 +149,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -149,10 +159,10 @@ m_organization t1 WHERE t1.is_delete = 0 - - AND + + AND t1.organization_id = #{organizationId} - + @@ -164,6 +174,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -173,10 +184,10 @@ m_organization t1 WHERE t1.is_delete = 0 - - AND + + AND t1.organization_id = #{organizationId} - + @@ -188,6 +199,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create FROM @@ -214,6 +226,10 @@ #{organizationIds[${index}]} + + + AND + t1.organization_type = #{organizationType} ORDER BY t1.gmt_create DESC @@ -227,6 +243,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -257,6 +274,10 @@ #{organizationIds[${index}]} + + AND + t1.organization_type = #{organizationType} + ORDER BY t1.gmt_create DESC @@ -269,6 +290,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -299,6 +321,10 @@ #{organizationIds[${index}]} + + AND + t1.organization_type = #{organizationType} + ORDER BY t1.gmt_create DESC diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java index 82e793d..c895ada 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java @@ -16,6 +16,7 @@ public class OrganizationBO { private String organizationPrincipal; private String organizationDesc; private String organizationImage; + private String organizationType; private String creator; private String gmtCreate; private String modifier; @@ -111,4 +112,11 @@ public class OrganizationBO { } + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } } diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java index ca5e1a8..593debf 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java @@ -26,9 +26,11 @@ public class OrganizationDTO { private String organizationDesc; @ApiModelProperty(name = "organizationImage", value = "组织图片") private String organizationImage; - @ApiModelProperty(name = "creator", value = "") + @ApiModelProperty(name = "organizationType", value = "组织类型") + private String organizationType; + @ApiModelProperty(name = "creator", value = "创建人") private String creator; - @ApiModelProperty(name = "gmtCreate", value = "") + @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; public String getOrganizationId() { @@ -96,4 +98,11 @@ public class OrganizationDTO { } + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } } diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java index 83b751e..897df12 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java @@ -16,6 +16,7 @@ public class OrganizationPO { private String organizationPrincipal; private String organizationDesc; private String organizationImage; + private String organizationType; private String creator; private String gmtCreate; private String modifier; @@ -111,4 +112,11 @@ public class OrganizationPO { } + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } } diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java index fc7ed06..4fec965 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java @@ -26,6 +26,8 @@ public class OrganizationVO { private String organizationDesc; @ApiModelProperty(name = "organizationImage", value = "组织图片") private String organizationImage; + @ApiModelProperty(name = "organizationType", value = "组织类型") + private String organizationType; public String getOrganizationName() { return organizationName == null ? "" : organizationName.trim(); @@ -67,5 +69,11 @@ public class OrganizationVO { this.organizationImage = organizationImage; } + public String getOrganizationType() { + return organizationType; + } + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } }