From 515341727b056ba359cb4aa437d9991f7b09a988 Mon Sep 17 00:00:00 2001 From: XLR_asd <xueyawei@seaskysh.com> Date: Wed, 23 Jun 2021 13:31:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=20=20=E7=94=B3=E6=8A=A5=E4=B9=A6=20?= =?UTF-8?q?=20out=E7=B1=BB=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...45\345\217\243\350\256\276\350\256\241.md" | 155 +++++++++--------- .../dto/projectplan/ProjectPlanBookOut.java | 4 +- .../dataobject/co/ProjectDailyPlanDo.java | 2 +- .../dataobject/co/ProjectInfoPlanDo.java | 2 +- .../db/mapper/xml/ProjectPlanBookMapper.xml | 4 +- .../projectplan/ProjectPlanQueryConvert.java | 12 +- ServiceSite/src/main/resources/bootstrap.yml | 2 +- 7 files changed, 90 insertions(+), 91 deletions(-) diff --git "a/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" "b/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" index 02d14c56..654e73db 100644 --- "a/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" +++ "b/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" @@ -664,89 +664,90 @@ { "code": "00000", "description": "鎴愬姛", - "currentTime": "1623378221385", - "rid": "7azgVYFW", + "currentTime": "1624426078278", + "rid": "MQNHCiq9", "pageIndex": 0, "pageSize": 0, "pageCount": 0, "total": 1, "data": [ { - "id": "0", - "year": 2022, - "projectName": "", - "departmentName": "杩欐槸淇敼鐨勮姹傜ず渚�!~!!!!!!", - "departmentCode": "8765986", - "projectLeaderId": "0", - "projectLeaderName": "", - "projectLeaderCode": "", + "id": "1407201974423654401", + "year": 2021, + "projectName": "椤圭洰2鍚嶇ОCCLJ", + "departmentName": "娴嬭瘯", + "departmentCode": "TEST", + "projectLeaderId": "1", + "projectLeaderName": "鍩虹鏁版嵁绠$悊鍛�", + "projectLeaderCode": "0000011", "flowId": "0", "flowType": "", "quotaMoney": 0, - "state": "", + "state": "瀹℃牳瀹屾垚", "planType": "XIANGMUKU", - "projectLibraryId": "0", + "projectLibraryId": "1407205824694071298", "summaryJson": "", - "projectType": "", - "planBookSubjectOutList": [ + "projectType": "椤圭洰绫诲瀷鍚嶇О1", + "projectTypeId": "1", + "planSubjectList": [ { - "id": "0", - "planBookId": "0", - "subjectName": "娴嬭瘯A213", - "subjectCode": "8848", + "id": "1407201975010856961", + "planBookId": "1407201974423654401", + "subjectName": "娴�2璇旵CLJ1", + "subjectCode": "22551", "subjectContent": "", "price": 0, "number": 0, "subtotal": 0, "otherJson": "", - "extendFormId": "0", + "extendFormId": "浼氳璐�", "helperCode": "123", - "helperName": "娴嬭瘯vA", + "helperName": "娴�2璇旵CLJ1", "subjectDetailList": [ { - "id": "0", - "parentId": "0", - "subtotal": 1001, - "otherJson": "51AA654" + "id": "1407201975375761409", + "parentId": "1407201975010856961", + "subtotal": 857, + "otherJson": "2CCLJ11" }, { - "id": "1", - "parentId": "0", + "id": "1407201975518367745", + "parentId": "1407201975010856961", "subtotal": 21, - "otherJson": "2111" + "otherJson": "2CCLJ12" } ] }, { - "id": "1", - "planBookId": "0", - "subjectName": "娴嬭瘯2asd", + "id": "1407201975157657602", + "planBookId": "1407201974423654401", + "subjectName": "娴�2璇旵CLJ2", "subjectCode": "64561", + "extendFormId": "浼氳璐�", "subjectDetailList": [ { - "id": "2", - "parentId": "1", + "id": "1407201975660974082", + "parentId": "1407201975157657602", "subtotal": 33, - "otherJson": "3333" + "otherJson": "2CCLJ21" }, { - "id": "3", - "parentId": "1", + "id": "1407201975803580417", + "parentId": "1407201975157657602", "subtotal": 54, - "otherJson": "54444" + "otherJson": "2CCLJ22" } ] } ], - "projectTargetInfo": { - "id": "0", - "summaryJson": "51654", - "subOtherArrayJson": "杩擜鍥�", - "planBookId": "0" + "projectTargetCmd": { + "id": "1407201976134930434", + "summaryJson": "{\n\"name\": \"鍒樻槍鑳� 鏍¢暱\",\"code\": \"02\"\n}", + "subOtherArrayJson": "[{\"name\":\"鎴愭棪绾� 涔﹁\",\"code\":\"01\"},{\"name\":\"鍒樻槍鑳� 鏍¢暱\",\"code\":\"02\"},{\"name\":\"娈� 鍕� 鍓功璁癨",\"code\":\"03\"},{\"name\":\"榫氭€濇€� 鍓牎闀縗",\"code\":\"04\"},{\"name\":\"娆ч槼鍗� 鍓功璁癨",\"code\":\"05\"},{\"name\":\"鍚存槑绾� 鍓牎闀縗",\"code\":\"06\"}]", + "planBookId": "1407201974423654401" } } ] - //鏆傛湭鍖呭惈娴佺▼鐩稿叧淇℃伅 } ``` @@ -784,81 +785,79 @@ { "code": "00000", "description": "鎴愬姛", - "currentTime": "1623378626132", - "rid": "T5VVO0vp", + "currentTime": "1624426133053", + "rid": "uyfnRphF", "pageIndex": 0, "pageSize": 0, "pageCount": 0, "total": 1, "data": [ { - "id": "0", - "year": 2022, - "projectName": "", - "departmentName": "杩欐槸淇敼鐨勮姹傜ず渚�!~!!!!!!", - "departmentCode": "8765986", - "projectLeaderId": "0", - "projectLeaderName": "", - "projectLeaderCode": "", + "id": "1407202258575167489", + "year": 2021, + "projectName": "椤圭洰4鍚嶇О鏃ュ父缁忚垂CCLJ", + "departmentName": "娴嬭瘯", + "departmentCode": "TEST", + "projectLeaderId": "1", + "projectLeaderName": "鍩虹鏁版嵁绠$悊鍛�", + "projectLeaderCode": "0000011", "flowId": "0", "flowType": "", "quotaMoney": 0, - "state": "", + "state": "瀹℃牳瀹屾垚", "planType": "XIANGMUKU", "projectLibraryId": "0", - "planBookSubjectOutList": [ + "planSubjectList": [ { - "id": "0", - "planBookId": "0", - "subjectName": "娴嬭瘯A213", - "subjectCode": "8848", + "id": "1407202258986209281", + "planBookId": "1407202258575167489", + "subjectName": "娴�4璇旵CLJ1", + "subjectCode": "22551", "subjectContent": "", "price": 0, "number": 0, "subtotal": 0, "otherJson": "", - "extendFormId": "0", - "helperCode": "123", - "helperName": "娴嬭瘯vA", + "extendFormId": "浼氳璐�", "subjectDetailList": [ { - "id": "0", - "parentId": "0", - "subtotal": 1001, - "otherJson": "51AA654" + "id": "1407202259338530818", + "parentId": "1407202258986209281", + "subtotal": 857, + "otherJson": "4CCLJ11" }, { - "id": "1", - "parentId": "0", + "id": "1407202259489525761", + "parentId": "1407202258986209281", "subtotal": 21, - "otherJson": "2111" + "otherJson": "4CCLJ12" } ] }, { - "id": "1", - "planBookId": "0", - "subjectName": "娴嬭瘯2asd", + "id": "1407202259133009922", + "planBookId": "1407202258575167489", + "subjectName": "娴�4璇旵CLJ2", "subjectCode": "64561", + "extendFormId": "浼氳璐�", "subjectDetailList": [ { - "id": "2", - "parentId": "1", + "id": "1407202259657297922", + "parentId": "1407202259133009922", "subtotal": 33, - "otherJson": "3333" + "otherJson": "4CCLJ21" }, { - "id": "3", - "parentId": "1", + "id": "1407202259812487170", + "parentId": "1407202259133009922", "subtotal": 54, - "otherJson": "54444" + "otherJson": "4CCLJ22" } ] } ] } ] - //鏆傛湭鍖呭惈娴佺▼鐩稿叧淇℃伅 } ``` diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java index a71839a1..400b5b40 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java @@ -90,9 +90,9 @@ public class ProjectPlanBookOut extends BaseDto implements Serializable { @ApiModelProperty(value = "浜哄憳涓€涓婂叧鑱� id",example = "") private Long projectDailyOncePlanId; - private List<PlanBookSubjectOut> planBookSubjectOutList; + private List<PlanBookSubjectOut> planSubjectList; - private PlanBookTargetOut projectTargetInfo; + private PlanBookTargetOut projectTargetCmd; private List<PlanBookPersonSubjectOut> planBookPersonSubjectOutList; diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectDailyPlanDo.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectDailyPlanDo.java index 47dd326b..12c3ec5f 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectDailyPlanDo.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectDailyPlanDo.java @@ -94,6 +94,6 @@ public class ProjectDailyPlanDo extends BaseDataObject { private String note; @ApiModelProperty("璁″垝涔︾鐩泦鍚�") - private List<PlanBookSubjectDo> subjectDetailList = new ArrayList<>(); + private List<PlanBookSubjectDo> planSubjectList = new ArrayList<>(); } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectInfoPlanDo.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectInfoPlanDo.java index 0f910d8c..31f5496d 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectInfoPlanDo.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/co/ProjectInfoPlanDo.java @@ -117,5 +117,5 @@ public class ProjectInfoPlanDo extends BaseDataObject { private List<PlanBookSubjectDo> planSubjectList = new ArrayList<>(); @ApiModelProperty("璁″垝鏁扮哗") - private PlanBookTargetPo projectTargetInfo; + private PlanBookTargetPo projectTargetCmd; } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml index d01efdd1..6b7e4313 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml @@ -21,7 +21,7 @@ <result column="project_type" property="projectType"/> <result column="project_type_id" property="projectTypeId"/> - <association property="projectTargetInfo" + <association property="projectTargetCmd" javaType="com.seasky.projectplan.infrastructure.dataobject.po.PlanBookTargetPo"> <result column="targetId" property="id"/> <result column="targetPId" property="planBookId"/> @@ -69,7 +69,7 @@ <result column="project_library_id" property="projectLibraryId"/> <result column="quota_money2" property="quotaMoney2"/> <result column="note" property="note"/> - <collection property="subjectDetailList" + <collection property="planSubjectList" ofType="com.seasky.projectplan.infrastructure.dataobject.co.PlanBookSubjectDo"> <result column="subjectId" property="id"/> <result column="subjectPId" property="planBookId"/> diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java index c8af4efc..e53169f3 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java @@ -31,9 +31,9 @@ public class ProjectPlanQueryConvert { ProjectPlanBookOut out = MapperUtils.INSTANCE.map(ProjectPlanBookOut.class, infoDo); if (infoDo.getPlanSubjectList().size() > 0 ) { List<PlanBookSubjectOut> planBookSubjectOuts = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectOut.class, infoDo.getPlanSubjectList()); - PlanBookTargetOut planBookTargetOut = MapperUtils.INSTANCE.map(PlanBookTargetOut.class, infoDo.getProjectTargetInfo()); - out.setPlanBookSubjectOutList(planBookSubjectOuts); - out.setProjectTargetInfo(planBookTargetOut); + PlanBookTargetOut planBookTargetOut = MapperUtils.INSTANCE.map(PlanBookTargetOut.class, infoDo.getProjectTargetCmd()); + out.setPlanSubjectList(planBookSubjectOuts); + out.setProjectTargetCmd(planBookTargetOut); } return out; } @@ -61,9 +61,9 @@ public class ProjectPlanQueryConvert { */ public static ProjectPlanBookOut dailyDoToOut(ProjectDailyPlanDo dailyDo){ ProjectPlanBookOut out = MapperUtils.INSTANCE.map(ProjectPlanBookOut.class, dailyDo); - if (dailyDo.getSubjectDetailList().size() > 0){ - List<PlanBookSubjectOut> planBookSubjectOuts = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectOut.class, dailyDo.getSubjectDetailList()); - out.setPlanBookSubjectOutList(planBookSubjectOuts); + if (dailyDo.getPlanSubjectList().size() > 0){ + List<PlanBookSubjectOut> planBookSubjectOuts = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectOut.class, dailyDo.getPlanSubjectList()); + out.setPlanSubjectList(planBookSubjectOuts); } return out; } diff --git a/ServiceSite/src/main/resources/bootstrap.yml b/ServiceSite/src/main/resources/bootstrap.yml index ad9ccaca..688f6889 100644 --- a/ServiceSite/src/main/resources/bootstrap.yml +++ b/ServiceSite/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: name: projectplan cloud: nacos: - server: 192.168.2.10:8848 + server: 192.168.1.80:8848 discovery: server-addr: ${spring.cloud.nacos.server} #server-addr: localhost:8848 -- GitLab From 683867ff5260a3dfc9790487ff0ef3dc20103c86 Mon Sep 17 00:00:00 2001 From: XLR_asd <xueyawei@seaskysh.com> Date: Wed, 23 Jun 2021 13:50:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=20=E6=9F=A5=E8=AF=A2=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BB=8D=E7=84=B6=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java index 400b5b40..cf5cbda2 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java @@ -1,5 +1,6 @@ package com.seasky.projectplan.dto.projectplan; +import com.fasterxml.jackson.annotation.JsonInclude; import com.seasky.core.ddd.base.BaseDto; import com.seasky.microflowapi.dto.FlowCanShowOut; import io.swagger.annotations.ApiModelProperty; @@ -22,6 +23,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) +@JsonInclude(JsonInclude.Include.ALWAYS) public class ProjectPlanBookOut extends BaseDto implements Serializable { @ApiModelProperty(value = "涓婚敭id",example = "") -- GitLab