Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

anderx 8 years ago
parent
commit
cf74c6f7c2

+ 3 - 1
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -203,5 +203,7 @@ public interface UserMapper {
 	 */
 	User selectByNumber(@Param("easemobName")String easemobName);
 	
-	List<Admin> findAdminName(String aid);
+	List<Admin> findAdminName(String aid);
+	
+	int updateEnteringAudit(@Param("id")String id,@Param("auditStatus")Integer auditStatus,@Param("auditOpinion")String auditOpinion);
 }

+ 13 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1450,4 +1450,17 @@
 	<select id="selectByNumber" parameterType="java.lang.String" resultMap="BaseResultMap">
 		select nickname,head_portrait_url from user where number = #{easemobName,jdbcType=VARCHAR}
 	</select>
+	
+	<update id="updateEnteringAudit" parameterType="com.goafanti.common.model.User">
+    update user
+    <set>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="auditOpinion != null">
+        audit_opinion = #{auditOpinion,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>

+ 69 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1103,4 +1103,73 @@
 		from admin d left join department_management dm on dm.id = d.department_id
 		where d.department_id=(select department_id from admin where id=#{aid,jdbcType=INTEGER})
 	</select>
+	
+	<select id="findEnteringAuditList" resultType="com.goafanti.customer.bo.CustomerListOut">
+		select u.id as uid,u.nickname as name,u.mobile as contactMobile,a.name as adminName,u.create_time as createTime,u.audit_status as auditStatus
+		from user u left join admin a on u.aid=a.id
+		where u.audit_status=0 and u.status != 1
+		<if test="aid != null and aid !=''">
+			and u.aid = #{aid,jdbcType=VARCHAR}
+		</if>
+		<if test="name != null and name != ''">
+			and u.nickname = #{name,jdbcType=VARCHAR}
+		</if>
+		<if test="adminName != null and adminName != ''">
+			and a.name = #{adminName,jdbcType=VARCHAR}
+		</if>
+		<if test="page_sql != null">
+    		${page_sql}
+   		 </if>
+	</select>
+	
+	<select id="findEnteringAuditCount" resultType="java.lang.Integer">
+		select 
+			count(0)	
+		from user u left join admin a on u.aid=a.id
+		where u.audit_status=0 and u.status != 1
+		<if test="aid != null and aid !=''">
+			and u.aid = #{aid,jdbcType=VARCHAR}
+		</if>
+		<if test="name != null and name != ''">
+			and u.nickname = #{name,jdbcType=VARCHAR}
+		</if>
+		<if test="adminName != null and adminName != ''">
+			and a.name = #{adminName,jdbcType=VARCHAR}
+		</if>
+	</select>
+	
+	<select id="findEnteringAuditIsNoList" resultType="com.goafanti.customer.bo.CustomerListOut">
+		select u.id as uid,u.nickname as name,u.mobile as contactMobile,a.name as adminName,u.create_time as createTime,
+		u.audit_status as auditStatus,u.audit_opinion as auditOpinion
+		from user u left join admin a on u.aid=a.id
+		where u.audit_status=2 and u.status != 1
+		<if test="aid != null and aid !=''">
+			and u.aid = #{aid,jdbcType=VARCHAR}
+		</if>
+		<if test="name != null and name != ''">
+			and u.nickname = #{name,jdbcType=VARCHAR}
+		</if>
+		<if test="adminName != null and adminName != ''">
+			and a.name = #{adminName,jdbcType=VARCHAR}
+		</if>
+		<if test="page_sql != null">
+    		${page_sql}
+   		 </if>
+	</select>
+	
+	<select id="findEnteringAuditIsNoCount" resultType="java.lang.Integer">
+		select 
+			count(0)	
+		from user u left join admin a on u.aid=a.id
+		where u.audit_status=2 and u.status != 1
+		<if test="aid != null and aid !=''">
+			and u.aid = #{aid,jdbcType=VARCHAR}
+		</if>
+		<if test="name != null and name != ''">
+			and u.nickname = #{name,jdbcType=VARCHAR}
+		</if>
+		<if test="adminName != null and adminName != ''">
+			and a.name = #{adminName,jdbcType=VARCHAR}
+		</if>
+	</select>
 </mapper>

+ 20 - 0
src/main/java/com/goafanti/common/model/User.java

@@ -139,6 +139,26 @@ public class  User extends BaseModel implements AftUser{
 	 * @return  the value of user.id
 	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
+	private Integer auditStatus;
+	
+	private String auditOpinion;
+	
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
+	public String getAuditOpinion() {
+		return auditOpinion;
+	}
+
+	public void setAuditOpinion(String auditOpinion) {
+		this.auditOpinion = auditOpinion;
+	}
+
 	public String getId() {
 		return id;
 	}

+ 11 - 0
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -22,6 +22,17 @@ public class CustomerListOut extends CustomerListIn{
 	/** 专家发布状态**/
 	private Integer releaseStatus;
 	
+	/** 审核意见**/
+	private String auditOpinion;
+	
+	public String getAuditOpinion() {
+		return auditOpinion;
+	}
+
+	public void setAuditOpinion(String auditOpinion) {
+		this.auditOpinion = auditOpinion;
+	}
+
 	public Integer getReleaseStatus() {
 		return releaseStatus;
 	}

+ 29 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -43,6 +43,7 @@ import com.goafanti.customer.bo.BusinessListBo;
 import com.goafanti.customer.bo.BussinessFollowBo;
 import com.goafanti.customer.bo.CustomerExcelBo;
 import com.goafanti.customer.bo.CustomerListIn;
+import com.goafanti.customer.bo.CustomerListOut;
 import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
 import com.goafanti.customer.bo.CustomerPersonalDetailBo;
 import com.goafanti.customer.bo.FollowBusinessBo;
@@ -832,4 +833,32 @@ public class AdminCustomerApiController extends BaseApiController{
 		customerService.updatePersonalCustomerz(bo);
 		return res;
 	}
+	
+	/** 客户录入审核 **/
+	@RequestMapping(value = "/findEnteringAudit" , method = RequestMethod.POST)
+	public Result findEnteringAudit(CustomerListOut clo,Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(customerService.findEnteringAudit(clo, pageNo, pageSize));
+		return res;
+	}
+	
+	/** 修改客户录入审核状态 **/
+	@RequestMapping(value = "/updateEnteringAudit", method = RequestMethod.POST)
+	public Result updateEnteringAudit(User bo){
+		Result res = new Result();
+		if(StringUtils.isBlank(bo.getId())){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
+			return res;
+		}
+		customerService.updateEnteringAudit(bo);
+		return res;
+	}
+	
+	/** 审核拒绝客户查询 **/
+	@RequestMapping(value = "/findEnteringAuditIsNo" , method = RequestMethod.POST)
+	public Result findEnteringAuditIsNo(CustomerListOut clo,Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(customerService.findEnteringAuditIsNo(clo, pageNo, pageSize));
+		return res;
+	}
 }

+ 6 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -389,4 +389,10 @@ public interface CustomerService {
 	List<Admin> findAdminName();
 	
 	int updatePersonalCustomerz(CustomerPersonalDetailBo bo);
+	
+	Pagination<CustomerListOut> findEnteringAudit(CustomerListOut clo, Integer pageNo, Integer pageSize);
+	
+	Pagination<CustomerListOut> findEnteringAuditIsNo(CustomerListOut clo, Integer pageNo, Integer pageSize);
+	
+	int updateEnteringAudit(User bo);
 }

+ 29 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -969,4 +969,33 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		userMapper.updateByPrimaryKeySelective(user);
 		return 1;
 	}
+
+	@Override
+	public Pagination<CustomerListOut> findEnteringAudit(CustomerListOut clo, Integer pageNo, Integer pageSize) {
+		Map<String,Object> params = disposeParams(clo);
+		if(!StringUtils.isBlank(clo.getAdminName()))params.put("adminName", clo.getAdminName());
+		@SuppressWarnings("unchecked")
+		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("findEnteringAuditList","findEnteringAuditCount",params,pageNo,pageSize);
+		return list;
+	}
+	
+	@Override
+	public Pagination<CustomerListOut> findEnteringAuditIsNo(CustomerListOut clo, Integer pageNo, Integer pageSize) {
+		clo.setAid(TokenManager.getAdminId());
+		Map<String,Object> params = disposeParams(clo);
+		if(!StringUtils.isBlank(clo.getAdminName()))params.put("adminName", clo.getAdminName());
+		@SuppressWarnings("unchecked")
+		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("findEnteringAuditIsNoList","findEnteringAuditIsNoCount",params,pageNo,pageSize);
+		return list;
+	}
+
+	@Override
+	public int updateEnteringAudit(User bo) {
+		String id=bo.getId();
+		Integer auditStatus=bo.getAuditStatus();
+		String auditOpinion=bo.getAuditOpinion();
+		return userMapper.updateEnteringAudit(id,auditStatus,auditOpinion);
+	}
+	
+	
 }