报修-2

op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java

@@ -41,6 +41,10 @@ public class EquTeamUser extends BaseEntity {
 	@Excel(name = "人员拼接名字")
 	private String teamUserName;
 
+	/** 手机号 */
+	@Excel(name = "手机号")
+	private String phonenumber;
+
 	public void setId(String id) {
 		this.id = id;
 	}
@@ -90,6 +94,14 @@ public class EquTeamUser extends BaseEntity {
 		this.teamUserName = teamUserName;
 	}
 
+	public void setPhonenumber(String phonenumber) {
+		this.phonenumber = phonenumber;
+	}
+
+	public String getPhonenumber() {
+		return phonenumber;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java

@@ -103,4 +103,6 @@ public interface EquRepairOrderMapper {
 	 */
 	public List<BaseFileData> getBaseFileBatch(String orderId);
 
+	//联系方式
+	EquTeamUser getRepairPhoneNumber(EquTeamUser equTeamUser);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -259,6 +259,16 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
             equRepairOrder.setCreateTime(DateUtils.getNowDate());
             equRepairOrder.setCreateBy(SecurityUtils.getUsername());
+            //报修人编码、故障时间、设备编码、报修时间、联系人联系方式-自动报修
+            equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());
+            equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername());
+            equRepairOrder.setEquipmentCode(equipmentCode);
+            equRepairOrder.setOrderTime(DateUtils.getNowDate());
+            EquTeamUser equTeamUser = new EquTeamUser();
+            equTeamUser.setUserName(SecurityUtils.getUsername());
+            EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser);
+            equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber());
+
             // 报修来源
             if (equOrder.getPlanType().equals("inspection")){
                 equRepairOrder.setOrderSource("巡检");

op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java

@@ -278,6 +278,17 @@ public class EquOrderServiceImpl implements IEquOrderService {
             equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
             equRepairOrder.setCreateTime(DateUtils.getNowDate());
             equRepairOrder.setCreateBy(SecurityUtils.getUsername());
+
+            //报修人编码、故障时间、设备编码、报修时间、联系人联系方式-自动报修
+            equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());
+            equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername());
+            equRepairOrder.setEquipmentCode(equipmentCode);
+            equRepairOrder.setOrderTime(DateUtils.getNowDate());
+            EquTeamUser equTeamUser = new EquTeamUser();
+            equTeamUser.setUserName(SecurityUtils.getUsername());
+            EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser);
+            equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber());
+
             // 报修来源
             if (equOrder.getPlanType().equals("inspection")) {
                 equRepairOrder.setOrderSource("巡检");

op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java

@@ -136,8 +136,8 @@ public class EquTeamServiceImpl implements IEquTeamService {
 				list = equTeam.getRightData();
 				String userId = list.get(i);
 				equTeamUser.setUserId(userId);
-				String userName = equTeamUserMapper.selectUserName(equTeamUser);
-				equTeamUser.setUserName(userName);
+//				String userName = equTeamUserMapper.selectUserName(equTeamUser);
+//				equTeamUser.setUserName(userName);
 				equTeamUserMapper.insertEquTeamUser(equTeamUser);
 			}
 			return success("修改设备班组成功！");

op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml

@@ -238,7 +238,7 @@
         <where>
             <if test="orderCode != null "> and eo.order_code = #{orderCode}</if>
             and eo.del_flag = '0'
-            and eos.error_flag = '1'
+            and eos.detail_reach = '0'
         </where>
     </select>
 

op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml

@@ -273,7 +273,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		user_id AS userId,
 		user_name AS userName,
 		nick_name AS nickName,
-		CONCAT(nick_name,user_name) AS teamUserName
+		CONCAT(nick_name,user_name) AS teamUserName,
+		phonenumber AS phonenumber
 		from sys_user
 		<where>
 		<if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
@@ -282,6 +283,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</select>
 
+	<select id="getRepairPhoneNumber" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
+		select
+		user_id AS userId,
+		user_name AS userName,
+		nick_name AS nickName,
+		CONCAT(nick_name,user_name) AS teamUserName,
+		phonenumber AS phoneNumber
+		from sys_user
+		where user_name = #{userName}
+		and del_flag = '0'
+	</select>
+
     <select id="selectEquRepairOrderByRepairCode"  parameterType="String" resultMap="EquRepairOrderResult">
 		<include refid="selectEquRepairOrderVo"/>
 		where order_code = #{repairCode} and del_flag = '0'