From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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/domain/vo/ProgressReportResponseVO.java                     |    5 
 business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java       |   16 
 business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java                |    8 
 business/src/main/java/com/ycl/domain/vo/ProjectInvestmentInfoVO.java                      |   11 
 start/src/main/resources/application.yml                                                   |    2 
 business/src/main/resources/mapper/ProjectInvestmentInfoMapper.xml                         |    5 
 business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml                      |    8 
 business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java                               |    2 
 business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java          |    8 
 business/src/main/resources/mapper/ProgressPlanMapper.xml                                  |    6 
 business/src/main/resources/mapper/ProjectProcessMapper.xml                                |    3 
 business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoItem.java                          |    3 
 business/src/main/java/com/ycl/domain/entity/File.java                                     |    6 
 business/src/main/java/com/ycl/domain/entity/ProjectPlanRecord.java                        |    3 
 common/src/main/java/com/ycl/common/enums/business/FileTypeEnum.java                       |    9 
 business/src/main/java/com/ycl/mapper/AuditHistoryMapper.java                              |   16 +
 business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java               |    3 
 business/src/main/java/com/ycl/controller/ProjectInvestmentFundingController.java          |   16 
 business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java         |    5 
 business/src/main/java/com/ycl/domain/entity/ProjectInvestmentInfo.java                    |   12 
 business/src/main/java/com/ycl/controller/ProjectInvestmentInfoController.java             |   16 
 business/src/main/java/com/ycl/service/impl/AuditHistoryServiceImpl.java                   |   22 ++
 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/controller/ProjectInvestmentPolicyComplianceController.java |   16 
 business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java                  |   28 --
 system/src/main/java/com/ycl/system/domain/base/AbsVo.java                                 |    2 
 business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java                 |    8 
 business/src/main/java/com/ycl/mapper/ProjectPlanProgressReportMapper.java                 |    4 
 business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml                     |   34 ++
 business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java                                |   13 +
 business/src/main/java/com/ycl/service/AuditHistoryService.java                            |   12 +
 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/ProjectPlanInfoServiceImpl.java                |    2 
 system/src/main/java/com/ycl/system/domain/base/AbsEntity.java                             |    2 
 business/src/main/java/com/ycl/service/impl/ProjectInvestmentInfoServiceImpl.java          |   17 +
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java                    |   53 ++++
 business/src/main/resources/mapper/AuditHistoryMapper.xml                                  |   20 +
 business/src/main/java/com/ycl/controller/IndexController.java                             |   22 +
 common/pom.xml                                                                             |    6 
 business/src/main/java/com/ycl/domain/entity/AuditHistory.java                             |   25 ++
 system/pom.xml                                                                             |    5 
 business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java        |    8 
 business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java       |   18 +
 business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java      |   43 +++
 48 files changed, 360 insertions(+), 275 deletions(-)

diff --git a/business/src/main/java/com/ycl/controller/IndexController.java b/business/src/main/java/com/ycl/controller/IndexController.java
index 464e95e..6cb53e6 100644
--- a/business/src/main/java/com/ycl/controller/IndexController.java
+++ b/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());
     }
 
     /**
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/ProjectInvestmentInfoController.java b/business/src/main/java/com/ycl/controller/ProjectInvestmentInfoController.java
index c809bd6..7a6d79b 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInvestmentInfoController.java
+++ b/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();
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/ProjectPlanProgressReportController.java b/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
index c19d78f..64db8ca 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
+++ b/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);
     }
 
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/AuditHistory.java b/business/src/main/java/com/ycl/domain/entity/AuditHistory.java
new file mode 100644
index 0000000..9f198f6
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/entity/AuditHistory.java
@@ -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;
+}
diff --git a/business/src/main/java/com/ycl/domain/entity/File.java b/business/src/main/java/com/ycl/domain/entity/File.java
index 0602ab1..806883c 100644
--- a/business/src/main/java/com/ycl/domain/entity/File.java
+++ b/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;
     /**
      * 鏂囦欢鍚�
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/ProjectInvestmentInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentInfo.java
index 13fbbbb..fefc6a7 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentInfo.java
+++ b/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")
     /** 鏇存柊浜� */
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/ProjectPlanProgressReport.java b/business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java
index 7e51dcb..b170006 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java
+++ b/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")
     /** 杩涘害鎯呭喌 */
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectPlanRecord.java b/business/src/main/java/com/ycl/domain/entity/ProjectPlanRecord.java
index 9495cb1..4056d7d 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanRecord.java
+++ b/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;
 
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 eaad73a..91269d4 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
+++ b/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;
 
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/ProgressReportResponseVO.java b/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
index 241086e..0ab14d6 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
+++ b/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 {
     // 璁″垝椤筰d
     private Integer id;
+    // 杩涘害涓婃姤id
+    private Integer progressReportId;
+    // 瀹℃牳璁板綍id
+    private Integer examineRecordId;
     private Integer planTime;
     private Integer PlanTimeFlag;
     private String title;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index 2fc8f32..ee49ea6 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/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();
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/ProjectInvestmentInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentInfoVO.java
index 4cd10ec..327eada 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentInfoVO.java
+++ b/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("鏇存柊浜�")
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/ProjectPlanInfoItem.java b/business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoItem.java
index 9be4fa1..fee3153 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoItem.java
+++ b/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
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/mapper/AuditHistoryMapper.java b/business/src/main/java/com/ycl/mapper/AuditHistoryMapper.java
new file mode 100644
index 0000000..a696551
--- /dev/null
+++ b/business/src/main/java/com/ycl/mapper/AuditHistoryMapper.java
@@ -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> {
+
+
+}
diff --git a/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java b/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java
index d1a54f3..fa9dd84 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java
@@ -22,7 +22,7 @@
      * @param id
      * @return
      */
-    ProjectInfoVO getById(Integer id);
+    ProjectInfo getById(Integer id);
 
     /**
     *  鍒嗛〉
diff --git a/business/src/main/java/com/ycl/mapper/ProjectPlanProgressReportMapper.java b/business/src/main/java/com/ycl/mapper/ProjectPlanProgressReportMapper.java
index e4f81c5..794b47c 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectPlanProgressReportMapper.java
+++ b/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);
 }
diff --git a/business/src/main/java/com/ycl/service/AuditHistoryService.java b/business/src/main/java/com/ycl/service/AuditHistoryService.java
new file mode 100644
index 0000000..8f64b4c
--- /dev/null
+++ b/business/src/main/java/com/ycl/service/AuditHistoryService.java
@@ -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> {
+
+
+}
diff --git a/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java b/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java
index 0a9802c..c9fbd88 100644
--- a/business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java
+++ b/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);
 
     /**
      * 淇敼
diff --git a/business/src/main/java/com/ycl/service/impl/AuditHistoryServiceImpl.java b/business/src/main/java/com/ycl/service/impl/AuditHistoryServiceImpl.java
new file mode 100644
index 0000000..8a830de
--- /dev/null
+++ b/business/src/main/java/com/ycl/service/impl/AuditHistoryServiceImpl.java
@@ -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 {
+
+}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 7f650e5..1cddb79 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/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());
-
         // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
         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);
     }
 
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 064a4b9..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,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 @@
         // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
         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);
     }
 
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
index 55690a8..a202490 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
+++ b/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("娣诲姞鎴愬姛");
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
index 79674ce..5d53406 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/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("娣诲姞鎴愬姛");
     }
 
diff --git a/business/src/main/resources/mapper/AuditHistoryMapper.xml b/business/src/main/resources/mapper/AuditHistoryMapper.xml
new file mode 100644
index 0000000..7bb92f3
--- /dev/null
+++ b/business/src/main/resources/mapper/AuditHistoryMapper.xml
@@ -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>
diff --git a/business/src/main/resources/mapper/ProgressPlanMapper.xml b/business/src/main/resources/mapper/ProgressPlanMapper.xml
index 4d1c63d..adf99f4 100644
--- a/business/src/main/resources/mapper/ProgressPlanMapper.xml
+++ b/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,
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,
diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index 14a03c2..1f5eea5 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/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">
diff --git a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
index 80f9304..5e7ddeb 100644
--- a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
+++ b/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,
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 3d69fe9..5ce1bb6 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -44,9 +44,6 @@
 
 
 
-
-
-
     <select id="getById" resultMap="BaseResultMap">
         SELECT
             TPP.project_id,
diff --git a/common/pom.xml b/common/pom.xml
index 2f8038a..99d8e16 100644
--- a/common/pom.xml
+++ b/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>
diff --git a/common/src/main/java/com/ycl/common/enums/business/FileTypeEnum.java b/common/src/main/java/com/ycl/common/enums/business/FileTypeEnum.java
index 7b5ef08..f2c0231 100644
--- a/common/src/main/java/com/ycl/common/enums/business/FileTypeEnum.java
+++ b/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;
     }
 }
diff --git a/start/src/main/resources/application.yml b/start/src/main/resources/application.yml
index 161c6cd..841764e 100644
--- a/start/src/main/resources/application.yml
+++ b/start/src/main/resources/application.yml
@@ -5,7 +5,7 @@
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
   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:
diff --git a/system/pom.xml b/system/pom.xml
index 439845d..18ddae0 100644
--- a/system/pom.xml
+++ b/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>
diff --git a/system/src/main/java/com/ycl/system/domain/base/AbsEntity.java b/system/src/main/java/com/ycl/system/domain/base/AbsEntity.java
index 3dbfca3..3f3cca0 100644
--- a/system/src/main/java/com/ycl/system/domain/base/AbsEntity.java
+++ b/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;
 
     /** 鍒涘缓鏃堕棿 */
diff --git a/system/src/main/java/com/ycl/system/domain/base/AbsVo.java b/system/src/main/java/com/ycl/system/domain/base/AbsVo.java
index f1489cf..864fa69 100644
--- a/system/src/main/java/com/ycl/system/domain/base/AbsVo.java
+++ b/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;

--
Gitblit v1.8.0