diff --git a/interface-institution-management/pom.xml b/interface-institution-management/pom.xml index 243d901..d269414 100644 --- a/interface-institution-management/pom.xml +++ b/interface-institution-management/pom.xml @@ -12,4 +12,13 @@ interface-institution-management + + + cn.com.tenlion + pojo-institution-management + 1.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java b/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java index d46aff0..6dbecb4 100644 --- a/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java +++ b/interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java @@ -1,11 +1,12 @@ -package cn.com.tenlion.service.institution; +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 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 java.util.List; import java.util.Map; diff --git a/interface-organization-management/pom.xml b/interface-organization-management/pom.xml index 8179549..f46035f 100644 --- a/interface-organization-management/pom.xml +++ b/interface-organization-management/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - wg-module - ink.wgink + tenlion-module + cn.com.tenlion 1.0-SNAPSHOT 4.0.0 @@ -15,8 +15,8 @@ - pojo-organization-management - cn.com.tenlion + cn.com.tenlion + pojo-organization-management 1.0-SNAPSHOT diff --git a/module-institution-management/pom.xml b/module-institution-management/pom.xml index 52868a5..d69b815 100644 --- a/module-institution-management/pom.xml +++ b/module-institution-management/pom.xml @@ -12,4 +12,14 @@ module-institution-management + + + cn.com.tenlion + interface-institution-management + 1.0-SNAPSHOT + + + + + \ No newline at end of file diff --git a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/api/institution/InstitutionController.java b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/api/institution/InstitutionController.java index af455e1..78360c6 100644 --- a/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/api/institution/InstitutionController.java +++ b/module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/api/institution/InstitutionController.java @@ -1,5 +1,8 @@ -package cn.com.tenlion.controller.api.institution; +package cn.com.tenlion.institutionmanagement.controller.api.institution; +import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; +import cn.com.tenlion.institutionmanagement.pojo.vos.institution.InstitutionVO; +import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; @@ -8,9 +11,7 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.institution.InstitutionDTO; -import cn.com.tenlion.pojo.vos.institution.InstitutionVO; -import cn.com.tenlion.service.institution.IInstitutionService; + import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; 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 ce06758..f13ef9a 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 @@ -1,4 +1,4 @@ -package cn.com.tenlion.controller.route.institution; +package cn.com.tenlion.institutionmanagement.controller.route.institution; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; 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 ee2cd6e..b31d769 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,4 +1,4 @@ -package cn.com.tenlion.dao.institution; +package cn.com.tenlion.institutionmanagement.dao.institution; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; 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 fcf9f2e..fa1a9b1 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,4 +1,4 @@ -package cn.com.tenlion.service.institution.impl; +package cn.com.tenlion.institutionmanagement.service.institution.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; diff --git a/module-institution-management/src/main/resources/mybatis/templates/institution/list.html b/module-institution-management/src/main/resources/mybatis/templates/institution/list.html index 680814f..e3dcd0e 100644 --- a/module-institution-management/src/main/resources/mybatis/templates/institution/list.html +++ b/module-institution-management/src/main/resources/mybatis/templates/institution/list.html @@ -86,15 +86,6 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'institutionId', width: 180, title: '机构ID', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'institutionName', width: 180, title: '机构名称', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -139,24 +130,6 @@ return rowData; } }, - {field: 'institutionX', width: 180, title: '机构经度', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'institutionY', width: 180, 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]; diff --git a/module-institution-management/src/main/resources/mybatis/templates/institution/save.html b/module-institution-management/src/main/resources/mybatis/templates/institution/save.html index 101584c..864a713 100644 --- a/module-institution-management/src/main/resources/mybatis/templates/institution/save.html +++ b/module-institution-management/src/main/resources/mybatis/templates/institution/save.html @@ -102,32 +102,30 @@
-
- +
+
-
-
- -
- +
+
-
-
- -
- +
+
-
-
- -
- +
+
-
-
- -
- +
+
diff --git a/module-organization-management/pom.xml b/module-organization-management/pom.xml index faf58d0..cddab84 100644 --- a/module-organization-management/pom.xml +++ b/module-organization-management/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - wg-module - ink.wgink + tenlion-module + cn.com.tenlion 1.0-SNAPSHOT 4.0.0 @@ -14,8 +14,8 @@ - interface-organization-management - cn.com.tenlion + cn.com.tenlion + interface-organization-management 1.0-SNAPSHOT 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 3d4a857..fbecee3 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 @@ -16,6 +16,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import java.util.*; @@ -27,6 +28,7 @@ import java.util.*; * @Date: 2021-04-28 11:06:42 * @Version: 3.0 **/ +@Primary @Service public class OrganizationServiceImpl extends DefaultBaseService implements IOrganizationService { 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 09945d7..d6f3a9a 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 @@ -101,24 +101,13 @@ UPDATE organization SET - organization_name = #{organizationName}, - - organization_user_num = #{organizationUserNum}, - - organization_principal = #{organizationPrincipal}, - - organization_desc = #{organizationDesc}, - - organization_image = #{organizationImage}, - gmt_modified = #{gmtModified}, - modifier = #{modifier}, - organization_id = organization_id + modifier = #{modifier} WHERE organization_id = #{organizationId} @@ -200,8 +189,7 @@ t1.organization_desc, t1.organization_image, t1.creator, - t1.gmt_create, - 1 + t1.gmt_create FROM organization t1 WHERE @@ -209,7 +197,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.organization_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -227,6 +215,7 @@ #{organizationIds[${index}]} + ORDER BY t1.gmt_create DESC @@ -250,7 +239,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.organization_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -268,6 +257,7 @@ #{organizationIds[${index}]} + ORDER BY t1.gmt_create DESC @@ -291,7 +281,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.organization_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -309,6 +299,7 @@ #{organizationIds[${index}]} + ORDER BY t1.gmt_create DESC 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 4c90a35..76aafbc 100644 --- a/module-organization-management/src/main/resources/templates/organization/list.html +++ b/module-organization-management/src/main/resources/templates/organization/list.html @@ -86,15 +86,6 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'organizationId', width: 180, title: '组织ID', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'organizationName', width: 180, title: '组织名称', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -148,7 +139,7 @@ return downloadFile; } }, - {field: 'creator', width: 180, title: '', align:'center', + {field: '创建人', width: 180, title: '', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -157,7 +148,7 @@ return rowData; } }, - {field: 'gmtCreate', width: 180, title: '', align:'center', + {field: '创建时间', width: 180, title: '', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { diff --git a/pojo-institution-management/pom.xml b/pojo-institution-management/pom.xml index 868e6bd..3c60ddf 100644 --- a/pojo-institution-management/pom.xml +++ b/pojo-institution-management/pom.xml @@ -11,5 +11,12 @@ pojo-institution-management + + + ink.wgink + common + 1.0-SNAPSHOT + + \ No newline at end of file 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 b5b73c7..efeeb71 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 @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.institution; +package cn.com.tenlion.institutionmanagement.pojo.bos.institution; /** * 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 11a01b7..141c49e 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 @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.institution; +package cn.com.tenlion.institutionmanagement.pojo.dtos.institution; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; 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 6a285cf..8ed15b3 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 @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.institution; +package cn.com.tenlion.institutionmanagement.pojo.pos.institution; /** * 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 ac756b9..cd0cea3 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 @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.institution; +package cn.com.tenlion.institutionmanagement.pojo.vos.institution; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/pojo-organization-management/pom.xml b/pojo-organization-management/pom.xml index b947c66..a0c952e 100644 --- a/pojo-organization-management/pom.xml +++ b/pojo-organization-management/pom.xml @@ -3,13 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - wg-module - ink.wgink + tenlion-module + cn.com.tenlion 1.0-SNAPSHOT 4.0.0 pojo-organization-management + + + ink.wgink + common + 1.0-SNAPSHOT + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5a01bae..fb881c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,17 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.com.tenlion tenlion-module 1.0-SNAPSHOT - - module-building-pictures - interface-building-pictures - pojo-building-pictures - pom + + pojo-building-pictures + interface-building-pictures + module-building-pictures + + pojo-organization-management + interface-organization-management + module-organization-management + + interface-institution-management + module-institution-management + pojo-institution-management + + 5.2.8.RELEASE 2.3.3.RELEASE