Tenlion/tenlion-module
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加组织模板，机构模块

Browse Source
This commit is contained in:
ly19960718 2021-04-28 19:09:39 +08:00
parent 41f15fc751
commit 80e4725a5c
21 changed files with 107 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
interface-institution-management/pom.xml
View File

@ -12,4 +12,13 @@
<artifactId>interface-institution-management</artifactId>
<dependencies>
<dependency>
<groupId>cn.com.tenlion</groupId>
<artifactId>pojo-institution-management</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

11
interface-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/IInstitutionService.java
View File

@ -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;

8
interface-organization-management/pom.xml
View File

@ -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">
<parent>
<artifactId>wg-module</artifactId>
<groupId>ink.wgink</groupId>
<artifactId>tenlion-module</artifactId>
<groupId>cn.com.tenlion</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>pojo-organization-management</groupId>
<artifactId>cn.com.tenlion</artifactId>
<groupId>cn.com.tenlion</groupId>
<artifactId>pojo-organization-management</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>

10
module-institution-management/pom.xml
View File

@ -12,4 +12,14 @@
<artifactId>module-institution-management</artifactId>
<dependencies>
<dependency>
<groupId>cn.com.tenlion</groupId>
<artifactId>interface-institution-management</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

9
module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/api/institution/InstitutionController.java
View File

@ -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.*;

2
module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/controller/route/institution/InstitutionRouteController.java
View File

@ -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;

2
module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/dao/institution/IInstitutionDao.java
View File

@ -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;

2
module-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/service/institution/impl/InstitutionServiceImpl.java
View File

@ -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;

27
module-institution-management/src/main/resources/mybatis/templates/institution/list.html
View File

@ -86,15 +86,6 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{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];

42
module-institution-management/src/main/resources/mybatis/templates/institution/save.html
View File

@ -102,32 +102,30 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区划-省</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionProvince" name="institutionRegionProvince" class="layui-input" value="" placeholder="请输入行政区划-省" maxlength="255">
<div class="layui-input-inline">
<select name="institutionRegionProvince" id="institutionRegionProvince" placeholder="请选择省" lay-verify="">
<option value="">请选择省</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区化-市</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionCity" name="institutionRegionCity" class="layui-input" value="" placeholder="请输入行政区化-市" maxlength="255">
<div class="layui-input-inline">
<select name="institutionRegionCity" id="institutionRegionCity" placeholder="请选择市" lay-verify="">
<option value="">请选择市</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区化-区</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionArea" name="institutionRegionArea" class="layui-input" value="" placeholder="请输入行政区化-区" maxlength="255">
<div class="layui-input-inline">
<select name="institutionRegionArea" id="institutionRegionArea" placeholder="请选择区" lay-verify="">
<option value="">请选择区</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区化-村</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionVillage" name="institutionRegionVillage" class="layui-input" value="" placeholder="请输入行政区化-村" maxlength="255">
<div class="layui-input-inline">
<select name="institutionRegionVillage" id="institutionRegionVillage" placeholder="请选择镇" lay-verify="">
<option value="">请选择镇/村</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">行政区化-街</label>
<div class="layui-input-block">
<input type="text" id="institutionRegionStreet" name="institutionRegionStreet" class="layui-input" value="" placeholder="请输入行政区化-街" maxlength="255">
<div class="layui-input-inline">
<select name="institutionRegionStreet" id="institutionRegionStreet" placeholder="请选择街" lay-verify="">
<option value="">请选择街</option>
</select>
</div>
</div>
<div class="layui-form-item layui-layout-admin">

8
module-organization-management/pom.xml
View File

@ -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">
<parent>
<artifactId>wg-module</artifactId>
<groupId>ink.wgink</groupId>
<artifactId>tenlion-module</artifactId>
<groupId>cn.com.tenlion</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -14,8 +14,8 @@
<dependencies>
<dependency>
<groupId>interface-organization-management</groupId>
<artifactId>cn.com.tenlion</artifactId>
<groupId>cn.com.tenlion</groupId>
<artifactId>interface-organization-management</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>

2
module-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/service/organization/impl/OrganizationServiceImpl.java
View File

@ -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 {

25
module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml
View File

@ -101,24 +101,13 @@
UPDATE
organization
SET
<if test="organizationName != null and organizationName != ''">
organization_name = #{organizationName},
</if>
<if test="organizationUserNum != null">
organization_user_num = #{organizationUserNum},
</if>
<if test="organizationPrincipal != null and organizationPrincipal != ''">
organization_principal = #{organizationPrincipal},
</if>
<if test="organizationDesc != null and organizationDesc != ''">
organization_desc = #{organizationDesc},
</if>
<if test="organizationImage != null and organizationImage != ''">
organization_image = #{organizationImage},
</if>
gmt_modified = #{gmtModified},
modifier = #{modifier},
organization_id = organization_id
modifier = #{modifier}
WHERE
organization_id = #{organizationId}
</update>
@ -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 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.organization_name LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">
@ -227,6 +215,7 @@
#{organizationIds[${index}]}
</foreach>
</if>
ORDER BY t1.gmt_create DESC
</select>
<!-- 组织管理列表 -->
@ -250,7 +239,7 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.organization_name LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">
@ -268,6 +257,7 @@
#{organizationIds[${index}]}
</foreach>
</if>
ORDER BY t1.gmt_create DESC
</select>
<!-- 组织管理列表 -->
@ -291,7 +281,7 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.organization_name LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">
@ -309,6 +299,7 @@
#{organizationIds[${index}]}
</foreach>
</if>
ORDER BY t1.gmt_create DESC
</select>
<!-- 组织管理统计 -->

13
module-organization-management/src/main/resources/templates/organization/list.html
View File

@ -86,15 +86,6 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{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 == '') {

7
pojo-institution-management/pom.xml
View File

@ -11,5 +11,12 @@
<artifactId>pojo-institution-management</artifactId>
<dependencies>
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

2
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.pojo.bos.institution;
package cn.com.tenlion.institutionmanagement.pojo.bos.institution;
/**
*

2
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java
View File

@ -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;

2
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.pojo.pos.institution;
package cn.com.tenlion.institutionmanagement.pojo.pos.institution;
/**
*

2
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java
View File

@ -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;

11
pojo-organization-management/pom.xml
View File

@ -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">
<parent>
<artifactId>wg-module</artifactId>
<groupId>ink.wgink</groupId>
<artifactId>tenlion-module</artifactId>
<groupId>cn.com.tenlion</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pojo-organization-management</artifactId>
<dependencies>
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

20
pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<groupId>cn.com.tenlion</groupId>
<artifactId>tenlion-module</artifactId>
<version>1.0-SNAPSHOT</version>
<modules>
<module>module-building-pictures</module>
<module>interface-building-pictures</module>
<module>pojo-building-pictures</module>
</modules>
<packaging>pom</packaging>
<modules>
<module>pojo-building-pictures</module>
<module>interface-building-pictures</module>
<module>module-building-pictures</module>
<module>pojo-organization-management</module>
<module>interface-organization-management</module>
<module>module-organization-management</module>
<module>interface-institution-management</module>
<module>module-institution-management</module>
<module>pojo-institution-management</module>
</modules>
<properties>
<spring.version>5.2.8.RELEASE</spring.version>
<spring-boot.version>2.3.3.RELEASE</spring-boot.version>