1.监督计划功能调整

2.全过程功能调整
This commit is contained in:
2024-10-31 13:21:00 +08:00
parent fad0e10203
commit 35d05dd3ac
12 changed files with 177 additions and 39 deletions

View File

@@ -1,6 +1,7 @@
package com.njcn.harmonic.service.upload.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,9 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -49,7 +53,12 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessA
PmsTemProcessApproval pmsTemProcessApproval = new PmsTemProcessApproval();
BeanUtils.copyProperties(param,pmsTemProcessApproval);
pmsTemProcessApproval.setUploadStatus(DataStateEnum.DELETED.getCode());
if(StrUtil.isBlank(pmsTemProcessApproval.getObjId())){
pmsTemProcessApproval.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemProcessApproval.setUpdateTime(new Timestamp(new Date().getTime()));
}else {
pmsTemProcessApproval.setUpdateTime(new Timestamp(new Date().getTime()));
}
boolean b = this.saveOrUpdate(pmsTemProcessApproval);
return b;
}

View File

@@ -25,6 +25,8 @@ import com.njcn.web.utils.GwSendUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -55,6 +57,8 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
pmsTemProcessTrackPO.setObjId(IdUtil.simpleUUID());
PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(param.getTempUserDossierId());
pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName());
pmsTemUserPO.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
pmsTemProcessTrackPO.setUploadStatus(DataStateEnum.DELETED.getCode());
return this.save(pmsTemProcessTrackPO);
}
@@ -66,9 +70,7 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
BeanUtil.copyProperties(updatePmsTemProcessTrackParam, pmsTemProcessTrackPO);
PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(updatePmsTemProcessTrackParam.getTempUserDossierId());
pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName());
LambdaUpdateWrapper<PmsTemProcessTrackPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(PmsTemProcessTrackPO::getAllOvCountDay,updatePmsTemProcessTrackParam.getAllOvCountDay());
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.updateById(pmsTemProcessTrackPO);
}

View File

@@ -37,7 +37,10 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -71,6 +74,8 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
BeanUtil.copyProperties(param, pmsTemUserPO);
assOrg(pmsTemUserPO);
pmsTemUserPO.setUploadStatus(DataStateEnum.DELETED.getCode());
pmsTemUserPO.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.save(pmsTemUserPO);
}
@@ -90,7 +95,7 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
updateWrapper.set(PmsTemProcessTrackPO::getTempUserDossierName,updatePmsTemUserParam.getConsName()).eq(PmsTemProcessTrackPO::getTempUserDossierId,result.getObjId());
pmsTemProcessTrackMapper.update(null,updateWrapper);
}
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.updateById(pmsTemUserPO);
}