Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-28 e929e18f8d04e72a23c24b06b89ab2d7be6f9c84

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/controller/IndexController.java

@@ -1,8 +1,11 @@
package com.ycl.controller;

import com.ycl.common.core.controller.BaseController;
import com.ycl.common.core.domain.R;
import com.ycl.common.core.page.TableDataInfo;
import com.ycl.domain.entity.AuditHistory;
import com.ycl.domain.vo.*;
import com.ycl.service.AuditHistoryService;
import com.ycl.service.ProjectInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +20,15 @@
@RequiredArgsConstructor
@RestController
@RequestMapping("/")
public class IndexController {
public class IndexController extends BaseController {


    @Autowired
    private ProjectInfoService projectInfoService;


    @Autowired
    private AuditHistoryService auditHistoryService;

    /**
     * 项目数量统计
@@ -49,7 +56,18 @@
     */
    @GetMapping("/audit-message")
    public TableDataInfo<Object> auditMessage(PageQuery pageQuery) {
        return null;
        AuditHistory auditHistory = new AuditHistory();
        auditHistory.setTaskId("001");
        auditHistory.setTaskDefinitionKey("key");
        auditHistory.setViewer("张三");
        auditHistory.setCommitDept("部门1");
        auditHistory.setAuditType("01");
        auditHistory.setIsRead("0");
        auditHistory.setBusinessKey("12");
        auditHistory.setBusinessTable("t_plan");
        auditHistory.setContent("消息回复");
//        auditHistoryService.save(auditHistory);
        return getDataTable(auditHistoryService.list());
    }

    /**

 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/ProjectInvestmentInfoController.java

@@ -27,55 +27,55 @@
@RequiredArgsConstructor
@Api(value = "投资项目基础信息表", tags = "投资项目基础信息表管理")
@RestController
@RequestMapping("/project-investment-info")
@RequestMapping("/project/investmentInfo")
public class ProjectInvestmentInfoController {

    private final ProjectInvestmentInfoService projectInvestmentInfoService;

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:add')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectInvestmentInfoForm form) {
        return projectInvestmentInfoService.add(form);
    }

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:edit')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:edit')")
    public Result update(@RequestBody @Validated(Update.class) ProjectInvestmentInfoForm form) {
        return projectInvestmentInfoService.update(form);
    }

    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:del')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:del')")
    public Result removeById(@PathVariable("id") String id) {
        return projectInvestmentInfoService.removeById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:del:batch')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:del:batch')")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return projectInvestmentInfoService.remove(ids);
    }

    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:page')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:page')")
    public Result page(ProjectInvestmentInfoQuery query) {
        return projectInvestmentInfoService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:detail')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:detail')")
    public Result detail(@PathVariable("id") Integer id) {
        return projectInvestmentInfoService.detail(id);
    }

    @GetMapping("/list")
    @PreAuthorize("hasAuthority('projectInvestmentInfo:list')")
//    @PreAuthorize("hasAuthority('projectInvestmentInfo:list')")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return projectInvestmentInfoService.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/ProjectPlanProgressReportController.java

@@ -6,6 +6,7 @@
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanProgressReportForm;
import com.ycl.domain.query.ProjectPlanProgressReportQuery;
import com.ycl.domain.vo.ProgressReportResponseVO;
import com.ycl.service.ProjectPlanProgressReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,8 +35,8 @@

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('projectPlanProgressReport:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectPlanProgressReportForm form) {
//    @PreAuthorize("hasAuthority('projectPlanProgressReport:add')")
    public Result add(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) {
        return projectPlanProgressReportService.add(form);
    }


 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/AuditHistory.java

New file
@@ -0,0 +1,25 @@
package com.ycl.domain.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;

@Data
@TableName("t_audit_history")
public class AuditHistory extends AbsEntity {
    private String taskId;
    private String taskDefinitionKey;
    private String viewer;
    private String commitDept;
    /**
     * 1:提交，2:审核，3:驳回，4:转交
     */
    private String auditType;
    /**
     * 是否阅读(0:未读，1:已读)
     */
    private String isRead;
    private String businessKey;
    private String businessTable;
    private String content;
}

 business/src/main/java/com/ycl/domain/entity/File.java

@@ -1,9 +1,6 @@
package com.ycl.domain.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
@@ -34,6 +31,7 @@
    /**
     * 文件分类
     */
    @TableField(value = "type")
    private FileTypeEnum type;
    /**
     * 文件名

 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/ProjectInvestmentInfo.java

@@ -6,6 +6,7 @@
import lombok.Data;

import java.time.LocalDateTime;
import java.util.Date;

/**
 * 投资项目基础信息表
@@ -45,11 +46,11 @@

    @TableField("planned_start_date")
    /** 计划开工时间 */
    private LocalDateTime plannedStartDate;
    private Date plannedStartDate;

    @TableField("expected_completion_date")
    /** 拟建成时间 */
    private LocalDateTime expectedCompletionDate;
    private Date expectedCompletionDate;

    @TableField("national_industry_classification")
    /** 国标行业分类 */
@@ -79,17 +80,10 @@
    /** 建管平台代码 */
    private String code;

    @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/ProjectPlanProgressReport.java

@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import com.ycl.system.domain.base.AbsEntityOnlyId;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * 进度上报内容
@@ -16,7 +18,7 @@
 */
@Data
@TableName("t_project_plan_progress_report")
public class ProjectPlanProgressReport extends AbsEntity {
public class ProjectPlanProgressReport extends AbsEntityOnlyId {

    private static final long serialVersionUID = 1L;

@@ -26,11 +28,11 @@

    @TableField("start_time")
    /** 实际开始时间 */
    private LocalDateTime startTime;
    private Date startTime;

    @TableField("end_time")
    /** 实际完成时间 */
    private LocalDateTime endTime;
    private Date endTime;

    @TableField("progress_status")
    /** 进度情况 */

 business/src/main/java/com/ycl/domain/entity/ProjectPlanRecord.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import com.ycl.system.domain.base.AbsEntityOnlyId;
import lombok.Data;

import java.math.BigDecimal;
@@ -17,7 +18,7 @@
 */
@Data
@TableName("t_project_plan_record")
public class ProjectPlanRecord extends AbsEntity {
public class ProjectPlanRecord extends AbsEntityOnlyId {

    private static final long serialVersionUID = 1L;


 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

@@ -1,5 +1,6 @@
package com.ycl.domain.form;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
import com.ycl.system.domain.base.AbsForm;
@@ -22,80 +23,57 @@
@Data
@ApiModel(value = "ProjectInvestmentInfo表单", description = "投资项目基础信息表表单")
public class ProjectInvestmentInfoForm extends AbsForm {

    @NotNull(message = "项目id不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("项目id")
    private Long projectId;

    @NotNull(message = "建设地点是否跨域不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("建设地点是否跨域")
    private Integer beCrossRegion;

    @NotBlank(message = "项目建设地点不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("项目建设地点")
    private String constructionLocation;

    @NotBlank(message = "建设详细地址不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("建设详细地址")
    private String detailedAddress;

    @NotNull(message = "是否是补码项目不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("是否是补码项目")
    private Integer beCompensationProject;

    @NotBlank(message = "补码原因不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("补码原因")
    private String compensationReason;

    @NotNull(message = "计划开工时间不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("计划开工时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date plannedStartDate;

    @NotNull(message = "拟建成时间不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("拟建成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date expectedCompletionDate;

    @NotBlank(message = "国标行业分类不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("国标行业分类")
    private String nationalIndustryClassification;

    @NotBlank(message = "所属行业分类不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("所属行业分类")
    private String industryClassification;

    @NotBlank(message = "项目建设性质不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("项目建设性质")
    private String projectNature;

    @NotBlank(message = "项目属性不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("项目属性")
    private String projectAttribute;

    @NotNull(message = "是否使用土地不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("是否使用土地")
    private Integer useEarth;

    @NotBlank(message = "主要建设内容及规模不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("主要建设内容及规模")
    private String contentScale;

    @NotBlank(message = "建管平台代码不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("建管平台代码")
    private String code;

    @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/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/ProgressReportResponseVO.java

@@ -1,5 +1,6 @@
package com.ycl.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -13,6 +14,10 @@
public class ProgressReportResponseVO {
    // 计划项id
    private Integer id;
    // 进度上报id
    private Integer progressReportId;
    // 审核记录id
    private Integer examineRecordId;
    private Integer planTime;
    private Integer PlanTimeFlag;
    private String title;

 business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java

@@ -1,5 +1,7 @@
package com.ycl.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.system.domain.base.AbsVo;
import io.swagger.annotations.ApiModel;
@@ -93,14 +95,17 @@

    /** 立项时间 */
    @ApiModelProperty("立项时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createProjectTime;

    /** 计划开工时间 */
    @ApiModelProperty("计划开工时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date planStartTime;

    /** 计划竣工时间 */
    @ApiModelProperty("计划竣工时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date planCompleteTime;

    /** 中标单位 */
@@ -113,6 +118,7 @@

    /** 中标时间 */
    @ApiModelProperty("中标时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date winTime;

    /** 详细地址 */
@@ -147,6 +153,13 @@
    @ApiModelProperty("创建人")
    private Long createBy;

    /** 状态码 */
    @ApiModelProperty("状态码")
    private String projectColorCode;

    @ApiModelProperty("文件")
    private List<File> fileList;

    public static ProjectInfoVO getVoByEntity(@NonNull ProjectInfo entity, ProjectInfoVO vo) {
        if(vo == null) {
            vo = new ProjectInfoVO();

 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/ProjectInvestmentInfoVO.java

@@ -1,5 +1,6 @@
package com.ycl.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProjectInvestmentInfo;
import java.util.List;
@@ -46,10 +47,12 @@

    /** 计划开工时间 */
    @ApiModelProperty("计划开工时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date plannedStartDate;

    /** 拟建成时间 */
    @ApiModelProperty("拟建成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date expectedCompletionDate;

    /** 国标行业分类 */
@@ -80,17 +83,9 @@
    @ApiModelProperty("建管平台代码")
    private String code;

    /** 创建时间 */
    @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/ProjectPlanInfoItem.java

@@ -1,11 +1,14 @@
package com.ycl.domain.vo;


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Date;


@Data
@AllArgsConstructor
@NoArgsConstructor

 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/mapper/AuditHistoryMapper.java

New file
@@ -0,0 +1,16 @@
package com.ycl.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.domain.entity.AuditHistory;
import com.ycl.domain.entity.File;
import org.apache.ibatis.annotations.Mapper;

/**
 * 审核记录 Mapper 接口
 *
 */
@Mapper
public interface AuditHistoryMapper extends BaseMapper<AuditHistory> {


}

 business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java

@@ -22,7 +22,7 @@
     * @param id
     * @return
     */
    ProjectInfoVO getById(Integer id);
    ProjectInfo getById(Integer id);

    /**
    *  分页

 business/src/main/java/com/ycl/mapper/ProjectPlanProgressReportMapper.java

@@ -33,4 +33,8 @@
    IPage getPage(IPage page, @Param("query") ProjectPlanProgressReportQuery query);

    ProgressReportResponseVO getDetail(Integer id);

    void insertOne(ProjectPlanProgressReport projectPlanProgressReport);

    void updateOne(ProjectPlanProgressReport projectPlanProgressReport);
}

 business/src/main/java/com/ycl/service/AuditHistoryService.java

New file
@@ -0,0 +1,12 @@
package com.ycl.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.domain.entity.AuditHistory;

/**
 * 审核记录 服务类
 */
public interface AuditHistoryService extends IService<AuditHistory> {


}

 business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java

@@ -5,6 +5,7 @@
import com.ycl.domain.entity.ProjectPlanProgressReport;
import com.ycl.domain.form.ProjectPlanProgressReportForm;
import com.ycl.domain.query.ProjectPlanProgressReportQuery;
import com.ycl.domain.vo.ProgressReportResponseVO;

import java.util.List;

@@ -21,7 +22,7 @@
     * @param form
     * @return
     */
    Result add(ProjectPlanProgressReportForm form);
    Result add(ProgressReportResponseVO form);

    /**
     * 修改

 business/src/main/java/com/ycl/service/impl/AuditHistoryServiceImpl.java

New file
@@ -0,0 +1,22 @@
package com.ycl.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.domain.entity.AuditHistory;
import com.ycl.mapper.AuditHistoryMapper;
import com.ycl.service.AuditHistoryService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

import java.util.List;

/**
 * 审核记录 服务实现类
 *
 */
@Service
@RequiredArgsConstructor
public class AuditHistoryServiceImpl extends ServiceImpl<AuditHistoryMapper, AuditHistory> implements AuditHistoryService {

}

 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

@@ -1,15 +1,18 @@
package com.ycl.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.FileMapper;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.service.FileService;
import com.ycl.service.ProjectInfoService;
@@ -37,6 +40,7 @@

    private final ProjectInfoMapper projectInfoMapper;
    private final FileService fileService;
    private final FileMapper fileMapper;
    /**
     * 添加
     *
@@ -48,6 +52,9 @@
    public Result add(ProjectInfoForm form) {
        //添加基本信息
        ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
        Long userId = SecurityUtils.getUserId();
        entity.setCreateBy(userId);
        entity.setUpdateBy(userId);
        baseMapper.insert(entity);
        //添加文件
        List<File> fileList = form.getFileList();
@@ -56,7 +63,7 @@
            item.setType(FileTypeEnum.PROJECT_INFO);
        });
        fileService.saveBatch(fileList);
        return Result.ok("添加成功");
        return Result.ok("添加成功").data(entity.getId());
    }

    /**
@@ -66,12 +73,28 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result update(ProjectInfoForm form) {
        ProjectInfo entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        ProjectInfoForm.getEntityByForm(form,entity);
        Long userId = SecurityUtils.getUserId();
        entity.setUpdateBy(userId);

        List<File> fileList = form.getFileList();
        fileList.forEach(item->{
            item.setBusId(entity.getId());
            item.setType(FileTypeEnum.PROJECT_INFO);
        });
        //删除原有文件
        QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
        fileQueryWrapper.eq("type",FileTypeEnum.PROJECT_INFO.getType());
        fileQueryWrapper.eq("bus_id",entity.getId());
        fileMapper.delete(fileQueryWrapper);
        //替换成现有
        fileService.saveBatch(fileList);
        //更新项目信息
        baseMapper.updateById(entity);
        return Result.ok("修改成功");
    }
@@ -83,6 +106,7 @@
     * @return
     */
    @Override
    //TODO:待完善
    public Result remove(List<String> ids) {
        baseMapper.deleteBatchIds(ids);
        return Result.ok("删除成功");
@@ -95,6 +119,7 @@
     * @return
     */
    @Override
    //TODO:待完善
    public Result removeById(String id) {
        baseMapper.deleteById(id);
        return Result.ok("删除成功");
@@ -108,9 +133,17 @@
     */
    @Override
    public Result page(ProjectInfoQuery query) {
        IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
        IPage<ProjectInfo> page = PageUtil.getPage(query, ProjectInfo.class);
        baseMapper.getPage(page, query);
        return Result.ok().data(page.getRecords()).total(page.getTotal());
        List<ProjectInfo> records = page.getRecords();
        List<ProjectInfoVO> list = records.stream()
                .map(entity -> {
                    ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
                    vo.setProjectColorCode("green");
                    return vo;
                })
                .collect(Collectors.toList());
        return Result.ok().data(list).total(page.getTotal());
    }

    /**
@@ -121,8 +154,14 @@
     */
    @Override
    public Result detail(Integer id) {
        ProjectInfoVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        ProjectInfo entity = baseMapper.getById(id);
        Assert.notNull(entity, "记录不存在");
        ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
        QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
        fileQueryWrapper.eq("type",FileTypeEnum.PROJECT_INFO.getType());
        fileQueryWrapper.eq("bus_id",vo.getId());
        List<File> files = fileMapper.selectList(fileQueryWrapper);
        vo.setFileList(files);
        return Result.ok().data(vo);
    }


 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,6 +1,8 @@
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;
import com.ycl.mapper.ProjectInvestmentInfoMapper;
import com.ycl.service.ProjectInvestmentInfoService;
@@ -38,8 +40,12 @@
    @Override
    public Result add(ProjectInvestmentInfoForm form) {
        ProjectInvestmentInfo entity = ProjectInvestmentInfoForm.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 +60,8 @@
        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Long userId = SecurityUtils.getUserId();
        entity.setUpdateBy(userId);
        baseMapper.updateById(entity);
        return Result.ok("修改成功");
    }
@@ -99,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/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java

@@ -20,6 +20,7 @@
import com.ycl.service.ProjectPlanInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
@@ -165,6 +166,7 @@
        item.setDeleted(0);
        list.stream().forEach(i -> {
            item.setProjectPlanInfoId(i.getId().longValue());
//            projectPlanExamineRecordMapper.insert(item);
            projectPlanExamineRecordMapper.insertOne(item);
        });
        return Result.ok("添加成功");

 business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java

@@ -1,10 +1,15 @@
package com.ycl.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.base.Result;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.entity.ProjectPlanProgressReport;
import com.ycl.domain.vo.ProgressReportResponseVO;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.mapper.ProjectPlanInfoMapper;
import com.ycl.mapper.ProjectPlanProgressReportMapper;
import com.ycl.service.ProjectPlanProgressReportService;

@@ -12,9 +17,11 @@
import com.ycl.domain.form.ProjectPlanProgressReportForm;
import com.ycl.domain.vo.ProjectPlanProgressReportVO;
import com.ycl.domain.query.ProjectPlanProgressReportQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;

import java.util.List;
@@ -31,16 +38,46 @@
public class ProjectPlanProgressReportServiceImpl extends ServiceImpl<ProjectPlanProgressReportMapper, ProjectPlanProgressReport> implements ProjectPlanProgressReportService {

    private final ProjectPlanProgressReportMapper projectPlanProgressReportMapper;
    @Autowired
    private final ProjectPlanExamineRecordMapper projectPlanExamineRecordMapper;
    @Autowired
    private ProjectPlanInfoMapper projectPlanInfoMapper;

    /**
     * 添加
     * @param form
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Result add(ProjectPlanProgressReportForm form) {
        ProjectPlanProgressReport entity = ProjectPlanProgressReportForm.getEntityByForm(form, null);
        baseMapper.insert(entity);
    public Result add(ProgressReportResponseVO form) {

        ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport();
        projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue());
        projectPlanProgressReport.setStartTime(form.getActualStartTime());
        projectPlanProgressReport.setEndTime(form.getActualEndTime());
        projectPlanProgressReport.setProgressStatus(form.getProgressStatus());
        projectPlanProgressReport.setActualInvest(form.getActualInvest());
        if (form.getProgressReportId() == null) {
            baseMapper.insertOne(projectPlanProgressReport);
        }else {
            projectPlanProgressReport.setId(form.getProgressReportId());
//            baseMapper.updateOne(projectPlanProgressReport);
            baseMapper.updateById(projectPlanProgressReport);
        }

        // 更新上级批复
        new LambdaUpdateChainWrapper<>(projectPlanExamineRecordMapper)
                .eq(ProjectPlanExamineRecord::getId, form.getExamineRecordId())
                .set(ProjectPlanExamineRecord::getDepartmentApprovalReply, form.getDepartmentApprovalReply())
                .set(ProjectPlanExamineRecord::getManageApprovalReply, form.getManageApprovalReply())
                .update();

        // 更新上报状态
        new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
                .eq(ProjectPlanInfo::getId, form.getId())
                .set(ProjectPlanInfo::getProgressStatus, 1)
                .update();
        return Result.ok("添加成功");
    }


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

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.mapper.AuditHistoryMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.domain.entity.AuditHistory">
        <result column="task_id" property="taskId" />
        <result column="task_definition_key" property="taskDefinitionKey" />
        <result column="viewer" property="viewer" />
        <result column="commit_dept" property="commitDept" />
        <result column="audit_type" property="auditType" />
        <result column="is_read" property="isRead" />
        <result column="business_key" property="businessKey" />
        <result column="business_table" property="businessTable" />
        <result column="content" property="content" />
    </resultMap>



</mapper>

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

@@ -13,12 +13,6 @@
        <result column="gmt_update_time" property="gmtUpdateTime" />
    </resultMap>







    <select id="getById" resultMap="BaseResultMap">
        SELECT
            TPP.project_info_id,

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

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







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

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

@@ -49,7 +49,8 @@
            delay_start_time,
            delay_end_time,
            gmt_create,
            gmt_update
            gmt_update,
            deleted
        ) values (
            #{projectPlanRecordId},
            #{projectPlanInfoId},
@@ -65,7 +66,8 @@
            #{delayStartTime},
            #{delayEndTime},
            #{gmtCreate},
            #{gmtUpdate}
            #{gmtUpdate},
            #{deleted}
        )
    </insert>
    <update id="updateByForm">
@@ -142,7 +144,7 @@
                 FROM t_project_plan_examine_record AS pper
                 WHERE project_plan_record_id = #{projectPlanRecordId}
             ) AS ranked
        WHERE rn = 1;
        WHERE rn = 1 AND ranked.deleted = 0
    </select>

    <select id="getPlanLog" resultType="com.ycl.domain.vo.DepartmentApprovalResponseVO">

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

@@ -10,12 +10,32 @@
        <result column="progress_status" property="progressStatus" />
        <result column="actual_invest" property="actualInvest" />
    </resultMap>






    <insert id="insertOne">
        INSERT INTO t_project_plan_progress_report (
            project_plan_info_id,
            start_time,
            end_time,
            progress_status,
            actual_invest
        )
        VALUES (
            #{projectPlanInfoId},
            #{startTime},
            #{endTime},
            #{progressStatus},
            #{actualInvest}
        )
    </insert>
    <update id="updateOne">
        UPDATE t_project_plan_progress_report
        SET
            start_time = #{startTime},
            end_time = #{endTime},
            progress_status = #{progressStatus},
            actual_invest = #{actualInvest}
        WHERE
            id = #{id}
    </update>


    <select id="getById" resultMap="BaseResultMap">
@@ -51,6 +71,8 @@
    <select id="getDetail" resultType="com.ycl.domain.vo.ProgressReportResponseVO">
        SELECT
            ppi.id,
            pppr.id AS progress_report_id,
            pper.id AS examine_record_id,
            ppr.plan_time,
            ppr.plan_time_flag,
            ppi.title,

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

@@ -44,9 +44,6 @@






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

 common/pom.xml

@@ -16,7 +16,11 @@
    </description>

    <dependencies>

        <!-- MybatisPlus -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
        </dependency>
        <!-- lombok -->
        <dependency>
            <groupId>org.projectlombok</groupId>

 common/src/main/java/com/ycl/common/enums/business/FileTypeEnum.java

@@ -1,5 +1,6 @@
package com.ycl.common.enums.business;

import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;

@@ -13,12 +14,14 @@
public enum FileTypeEnum {
    PROJECT_INFO("project_info", "项目基本信息");

    private final String code;
    @EnumValue // 标明该字段存入数据库
    private final String type;

    @JsonValue // 标明在转JSON时使用该字段
    private final String desc;

    FileTypeEnum(String code, String desc) {
        this.code = code;
    FileTypeEnum(String type, String desc) {
        this.type = type;
        this.desc = desc;
    }
}

 start/src/main/resources/application.yml

@@ -5,7 +5,7 @@
  # 实体扫描，多个package用逗号或者分号分隔
  typeAliasesPackage: com.ycl.**.domain
  configuration:
    default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler # 通用枚举处理器
    default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler # 通用枚举处理器
  #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 日志打印
  global-config:
    db-config:

 system/pom.xml

@@ -28,11 +28,6 @@
            <artifactId>easyexcel</artifactId>
        </dependency>

        <!-- MybatisPlus -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
        </dependency>

        <!-- 验证码 -->
        <dependency>

 system/src/main/java/com/ycl/system/domain/base/AbsEntity.java

@@ -17,7 +17,7 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /** 创建时间 */

 system/src/main/java/com/ycl/system/domain/base/AbsVo.java

@@ -13,7 +13,7 @@
public abstract class AbsVo {

    @ApiModelProperty("id")
    private Integer id;
    private Long id;

    @ApiModelProperty("创建时间")
    private Date gmtCreate;