|
@@ -9,6 +9,8 @@ import com.ruoyi.common.enums.FileType;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.sms.SmsSenderUtils;
|
|
|
import com.ruoyi.common.utils.uuid.IdUtils;
|
|
|
+import com.ruoyi.invest.domain.TProjectCirculation;
|
|
|
+import com.ruoyi.invest.service.ITProjectCirculationService;
|
|
|
import com.ruoyi.invest.service.ITProjectPoolService;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
import com.ruoyi.tool.domain.TUnifyFile;
|
|
@@ -57,6 +59,9 @@ public class TProjectApprovalController extends BaseController
|
|
|
@Autowired
|
|
|
private ISysUserService sysUserService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITProjectCirculationService tProjectCirculationService;
|
|
|
+
|
|
|
/**
|
|
|
* 查询立项申请列表
|
|
|
*/
|
|
@@ -104,18 +109,14 @@ public class TProjectApprovalController extends BaseController
|
|
|
public AjaxResult add(@RequestBody TProjectApproval tProjectApproval)
|
|
|
{
|
|
|
tProjectApproval.setId(IdUtils.fastSimpleUUID());
|
|
|
+
|
|
|
// todo 保存立项资料
|
|
|
- List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
|
|
|
- if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
|
|
|
- for (TUnifyFile tUnifyFile:
|
|
|
- tUnifyFileList) {
|
|
|
- tUnifyFile.setFileId(tProjectApproval.getProjectPoolId());
|
|
|
- tUnifyFile.setFileBusinessId(tProjectApproval.getId());
|
|
|
- tUnifyFile.setUploadType(String.valueOf(FileType.APPROVAL.ordinal()));//文件类型:立项资料
|
|
|
- tUnifyFile.setCreateBy(getNickName());
|
|
|
- tUnifyFileService.insertTUnifyFile(tUnifyFile);
|
|
|
- }
|
|
|
- }
|
|
|
+ tUnifyFileService.insertTUnifyFileList(tProjectApproval.getListFile(),
|
|
|
+ tProjectApproval.getProjectPoolId(),
|
|
|
+ tProjectApproval.getId(),
|
|
|
+ String.valueOf(FileType.APPROVAL.ordinal()),
|
|
|
+ getNickName());
|
|
|
+
|
|
|
// todo 更改立项状态
|
|
|
tProjectPoolService.updateTProjectPoolByApprovalFlag(tProjectApproval.getProjectPoolId(),"1");
|
|
|
|
|
@@ -132,6 +133,13 @@ public class TProjectApprovalController extends BaseController
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ // todo 增加项目创建记录
|
|
|
+ TProjectCirculation tProjectCirculation = new TProjectCirculation();
|
|
|
+ tProjectCirculation.setProjectPoolId(tProjectApproval.getProjectPoolId());
|
|
|
+ tProjectCirculation.setStageName("立项申请");
|
|
|
+ tProjectCirculation.setCreateBy(getNickName());
|
|
|
+ tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
|
|
|
+
|
|
|
return toAjax(tProjectApprovalService.insertTProjectApproval(tProjectApproval));
|
|
|
}
|
|
|
|
|
@@ -145,19 +153,12 @@ public class TProjectApprovalController extends BaseController
|
|
|
public AjaxResult edit(@RequestBody TProjectApproval tProjectApproval)
|
|
|
{
|
|
|
// todo 保存立项资料
|
|
|
- List<TUnifyFile> tUnifyFileList = tProjectApproval.getListFile();
|
|
|
- if(null != tUnifyFileList && !tUnifyFileList.isEmpty()){
|
|
|
- for (TUnifyFile tUnifyFile:
|
|
|
- tUnifyFileList) {
|
|
|
- if(tUnifyFile.getId() == null){
|
|
|
- tUnifyFile.setFileId(tProjectApproval.getProjectPoolId());
|
|
|
- tUnifyFile.setFileBusinessId(tProjectApproval.getId());
|
|
|
- tUnifyFile.setUploadType(String.valueOf(FileType.APPROVAL.ordinal()));//文件类型:立项资料
|
|
|
- tUnifyFile.setCreateBy(getNickName());
|
|
|
- tUnifyFileService.insertTUnifyFile(tUnifyFile);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ tUnifyFileService.insertTUnifyFileList(tProjectApproval.getListFile(),
|
|
|
+ tProjectApproval.getProjectPoolId(),
|
|
|
+ tProjectApproval.getId(),
|
|
|
+ String.valueOf(FileType.APPROVAL.ordinal()),
|
|
|
+ getNickName());
|
|
|
+
|
|
|
return toAjax(tProjectApprovalService.updateTProjectApproval(tProjectApproval));
|
|
|
}
|
|
|
|