修改进度

research-system/src/main/java/com/research/system/domain/dto/ShsResDeviceDto.java

@@ -44,6 +44,7 @@ public class ShsResDeviceDto {
         @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
         private Date purchaseDate;
 
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
         private Date networkingDate;
 
         private String manufacturer;

research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml

@@ -82,7 +82,7 @@
                sum(case when a.category_id_2 != '2' and category_id_2 != '3' then 1 else 0 end) as qt
         from prj_proj_org o
         left join
-             ach_achievement a on a.proj_org_id = o.id
+             ach_achievement a on a.proj_org_id = o.id and a.del_flag = 0
         where o.del_flag = 0
         GROUP BY
             o.id
@@ -96,7 +96,7 @@
                sum(case when a.category_id_2 = '14' then 1 else 0 end) as wg
         from prj_proj_org o
                  left join
-             ach_achievement a on a.proj_org_id = o.id
+             ach_achievement a on a.proj_org_id = o.id and a.del_flag = 0
         where o.del_flag = 0
         GROUP BY
             o.id
@@ -108,7 +108,7 @@
                count(a.id) as dtr
         from prj_proj_org o
                  left join
-             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 5
+             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 5 and a.del_flag = 0
         where o.del_flag = 0
         GROUP BY
             o.id
@@ -122,7 +122,7 @@
                sum(case when a.type = '2' then 1 else 0 end) as ss
         from prj_proj_org o
                  left join
-             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 6
+             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 6 and a.del_flag = 0
         where o.del_flag = 0
         GROUP BY
             o.id
@@ -141,7 +141,7 @@
                sum(case when a.category_id_1 = '6' then 1 else 0 end) as rcNum
         from prj_proj_org o
                  left join
-             ach_achievement a on a.proj_org_id = o.id
+             ach_achievement a on a.proj_org_id = o.id and a.del_flag = 0
         where o.del_flag = 0
         GROUP BY
             o.id