java/zhihuishenqu.git

			@@ -112,6 +112,7 @@
			entity.setToUserId(sysUser.getUserId()+"");
			entity.setFromUserId(order.getGuideUserId());
			entity.setFromDepartmentalId(order.getGuideDepartmentId());
			entity.setGuideId(order.getId().toString());

			iGuideEvolveService.insertConfig(entity);

			@@ -156,6 +157,7 @@
			entity.setToUserId(sysUser.getUserId()+"");
			entity.setFromUserId(order.getGuideUserId());
			entity.setFromDepartmentalId(order.getGuideDepartmentId());
			entity.setGuideId(order.getId().toString());

			iGuideEvolveService.insertConfig(entity);

			@@ -207,6 +209,7 @@
			entity.setState("4");
			entity.setFromDepartmentalId(sysUser.getDepartmentId());
			entity.setFromUserId(sysUser.getUserId()+"");
			entity.setGuideId(order.getId().toString());
			iGuideEvolveService.insertConfig(entity);
			return toAjax(iGuideRepairOrderService.updateConfig(order));
			}
			@@ -251,6 +254,7 @@
			entity.setState("5");
			entity.setFromDepartmentalId(sysUser.getDepartmentId());
			entity.setFromUserId(sysUser.getUserId()+"");
			entity.setGuideId(order.getId().toString());
			iGuideEvolveService.insertConfig(entity);
			return toAjax(iGuideRepairOrderService.updateConfig(order));
			}
			@@ -295,6 +299,7 @@
			guideEvolveEntity.setState("3");
			guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
			guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
			guideEvolveEntity.setGuideId(entity.getId().toString());
			iGuideEvolveService.insertConfig(guideEvolveEntity);

			return toAjax(iGuideRepairOrderService.updateConfig(entity));

			@@ -1,6 +1,7 @@
			package com.dg.core.db.gen.entity;

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.fasterxml.jackson.annotation.JsonFormat;
			@@ -120,4 +121,12 @@
			@ApiModelProperty(name = "pictureUrl", value = "图片url")
			private String pictureUrl;

			@TableField(exist = false)
			@ApiModelProperty(name = "toUserName", value = "发起人名字")
			private String toUserName;

			@TableField(exist = false)
			@ApiModelProperty(name = "toUserName", value = "接收人名字")
			private String fromUserName;

			}

			@@ -26,6 +26,8 @@
			SELECT
			id,
			departmental_id,
			(select user_name from automessage_sys_user where a.to_user_id=user_id)toUserName,
			(select user_name from automessage_sys_user where a.from_user_id=user_id)fromUserName,
			to_user_id,
			from_user_id,
			state,
			@@ -41,7 +43,7 @@
			create_time,
			update_time
			FROM
			automessage_guide_evolve
			automessage_guide_evolve a
			</sql>

			<select id="selectConfigList" resultMap="GuideEvolveResult">
			@@ -57,7 +59,6 @@

			<insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
			insert into automessage_guide_evolve (
			<if test="id != null">id,</if>
			<if test="departmentalId != null and departmentalId != '' ">departmental_id,</if>
			<if test="toUserId != null and toUserId != '' ">to_user_id,</if>
			<if test="fromUserId != null and fromUserId != '' ">from_user_id,</if>

	flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/GuideEvolveMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史