Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 7 years ago
parent
commit
e7a51f0e50

+ 0 - 25
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -105,31 +105,6 @@ public class AppUserController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"用户昵称不能为空"));
 			return res;
 		}
-		List<User> checkData = userServiceImpl.checkExistUser(null, null, null, null, AFTConstants.USER_SOURCE_REGISTER,
-				u.getNickname());
-		boolean exist = false;
-		boolean needChange = false;
-		if (null != checkData && checkData.size() > 0) {
-			for (User item : checkData) {
-				if (!item.getId().equals(TokenManager.getUserId()))
-					exist = true;
-			}
-		} else {
-			needChange = true;
-		}
-		if (exist) {
-			res.getError().add(buildError(ErrorConstants.USER_NICKNAME_EXIST));
-			return res;
-		} else if (needChange) { // 修改环信昵称
-			JpushEasemobAccount jea = messageService.selectSynAccByUid(TokenManager.getUserId());
-			if (null != jea && StringUtils.isNotBlank(jea.getEasemobName())) {
-				JSONObject resultObj = new JSONObject();
-				resultObj.put("username", jea.getEasemobName());
-				resultObj.put("nickname", u.getNickname());
-				easemobUtils.sendLater(
-						new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
-			}
-		}
 		u.setId(TokenManager.getUserId());
 		userServiceImpl.updateByPrimaryKeySelective(u);
 		return res;

+ 1 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -15,7 +15,7 @@ public class AFTConstants {
 
 	public static final String	SUPERADMIN							= "999999";				// 超级管理员
 
-	public static final String	APPROVAL_DECISION					= "99999";				//特批决策者
+	public static final String	APPROVAL_DECISION					= "99999";				// 特批决策者
 
 	public static final String	AREAADMIN							= "";					// 地区管理员
 

+ 0 - 6
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -69,12 +69,6 @@ public interface OrganizationManagementMapper {
 	int updateByPrimaryKey(OrganizationManagement record);
 	List<OrganizationListOut> selectSuperId();
 	/**
-	 * 新增
-	 * @param olo
-	 * @return
-	 */
-	int insert1(OrganizationListOut olo);
-	/**
 	 * 根据组织名称查组织编号
 	 */
 	String selectDepNoByName(String name);

+ 34 - 19
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -397,17 +397,21 @@
   </update>
 	<select id="selectOrganizationList" parameterType="String" resultType="com.goafanti.organization.bo.OrganizationListOut">
 		select
-		om.id,om.create_id as createId,om.create_time as createTime,
-		om.update_time as updateTime,om.deleted_sign as deletedSign,
-		om.name,om.type,om.manager_id as managerId,
-		om.dep_no as depNo,
-		om.super_id as superId,
-		om.remarks,om.status
+			om.id,om.create_id as createId,om.create_time as createTime,
+			om.update_time as updateTime,om.deleted_sign as deletedSign,
+			om.name,om.type,
+			om.dep_no as depNo,
+			om.remarks,
+			om.status,
+			dm.name as superName,
+			x.name as managerName
 		from department_management om 
+		left join department_management dm on om.super_id = dm.id
+		left join admin x on om.manager_id = x.id
 		where
-		om.deleted_sign = '0'
-		and
-		om.name != '平台超管中心'
+			om.deleted_sign = '0'
+			and
+			om.name != '平台超管中心'
 		<if test="name !=null">
 			AND om.name=#{name,jdbcType=VARCHAR}
 		</if>
@@ -426,10 +430,13 @@
 	</select>
 	<select id="selectOrganizationCount" resultType="java.lang.Integer">
 		select
-		count(0)
+			count(0)
 		from department_management om
+		from department_management om 
+		left join department_management dm on om.super_id = dm.id
+		left join admin x on om.manager_id = x.id
 		where
-		om.deleted_sign='0'
+			om.deleted_sign='0'
 		<if test="name !=null">
 			AND om.name=#{name,jdbcType=VARCHAR}
 		</if>
@@ -484,14 +491,22 @@
 		name  like concat('%',#{name,jdbcType=VARCHAR},'%')
 	</select>
 	<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
-		select
-		id,create_id as createId,create_time as createTime,
-		update_time as updateTime,deleted_sign as deletedSign,
-		name,type,manager_id as managerId,
-		dep_no as depNo,
-		super_id as superId,
-		remarks,status
-		from department_management
+	select
+		a.id,
+		a.create_id as createId,
+		a.create_time as createTime,
+		a.update_time as updateTime,
+		a.deleted_sign as deletedSign,
+		a.name,
+		a.type,
+		a.manager_id as managerId,
+		a.dep_no as depNo,
+		a.super_id as superId,
+		a.remarks,
+		a.status,
+		b.name as managerName
+	from department_management a 
+	left join admin b on a.manager_id = b.id 
 		where 
 		id=#{id,jdbcType=VARCHAR}
 	</select>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1396,7 +1396,7 @@
 			id
 		from
 			user
-		where 1=1
+		where status <![CDATA[!= ]]> 1
 		<if test="id != null and id != ''">
 			and id = #{id,jdbcType=VARCHAR}
 		</if>
@@ -1415,6 +1415,7 @@
 		<if test="nickname != null and nickname != ''">
 			and nickname = #{nickname,jdbcType=INTEGER}
 		</if>
+		
 	</select>
 
 	<select id="userInterest" resultType="com.goafanti.user.bo.UserInterestBo">

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

@@ -247,7 +247,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			ui.setAuditStatus(IdentityProcess.SUCCESS.getCode());//认证个人
 			userIdentityMapper.insert(ui);
 		}else if(type == UserType.ORGANIZATION.getCode()){
-			if(userMapper.judgeCustomerByName(name)>0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, name,""));
+			if(userMapper.checkUser("",name,"",type,null,null).size()>0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, name,""));
 			// 创建企业认证信息
 			OrganizationIdentity oi = new OrganizationIdentity();
 			oi.setUnitName(name);

+ 3 - 6
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -66,7 +66,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateServiceOrder",method = RequestMethod.POST)
 	public Result updateServiceOrder(String orderNo,String signFirstPayment,String signTotalAmount,
-			String contractNo,String orderRemarks){
+			String contractNo,String orderRemarks,String contractPictureUrl){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
@@ -77,7 +77,7 @@ public class AdminOrderApiController extends CertifyApiController {
 			return res;
 		}
 		orderServiceImpl.updateServiceOrder(orderNo,signFirstPayment,signTotalAmount,contractNo,
-				orderRemarks);
+				orderRemarks,contractPictureUrl);
 		return res;
 	}
 	
@@ -98,10 +98,6 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
 			return res;
 		}
-		if(StringUtils.isBlank(contractNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "合同编号"));
-			return res;
-		}
 		if(StringUtils.isBlank(signFirstPayment) || StringUtils.isBlank(signTotalAmount)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单金额 和 首付金额"));
 			return res;
@@ -615,4 +611,5 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateTransferOrder(orderNo, aid, targetType);
 		return res;
 	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderService.java

@@ -134,7 +134,7 @@ public interface OrderService {
 	 * @return
 	 */
 	int updateServiceOrder(String orderNo, String signFirstPayment,
-			String signTotalAmount, String contractNo,String orderRemarks);
+			String signTotalAmount, String contractNo,String orderRemarks,String contractPictureUrl);
 	
 	/**
 	 * 签单

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -845,7 +845,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	public int updateServiceOrder(String orderNo,  String signFirstPayment,
-			String signTotalAmount,String contractNo, String orderRemarks) {
+			String signTotalAmount,String contractNo, String orderRemarks,String contractPictureUrl) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		checkOrder(tOrder);
 		boolean flag = false;
@@ -861,6 +861,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setOrderRemarks(orderRemarks);
 		tOrder.setUpdateTime(new Date());
 		tOrder.setContractNo(contractNo);
+		tOrder.setContractPictureUrl(contractPictureUrl);
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
 	}

+ 16 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -17,10 +17,14 @@ public class OrganizationListOut {
 	private String name;
 	/**组织类型**/
 	private String type;
+	/** 负责人姓名 **/
+	private String managerName;
 	/**组织负责人ID**/
 	private String managerId;
 	/**组织编号**/
 	private String depNo;
+	/** 上级组织名称 **/
+	private String superName;
 	/**上级组织**/
 	private String superId;
 	/**组织职能说明**/
@@ -75,6 +79,12 @@ public class OrganizationListOut {
 	public void setType(String type) {
 		this.type = type;
 	}
+	public String getManagerName() {
+		return managerName;
+	}
+	public void setManagerName(String managerName) {
+		this.managerName = managerName;
+	}
 	public String getManagerId() {
 		return managerId;
 	}
@@ -87,6 +97,12 @@ public class OrganizationListOut {
 	public void setDepNo(String depNo) {
 		this.depNo = depNo;
 	}
+	public String getSuperName() {
+		return superName;
+	}
+	public void setSuperName(String superName) {
+		this.superName = superName;
+	}
 	public String getSuperId() {
 		return superId;
 	}

+ 0 - 5
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -29,11 +29,6 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		Map<String,Object> params =disposeParams(olo);
 		@SuppressWarnings("unchecked")
 		Pagination<OrganizationListOut> p=(Pagination<OrganizationListOut>)findPage("selectOrganizationList","selectOrganizationCount",params,pageNo,pageSize);
-		@SuppressWarnings("unchecked")
-		List<OrganizationListOut> list=(List<OrganizationListOut>) p.getList();
-		for(OrganizationListOut i:list){
-			i.setSuperId(organizationManagementMapper.selectNameById(i.getSuperId()));
-		}
 		return p;
 	}
 	private Map<String,Object> disposeParams(OrganizationListOut olo){

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -183,7 +183,7 @@ public class UserRegisterController extends BaseController {
 			//us.setAid("0");
 			userService.insertRegister(us,user.getUnitName(),user.getUsername());
 			User currentUser = userService.selectByPrimaryKey(us.getId()); 			
-			registerEasemobAfterRegister(uuid,currentUser);//开通环信账号
+			//registerEasemobAfterRegister(uuid,currentUser);//开通环信账号
 		}
 		return res;
 	}

+ 0 - 2
src/main/java/com/goafanti/user/service/UserService.java

@@ -63,7 +63,5 @@ public interface UserService {
 
 	UserBasicInfo selectBaseInfo();
 	
-	List<User> checkExistUser(String id,String identifyName, String mobile,Integer type,Integer source,String nickname);
-
 	User selectByNumber(String easemobName);
 }

+ 0 - 5
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -362,11 +362,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	}
 
 	@Override
-	public List<User> checkExistUser(String id,String identifyName, String mobile,Integer type,Integer source,String nickname) {
-		return userMapper.checkUser(id, identifyName, mobile, type, source, nickname);
-	}
-
-	@Override
 	public User selectByNumber(String easemobName) {
 		
 		return userMapper.selectByNumber(easemobName);