|
@@ -10,7 +10,6 @@ import com.ruoyi.opt.domain.ProcessInfo;
|
|
import com.ruoyi.opt.domain.ProjectInfo;
|
|
import com.ruoyi.opt.domain.ProjectInfo;
|
|
import com.ruoyi.opt.mapper.ProcessInfoMapper;
|
|
import com.ruoyi.opt.mapper.ProcessInfoMapper;
|
|
import com.ruoyi.opt.mapper.ProjectInfoMapper;
|
|
import com.ruoyi.opt.mapper.ProjectInfoMapper;
|
|
-import lombok.Builder;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -63,7 +62,14 @@ public class CompanyInfoServiceImpl implements ICompanyInfoService
|
|
// companyInfo.setCreateTime(new Date("yyyy-MM-dd"));
|
|
// companyInfo.setCreateTime(new Date("yyyy-MM-dd"));
|
|
companyInfo.setUpdateBy(null);
|
|
companyInfo.setUpdateBy(null);
|
|
// companyInfo.setUpdateTime(new Date("yyyy-MM-dd"));
|
|
// companyInfo.setUpdateTime(new Date("yyyy-MM-dd"));
|
|
- companyInfoMapper.insertCompanyInfo(companyInfo);
|
|
|
|
|
|
+ Long companyId = companyInfoMapper.getCompanyIdByParams(companyInfo);
|
|
|
|
+ if(null == companyId) {
|
|
|
|
+ companyInfoMapper.insertCompanyInfo(companyInfo);
|
|
|
|
+ }else {
|
|
|
|
+ companyInfo.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
+ companyInfo.setCompanyId(companyId);
|
|
|
|
+ companyInfoMapper.updateCompanyInfo(companyInfo);
|
|
|
|
+ }
|
|
|
|
|
|
//开始入库项目信息
|
|
//开始入库项目信息
|
|
ProjectInfo projectInfo = new ProjectInfo();
|
|
ProjectInfo projectInfo = new ProjectInfo();
|
|
@@ -83,7 +89,14 @@ public class CompanyInfoServiceImpl implements ICompanyInfoService
|
|
// projectInfo.setCreateTime(new Date("yyyy-MM-dd"));
|
|
// projectInfo.setCreateTime(new Date("yyyy-MM-dd"));
|
|
projectInfo.setUpdateBy(null);
|
|
projectInfo.setUpdateBy(null);
|
|
// projectInfo.setUpdateTime(new Date("yyyy-MM-dd"));
|
|
// projectInfo.setUpdateTime(new Date("yyyy-MM-dd"));
|
|
- projectInfoMapper.insertProjectInfo(projectInfo);
|
|
|
|
|
|
+ Long projectId = projectInfoMapper.getProjectIdByParams(projectInfo);
|
|
|
|
+ if(null == projectId) {
|
|
|
|
+ projectInfoMapper.insertProjectInfo(projectInfo);
|
|
|
|
+ }else {
|
|
|
|
+ projectInfo.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
+ projectInfo.setProjectId(projectId);
|
|
|
|
+ projectInfoMapper.updateProjectInfo(projectInfo);
|
|
|
|
+ }
|
|
|
|
|
|
//开始组装数据准备入库
|
|
//开始组装数据准备入库
|
|
ProcessInfo processInfo = new ProcessInfo();
|
|
ProcessInfo processInfo = new ProcessInfo();
|
|
@@ -104,7 +117,14 @@ public class CompanyInfoServiceImpl implements ICompanyInfoService
|
|
processInfo.setCreateBy(null);
|
|
processInfo.setCreateBy(null);
|
|
processInfo.setUpdateBy(null);
|
|
processInfo.setUpdateBy(null);
|
|
// processInfo.setUpdateTime(new Date("yyyy-MM-dd"));
|
|
// processInfo.setUpdateTime(new Date("yyyy-MM-dd"));
|
|
- processInfoMapper.insertProcessInfo(processInfo);
|
|
|
|
|
|
+ Long pId = processInfoMapper.getPIdByParams(processInfo);
|
|
|
|
+ if(null == pId) {
|
|
|
|
+ processInfoMapper.insertProcessInfo(processInfo);
|
|
|
|
+ }else {
|
|
|
|
+ processInfo.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
+ processInfo.setpId(pId);
|
|
|
|
+ processInfoMapper.updateProcessInfo(processInfo);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|