Commit 5ffcd59e authored by lixinglin's avatar lixinglin

逻辑修改

parent b15a9881
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.ParkInfo; import com.ruoyi.system.domain.ParkInfo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.DevelopmentInfoMapper; import com.ruoyi.system.mapper.DevelopmentInfoMapper;
...@@ -75,7 +76,7 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService { ...@@ -75,7 +76,7 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
List<DevelopmentInfo> parkInfos = developmentInfoMapper.selectDevelopmentInfoList(parkInfo1); List<DevelopmentInfo> parkInfos = developmentInfoMapper.selectDevelopmentInfoList(parkInfo1);
DevelopmentInfo developmentInfo1 = developmentInfoMapper.selectDevelopmentInfoById(mirrorId); DevelopmentInfo developmentInfo1 = developmentInfoMapper.selectDevelopmentInfoById(mirrorId);
if(developmentInfo1!=null){ if(developmentInfo1!=null){
developmentInfo1.setStatus(9); BeanUtils.copyProperties(developmentInfo,developmentInfo1);
developmentInfoMapper.updateDevelopmentInfo(developmentInfo1); developmentInfoMapper.updateDevelopmentInfo(developmentInfo1);
} }
for (DevelopmentInfo info : parkInfos) { for (DevelopmentInfo info : parkInfos) {
...@@ -86,6 +87,8 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService { ...@@ -86,6 +87,8 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
} }
} }
} }
//把该条子记录删除
developmentInfoMapper.deleteDevelopmentInfoById(id);
} }
return developmentInfoMapper.updateDevelopmentInfo(developmentInfo); return developmentInfoMapper.updateDevelopmentInfo(developmentInfo);
......
...@@ -5,6 +5,7 @@ import java.util.Map; ...@@ -5,6 +5,7 @@ import java.util.Map;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.DevelopmentInfo; import com.ruoyi.system.domain.DevelopmentInfo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.ParkInfoMapper; import com.ruoyi.system.mapper.ParkInfoMapper;
...@@ -82,8 +83,8 @@ public class ParkInfoServiceImpl implements IParkInfoService { ...@@ -82,8 +83,8 @@ public class ParkInfoServiceImpl implements IParkInfoService {
parkInfo1.setMirrorId(mirrorId); parkInfo1.setMirrorId(mirrorId);
List<ParkInfo> parkInfos = parkInfoMapper.selectParkInfoList(parkInfo1); List<ParkInfo> parkInfos = parkInfoMapper.selectParkInfoList(parkInfo1);
ParkInfo parkInfo2 = parkInfoMapper.selectParkInfoById(mirrorId); ParkInfo parkInfo2 = parkInfoMapper.selectParkInfoById(mirrorId);
if(parkInfo2!=null){ if (parkInfo2 != null) {
parkInfo2.setStatus(9); BeanUtils.copyProperties(parkInfo, parkInfo2);
parkInfoMapper.updateParkInfo(parkInfo2); parkInfoMapper.updateParkInfo(parkInfo2);
} }
for (ParkInfo info : parkInfos) { for (ParkInfo info : parkInfos) {
...@@ -94,6 +95,8 @@ public class ParkInfoServiceImpl implements IParkInfoService { ...@@ -94,6 +95,8 @@ public class ParkInfoServiceImpl implements IParkInfoService {
} }
} }
} }
//把该条子记录删除
parkInfoMapper.deleteParkInfoById(id);
} }
return parkInfoMapper.updateParkInfo(parkInfo); return parkInfoMapper.updateParkInfo(parkInfo);
} }
......
...@@ -225,7 +225,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -225,7 +225,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="selectByStatus" parameterType="String" resultMap="DevelopmentInfoResult"> <select id="selectByStatus" parameterType="String" resultMap="DevelopmentInfoResult">
<include refid="selectDevelopmentInfoVo"/> <include refid="selectDevelopmentInfoVo"/>
where status != #{status} where status != #{status}
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment