修改单位信息

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/Company.java

@@ -37,6 +37,8 @@ public class Company {
 	private String type;
     @ApiModelProperty(value = "营业性质")
 	private String businessNature;
+	@ApiModelProperty(value = "营业性质名称")
+	private String businessNatureN;
     @ApiModelProperty(value = "营业范围")
 	private String businessScope;
     @ApiModelProperty(value = "行业类型")

picc-common/src/main/resources/mapper/base/Company.xml

@@ -35,6 +35,12 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
     </resultMap>
+    <resultMap id="CompanyMap2" extends="CompanyMap" type="com.jpsoft.picc.modules.base.entity.Company">
+        <association property="businessNatureN"
+                     column="{catalogName=business_nature_catalog,value=business_nature}"
+                     select="com.jpsoft.picc.modules.sys.dao.DataDictionaryDAO.findNameByCatalogNameAndValue"
+        />
+    </resultMap>
     <insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.Company">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -189,9 +195,10 @@
     <select id="list" resultMap="CompanyMap">
         select * from base_company
     </select>
-    <select id="search" parameterType="hashmap" resultMap="CompanyMap">
+    <select id="search" parameterType="hashmap" resultMap="CompanyMap2">
         <![CDATA[
-			select * from base_company where del_flag=0
+			select *,'营业性质' as 'business_nature_catalog'
+			from base_company where del_flag=0
 		]]>
         <if test="searchParams.name != null">
             and name_ like #{searchParams.name}
@@ -215,14 +222,12 @@
 				and create_time < str_to_date( #{searchParams.endTime},'%Y-%m-%d')
 			]]>
         </if>
-
         <if test="searchParams.promotionList != null">
             and promoter_ in
             <foreach item="item" collection="searchParams.promotionList" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-
         <if test="searchParams.hasPromotion != null">
             <![CDATA[
 				and ifnull(promoter_,'')<>''