|
|
|
|
@ -11,20 +11,28 @@ import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.Data; |
|
|
|
|
import lombok.EqualsAndHashCode; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
import org.springblade.core.mp.base.BaseEntity; |
|
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.desk.basic.pojo.vo.BaseEntityVO; |
|
|
|
|
import org.springblade.desk.quality.constant.ProReTemplateConst; |
|
|
|
|
import org.springblade.desk.quality.excel.ProReTemplateExcel; |
|
|
|
|
import org.springblade.desk.quality.mapper.ProReTemplateMapper; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.ProReTemplate; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ProReTemplateDetailVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ProReTemplateTankVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; |
|
|
|
|
import org.springblade.desk.quality.service.IProReTemplateDetailService; |
|
|
|
|
import org.springblade.desk.quality.service.IProReTemplateService; |
|
|
|
|
import org.springblade.desk.quality.service.IProReTemplateTankService; |
|
|
|
|
import org.springblade.desk.basic.util.IdUtil; |
|
|
|
|
import org.springblade.system.feign.IDictClient; |
|
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
|
import org.springblade.system.feign.IUserClient; |
|
|
|
|
import org.springblade.system.pojo.entity.Dept; |
|
|
|
|
import org.springblade.system.pojo.entity.User; |
|
|
|
|
import org.springblade.system.pojo.entity.UserInfo; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.util.Comparator; |
|
|
|
|
@ -48,6 +56,10 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe |
|
|
|
|
@Resource |
|
|
|
|
private IUserClient userClient; |
|
|
|
|
@Resource |
|
|
|
|
private ISysClient sysClient; |
|
|
|
|
@Resource |
|
|
|
|
private IDictClient dictClient; |
|
|
|
|
@Resource |
|
|
|
|
private IProReTemplateTankService tankService; |
|
|
|
|
@Resource |
|
|
|
|
private IProReTemplateDetailService detailService; |
|
|
|
|
@ -68,7 +80,10 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void setVOValue(ProReTemplateVO vo) { |
|
|
|
|
vo.setBase(setBaseVOValue(vo, ProReTemplateConst.DIC)); |
|
|
|
|
//
|
|
|
|
|
List<ProReTemplateTankVO> tankVOList = tankService.getListByTemplateId(vo.getId()); |
|
|
|
|
if (tankVOList != null && !tankVOList.isEmpty()) { |
|
|
|
|
// 根据插入序号 getInsertIndex 排序 生成新的list
|
|
|
|
|
tankVOList = tankVOList.stream() |
|
|
|
|
.sorted(Comparator.comparingInt(ProReTemplateTankVO::getInsertIndex)) |
|
|
|
|
@ -79,6 +94,84 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe |
|
|
|
|
tankVO.setChildrenList(detailVOList); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 构建BaseEntityVO |
|
|
|
|
* |
|
|
|
|
* @param be 不赋值可以传入null |
|
|
|
|
* @param statusCode 不需要可以传null |
|
|
|
|
* @return BaseEntityVO |
|
|
|
|
*/ |
|
|
|
|
public BaseEntityVO setBaseVOValue(BaseEntity be, String statusCode) { |
|
|
|
|
if (be == null) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
BaseEntityVO bv = new BaseEntityVO(); |
|
|
|
|
R<UserInfo> rUICR = null; |
|
|
|
|
R<UserInfo> rUIUP = null; |
|
|
|
|
R<Dept> rDept = null; |
|
|
|
|
if (IdUtil.isValid(be.getCreateUser())) { |
|
|
|
|
rUICR = userClient.userInfo(be.getCreateUser()); |
|
|
|
|
if (rUICR != null && rUICR.isSuccess() && |
|
|
|
|
rUICR.getData() != null && rUICR.getData().getUser() != null) { |
|
|
|
|
bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (IdUtil.isValid(be.getUpdateUser())) { |
|
|
|
|
rUIUP = userClient.userInfo(be.getUpdateUser()); |
|
|
|
|
if (rUIUP != null && rUIUP.isSuccess() && |
|
|
|
|
rUIUP.getData() != null && rUIUP.getData().getUser() != null) { |
|
|
|
|
bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (IdUtil.isValid(be.getCreateDept())) { |
|
|
|
|
rDept = sysClient.getDept(be.getCreateDept()); |
|
|
|
|
if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { |
|
|
|
|
bv.setCreateDeptName(rDept.getData().getDeptName()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (be.getCreateTime() != null && be.getUpdateTime() != null) { |
|
|
|
|
if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚
|
|
|
|
|
bv.setKeepUser(be.getUpdateUser()); |
|
|
|
|
bv.setKeepUserRealName(bv.getUpdateUserRealName()); |
|
|
|
|
} else { // 等于或更早
|
|
|
|
|
bv.setKeepUser(be.getCreateUser()); |
|
|
|
|
bv.setKeepUserRealName(bv.getCreateUserRealName()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (StringUtils.isNotBlank(statusCode)) { |
|
|
|
|
R<String> rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); |
|
|
|
|
if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { |
|
|
|
|
bv.setStatusName(rStatusDic.getData()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return bv; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R updateDetail(ProReTemplateVO vo) { |
|
|
|
|
for (ProReTemplateTankVO tankOne : vo.getPreserveSlotList()) { |
|
|
|
|
tankOne.setTemplateId(vo.getId()); |
|
|
|
|
if (IdUtil.isValid(tankOne.getId())) { |
|
|
|
|
tankService.updateById(tankOne); |
|
|
|
|
} else { |
|
|
|
|
tankService.save(tankOne); |
|
|
|
|
} |
|
|
|
|
for (ProReTemplateDetailVO detailOne : tankOne.getChildrenList()) { |
|
|
|
|
detailOne.setTemplateTankId(tankOne.getId()); |
|
|
|
|
if (IdUtil.isValid(detailOne.getId())) { |
|
|
|
|
detailService.updateById(detailOne); |
|
|
|
|
} else { |
|
|
|
|
detailService.save(detailOne); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
ProReTemplate e = new ProReTemplate(); |
|
|
|
|
BeanUtil.copyProperties(vo, e, true); |
|
|
|
|
return R.status(updateById(e)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R copy(Long id) { |
|
|
|
|
@ -94,4 +187,9 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe |
|
|
|
|
public R upgradeVer(Long id) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R removeFromDetail(Long tankId) { |
|
|
|
|
return R.status(tankService.removeById(tankId)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Tom Li
4 months ago