~zhangleilei/supipe.git

			@@ -114,7 +114,7 @@
			</if>
			</trim>
			</where>

			order by spu.create_time desc
			</select>

			<select id="queryForPullDownDorm" resultType="com.thhy.staff.modules.biz.platuser.entity.PlatUserPullDown">

			@@ -171,7 +171,6 @@
			public BasicResult examine(HiddenDangerEntity hiddenDangerEntity) {
			SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
			String platUserId = regionInspectionRecordMapper.selectPlatUserId(hiddenDangerEntity.getCreateUser());

			Map platUser = regionInspectionRecordMapper.getPlatUser(platUserId);
			int user_type = (int) platUser.get("user_type");
			Map account = new HashMap();

			@@ -32,8 +32,9 @@
			private Double changeIntegral;//变量在积分超市修改前的变量


			@Excel(sort = 1,title = "时间")
			private Date createTime;
			@Excel(sort = 1,title = "时间")
			private String createDate;
			@Excel(sort = 2,title = "人员类别")
			private String userTypeName;
			@Excel(sort = 3,title = "人员姓名")

			@@ -236,8 +236,9 @@
			SELECT
			t.*,
			spu.real_name realName,
			spu.user_type userTypeName
			FROM t_integral_detail t
			spu.user_type userTypeName,
			DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
			FROM t_integral_detail t
			LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
			WHERE t.isUse = 1 and t.type = 2 and t.companyId = #{companyId}
			<if test="userId != null and userId !=''">
			@@ -280,7 +281,7 @@
			<select id="selectSafeIntegralInfo" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto">
			SELECT
			t.*,
			DATE_FORMAT(t.createTime, '%Y-%m-%d') createDate
			DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
			FROM t_integral_detail t
			WHERE t.isUse = 1
			<if test="companyId != null and companyId !=''">

	hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史