智慧保安后台管理-外网-验收版本
tangzy
2021-07-07 dff67b0610474954ae2cb1506af8aab5becd727b
1.保安单位
8 files modified
47 ■■■■ changed files
src/main/java/org/springblade/modules/information/controller/InformationController.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/dto/InformationDTO.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/entity/Information.java 23 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml 12 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/service/IInformationService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/vo/InformationVO.java 2 ●●● patch | view | raw | blame | history
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
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)
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;
}
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> {
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>
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> {
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 {
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)