|
@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.helper.LoginHelper;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
+import com.ruoyi.framework.handler.MonthTableNameHandler;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
|
|
|
import com.ruoyi.zdsz.domain.ZEngineeringInfo;
|
|
@@ -31,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
@@ -483,12 +485,23 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
|
|
|
LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getId, bo.getId());
|
|
|
ZEngineeringInfo zEngineeringInfo = baseMapper.selectOne(lqw);
|
|
|
+ SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy_MM");
|
|
|
ZEngineeringInfoBo zEngineeringInfobo =new ZEngineeringInfoBo();
|
|
|
zEngineeringInfobo= BeanUtil.toBean(zEngineeringInfo, ZEngineeringInfoBo.class);
|
|
|
//zEngineeringInfobo.setCreateTime(bo.getCreateTime());
|
|
|
izEngiineeringPhotoService.delete(zEngineeringInfobo);
|
|
|
izEngineeringMaterialService.delete(zEngineeringInfobo);
|
|
|
- baseMapper.deleteById(zEngineeringInfo.getId());
|
|
|
+
|
|
|
+ MonthTableNameHandler.setData(simpleDateFormat.format(bo.getCreateTime()));
|
|
|
+ baseMapper.deleteById(bo.getId());
|
|
|
+ LambdaQueryWrapper<ZEngineeringInfo> lqw2 = Wrappers.lambdaQuery();
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getEngInfoId()), ZEngineeringInfo::getEngInfoId, bo.getEngInfoId());
|
|
|
+ List<ZEngineeringInfo> zEngineeringInfoList = baseMapper.selectList(lqw2);
|
|
|
+ MonthTableNameHandler.removeData();
|
|
|
+ if (zEngineeringInfoList.size()==0)
|
|
|
+ {
|
|
|
+ izEngineeringReviewService.deleteByNodeId(zEngineeringInfobo);
|
|
|
+ }
|
|
|
return null;
|
|
|
}
|
|
|
|