qxm-增加经销商认证状态和筛选

suishenbang-admin/src/main/resources/templates/system/user/user.html

@@ -68,6 +68,13 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                                 </li>
+								<li>
+									经销商是否认证：<select name="isOrgAuthentication">
+									<option value="">所有</option>
+									<option value="1">是</option>
+									<option value="0">否</option>
+								</select>
+								</li>
 								<li class="select-time">
 									<label>创建时间： </label>
 									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
@@ -214,6 +221,21 @@
                     width: 90,
                     title: '组织code'
                 },
+				{
+					field: 'isOrgAuthentication',
+					width: 90,
+					title: '经销商是否认证',
+					align: 'center',
+					formatter: function(value, row, index) {
+						if (value==0){
+							return '否';
+						}else if(value==1){
+							return '是';
+						}else{
+							return '未注册';
+						}
+					}
+				},
 		        {
 		            title: '操作',
 		            align: 'center',

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -117,7 +117,10 @@ public class SysUser extends BaseEntity
     private SysUserExt  sysUserExt;
     /** 是否收货人 */
     private String  isConsignee;
-
+    /*企业认证状态0未认证1已认证*/
+    private String isOrgAuthentication;
+    /*企业认证时间*/
+    private Date orgAttestationTime;
 
     //    /** 所属销售组织等级 详见字典（sales_level） */
 //    private String salesLevel;
@@ -479,6 +482,22 @@ public class SysUser extends BaseEntity
         this.isConsignee = isConsignee;
     }
 
+    public String getIsOrgAuthentication() {
+        return isOrgAuthentication;
+    }
+
+    public void setIsOrgAuthentication(String isOrgAuthentication) {
+        this.isOrgAuthentication = isOrgAuthentication;
+    }
+
+    public Date getOrgAttestationTime() {
+        return orgAttestationTime;
+    }
+
+    public void setOrgAttestationTime(Date orgAttestationTime) {
+        this.orgAttestationTime = orgAttestationTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -32,6 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
 		<result property="isConsignee"       column="is_consignee"       />
+		<result property="isAuthentication"       column="is_authentication"       />
+		<result property="personAttestationTime"       column="person_attestation_time"       />
+		<result property="isOrgAuthentication"       column="is_org_authentication"       />
+		<result property="orgAttestationTime"       column="org_attestation_time"       />
         <!--<result property="salesLevel"   column="sales_level"  />-->
         <!--<result property="orgName"      column="org_name"     />-->
         <!--<result property="orgCode"      column="org_code"     />-->
@@ -100,11 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
           u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
           d.dept_name, d.leader,
-        suse.sales_level,suse.org_name,suse.org_code,suse.post_name,suse.is_customer_manager
+        suse.sales_level,suse.org_name,suse.org_code,suse.post_name,suse.is_customer_manager,ce.is_authentication is_org_authentication,ce.org_attestation_time
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_company c on u.company_id = c.id
         left join sys_user_ext suse on suse.user_id = u.user_id
+		LEFT JOIN customers_ext ce ON suse.org_code = ce.chains_code
 		where u.del_flag = '0'
 		<if test="loginName != null and loginName != ''">
 			AND u.login_name like concat('%', #{loginName}, '%')
@@ -142,6 +147,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="companyId != null and companyId != 0">
 			AND u.company_id = #{companyId}
 		</if>
+		<if test="isAuthentication != null and isAuthentication != ''">
+			AND u.is_authentication = #{isAuthentication}
+		</if>
+		<if test="isOrgAuthentication != null and isOrgAuthentication != '' and isOrgAuthentication =='1'.toString()">
+			AND ce.is_authentication = '1'
+		</if>
+		<if test="isOrgAuthentication != null and isOrgAuthentication != '' and isOrgAuthentication =='0'.toString()">
+			AND (ce.is_authentication = '0' or ce.is_authentication is null)
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>