From 6d86cb5870d09c7773bd276d8869484546cc4f85 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 28 十一月 2024 02:46:41 +0800
Subject: [PATCH] 投资金额
---
business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java | 36 ---------
business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java | 24 ------
business/src/main/java/com/ycl/controller/ProjectInvestmentPolicyComplianceController.java | 16 ++--
business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java | 16 ++--
business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java | 2
business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java | 8 --
business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml | 5 -
business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java | 8 --
business/src/main/java/com/ycl/domain/vo/ProjectUnitRegistrationInfoVO.java | 8 --
business/src/main/java/com/ycl/domain/form/ProjectUnitRegistrationInfoForm.java | 28 -------
business/src/main/java/com/ycl/service/impl/ProjectInvestmentInfoServiceImpl.java | 8 +
business/src/main/java/com/ycl/controller/ProjectInvestmentFundingController.java | 16 ++--
business/src/main/java/com/ycl/domain/entity/ProjectUnitRegistrationInfo.java | 8 --
business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java | 8 --
business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java | 8 --
business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java | 18 +++
16 files changed, 46 insertions(+), 171 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectInvestmentFundingController.java b/business/src/main/java/com/ycl/controller/ProjectInvestmentFundingController.java
index 4f5d4ff..5ecf6c4 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInvestmentFundingController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInvestmentFundingController.java
@@ -27,55 +27,55 @@
@RequiredArgsConstructor
@Api(value = "椤圭洰鎶曡祫鍙婅祫閲戞潵婧愭儏鍐佃〃", tags = "椤圭洰鎶曡祫鍙婅祫閲戞潵婧愭儏鍐佃〃绠＄悊")
@RestController
-@RequestMapping("/project-investment-funding")
+@RequestMapping("/project/investmentFunding")
public class ProjectInvestmentFundingController {
private final ProjectInvestmentFundingService projectInvestmentFundingService;
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:add')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:add')")
public Result add(@RequestBody @Validated(Add.class) ProjectInvestmentFundingForm form) {
return projectInvestmentFundingService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:edit')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:edit')")
public Result update(@RequestBody @Validated(Update.class) ProjectInvestmentFundingForm form) {
return projectInvestmentFundingService.update(form);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:del')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:del')")
public Result removeById(@PathVariable("id") String id) {
return projectInvestmentFundingService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:del:batch')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:del:batch')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return projectInvestmentFundingService.remove(ids);
}
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:page')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:page')")
public Result page(ProjectInvestmentFundingQuery query) {
return projectInvestmentFundingService.page(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:detail')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:detail')")
public Result detail(@PathVariable("id") Integer id) {
return projectInvestmentFundingService.detail(id);
}
@GetMapping("/list")
- @PreAuthorize("hasAuthority('projectInvestmentFunding:list')")
+// @PreAuthorize("hasAuthority('projectInvestmentFunding:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
public Result list() {
return projectInvestmentFundingService.all();
diff --git a/business/src/main/java/com/ycl/controller/ProjectInvestmentPolicyComplianceController.java b/business/src/main/java/com/ycl/controller/ProjectInvestmentPolicyComplianceController.java
index 1541b7c..3c12c66 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInvestmentPolicyComplianceController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInvestmentPolicyComplianceController.java
@@ -27,55 +27,55 @@
@RequiredArgsConstructor
@Api(value = "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌琛�", tags = "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌琛ㄧ鐞�")
@RestController
-@RequestMapping("/project-investment-policy-compliance")
+@RequestMapping("/project/investmentPolicyCompliance")
public class ProjectInvestmentPolicyComplianceController {
private final ProjectInvestmentPolicyComplianceService projectInvestmentPolicyComplianceService;
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:add')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:add')")
public Result add(@RequestBody @Validated(Add.class) ProjectInvestmentPolicyComplianceForm form) {
return projectInvestmentPolicyComplianceService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:edit')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:edit')")
public Result update(@RequestBody @Validated(Update.class) ProjectInvestmentPolicyComplianceForm form) {
return projectInvestmentPolicyComplianceService.update(form);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:del')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:del')")
public Result removeById(@PathVariable("id") String id) {
return projectInvestmentPolicyComplianceService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:del:batch')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:del:batch')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return projectInvestmentPolicyComplianceService.remove(ids);
}
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:page')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:page')")
public Result page(ProjectInvestmentPolicyComplianceQuery query) {
return projectInvestmentPolicyComplianceService.page(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:detail')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:detail')")
public Result detail(@PathVariable("id") Integer id) {
return projectInvestmentPolicyComplianceService.detail(id);
}
@GetMapping("/list")
- @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:list')")
+// @PreAuthorize("hasAuthority('projectInvestmentPolicyCompliance:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
public Result list() {
return projectInvestmentPolicyComplianceService.all();
diff --git a/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java b/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java
index 4fe5396..a975aaa 100644
--- a/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java
@@ -27,55 +27,55 @@
@RequiredArgsConstructor
@Api(value = "椤圭洰锛堟硶浜猴級鍗曚綅鐧昏淇℃伅琛�", tags = "椤圭洰锛堟硶浜猴級鍗曚綅鐧昏淇℃伅琛ㄧ鐞�")
@RestController
-@RequestMapping("/project-unit-registration-info")
+@RequestMapping("/project/unitRegistrationInfo")
public class ProjectUnitRegistrationInfoController {
private final ProjectUnitRegistrationInfoService projectUnitRegistrationInfoService;
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:add')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:add')")
public Result add(@RequestBody @Validated(Add.class) ProjectUnitRegistrationInfoForm form) {
return projectUnitRegistrationInfoService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:edit')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:edit')")
public Result update(@RequestBody @Validated(Update.class) ProjectUnitRegistrationInfoForm form) {
return projectUnitRegistrationInfoService.update(form);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:del')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:del')")
public Result removeById(@PathVariable("id") String id) {
return projectUnitRegistrationInfoService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:del:batch')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:del:batch')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return projectUnitRegistrationInfoService.remove(ids);
}
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:page')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:page')")
public Result page(ProjectUnitRegistrationInfoQuery query) {
return projectUnitRegistrationInfoService.page(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:detail')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:detail')")
public Result detail(@PathVariable("id") Integer id) {
return projectUnitRegistrationInfoService.detail(id);
}
@GetMapping("/list")
- @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:list')")
+// @PreAuthorize("hasAuthority('projectUnitRegistrationInfo:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
public Result list() {
return projectUnitRegistrationInfoService.all();
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java
index 28343de..93486e7 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java
@@ -123,17 +123,9 @@
/** 鍏朵粬鎶曡祫鎬婚 */
private String otherInvestmentTotal;
- @TableField("gmt_create_time")
- /** 鍒涘缓鏃堕棿 */
- private LocalDateTime gmtCreateTime;
-
@TableField("create_by")
/** 鍒涘缓浜� */
private Long createBy;
-
- @TableField("gmt_update_time")
- /** 鏇存柊鏃堕棿 */
- private LocalDateTime gmtUpdateTime;
@TableField("update_by")
/** 鏇存柊浜� */
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java
index 8fb94a5..bc9563f 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java
@@ -75,14 +75,6 @@
/** 澶囨敞 */
private String remarks;
- @TableField("gmt_create_time")
- /** 鍒涘缓鏃堕棿 */
- private LocalDateTime gmtCreateTime;
-
- @TableField("gmt_update_time")
- /** 鏇存柊鏃堕棿 */
- private LocalDateTime gmtUpdateTime;
-
@TableField("create_by")
/** 鍒涘缓浜� */
private Long createBy;
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectUnitRegistrationInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectUnitRegistrationInfo.java
index 7785a52..1699ae4 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectUnitRegistrationInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectUnitRegistrationInfo.java
@@ -108,13 +108,5 @@
/** 鏇存柊浜� */
private Long updateBy;
- @TableField("gmt_create_time")
- /** 鍒涘缓鏃堕棿 */
- private LocalDateTime gmtCreateTime;
-
- @TableField("gmt_update_time")
- /** 鏇存柊鏃堕棿 */
- private LocalDateTime gmtUpdateTime;
-
}
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java
index e62ec8a..d565403 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java
@@ -22,124 +22,88 @@
@Data
@ApiModel(value = "ProjectInvestmentFunding琛ㄥ崟", description = "椤圭洰鎶曡祫鍙婅祫閲戞潵婧愭儏鍐佃〃琛ㄥ崟")
public class ProjectInvestmentFundingForm extends AbsForm {
-
@NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰id")
private Long projectId;
- @NotBlank(message = "椤圭洰鎬绘姇璧勯涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鎬绘姇璧勯")
private String totalInvestment;
- @NotBlank(message = "椤圭洰鏈噾涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鏈噾")
private String principal;
- @NotBlank(message = "鏀垮簻鎶曡祫鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏀垮簻鎶曡祫鎬婚")
private String governmentInvestmentTotal;
- @NotBlank(message = "涓ぎ鎶曡祫鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓ぎ鎶曡祫鎬婚")
private String centralInvestmentTotal;
- @NotBlank(message = "涓ぎ棰勭畻鎶曡祫涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓ぎ棰勭畻鎶曡祫")
private String centralBudgetInvestment;
- @NotBlank(message = "涓ぎ璐㈡斂涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓ぎ璐㈡斂")
private String centralFiscalInvestment;
- @NotBlank(message = "涓ぎ涓撻」鍊哄埜绛归泦鐨勪笓椤瑰缓璁捐祫閲戜笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("涓ぎ涓撻」鍊哄埜绛归泦鐨勪笓椤瑰缓璁捐祫閲�")
private String centralSpecialBondInvestment;
- @NotBlank(message = "涓ぎ涓撻」寤鸿鍩洪噾涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓ぎ涓撻」寤鸿鍩洪噾")
private String centralSpecialFundInvestment;
- @NotBlank(message = "鐪佺骇鎶曡祫鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鐪佺骇鎶曡祫鎬婚")
private String provincialInvestmentTotal;
- @NotBlank(message = "鐪侀绠楀唴鎶曡祫涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鐪侀绠楀唴鎶曡祫")
private String provincialBudgetInvestment;
- @NotBlank(message = "鐪佽储鏀挎�у缓璁炬姇璧勪笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鐪佽储鏀挎�у缓璁炬姇璧�")
private String provincialFiscalInvestment;
- @NotBlank(message = "鐪佷笓椤瑰缓璁捐祫閲戜笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鐪佷笓椤瑰缓璁捐祫閲�")
private String provincialSpecialFundInvestment;
- @NotBlank(message = "甯傦紙宸烇級鎶曡祫鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("甯傦紙宸烇級鎶曡祫鎬婚")
private String cityInvestmentTotal;
- @NotBlank(message = "甯傦紙宸烇級棰勭畻鍐呮姇璧勪笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("甯傦紙宸烇級棰勭畻鍐呮姇璧�")
private String cityBudgetInvestment;
- @NotBlank(message = "甯傦紙宸烇級璐㈡斂鎬ф姇璧勪笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("甯傦紙宸烇級璐㈡斂鎬ф姇璧�")
private String cityFiscalInvestment;
- @NotBlank(message = "甯傦紙宸烇級涓撻」璧勯噾涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("甯傦紙宸烇級涓撻」璧勯噾")
private String citySpecialFundInvestment;
- @NotBlank(message = "鍘匡紙甯傘�佸尯锛夋姇璧勬�婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍘匡紙甯傘�佸尯锛夋姇璧勬�婚")
private String countyInvestmentTotal;
- @NotBlank(message = "鍘匡紙甯傘�佸尯锛夐绠楀唴鎶曡祫涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍘匡紙甯傘�佸尯锛夐绠楀唴鎶曡祫")
private String countyBudgetInvestment;
- @NotBlank(message = "鍘匡紙甯傘�佸尯锛夎储鏀挎�у缓璁捐祫閲戜笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍘匡紙甯傘�佸尯锛夎储鏀挎�у缓璁捐祫閲�")
private String countyFiscalInvestment;
- @NotBlank(message = "鍘匡紙甯傘�佸尯锛変笓椤硅祫閲戜笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍘匡紙甯傘�佸尯锛変笓椤硅祫閲�")
private String countySpecialFundInvestment;
- @NotBlank(message = "鍥藉唴璐锋鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍥藉唴璐锋鎬婚")
private String domesticLoanTotal;
- @NotBlank(message = "閾惰璐锋涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("閾惰璐锋")
private String bankLoan;
- @NotBlank(message = "澶栧晢鎶曡祫鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("澶栧晢鎶曡祫鎬婚")
private String foreignInvestmentTotal;
- @NotBlank(message = "浼佷笟鑷鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("浼佷笟鑷鎬婚")
private String enterpriseSelfRaisedTotal;
- @NotBlank(message = "鍏朵粬鎶曡祫鎬婚涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍏朵粬鎶曡祫鎬婚")
private String otherInvestmentTotal;
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
- @NotNull(message = "鏇存柊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
- @NotNull(message = "鏇存柊浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏇存柊浜�")
private Long updateBy;
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
index 3faafe5..91269d4 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
@@ -23,7 +23,7 @@
@Data
@ApiModel(value = "ProjectInvestmentInfo琛ㄥ崟", description = "鎶曡祫椤圭洰鍩虹淇℃伅琛ㄨ〃鍗�")
public class ProjectInvestmentInfoForm extends AbsForm {
-
+ @NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰id")
private Long projectId;
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java
index 87130cf..b6d7306 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java
@@ -22,76 +22,52 @@
@Data
@ApiModel(value = "ProjectInvestmentPolicyCompliance琛ㄥ崟", description = "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌琛ㄨ〃鍗�")
public class ProjectInvestmentPolicyComplianceForm extends AbsForm {
-
@NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰id")
private Long projectId;
- @NotBlank(message = "绗﹀悎浜т笟鏀跨瓥闄勪欢涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("绗﹀悎浜т笟鏀跨瓥闄勪欢")
private String policyComplianceAttachment;
- @NotBlank(message = "鏄惁灞炰簬銆婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬩笅鐨勯」鐩笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏄惁灞炰簬銆婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬩笅鐨勯」鐩�")
private Boolean belongsToIndustryAdjustmentDirectory;
- @NotBlank(message = "鏄惁灞炰簬鏈垪鍏ャ�婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬬殑鍏佽绫婚」鐩笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏄惁灞炰簬鏈垪鍏ャ�婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬬殑鍏佽绫婚」鐩�")
private Boolean belongsToAllowedProjects;
- @NotNull(message = "鏄惁灞炰簬銆婅タ閮ㄥ湴鍖洪紦鍔辩被浜т笟鐩綍銆嬬殑椤圭洰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏄惁灞炰簬銆婅タ閮ㄥ湴鍖洪紦鍔辩被浜т笟鐩綍銆嬬殑椤圭洰")
private Boolean belongsToWesternEncouragedDirectory;
- @NotNull(message = "鏄惁涓嶅睘浜庝骇涓氭斂绛栫姝㈡姇璧勫缓璁炬垨瀹炶鏍稿噯銆佸鎵圭鐞嗙殑椤圭洰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏄惁涓嶅睘浜庝骇涓氭斂绛栫姝㈡姇璧勫缓璁炬垨瀹炶鏍稿噯銆佸鎵圭鐞嗙殑椤圭洰")
private Boolean notBannedOrControlledProject;
- @NotNull(message = "濉姤淇℃伅鏄惁鐪熷疄涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("濉姤淇℃伅鏄惁鐪熷疄")
private Boolean informationIsTrue;
- @NotBlank(message = "涓撻」瑙勫垝澶嶅悎鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓撻」瑙勫垝澶嶅悎鎯呭喌")
private String specialPlanningCompliance;
- @NotBlank(message = "椤圭洰鑳借�楁儏鍐典笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鑳借�楁儏鍐�")
private String energyConsumption;
- @NotBlank(message = "椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級")
private String annualEnergyConsumption;
- @NotBlank(message = "椤圭洰骞寸數鍔涙秷鑰楅噺锛堟爣鍑嗙叅褰撻噺鍊硷級涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰骞寸數鍔涙秷鑰楅噺锛堟爣鍑嗙叅褰撻噺鍊硷級")
private String annualElectricityConsumption;
- @NotBlank(message = "鑺傝兘瀹℃煡锛�1闇�瑕侊紝0涓嶉渶瑕侊級涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鑺傝兘瀹℃煡锛�1闇�瑕侊紝0涓嶉渶瑕侊級")
private String energyCheck;
- @NotBlank(message = "涓嶅啀鍗曠嫭杩涜鑺傝兘瀹℃煡鐨勭被鍨嬩笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("涓嶅啀鍗曠嫭杩涜鑺傝兘瀹℃煡鐨勭被鍨�")
private String noOnlyCheckType;
- @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("澶囨敞")
private String remarks;
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- @NotNull(message = "鏇存柊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
- @NotNull(message = "鏇存柊浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏇存柊浜�")
private Long updateBy;
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectUnitRegistrationInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectUnitRegistrationInfoForm.java
index d3fe887..097161e 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectUnitRegistrationInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectUnitRegistrationInfoForm.java
@@ -29,97 +29,69 @@
@ApiModelProperty("椤圭洰id")
private Long projectId;
- @NotNull(message = "椤圭洰鎬绘姇璧勯涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鎬绘姇璧勯")
private BigDecimal totalInvestment;
- @NotBlank(message = "椤圭洰鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鍗曚綅")
private String projectUnit;
- @NotBlank(message = "椤圭洰鍗曚綅绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鍗曚綅绫诲瀷")
private String projectUnitType;
- @NotBlank(message = "鐧昏娉ㄥ唽绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鐧昏娉ㄥ唽绫诲瀷")
private String registrationType;
- @NotBlank(message = "鎺ц偂鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鎺ц偂鎯呭喌")
private String holdingSituation;
- @NotBlank(message = "璇佺収绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("璇佺収绫诲瀷")
private String certificateType;
- @NotBlank(message = "璇佺収鍙风爜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("璇佺収鍙风爜")
private String certificateNumber;
- @NotBlank(message = "娉ㄥ唽鍦板潃涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("娉ㄥ唽鍦板潃")
private String registeredAddress;
- @NotNull(message = "娉ㄥ唽璧勯噾涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("娉ㄥ唽璧勯噾")
private BigDecimal registeredCapital;
- @NotBlank(message = "娉曚汉浠ｈ〃涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("娉曚汉浠ｈ〃")
private String legalRepresentative;
- @NotBlank(message = "鍥哄畾鐢佃瘽涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍥哄畾鐢佃瘽")
private String fixedPhone;
- @NotBlank(message = "娉曚汉韬唤璇佷笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("娉曚汉韬唤璇�")
private String legalPersonIdcard;
- @NotBlank(message = "椤圭洰鑱旂郴浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鑱旂郴浜�")
private String projectContactPerson;
- @NotBlank(message = "绉诲姩鐢佃瘽涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("绉诲姩鐢佃瘽")
private String phone;
- @NotBlank(message = "鑱旂郴浜鸿韩浠借瘉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鑱旂郴浜鸿韩浠借瘉")
private String contactIdcard;
- @NotBlank(message = "寰俊鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("寰俊鍙�")
private String wechat;
- @NotBlank(message = "鑱旂郴浜洪�氳鍦板潃涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鑱旂郴浜洪�氳鍦板潃")
private String contactAddress;
- @NotBlank(message = "閭斂缂栫爜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("閭斂缂栫爜")
private String postCode;
- @NotBlank(message = "鐢靛瓙閭涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鐢靛瓙閭")
private String email;
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
- @NotNull(message = "鏇存柊浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏇存柊浜�")
private Long updateBy;
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- @NotNull(message = "鏇存柊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
public static ProjectUnitRegistrationInfo getEntityByForm(@NonNull ProjectUnitRegistrationInfoForm form, ProjectUnitRegistrationInfo entity) {
if(entity == null) {
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java
index b8369f8..55cfaec 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java
@@ -124,17 +124,9 @@
@ApiModelProperty("鍏朵粬鎶曡祫鎬婚")
private String otherInvestmentTotal;
- /** 鍒涘缓鏃堕棿 */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
/** 鍒涘缓浜� */
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
/** 鏇存柊浜� */
@ApiModelProperty("鏇存柊浜�")
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java
index a1406c6..61b1e88 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java
@@ -76,14 +76,6 @@
@ApiModelProperty("澶囨敞")
private String remarks;
- /** 鍒涘缓鏃堕棿 */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
/** 鍒涘缓浜� */
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectUnitRegistrationInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectUnitRegistrationInfoVO.java
index 1558401..0ccba7c 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectUnitRegistrationInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectUnitRegistrationInfoVO.java
@@ -110,14 +110,6 @@
@ApiModelProperty("鏇存柊浜�")
private Long updateBy;
- /** 鍒涘缓鏃堕棿 */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
public static ProjectUnitRegistrationInfoVO getVoByEntity(@NonNull ProjectUnitRegistrationInfo entity, ProjectUnitRegistrationInfoVO vo) {
if(vo == null) {
vo = new ProjectUnitRegistrationInfoVO();
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
index d77109b..ff2a93b 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
@@ -1,7 +1,11 @@
package com.ycl.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectInvestmentFunding;
+import com.ycl.domain.entity.ProjectInvestmentInfo;
+import com.ycl.domain.vo.ProjectInvestmentInfoVO;
import com.ycl.mapper.ProjectInvestmentFundingMapper;
import com.ycl.service.ProjectInvestmentFundingService;
import com.ycl.common.base.Result;
@@ -38,8 +42,11 @@
@Override
public Result add(ProjectInvestmentFundingForm form) {
ProjectInvestmentFunding entity = ProjectInvestmentFundingForm.getEntityByForm(form, null);
+ Long userId = SecurityUtils.getUserId();
+ entity.setCreateBy(userId);
+ entity.setUpdateBy(userId);
baseMapper.insert(entity);
- return Result.ok("娣诲姞鎴愬姛");
+ return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
/**
@@ -54,6 +61,8 @@
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Long userId = SecurityUtils.getUserId();
+ entity.setUpdateBy(userId);
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -99,8 +108,11 @@
*/
@Override
public Result detail(Integer id) {
- ProjectInvestmentFundingVO vo = baseMapper.getById(id);
- Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ QueryWrapper<ProjectInvestmentFunding> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("project_id",id);
+ ProjectInvestmentFunding entity = baseMapper.selectOne(queryWrapper);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ ProjectInvestmentFundingVO vo = ProjectInvestmentFundingVO.getVoByEntity(entity, null);
return Result.ok().data(vo);
}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentInfoServiceImpl.java
index d054f1a..ce9d181 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectInvestmentInfo;
@@ -106,8 +107,11 @@
*/
@Override
public Result detail(Integer id) {
- ProjectInvestmentInfoVO vo = baseMapper.getById(id);
- Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ QueryWrapper<ProjectInvestmentInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("project_id",id);
+ ProjectInvestmentInfo entity = baseMapper.selectOne(queryWrapper);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ ProjectInvestmentInfoVO vo = ProjectInvestmentInfoVO.getVoByEntity(entity, null);
return Result.ok().data(vo);
}
diff --git a/business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml b/business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml
index 826486c..e9270c7 100644
--- a/business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml
@@ -26,11 +26,6 @@
</resultMap>
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
SELECT
TPII.project_id,
--
Gitblit v1.8.0