投资金额

fuliqi

2024-11-28 6d86cb5870d09c7773bd276d8869484546cc4f85

投资金额

 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();

 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();

 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();

 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")
    /** 更新人 */

 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;

 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;


}

 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;


 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;


 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;


 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) {

 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("更新人")

 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;

 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();

 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 @@
        // 为空抛IllegalArgumentException，做全局异常处理
        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);
    }


 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);
    }


 business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml

@@ -26,11 +26,6 @@
    </resultMap>







    <select id="getById" resultMap="BaseResultMap">
        SELECT
            TPII.project_id,