|
|
@ -16,7 +16,6 @@ import com.kms.yxgh.df.domain.DfCheckingPlanContent; |
|
|
|
import com.kms.yxgh.df.domain.DfPlan; |
|
|
|
import com.kms.yxgh.df.dto.DfCheckingLineDto; |
|
|
|
import com.kms.yxgh.df.dto.DfCheckingLineSearchDto; |
|
|
|
import com.kms.yxgh.df.dto.DfPointDto; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingLineMapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingPlanContentMapper; |
|
|
|
import com.kms.yxgh.util.BeanCopyUtils; |
|
|
@ -57,7 +56,7 @@ public class DfCheckingLineService extends BaseService<DfCheckingLineMapper, DfC |
|
|
|
DfCheckingLine checkingLine = this.getById(id); |
|
|
|
DfCheckingLineDto dto = BeanCopyUtils.copy(checkingLine, DfCheckingLineDto.class); |
|
|
|
if (dto != null) { |
|
|
|
dto.setPoints(JSON.parseArray(checkingLine.getPoints(), DfPointDto.class)); |
|
|
|
dto.setEntries(checkingLine.getPoints()); |
|
|
|
dto.setCheckingDetail(dfCheckingService.getDetailById(dto.getXcId())); |
|
|
|
BsSgcDfSafeJbxx df = dfSafeJbxxMapper.getByDikeCode(dto.getDikeCode()); |
|
|
|
if (df != null) { |
|
|
@ -82,7 +81,7 @@ public class DfCheckingLineService extends BaseService<DfCheckingLineMapper, DfC |
|
|
|
DfCheckingLine checkingLine = BeanCopyUtils.copy(dto, DfCheckingLine.class); |
|
|
|
if (checkingLine != null) { |
|
|
|
checkingLine.setId(null); |
|
|
|
checkingLine.setPoints(JSON.toJSONString(dto.getPoints())); |
|
|
|
checkingLine.setPoints(JSON.toJSONString(dto.getEntries())); |
|
|
|
getBaseMapper().insert(checkingLine); |
|
|
|
String id = checkingLine.getId(); |
|
|
|
return this.getDetailById(id); |
|
|
@ -95,7 +94,7 @@ public class DfCheckingLineService extends BaseService<DfCheckingLineMapper, DfC |
|
|
|
if (exist(dto.getId())) { |
|
|
|
DfCheckingLine checkingLine = BeanCopyUtils.copy(dto, DfCheckingLine.class); |
|
|
|
if (checkingLine != null) { |
|
|
|
checkingLine.setPoints(JSON.toJSONString(dto.getPoints())); |
|
|
|
checkingLine.setPoints(JSON.toJSONString(dto.getEntries())); |
|
|
|
getBaseMapper().updateById(checkingLine); |
|
|
|
String id = checkingLine.getId(); |
|
|
|
return this.getDetailById(id); |
|
|
|