|
@@ -1,16 +1,21 @@
|
|
package com.siwei.apply.service.impl;
|
|
package com.siwei.apply.service.impl;
|
|
|
|
|
|
import com.siwei.apply.domain.Project;
|
|
import com.siwei.apply.domain.Project;
|
|
|
|
+import com.siwei.apply.domain.ProjectWorkflow;
|
|
|
|
+import com.siwei.apply.domain.Workflow;
|
|
import com.siwei.apply.domain.Ydysyxz;
|
|
import com.siwei.apply.domain.Ydysyxz;
|
|
import com.siwei.apply.domain.res.YdysyxzRes;
|
|
import com.siwei.apply.domain.res.YdysyxzRes;
|
|
import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
|
|
import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
|
|
import com.siwei.apply.domain.vo.YdysyxzVo;
|
|
import com.siwei.apply.domain.vo.YdysyxzVo;
|
|
import com.siwei.apply.mapper.ProjectMapper;
|
|
import com.siwei.apply.mapper.ProjectMapper;
|
|
|
|
+import com.siwei.apply.mapper.ProjectWorkflowMapper;
|
|
|
|
+import com.siwei.apply.mapper.WorkflowMapper;
|
|
import com.siwei.apply.mapper.YdysyxzMapper;
|
|
import com.siwei.apply.mapper.YdysyxzMapper;
|
|
import com.siwei.apply.service.YdysyxzService;
|
|
import com.siwei.apply.service.YdysyxzService;
|
|
import com.siwei.common.core.utils.bean.BeanUtils;
|
|
import com.siwei.common.core.utils.bean.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import static com.siwei.apply.common.Common.UserId;
|
|
import static com.siwei.apply.common.Common.UserId;
|
|
|
|
|
|
@@ -23,6 +28,10 @@ public class YdysyxzImpl implements YdysyxzService {
|
|
private YdysyxzMapper ydysyxzMapper;
|
|
private YdysyxzMapper ydysyxzMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private ProjectMapper projectMapper;
|
|
private ProjectMapper projectMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ProjectWorkflowMapper projectWorkflowMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ private WorkflowMapper workflowMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Boolean isExit(String projectId) {
|
|
public Boolean isExit(String projectId) {
|
|
@@ -30,12 +39,24 @@ public class YdysyxzImpl implements YdysyxzService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
public String add(YdysyxzVo ydysyxzVo) {
|
|
public String add(YdysyxzVo ydysyxzVo) {
|
|
|
|
+ // 添加
|
|
Ydysyxz ydysyxz = new Ydysyxz();
|
|
Ydysyxz ydysyxz = new Ydysyxz();
|
|
BeanUtils.copyProperties(ydysyxzVo, ydysyxz);
|
|
BeanUtils.copyProperties(ydysyxzVo, ydysyxz);
|
|
ydysyxz.generateId();
|
|
ydysyxz.generateId();
|
|
ydysyxz.setCreatorId(UserId);
|
|
ydysyxz.setCreatorId(UserId);
|
|
ydysyxzMapper.add(ydysyxz);
|
|
ydysyxzMapper.add(ydysyxz);
|
|
|
|
+ // 添加项目流程
|
|
|
|
+ Integer projectType = projectMapper.getProjectTypeById(ydysyxz.getProjectId());
|
|
|
|
+ Workflow workflow = workflowMapper.selectByProjectTypeAndTableName(projectType, "t_ydysyxz");
|
|
|
|
+ ProjectWorkflow projectWorkflow = new ProjectWorkflow();
|
|
|
|
+ projectWorkflow.setId(ydysyxz.getId());
|
|
|
|
+ projectWorkflow.setParentId("");
|
|
|
|
+ projectWorkflow.setProjectId(ydysyxz.getProjectId());
|
|
|
|
+ projectWorkflow.setNodeId(ydysyxz.getId());
|
|
|
|
+ projectWorkflow.setNodeTableName(workflow.getTableName());
|
|
|
|
+ projectWorkflowMapper.add(projectWorkflow);
|
|
return ydysyxz.getId();
|
|
return ydysyxz.getId();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -45,7 +66,7 @@ public class YdysyxzImpl implements YdysyxzService {
|
|
Project project = projectMapper.get(projectId);
|
|
Project project = projectMapper.get(projectId);
|
|
|
|
|
|
YdysyxzRes ydysyxzRes = new YdysyxzRes();
|
|
YdysyxzRes ydysyxzRes = new YdysyxzRes();
|
|
- if(ydysyxz != null){
|
|
|
|
|
|
+ if (ydysyxz != null) {
|
|
BeanUtils.copyProperties(ydysyxz, ydysyxzRes);
|
|
BeanUtils.copyProperties(ydysyxz, ydysyxzRes);
|
|
}
|
|
}
|
|
ydysyxzRes.setProjectId(projectId);
|
|
ydysyxzRes.setProjectId(projectId);
|