考核评分优化
This commit is contained in:
parent
e03fc1083a
commit
8b3345c251
@ -10,6 +10,8 @@ import com.zhgd.xmgl.modules.basicdata.mapper.EngineeringSingleMapper;
|
|||||||
import com.zhgd.xmgl.modules.basicdata.service.*;
|
import com.zhgd.xmgl.modules.basicdata.service.*;
|
||||||
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
|
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
|
||||||
import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
|
import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
|
||||||
|
import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreDetail;
|
||||||
|
import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreDetailService;
|
||||||
import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService;
|
import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService;
|
||||||
import com.zhgd.xmgl.util.ParamEnum;
|
import com.zhgd.xmgl.util.ParamEnum;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -43,6 +45,9 @@ public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleM
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IEnterpriseScoreService enterpriseScoreService;
|
private IEnterpriseScoreService enterpriseScoreService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IEnterpriseScoreDetailService enterpriseScoreDetailService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProjectService projectService;
|
private IProjectService projectService;
|
||||||
|
|
||||||
@ -66,13 +71,18 @@ public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleM
|
|||||||
engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn());
|
engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn());
|
||||||
}
|
}
|
||||||
engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList());
|
engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList());
|
||||||
EnterpriseScore enterpriseScore = new EnterpriseScore();
|
EnterpriseScore scoreServiceOne = enterpriseScoreService.getOne(Wrappers.<EnterpriseScore>lambdaQuery()
|
||||||
enterpriseScore.setEnterpriseSn(engineeringMain.getEnterpriseSn());
|
.eq(EnterpriseScore::getEnterpriseSn, engineeringMain.getEnterpriseSn())
|
||||||
enterpriseScore.setEngineeringSn(engineeringVo.getEngineeringSn());
|
.eq(EnterpriseScore::getEngineeringSn, engineeringVo.getEngineeringSn()));
|
||||||
enterpriseScore.setEnterpriseType(engineeringMain.getType());
|
if (scoreServiceOne == null) {
|
||||||
enterpriseScore.setCreateBy(projectService.list().get(0).getGovernmentSn());
|
EnterpriseScore enterpriseScore = new EnterpriseScore();
|
||||||
enterpriseScore.setCreateTime(new Date());
|
enterpriseScore.setEnterpriseSn(engineeringMain.getEnterpriseSn());
|
||||||
scoreList.add(enterpriseScore);
|
enterpriseScore.setEngineeringSn(engineeringVo.getEngineeringSn());
|
||||||
|
enterpriseScore.setEnterpriseType(engineeringMain.getType());
|
||||||
|
enterpriseScore.setCreateBy(projectService.list().get(0).getGovernmentSn());
|
||||||
|
enterpriseScore.setCreateTime(new Date());
|
||||||
|
scoreList.add(enterpriseScore);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
enterpriseScoreService.saveBatch(scoreList);
|
enterpriseScoreService.saveBatch(scoreList);
|
||||||
return true;
|
return true;
|
||||||
@ -87,9 +97,20 @@ public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleM
|
|||||||
List<EngineeringMain> engineeringMains = engineeringMainService.list(Wrappers.<EngineeringMain>lambdaQuery()
|
List<EngineeringMain> engineeringMains = engineeringMainService.list(Wrappers.<EngineeringMain>lambdaQuery()
|
||||||
.eq(EngineeringMain::getEngineeringSn, engineeringSn));
|
.eq(EngineeringMain::getEngineeringSn, engineeringSn));
|
||||||
List<Long> mainIds = engineeringMains.stream().map(m -> m.getId()).collect(Collectors.toList());
|
List<Long> mainIds = engineeringMains.stream().map(m -> m.getId()).collect(Collectors.toList());
|
||||||
|
List<String> enterprises = engineeringMains.stream().map(m -> m.getEnterpriseSn()).collect(Collectors.toList());
|
||||||
engineeringMainPersonService.remove(Wrappers.<EngineeringMainPerson>lambdaQuery()
|
engineeringMainPersonService.remove(Wrappers.<EngineeringMainPerson>lambdaQuery()
|
||||||
.in(EngineeringMainPerson::getMainId, mainIds));
|
.in(EngineeringMainPerson::getMainId, mainIds));
|
||||||
engineeringMainService.removeByIds(mainIds);
|
engineeringMainService.removeByIds(mainIds);
|
||||||
|
List<EnterpriseScore> scoreServiceList = enterpriseScoreService.list(Wrappers.<EnterpriseScore>lambdaQuery()
|
||||||
|
.in(EnterpriseScore::getEnterpriseSn, enterprises)
|
||||||
|
.eq(EnterpriseScore::getEngineeringSn, engineeringSn));
|
||||||
|
for (EnterpriseScore enterpriseScore : scoreServiceList) {
|
||||||
|
int num = enterpriseScoreDetailService.count(Wrappers.<EnterpriseScoreDetail>lambdaQuery()
|
||||||
|
.eq(EnterpriseScoreDetail::getScoreId, enterpriseScore.getId()));
|
||||||
|
if (num == 0) {
|
||||||
|
enterpriseScoreService.removeById(enterpriseScore.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user