java/zhihuishenqu.git

			@@ -251,7 +251,7 @@
			if(allNum>0 && score>0)
			{
			java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##");//传入格式模板
			String workEfficiency=weekDf.format((float)(score/allNum));
			String workEfficiency=weekDf.format((float)score/(float)allNum);
			bean.setNum(workEfficiency);
			}
			}

			@@ -275,6 +275,10 @@
			@Authorization
			public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
			{
			if(ids==null \|\| ids.size()<1)
			{
			ids=null;
			}
			return getDataTable(iTransactionEventService.selectClassifyList(ids));
			}

			@@ -118,6 +118,12 @@
			}
			else
			{
			if(StringUtils.equals("4",user.getUserType()))
			{
			//提示用户名或密码错误
			return ResultData.fail(HttpStatus.UNAUTHORIZED, "账户不存在");
			}

			if(!password.equals(user.getPassword()))
			{
			//提示用户名或密码错误
			@@ -229,17 +235,44 @@
			return error("手机号不能为空");
			}




			SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
			SysUser user2 = IUserService.selectData("","",config.getLoginName());
			if (user != null) {
			//提示用户名或密码错误
			return error("该用户已存在！");
			if(StringUtils.equals("4",user.getUserType()))
			{
			config.setUserId(user.getUserId());
			config.setCreateBy(user.getUserId()+"");
			config.setUserType("3");

			config.setUpdateTime(LocalDateTime.now());
			return toAjax(IUserService.updateConfig(config));
			}
			else
			{
			//提示用户名或密码错误
			return error("该用户已存在！");
			}
			}

			if(user2 != null)
			{
			//提示用户名或密码错误
			return error("该登录账户已存在！请修改登录账户");
			if(StringUtils.equals("4",user2.getUserType()))
			{
			config.setUserId(user2.getUserId());
			config.setCreateBy(user2.getUserId()+"");
			config.setUserType("3");

			config.setUpdateTime(LocalDateTime.now());
			return toAjax(IUserService.updateConfig(config));
			}
			else
			{
			//提示用户名或密码错误
			return error("该用户已存在！");
			}
			}

			config.setCreateBy(sysUser.getUserId()+"");

			@@ -95,7 +95,7 @@
			transaction_ids,
			transaction_names,
			openid,
			(select user_name from automessage_sys_user where automessage_sys_user.user_id=create_by) as createName,
			(select user_name from automessage_sys_user as asu where asu.user_id=automessage_sys_user.create_by) as createName,
			transaction_num,
			(select count(id) from automessage_guide_repair_order where automessage_guide_repair_order.state='3'
			and automessage_guide_repair_order.guide_user_id=user_id and

	flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/UserController.java	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/SysUserMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史