@@ -6,6 +6,7 @@ import com.hz.pm.api.projectdeclared.model.req.ProjectReviewApplyReq; | |||||
import com.hz.pm.api.projectlib.model.req.ProjectListReq; | import com.hz.pm.api.projectlib.model.req.ProjectListReq; | ||||
import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; | import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.log.annotation.WebLog; | |||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -29,6 +30,7 @@ public class ProjectReviewController { | |||||
@ApiOperation("提交项目评审申请") | @ApiOperation("提交项目评审申请") | ||||
@PostMapping(value = {"/submit", "resubmit"}) | @PostMapping(value = {"/submit", "resubmit"}) | ||||
@WebLog("提交项目评审申请") | |||||
public void projectReviewApply(@RequestBody ProjectReviewApplyReq req) { | public void projectReviewApply(@RequestBody ProjectReviewApplyReq req) { | ||||
projectReviewManage.projectReviewApply(req); | projectReviewManage.projectReviewApply(req); | ||||
} | } | ||||
@@ -1,39 +0,0 @@ | |||||
package com.hz.pm.api.projectdeclared.model.req; | |||||
import com.ningdatech.basic.model.PagePo; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
import org.springframework.format.annotation.DateTimeFormat; | |||||
import java.time.LocalDateTime; | |||||
/** | |||||
* @Classname PrequalificationDeclaredReq | |||||
* @Description | |||||
* @Date 2023/2/14 11:42 | |||||
* @Author PoffyZhang | |||||
*/ | |||||
@Data | |||||
public class ConstrctionPlanListReq extends PagePo { | |||||
@ApiModelProperty("项目名称") | |||||
private String projectName; | |||||
@ApiModelProperty("申报单位") | |||||
private String buildOrg; | |||||
@ApiModelProperty("项目类型") | |||||
private Integer projectType; | |||||
@ApiModelProperty("预算年度") | |||||
private Integer projectYear; | |||||
@ApiModelProperty("创建时间") | |||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") | |||||
private LocalDateTime createOnMin; | |||||
@ApiModelProperty("创建时间") | |||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") | |||||
private LocalDateTime createOnMax; | |||||
} |
@@ -6,6 +6,7 @@ import com.hz.pm.api.projectlib.model.req.DeclaredProjectListReq; | |||||
import com.hz.pm.api.projectlib.model.vo.DeclaredProjectListVO; | import com.hz.pm.api.projectlib.model.vo.DeclaredProjectListVO; | ||||
import com.hz.pm.api.projectlib.model.vo.MhProjectBaseInfoVO; | import com.hz.pm.api.projectlib.model.vo.MhProjectBaseInfoVO; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.log.annotation.WebLog; | |||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -32,24 +33,28 @@ public class MhProjectController { | |||||
@ApiOperation("立项备案列表") | @ApiOperation("立项备案列表") | ||||
@GetMapping("/pageDeclaredProject") | @GetMapping("/pageDeclaredProject") | ||||
@WebLog("立项备案列表") | |||||
public PageVo<DeclaredProjectListVO> pageDeclaredProject(DeclaredProjectListReq req) { | public PageVo<DeclaredProjectListVO> pageDeclaredProject(DeclaredProjectListReq req) { | ||||
return declaredRecordManage.pageDeclaredProject(req); | return declaredRecordManage.pageDeclaredProject(req); | ||||
} | } | ||||
@ApiOperation("信产项目基本信息") | @ApiOperation("信产项目基本信息") | ||||
@GetMapping("/baseInfo/{mhProjectId}") | @GetMapping("/baseInfo/{mhProjectId}") | ||||
@WebLog("信产项目基本信息") | |||||
public MhProjectBaseInfoVO projectBaseInfo(@PathVariable Long mhProjectId) { | public MhProjectBaseInfoVO projectBaseInfo(@PathVariable Long mhProjectId) { | ||||
return declaredRecordManage.getProjectBaseInfo(mhProjectId); | return declaredRecordManage.getProjectBaseInfo(mhProjectId); | ||||
} | } | ||||
@ApiOperation("立项备案提交") | @ApiOperation("立项备案提交") | ||||
@PostMapping("/submit") | @PostMapping("/submit") | ||||
@WebLog("立项备案提交") | |||||
public void submit(@Valid @RequestBody DefaultDeclaredDTO req) { | public void submit(@Valid @RequestBody DefaultDeclaredDTO req) { | ||||
declaredRecordManage.startDeclaredRecord(req); | declaredRecordManage.startDeclaredRecord(req); | ||||
} | } | ||||
@ApiOperation("立项备案重新提交") | @ApiOperation("立项备案重新提交") | ||||
@PostMapping("/resubmit") | @PostMapping("/resubmit") | ||||
@WebLog("立项备案重新提交") | |||||
public void resubmit(@Valid @RequestBody DefaultDeclaredDTO req) { | public void resubmit(@Valid @RequestBody DefaultDeclaredDTO req) { | ||||
declaredRecordManage.restartDeclaredRecord(req); | declaredRecordManage.restartDeclaredRecord(req); | ||||
} | } | ||||
@@ -396,7 +396,7 @@ public class DeclaredRecordManage { | |||||
} | } | ||||
@Transactional(rollbackFor = Exception.class) | @Transactional(rollbackFor = Exception.class) | ||||
public void importProjectFinanceInfos(MultipartFile file) { | |||||
public synchronized void importProjectFinanceInfos(MultipartFile file) { | |||||
try (InputStream is = file.getInputStream()) { | try (InputStream is = file.getInputStream()) { | ||||
List<Map<String, Object>> rows = ExcelUtil.getReader(is).readAll(); | List<Map<String, Object>> rows = ExcelUtil.getReader(is).readAll(); | ||||
if (rows.isEmpty()) { | if (rows.isEmpty()) { | ||||
@@ -459,7 +459,7 @@ public class DeclaredRecordManage { | |||||
} | } | ||||
@Transactional(rollbackFor = Exception.class) | @Transactional(rollbackFor = Exception.class) | ||||
public void importReplaceSystemInfos(MultipartFile file) { | |||||
public synchronized void importReplaceSystemInfos(MultipartFile file) { | |||||
try (InputStream is = file.getInputStream()) { | try (InputStream is = file.getInputStream()) { | ||||
List<Map<String, Object>> rows = ExcelUtil.getReader(is) | List<Map<String, Object>> rows = ExcelUtil.getReader(is) | ||||
.readAll(); | .readAll(); | ||||