设备-维修-1

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

@@ -234,6 +234,9 @@ public class EquRepairWorkOrder extends BaseEntity {
 	//申领单列表
 	private List<EquSpareApply> applyList;
 
+	//检查项列表
+	private List<EquOrderStandard> standardList;
+
 	//维修前 维修后
 	public String getAfterRepairFile() {
 		return afterRepairFile;
@@ -690,6 +693,14 @@ public class EquRepairWorkOrder extends BaseEntity {
 		this.files = files;
 	}
 
+	//标准列表
+	public List<EquOrderStandard> getStandardList() {
+		return standardList;
+	}
+	public void setStandardList(List<EquOrderStandard> standardList) {
+		this.standardList = standardList;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -91,4 +91,9 @@ public interface EquOrderStandardMapper {
     public List<EquOrderStandard> selectPdaEquOrderList(EquOrder equOrder);
 
     int insertEquOrderStandards(@Param("list") List<EquPlanStandard> standards);
+
+    /**
+     * 更新维修后标准
+     */
+    void updateStandardAfterRepair(EquOrderStandard equOrderStandard);
 }

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

@@ -73,6 +73,6 @@ public interface EquTeamMapper {
 	public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
 
 	//查询特定人员
-	@DS("master")
+	@DS("#master")
 	public EquTeamUser selectTeamMember(EquTeamUser equTeamUser);
 }

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

@@ -63,6 +63,7 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
 	@Override
 	@DS("#header.poolName")
 	public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork) {
+		//新增的委外工单，不用报修单号、维修单号拼接
 		equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
 		String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber());
 		String equipmentCode = equOutsourceWork.getEquipmentCode();

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

@@ -239,6 +239,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
 			equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit());
 			equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson());
 			equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason());
+			//委外类型 维修委外
+			equOutsourceWork.setWorkType("0");
 			equOutsourceWork.setCreateBy(SecurityUtils.getUsername());
 			equOutsourceWork.setCreateTime(DateUtils.getNowDate());
 			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();

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

@@ -1,11 +1,14 @@
 package com.op.device.service.impl;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.domain.BaseFileData;
 import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.device.domain.*;
@@ -153,6 +156,34 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
 		}
 		equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
 		equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
+
+		//先删除每个维修工单对应图片
+		equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId());
+		if (StringUtils.isNotEmpty(equRepairWorkOrder.getAfterRepairFile())) {
+			String[] ids = equRepairWorkOrder.getAfterRepairFile().split(",");
+			List<BaseFileData> files = new ArrayList<>();
+			BaseFileData file = null;
+			for (String id : ids) {
+				file = new BaseFileData();
+				file.setFileId(IdUtils.fastSimpleUUID());
+				file.setFileName(id.split("&fileName=")[1]);
+				file.setFileAddress(id);
+				file.setSourceId(equRepairWorkOrder.getWorkId());
+				file.setCreateBy(SecurityUtils.getUsername());
+				file.setCreateTime(new Date());
+				//维修后
+				file.setImageType("4");
+				files.add(file);
+			}
+			equRepairWorkOrderMapper.insertBaseFileBatch(files);
+		}
+
+		//更新标准表
+		for(EquOrderStandard equOrderStandard:equRepairWorkOrder.getStandardList()){
+			equOrderStandard.setUpdateBy(SecurityUtils.getUsername());
+			equOrderStandard.setUpdateTime(DateUtils.getNowDate());
+			equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard);
+		}
 		return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
 	}
 
@@ -204,6 +235,8 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
 		equOutsourceWork.setWorkPerson(equRepairWorkOrder.getOutSourcePerson());
 		equOutsourceWork.setWorkOutsourcingUnit(equRepairWorkOrder.getWorkOutsourcingUnit());
 		equOutsourceWork.setWorkConnection(equRepairWorkOrder.getWorkConnection());
+		//委外类型 维修委外
+		equOutsourceWork.setWorkType("0");
 		equOutsourceWork.setCreateTime(DateUtils.getNowDate());
 		equOutsourceWork.setCreateBy(SecurityUtils.getUsername());
 		if(equRepairWorkOrder.getWorkId()!= null){

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

@@ -52,7 +52,7 @@ public class EquTeamServiceImpl implements IEquTeamService {
 		List<EquTeamUser> equTeamUser1 = equTeamUserMapper.selectEquTeamUserList(equTeamUser);
 		EquTeam equTeam = equTeamMapper.selectEquTeamById(id);
 		equTeam.setSelectedData(equTeamUser1);
-		return equTeamMapper.selectEquTeamById(id);
+		return equTeam;
 	}
 
 	/**
@@ -99,9 +99,9 @@ public class EquTeamServiceImpl implements IEquTeamService {
 				list = equTeam.getRightData();
 				String userId = list.get(i);
 				equTeamUser.setUserId(userId);
-				EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
-				equTeamUser.setUserName(memberList.getUserName());
-				equTeamUser.setNickName(memberList.getNickName());
+//				EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
+//				equTeamUser.setUserName(memberList.getUserName());
+//				equTeamUser.setNickName(memberList.getNickName());
 				equTeamUserMapper.insertEquTeamUser(equTeamUser);
 			}
 			return success("新增设备班组成功！");
@@ -123,6 +123,7 @@ public class EquTeamServiceImpl implements IEquTeamService {
 		try{
 			equTeam.setUpdateTime(DateUtils.getNowDate());
 			equTeam.setUpdateBy(SecurityUtils.getUsername());
+			equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId());
 			equTeamMapper.updateEquTeam(equTeam);
 			for(int i = 0;i<equTeam.getRightData().size();i++){
 				EquTeamUser equTeamUser = new EquTeamUser();
@@ -136,7 +137,6 @@ public class EquTeamServiceImpl implements IEquTeamService {
 				String userId = list.get(i);
 				equTeamUser.setUserId(userId);
 				String userName = equTeamUserMapper.selectUserName(equTeamUser);
-				//判断班组人员有没有变动 挨个遍历
 				equTeamUser.setUserName(userName);
 				equTeamUserMapper.insertEquTeamUser(equTeamUser);
 			}

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

@@ -268,4 +268,16 @@
         where source_id = #{sourceId}
     </select>
 
+    <update id="updateStandardAfterRepair" parameterType="EquOrderStandard">
+        update equ_order_standard
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="repairReach != null">repair_reach = #{repairReach},</if>
+            <if test="repairValue != null">repair_value = #{repairValue},</if>
+        </trim>
+        where id = #{id}
+        and del_flag = '0'
+    </update>
+
 </mapper>

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

@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="workType != null  and workType != ''"> and work_type = #{workType}</if>
 			<if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
 			<if test="workCost != null  and workCost != ''"> and work_cost like concat('%', #{workCost}, '%')</if>
-			<if test="workCostTime != null  and workCostTime != ''"> and work_cost_time = #{workCostTime}</if>
+			<if test="workCostTime != null  and workCostTime != ''"> and work_cost_time like concat('%', #{workCostTime}, '%')</if>
 			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>

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

@@ -129,4 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    where del_flag = '0'
 	</select>
 
+	<select id="selectTeamMember" 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
+		from sys_user
+	    where del_flag = '0'
+	    and user_id  = #{userId}
+	</select>
+
 </mapper>

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

@@ -21,13 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
 	<select id="selectEquTeamUserList" parameterType="EquTeamUser" resultMap="EquTeamUserResult">
-		<include refid="selectEquTeamUserVo"/>
-		<where>  
-			<if test="teamId != null  and teamId != ''"> and team_id = #{teamId}</if>
-			<if test="teamCode != null  and teamCode != ''"> and team_code = #{teamCode}</if>
-			<if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
-			<if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-		</where>
+		select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time from equ_team_user
+		where team_id = #{teamId}
 	</select>
 	
 	<select id="selectEquTeamUserById" parameterType="String" resultMap="EquTeamUserResult">
@@ -76,10 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where id = #{id}
 	</update>
 
-	<delete id="deleteEquTeamUserById" parameterType="String">
-		delete from equ_team_user where id = #{id}
-	</delete>
-
 	<delete id="deleteEquTeamUserByTeamId" parameterType="String">
 		delete from equ_team_user where team_id = #{teamId}
 	</delete>