From dff67b0610474954ae2cb1506af8aab5becd727b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 07 Jul 2021 15:37:07 +0800
Subject: [PATCH] 1.保安单位
---
src/main/java/org/springblade/modules/information/dto/InformationDTO.java | 2 +-
src/main/java/org/springblade/modules/information/entity/Information.java | 23 +++++++++--------------
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 12 +++++++++---
src/main/java/org/springblade/modules/information/service/IInformationService.java | 2 +-
src/main/java/org/springblade/modules/information/controller/InformationController.java | 2 +-
src/main/java/org/springblade/modules/information/vo/InformationVO.java | 2 +-
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 2 +-
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 2 +-
8 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index d671030..e49d963 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -38,7 +38,7 @@
* 控制器
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
@RestController
@AllArgsConstructor
diff --git a/src/main/java/org/springblade/modules/information/dto/InformationDTO.java b/src/main/java/org/springblade/modules/information/dto/InformationDTO.java
index d961150..3da1e85 100644
--- a/src/main/java/org/springblade/modules/information/dto/InformationDTO.java
+++ b/src/main/java/org/springblade/modules/information/dto/InformationDTO.java
@@ -24,7 +24,7 @@
* 数据传输对象实体类
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
@Data
@EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/org/springblade/modules/information/entity/Information.java b/src/main/java/org/springblade/modules/information/entity/Information.java
index 78c0ec3..211e461 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -31,7 +31,7 @@
* 实体类
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
@Data
@TableName("sys_information")
@@ -63,14 +63,13 @@
* 登记状态
*/
@ApiModelProperty(value = "登记状态")
- @TableField(" registstat")
- private String registstat;
+ private String regstsat;
/**
* 成立日期
*/
@ApiModelProperty(value = "成立日期")
@TableField("establishTime")
- private String establishtime;
+ private LocalDateTime establishtime;
/**
* 注册资本
*/
@@ -131,15 +130,11 @@
@ApiModelProperty(value = "所属行业")
private String industry;
/**
- * 租户ID
- */
- @ApiModelProperty(value = "租户ID")
- @TableField("tenantId")
+ * 租户ID
+ */
+ @ApiModelProperty(value = "租户ID")
+ @TableField("tenantId")
private String tenantid;
- /**
- * 租户ID
- */
- @ApiModelProperty(value = "租户ID")
- @TableField("identification")
- private String identification;
+
+
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 61e63b7..7a81637 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -26,7 +26,7 @@
* Mapper 接口
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
public interface InformationMapper extends BaseMapper<Information> {
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 7f1ccbb..ba760af 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -8,7 +8,7 @@
<result column="creditCode" property="creditcode"/>
<result column="enterpriseName" property="enterprisename"/>
<result column="representative" property="representative"/>
- <result column="registstat" property="registstat"/>
+ <result column="regstsat" property="regstsat"/>
<result column="establishTime" property="establishtime"/>
<result column="registeredCapital" property="registeredcapital"/>
<result column="capital" property="capital"/>
@@ -21,12 +21,18 @@
<result column="region" property="region"/>
<result column="registration" property="registration"/>
<result column="industry" property="industry"/>
- <result column="identification" property="identification"/>
+ <result column="tenantId" property="tenantid"/>
</resultMap>
<select id="selectInformationPage" resultMap="informationResultMap">
- select * from sys_information where is_deleted = 0
+ select * from sys_information where 1=1
+ <if test="information.enterprisename!=null and information.enterprisename!=''">
+ and enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
+ </if>
+ <if test="information.representative!=null and information.representative!=''">
+ and representative like concat(concat('%', #{information.representative}),'%')
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index 56094a9..e15ac9a 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -25,7 +25,7 @@
* 服务类
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
public interface IInformationService extends IService<Information> {
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index ffa5a0d..acc3afd 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -28,7 +28,7 @@
* 服务实现类
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
@Service
public class InformationServiceImpl extends ServiceImpl<InformationMapper, Information> implements IInformationService {
diff --git a/src/main/java/org/springblade/modules/information/vo/InformationVO.java b/src/main/java/org/springblade/modules/information/vo/InformationVO.java
index 5c9c5de..9730063 100644
--- a/src/main/java/org/springblade/modules/information/vo/InformationVO.java
+++ b/src/main/java/org/springblade/modules/information/vo/InformationVO.java
@@ -25,7 +25,7 @@
* 视图实体类
*
* @author BladeX
- * @since 2021-07-06
+ * @since 2021-07-07
*/
@Data
@EqualsAndHashCode(callSuper = true)
--
Gitblit v1.9.3