bug处理

pms-base/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
    profiles:
-      active: pro
+      active: dev

pms-report/pom.xml

@@ -112,13 +112,13 @@
                     <scope>runtime</scope>
                 </dependency>
         <!-- ===需要什么数据库，手工打开注释=== -->
-        <!-- 达梦驱动-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.dameng</groupId>-->
-        <!--            <artifactId>DmJdbcDriver18</artifactId>-->
-        <!--            <version>1.0</version>-->
-        <!--            <scope>runtime</scope>-->
-        <!--        </dependency>-->
+<!--         达梦驱动-->
+                <dependency>
+                    <groupId>com.dameng</groupId>
+                    <artifactId>DmJdbcDriver18</artifactId>
+                    <version>1.0</version>
+                    <scope>runtime</scope>
+                </dependency>
         <!--        <dependency>-->
         <!--            <groupId>com.dameng</groupId>-->
         <!--            <artifactId>DmDialectForHibernate</artifactId>-->

pms-service/src/main/java/com/tofly/pms/supervise/mapper/ProjectReportPersonnelMapper.java

@@ -33,13 +33,13 @@ public interface ProjectReportPersonnelMapper extends BaseMapper<ProjectReportPe
      * 根据项目ID列表删除项目报告人员信息。
      *
      * @param projectIdList 项目ID
-     * @param personnelType 类型
+
      */
-    default void deleteByProjectIdList(String reportId, List<Integer> projectIdList, ReportPersonnelType personnelType) {
+    default void deleteByProjectIdList(String reportId, List<Integer> projectIdList, ProjectReportType reportType) {
         this.delete(Wrappers.lambdaQuery(ProjectReportPersonnel.class)
                 .eq(ProjectReportPersonnel::getReportId, reportId)
                 .in(ProjectReportPersonnel::getProjectId, projectIdList)
-                .eq(ProjectReportPersonnel::getPersonnelType, personnelType));
+                .eq(ProjectReportPersonnel::getReportType, reportType));
     }
 
 

pms-service/src/main/java/com/tofly/pms/supervise/service/impl/ProjectReportPersonnelServiceImpl.java

@@ -124,7 +124,7 @@ public class ProjectReportPersonnelServiceImpl extends ServiceImpl<ProjectReport
                         .eq(ProjectReportPersonnel::getReportType,projectReportPersonnel.getReportType()));
                 //删除后保存
                 if(personnelOld!=null){
-                    baseMapper.deleteByProjectIdList(reportId, Collections.singletonList(personnelOld.getProjectId()), personnelType);
+                    baseMapper.deleteByProjectIdList(reportId, Collections.singletonList(personnelOld.getProjectId()), projectReportPersonnel.getReportType());
                 }
                 projectReportPersonnel.setReportId(vo.getReportId());
                 projectReportPersonnel.setPersonnelType(vo.getPersonnelType());

pms-service/src/main/java/com/tofly/pms/testmanage/entity/BugInfo.java

@@ -216,6 +216,8 @@ public class BugInfo implements Serializable, Cloneable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 
+
+
     public void setProcessingModeAnnotation() {
         try {
             Field field = this.getClass().getDeclaredField("processingMode");

pms-service/src/main/java/com/tofly/pms/working/entity/TaskW.java

@@ -217,7 +217,9 @@ public class TaskW implements Serializable, Cloneable {
     private Integer feedbackId;
     @ApiModelProperty(value = "是否正在处理：0：未处理，1：正在处理")
     private Integer processing;
-
+    @ApiModelProperty(value = "提交任务人的提交完成时间")
+    @TableField(exist = false)
+    private Date commitDate;
     public TaskW deepClone() throws Exception {
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
              ObjectOutputStream oos = new ObjectOutputStream(baos)) {

pms-service/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss