hanfucheng 9 月之前
父節點
當前提交
16c21251aa

+ 20 - 11
data-ui/src/views/data/housingconstruction/realnameuser/index.vue

@@ -160,13 +160,13 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-            <el-form-item label="用户姓名" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户姓名"/>
+            <el-form-item label="商户名称" prop="merchantName">
+              <el-input v-model="form.merchantName" placeholder="请输入商户名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="证照代码" prop="licenseCode">
-              <el-input v-model="form.licenseCode" placeholder="请输入证照代码"/>
+            <el-form-item label="用户姓名" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户姓名"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -177,6 +177,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="证照代码" prop="licenseCode">
+              <el-input v-model="form.licenseCode" placeholder="请输入证照代码"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
             <el-form-item label="开户时间" prop="accountOpenTime">
               <el-date-picker clearable size="small"
                               v-model="form.accountOpenTime"
@@ -186,13 +193,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="用气地址" prop="gasAddress">
-              <el-input v-model="form.gasAddress" placeholder="请输入用气地址(城区、街道、社区、小区或道路、门牌号)"/>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="contactNumber">
               <el-input v-model="form.contactNumber" placeholder="请输入联系电话"/>
@@ -213,6 +213,11 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
+            <el-form-item label="用气地址" prop="gasAddress">
+              <el-input v-model="form.gasAddress" placeholder="请输入用气地址(城区、街道、社区、小区或道路、门牌号)"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="所属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
                           placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
@@ -321,6 +326,9 @@ export default {
         accountOpenTime: [
           {required: true, message: "开户时间不能为空", trigger: "blur"}
         ],
+        merchantName: [
+          {required: true, message: "商户名称不能为空", trigger: "blur"}
+        ],
         licensePeriodStart: [
           {required: true, message: "许可期限开始时间不能为空", trigger: "blur"}
         ],
@@ -422,6 +430,7 @@ export default {
         userName: null,
         gasAddress: null,
         licenseCode: null,
+        merchantName: null,
         contactNumber: null,
         accountOpenTime: null,
         longitude: null,

+ 3 - 0
src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionRealnameuser.java

@@ -50,6 +50,9 @@ public class CenterdataTHousingconstructionRealnameuser extends BaseBusinessEnti
     @Excel(name = "用户代码")
     private String userCode;
 
+    @Excel(name = "商户名称")
+    private String merchantName;
+
     /**
      * 用户姓名
      */

+ 7 - 2
src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionRealnameuserMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateName"    column="update_name"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
+        <result property="merchantName"    column="merchant_name"    />
     </resultMap>
 
     <sql id="selectCenterdataTHousingconstructionRealnameuserVo">
-        select a.id, a.enterprise_id, a.enterprise_user_type, a.user_code, a.user_name, a.gas_address, a.license_code, a.contact_number, a.account_open_time, a.longitude, a.latitude, a.create_time, a.create_by, a.create_name, a.update_time, a.update_by, a.update_name, a.dept_id, a.dept_name from centerdata_t_housingconstruction_realnameuser a
+        select a.id, a.enterprise_id, a.enterprise_user_type, a.user_code, a.user_name, a.gas_address, a.license_code, a.contact_number, a.account_open_time, a.longitude, a.latitude, a.create_time, a.create_by, a.create_name, a.update_time, a.update_by, a.update_name, a.dept_id, a.dept_name,a.merchant_name from centerdata_t_housingconstruction_realnameuser a
     </sql>
 
     <select id="selectCenterdataTHousingconstructionRealnameuserList" parameterType="CenterdataTHousingconstructionRealnameuser" resultMap="CenterdataTHousingconstructionRealnameuserResult">
@@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateName != null">update_name,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null">dept_name,</if>
+            <if test="merchantName != null">merchant_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="enterpriseId != null">#{enterpriseId},</if>
@@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateName != null">#{updateName},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
+            <if test="merchantName != null">#{merchantName},</if>
          </trim>
     </insert>
 
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateName != null">update_name = #{updateName},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="merchantName != null">merchant_name = #{merchantName},</if>
         </trim>
         where id = #{id}
     </update>
@@ -138,7 +142,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         contact_number contactNumber,
         account_open_time accountOpenTime,
         longitude,
-        latitude
+        latitude,
+        a.merchant_name merchantName
         FROM
         centerdata_t_housingconstruction_realnameuser a
         left join ${database_system}.sys_dict_data b on a.enterprise_user_type = b.dict_value