From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 99 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
index 649f103..1b1b51e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -102,10 +102,9 @@
dispatchUnitMapper.updateById(update);
if(Constants.equalsInteger(param.getWorktypeStatus(),Constants.ONE)){
//瀹℃牳閫氳繃锛屼慨鏀圭姸鎬侊紝浜х敓鍘嗗彶鐗堟湰
- newVersionData(dispatchUnitMapper.selectById(param.getId()),update);
+ newVersionData(model,update,false);
//瀛樺偍鎿嶄綔鍘嗗彶
this.saveDuLog(update,Constants.DispatchUnitLogType.WORK_TYPE_AUDIT_PASS,update.getCheckInfo());
-
}else{
//鏇存柊鏄庣粏鏁版嵁涓哄鏍稿け璐�
duSolutionMapper.update(null,new UpdateWrapper<DuSolution>().lambda()
@@ -136,23 +135,33 @@
return 1;
}
- private void newVersionData(DispatchUnit model, DispatchUnit update) {
- dispatchUnitMapper.update(null,new UpdateWrapper<DispatchUnit>().lambda()
- .set(DispatchUnit::getDataType,Constants.ZERO)
- .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
- .eq(DispatchUnit::getBaseId,model.getId()));
+ private void newVersionData(DispatchUnit model, DispatchUnit update,Boolean flag) {
DispatchUnit newVersion = new DispatchUnit();
- BeanUtils.copyProperties(model, newVersion);
- newVersion.setWorktypeStatus(Constants.ONE);
- newVersion.setCheckDate(update.getEditDate());
- newVersion.setCheckUserId(update.getCheckUserId());
- newVersion.setCheckInfo(update.getCheckInfo());
- newVersion.setCreateDate(update.getCreateDate());
- newVersion.setCreator(update.getEditor());
- newVersion.setBaseId(model.getBaseId());
- newVersion.setDataType(Constants.TWO);
- dispatchUnitMapper.insert(newVersion);
-
+ if(flag){
+ dispatchUnitMapper.update(null,new UpdateWrapper<DispatchUnit>().lambda()
+ .set(DispatchUnit::getDataType,Constants.ZERO)
+ .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+ .eq(DispatchUnit::getBaseId,model.getId()));
+ BeanUtils.copyProperties(model, newVersion);
+ newVersion.setWorktypeStatus(Constants.ONE);
+ newVersion.setCheckDate(update.getEditDate());
+ newVersion.setCheckUserId(update.getCheckUserId());
+ newVersion.setCheckInfo(update.getCheckInfo());
+ newVersion.setCreateDate(update.getCreateDate());
+ newVersion.setCreator(update.getEditor());
+ newVersion.setBaseId(model.getId());
+ newVersion.setDataType(Constants.TWO);
+ dispatchUnitMapper.insert(newVersion);
+ }else{
+ newVersion = dispatchUnitMapper.selectOne(new QueryWrapper<DispatchUnit>().lambda()
+ .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+ .eq(DispatchUnit::getDataType,Constants.TWO)
+ .eq(DispatchUnit::getBaseId,model.getId())
+ .last(" limit 1"));
+ }
+ if(Objects.isNull(newVersion)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌娲鹃仯鍗曚綅鏈�鏂扮増鏈�");
+ }
List<DuWorktype> newWorktypes = new ArrayList<>();
List<DuSolution> solutions = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
.eq(DuSolution::getIsdeleted,Constants.ZERO)
@@ -167,7 +176,6 @@
.eq(DuSolution::getStatus,Constants.ZERO)
.eq(DuSolution::getDispatchUnitId,model.getId())
);
-
if(solutions == null || solutions.size() ==0){
@@ -247,7 +255,7 @@
DispatchUnit dispatchUnit = dispatchUnitMapper.selectById(param.getId());
if(Constants.equalsInteger(param.getUnitStatus(),Constants.ONE)){
//瀹℃牳閫氳繃锛屼慨鏀圭姸鎬侊紝浜х敓鍘嗗彶鐗堟湰
- newVersionData(dispatchUnit,update);
+ newVersionData(dispatchUnit,update,true);
//瀛樺偍鎿嶄綔鍘嗗彶
this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_PASS,update.getCheckInfo());
}else{
@@ -284,8 +292,6 @@
public Integer create(SaveDispatchUnitDTO saveDispatchUnitDTO) {
if(Objects.isNull(saveDispatchUnitDTO)
|| StringUtils.isEmpty(saveDispatchUnitDTO.getName())
- || StringUtils.isEmpty(saveDispatchUnitDTO.getCode())
- || StringUtils.isEmpty(saveDispatchUnitDTO.getContent())
|| CollectionUtils.isEmpty(saveDispatchUnitDTO.getSaveDuSolutionDTOList())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -298,13 +304,13 @@
)> Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆愭淳閬ｅ崟浣嶅悕绉般�戝凡瀛樺湪");
};
- if(dispatchUnitMapper.selectCount(new QueryWrapper<DispatchUnit>().lambda()
- .eq(DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
- .eq(DispatchUnit::getCode,saveDispatchUnitDTO.getCode())
- .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
- )> Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆愭淳閬ｅ崟浣嶄俊鐢ㄤ唬鐮併�戝凡瀛樺湪");
- };
+// if(dispatchUnitMapper.selectCount(new QueryWrapper<DispatchUnit>().lambda()
+// .eq(DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
+// .eq(DispatchUnit::getCode,saveDispatchUnitDTO.getCode())
+// .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+// )> Constants.ZERO){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆愭淳閬ｅ崟浣嶄俊鐢ㄤ唬鐮併�戝凡瀛樺湪");
+// };
DispatchUnit dispatchUnit = new DispatchUnit();
dispatchUnit.setCreateDate(new Date());
dispatchUnit.setCreator(loginUserInfo.getId());
@@ -371,7 +377,6 @@
}
}
-
//瀛樺偍寰呭姙淇℃伅
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
//鍒犻櫎鍏朵粬寰呭姙
@@ -405,14 +410,6 @@
)> Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆愭淳閬ｅ崟浣嶅悕绉般�戝凡瀛樺湪");
};
- if(dispatchUnitMapper.selectCount(new QueryWrapper<DispatchUnit>().lambda()
- .ne(DispatchUnit::getId,saveDispatchUnitDTO.getId())
- .eq(DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
- .eq(DispatchUnit::getCode,saveDispatchUnitDTO.getCode())
- .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
- )> Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆愭淳閬ｅ崟浣嶄俊鐢ㄤ唬鐮併�戝凡瀛樺湪");
- }
dispatchUnit.setCode(saveDispatchUnitDTO.getCode());
dispatchUnit.setContent(saveDispatchUnitDTO.getContent());
dispatchUnit.setName(saveDispatchUnitDTO.getName());
@@ -423,9 +420,6 @@
//瀛樺偍鎿嶄綔璁板綍
this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.EDIT_UNIT,null);
-
-// this.dealDuData(saveDispatchUnitDTO,loginUserInfo);
-
//瀛樺偍寰呭姙淇℃伅
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
@@ -455,6 +449,9 @@
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
DispatchUnit dispatchUnit = this.dispatchUnitMapper.selectById(saveDispatchUnitDTO.getId());
+ if(!dispatchUnit.getUnitStatus().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"娲鹃仯鍗曚綅鏈鎵归�氳繃,鏃犳硶杩涜璇ユ搷浣�");
+ }
dispatchUnit.setWorktypeStatus(Constants.ZERO);
dispatchUnit.setEditDate(new Date());
dispatchUnit.setEditor(loginUserInfo.getId());
@@ -810,13 +807,16 @@
if (pageWrap.getModel().getBaseId() != null) {
queryWrapper.eq(DispatchUnit::getBaseId, pageWrap.getModel().getBaseId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.orderByAsc(DispatchUnit::getUnitStatus);
+ queryWrapper.orderByAsc(DispatchUnit::getWorktypeStatus);
+ queryWrapper.orderByDesc(DispatchUnit::getCreateDate);
+// for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+// if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+// queryWrapper.orderByDesc(sortData.getProperty());
+// } else {
+// queryWrapper.orderByAsc(sortData.getProperty());
+// }
+// }
PageData<DispatchUnit> pageData = PageData.from(dispatchUnitJoinMapper.selectJoinPage(page,DispatchUnit.class, queryWrapper));
return pageData;
}
@@ -897,11 +897,10 @@
.eq(DispatchUnit::getStatus,Constants.ZERO)
.select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+dispatchUnitQueryDTO.getSolutionId()+" limit 1) as du_solution_id" )
.eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
- .eq(DispatchUnit::getStatus,Constants.ZERO)
.eq(Objects.isNull(dispatchUnitQueryDTO.getDataType()),DispatchUnit::getDataType,Constants.TWO)
.eq(!Objects.isNull(dispatchUnitQueryDTO.getDataType()),DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
.exists(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()),
- "select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+dispatchUnitQueryDTO.getSolutionId() )
+ "select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.status = 1 and b.solution_id="+dispatchUnitQueryDTO.getSolutionId() )
.exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
" select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +
" and ad.du_id = t.id ")
--
Gitblit v1.9.3