|
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.rongwei.bscommon.sys.service.*;
|
|
import com.rongwei.bscommon.sys.service.*;
|
|
import com.rongwei.bscommon.sys.utils.ConstantUtil;
|
|
import com.rongwei.bscommon.sys.utils.ConstantUtil;
|
|
@@ -11,6 +12,7 @@ import com.rongwei.bsentity.domain.*;
|
|
import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckDao;
|
|
import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckDao;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.rongwei.bsentity.dto.lowaltitude.AddHoistingPlanDateRequest;
|
|
import com.rongwei.bsentity.dto.lowaltitude.AddHoistingPlanDateRequest;
|
|
|
|
+import com.rongwei.bsentity.dto.lowaltitude.DeleteCheckRequest;
|
|
import com.rongwei.bsentity.dto.lowaltitude.SaveCheckDetailDto;
|
|
import com.rongwei.bsentity.dto.lowaltitude.SaveCheckDetailDto;
|
|
import com.rongwei.bsentity.dto.lowaltitude.SaveCheckRequest;
|
|
import com.rongwei.bsentity.dto.lowaltitude.SaveCheckRequest;
|
|
import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
|
|
import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
|
|
@@ -124,9 +126,8 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
|
|
|
|
//分包商
|
|
//分包商
|
|
lowaltitudeDebtfreeCheckSubcontractorService.saveSubcontractor(newRecord.getId(), plate, classfySet);
|
|
lowaltitudeDebtfreeCheckSubcontractorService.saveSubcontractor(newRecord.getId(), plate, classfySet);
|
|
-
|
|
|
|
//分包商机电
|
|
//分包商机电
|
|
- lowaltitudeDebtfreeCheckSubcontractorPowerService.saveSubcontractor(newRecord.getId(), plate, classfySet);
|
|
|
|
|
|
+ lowaltitudeDebtfreeCheckSubcontractorPowerService.copyByCheckId(newRecord.getId());
|
|
|
|
|
|
// 明细
|
|
// 明细
|
|
SaveCheckDetailDto saveCheckDetailDto = SaveCheckDetailDto.builder()
|
|
SaveCheckDetailDto saveCheckDetailDto = SaveCheckDetailDto.builder()
|
|
@@ -136,7 +137,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
.build();
|
|
.build();
|
|
lowaltitudeDebtfreeCheckDetailService.saveCheckDetail(saveCheckDetailDto);
|
|
lowaltitudeDebtfreeCheckDetailService.saveCheckDetail(saveCheckDetailDto);
|
|
//明细-机电
|
|
//明细-机电
|
|
- lowaltitudeDebtfreeCheckDetailPowerService.saveCheckDetail(saveCheckDetailDto);
|
|
|
|
|
|
+ lowaltitudeDebtfreeCheckDetailPowerService.copyByCheckId(newRecord.getId());
|
|
}
|
|
}
|
|
|
|
|
|
//重新计算机台不欠债率
|
|
//重新计算机台不欠债率
|
|
@@ -180,6 +181,42 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 删除
|
|
|
|
+ *
|
|
|
|
+ * @param req
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public void delete(DeleteCheckRequest req) {
|
|
|
|
+ final ZhcxLowaltitudeDebtfreeCheckDo check = getById(req.getId());
|
|
|
|
+
|
|
|
|
+ //删除check
|
|
|
|
+ removeById(req.getId());
|
|
|
|
+
|
|
|
|
+ //删除明细
|
|
|
|
+ LambdaUpdateWrapper<ZhcxLowaltitudeDebtfreeCheckDetailDo> delDetailWrapper = Wrappers.lambdaUpdate();
|
|
|
|
+ delDetailWrapper.eq(ZhcxLowaltitudeDebtfreeCheckDetailDo::getCheckerid, req.getId());
|
|
|
|
+ lowaltitudeDebtfreeCheckDetailService.remove(delDetailWrapper);
|
|
|
|
+
|
|
|
|
+ //删除明细机电
|
|
|
|
+ LambdaUpdateWrapper<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> delDetailPowerWrapper = Wrappers.lambdaUpdate();
|
|
|
|
+ delDetailPowerWrapper.eq(ZhcxLowaltitudeDebtfreeCheckDetailPowerDo::getCheckerid, req.getId());
|
|
|
|
+ lowaltitudeDebtfreeCheckDetailPowerService.remove(delDetailPowerWrapper);
|
|
|
|
+
|
|
|
|
+ //主表
|
|
|
|
+ //主表下不存在check,需要删除主表数据
|
|
|
|
+ final LambdaQueryWrapper<ZhcxLowaltitudeDebtfreeCheckDo> query = Wrappers.lambdaQuery();
|
|
|
|
+ query.eq(ZhcxLowaltitudeDebtfreeCheckDo::getMainid, check.getId());
|
|
|
|
+ final int count = count(query);
|
|
|
|
+ if(count == 0) {
|
|
|
|
+ lowaltitudeDebtfreeCheckMainService.removeById(check.getId());
|
|
|
|
+ }
|
|
|
|
+ //存在时需要重新计算机台不欠债率
|
|
|
|
+ else {
|
|
|
|
+ lowaltitudeDebtfreeCheckMainService.updateMachineById(check.getMainid());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 修改检查
|
|
* 修改检查
|
|
*
|
|
*
|
|
@@ -191,7 +228,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
|
|
final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
|
|
|
|
|
|
//改check
|
|
//改check
|
|
- updateCheckObj(req, checkDo, "quality");
|
|
|
|
|
|
+ updateCheckObj(req, checkDo);
|
|
|
|
|
|
//分包商
|
|
//分包商
|
|
//明细
|
|
//明细
|
|
@@ -226,7 +263,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
public void updateCheck4Power(SaveCheckRequest req) {
|
|
public void updateCheck4Power(SaveCheckRequest req) {
|
|
final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
|
|
final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
|
|
//改check
|
|
//改check
|
|
- updateCheckObj(req, checkDo, "power");
|
|
|
|
|
|
+ updateCheckObjPower(req, checkDo);
|
|
|
|
|
|
try {
|
|
try {
|
|
if(ObjectUtil.isNotEmpty(req.getDetailList())) {
|
|
if(ObjectUtil.isNotEmpty(req.getDetailList())) {
|
|
@@ -249,17 +286,13 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
* @param req
|
|
* @param req
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- private void updateCheckObj(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo, String source) {
|
|
|
|
|
|
+ private void updateCheckObj(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
|
|
ZhcxLowaltitudeDebtfreeCheckDo entity = new ZhcxLowaltitudeDebtfreeCheckDo();
|
|
ZhcxLowaltitudeDebtfreeCheckDo entity = new ZhcxLowaltitudeDebtfreeCheckDo();
|
|
entity.setId(req.getId());
|
|
entity.setId(req.getId());
|
|
- if("quality".equals(source)) {
|
|
|
|
- entity.setCheckdate(req.getCheckdate());
|
|
|
|
- entity.setSectordebtratio(req.getSectordebtratio());
|
|
|
|
- entity.setCompletionstatus(req.getCompletionstatus());
|
|
|
|
- } else if("power".equals(source)) {
|
|
|
|
- entity.setPowersectordebtratio(req.getSectordebtratio());
|
|
|
|
- entity.setPowercompletionstatus(req.getCompletionstatus());
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ entity.setCheckdate(req.getCheckdate());
|
|
|
|
+ entity.setSectordebtratio(req.getSectordebtratio());
|
|
|
|
+ entity.setCompletionstatus(req.getCompletionstatus());
|
|
|
|
|
|
//只有保存才会进入下一步
|
|
//只有保存才会进入下一步
|
|
if("default".equals(req.getSaveBehavior())) {
|
|
if("default".equals(req.getSaveBehavior())) {
|
|
@@ -268,6 +301,45 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
|
|
updateById(entity);
|
|
updateById(entity);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 更新检查表
|
|
|
|
+ *
|
|
|
|
+ * @param req
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ private void updateCheckObjPower(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
|
|
|
|
+ ZhcxLowaltitudeDebtfreeCheckDo entity = new ZhcxLowaltitudeDebtfreeCheckDo();
|
|
|
|
+ entity.setId(req.getId());
|
|
|
|
+ entity.setPowersectordebtratio(req.getSectordebtratio());
|
|
|
|
+ entity.setPowercompletionstatus(req.getCompletionstatus());
|
|
|
|
+
|
|
|
|
+ //只有保存才会进入下一步
|
|
|
|
+ if("default".equals(req.getSaveBehavior())) {
|
|
|
|
+ entity.setElectromechanicalstatus(getStepStatusPower(checkDo));
|
|
|
|
+ }
|
|
|
|
+ updateById(entity);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获取状态
|
|
|
|
+ *
|
|
|
|
+ * @param checkDo
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ private String getStepStatusPower(ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
|
|
|
|
+ if(ObjectUtil.isEmpty(checkDo.getElectromechanicalstatus())) {
|
|
|
|
+ checkDo.setQualitystatus("assembling");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if("done".equals(checkDo.getElectromechanicalstatus())) {
|
|
|
|
+ return checkDo.getElectromechanicalstatus();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ final int index = ConstantUtil.LOWER_STEP_STATUS.indexOf(checkDo.getElectromechanicalstatus());
|
|
|
|
+
|
|
|
|
+ return ConstantUtil.LOWER_STEP_STATUS.get(index + 1);
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取状态
|
|
* 获取状态
|
|
*
|
|
*
|