增加业务类别

heheng

2025-03-24 9a8a4a431c61d22a334003b2e8a52571ea809920

增加业务类别

 assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java

@@ -210,6 +210,11 @@
    @TableField("version")
    private Integer version;

    @NotBlank(message = "业务类型不能为空")
    @ApiModelProperty(value = "业务类型1安全评价2检验检测,多个逗号隔开",required = true)
    @TableField("business_type")
    private String businessType;



}

 assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java

@@ -207,4 +207,8 @@
    @TableField(exist = false)
    private Integer attribute;

    @ApiModelProperty(value = "业务类型(0全部，1安全评价,2检验检测)",required = false)
    @TableField(exist = false)
    private Integer businessType;

}

 assess-system/src/main/resources/mapper/SysAgencyMapper.xml

@@ -29,6 +29,7 @@
        <result property="publication"     column="publication"      />
        <result property="createTime"     column="create_time"      />
        <result property="remark"     column="remark"      />
        <result property="businessType"     column="business_type"      />
        <association property="user" javaType="com.gkhy.assess.system.domain.SysUser" resultMap="userResult" />
        <collection property="businessNames" ofType="java.lang.String" select="getBusinessById" column="{business=business}"/>
    </resultMap>
@@ -44,7 +45,7 @@
        select a.id,a.name,a.credit_code,a.attribute,a.province,a.city,a.district,a.address,a.web,a.legal_person,
               a.legal_phone,a.manager,a.manager_phone,a.cert_number,a.cert_path,a.issue_date,a.valid_date,a.asset_value,a.work_area,a.archive_area,
               a.reg_address,a.business,a.report_path,a.del_flag,a.publication,a.create_time,a.remark,
               b.id as user_id,b.username,b.phone
               b.id as user_id,b.username,b.phone,a.business_type
        from sys_agency a
        left join sys_user b on b.agency_id=a.id and b.identity=1 and b.del_flag=0
    </sql>
@@ -54,7 +55,7 @@
    </select>

    <select id="agencyList" resultMap="SysAgencyResult">
        select a.id,a.name,a.credit_code,a.attribute,a.cert_number,a.issue_date,a.valid_date,a.create_time,a.business,a.province,a.city,a.district,a.publication from sys_agency a
        select a.id,a.name,a.credit_code,a.attribute,a.cert_number,a.issue_date,a.valid_date,a.create_time,a.business,a.province,a.city,a.district,a.publication,a.business_type from sys_agency a
        <where>
            and a.del_flag = 0
            <if test="name != null and name != ''">

 assess-system/src/main/resources/mapper/SysUserMapper.xml

@@ -47,13 +47,14 @@
        <result property="name"     column="agency_name"      />
        <result property="creditCode"      column="credit_code"       />
        <result property="attribute"      column="attribute"       />
        <result property="businessType"      column="business_type"       />
    </resultMap>

    <sql id="selectUserVo">
        select u.id,u.username, u.name,u.identity,u.user_type,u.phone,u.sex,u.status,
               u.del_flag,u.manage_region,u.expert_type,u.agency_id,u.post,u.job_title,
               u.major,u.state,u.create_time,u.remark,u.level,u.id_photo,u.certificate_no,
               a.id as agency_id,a.name as agency_name,a.credit_code,a.attribute
               a.id as agency_id,a.name as agency_name,a.credit_code,a.attribute,a.business_type
        from sys_user u
        left join sys_agency a on u.agency_id=a.id
    </sql>
@@ -103,6 +104,9 @@
            <if test="agencyName != null and agencyName != ''">
                AND a.name like concat('%', #{agencyName}, '%')
            </if>
            <if test="businessType != null and businessType != 0">
                AND a.business_type like concat('%', #{businessType}, '%')
            </if>
        </where>
        order by u.create_time desc
    </select>