评估-作废

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/domain/ProgramCancellation.java

@@ -19,4 +19,6 @@ public class ProgramCancellation extends BaseEntity {
 
     private String processDefinitionId;
 
+    private String reason;
+
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/domain/ProgramProjectListInfo.java

@@ -464,11 +464,18 @@ public class ProgramProjectListInfo extends BaseEntity {
     /*8
     作废信息
      */
+    @TableField(exist = false)
     private String cancellId;
+    @TableField(exist = false)
     private String procInsIdCancell;
+    @TableField(exist = false)
     private String cancellationStatus;
+    @TableField(exist = false)
     private String taskIdCan;
+    @TableField(exist = false)
     private List<String> auditUserIdsCan;
+    @TableField(exist = false)
+    private String reason;
 
 
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -586,6 +586,7 @@
             pc.id as cancellId,
             pc.proc_ins_id AS procInsIdCancell,
             pc.status as cancellationStatus,
+            pc.reason as reason,
            d.id AS issued_id,
            d.proc_ins_id AS procInsId4,
            d.status AS issued_status

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/ProjectListService.java

@@ -1943,6 +1943,7 @@ public class ProjectListService {
             programCancellation.setUpdateById(userDTO.getId());
             programCancellation.setUpdateTime(new Date());
             programCancellation.setStatus(projectListDto.getStatus());
+            programCancellation.setReason(projectListDto.getReason());
             programCancellationMapper.updateById(programCancellation);
             canId=projectListDto.getCancellId();
         }else {
@@ -1951,6 +1952,7 @@ public class ProjectListService {
             programCancellation.setId(id);
             programCancellation.setProjectId(projectListDto.getId());
             programCancellation.setStatus(projectListDto.getStatus());
+            programCancellation.setReason(projectListDto.getReason());
             programCancellationMapper.insert(programCancellation);
             canId=id;
         }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProjectListDto.java

@@ -184,5 +184,6 @@ public class ProjectListDto extends BaseEntity {
     private String cancellationStatus;
     private String taskIdCan;
     private List<String> auditUserIdsCan;
+    private String reason;
 
 }