From 21f45258cfcdc79127f85ad6e45736cff5acd345 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 21 Oct 2024 20:58:05 +0800
Subject: [PATCH] 1、数据割接程序，白云区矛盾纠纷多元化解平台 2、纠纷态势报错修改
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java | 4
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseDisp.java | 282 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 7
dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java | 47
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseDispService.java | 105
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java | 5
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseTaskBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseSign.java | 174
dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java | 4
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java | 0
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 22
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java | 138
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java | 153
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CasePersonBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtDeptDTO.java | 94
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml | 8
dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java | 37
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseDispMapper.xml | 358 +
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseSignBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/resources/config/application-prod.yml | 4
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml | 178
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/ByRegion.java | 58
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtuserService.java | 181
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 34
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CasePersonService.java | 105
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 14
dyh-service/dyh-sync-ssim/src/main/assembly/assembly.xml | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseInfoMapper.xml | 739 ++
dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java | 68
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/resources/config/application-dev.yml | 4
dyh-service/dyh-sync-bydyh/src/main/resources/config/application-test.yml | 4
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/constant/CacheConsts.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java | 154
dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzRegionEnum.java | 103
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/config/MybatisPlusConfig.java | 0
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/CustClient.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConstsEnum.java | 305 +
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java | 71
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseTaskMapper.xml | 454 +
dyh-service/dyh-sync-bydyh/src/main/resources/config/application.yml | 6
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRegionEnum.java | 188
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java | 51
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseAgentDTO.java | 299 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java | 97
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCasePersonDTO.java | 303 +
dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/BuildCodeServiceTest.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java | 26
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZCaseTaskConsts.java | 90
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml | 190
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml | 79
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseDispMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseAgentBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUseroleDTO.java | 61
dyh-service/dyh-base/src/main/java/cn/huge/module/cust/dto/CtUnitDTO.java | 22
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java | 17
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseInfoService.java | 505 +
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/DyhSyncBydyhApplication.java | 4
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/ByRegionMapper.xml | 52
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/utils/ConfigUtils.java | 0
dyh-service/dyh-sync-ssim/src/main/resources/logback-spring.xml | 0
dyh-service/dyh-sync-bydyh/pom.xml | 10
dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java | 96
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java | 17
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java | 44
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseDTO.java | 28
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/ByRegionMapper.java | 64
dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/domain/dto/GZCaseDTO.java | 29
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java | 112
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/Ctuser.java | 276 +
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java | 109
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUserDTO.java | 220
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java | 67
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseAgent.java | 246
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtuserBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByUserConsts.java | 132
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 152
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/controller/SyncCustController.java | 123
dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java | 183
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 22
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUnitDTO.java | 93
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZTaskUsetimeUtils.java | 81
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseSignService.java | 105
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java | 0
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java | 48
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/web/CaseUtilsWebController.java | 5
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseAgentService.java | 105
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 251
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java | 17
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java | 3
dyh-service/dyh-sync-bydyh/src/main/assembly/assembly.xml | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseAgentMapper.xml | 322 +
dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/base/common/base/BaseServiceTest.java | 0
dyh-service/dyh-sync-ssim/src/test/java/cn/huge/base/common/base/BaseServiceTest.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtuserMapper.xml | 352 +
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java | 0
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml | 8
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseSignMapper.xml | 250
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java | 48
dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/controller/web/CaseDispWebController.java | 2
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml | 3
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoDTO.java | 378 +
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java | 0
dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/SysClient.java | 7
dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java | 5
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowNodeEnum.java | 156
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRoleEnum.java | 15
dyh-service/dyh-sync-bydyh/src/main/resources/logback-spring.xml | 0
dyh-service/dyh-sync-ssim/pom.xml | 10
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/UtilsClient.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/UtilsClient.java | 59
dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java | 131
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CasePersonMapper.java | 64
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 8
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseSignMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml | 86
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/ByRegionBO.java | 17
dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml | 2
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/config/MybatisPlusConfig.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java | 83
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java | 17
dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/DyhSyncBydyhApplicationTest.java | 2
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowableConsts.java | 104
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtAccountDTO.java | 18
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoUnfoldDTO.java | 256
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml | 334 +
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseInfoBO.java | 17
.gitignore | 6
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java | 5
dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java | 37
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml | 8
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseTaskDTO.java | 248
dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/domain/po/CaseDisp.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java | 145
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseAgentMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConsts.java | 135
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java | 72
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseTask.java | 378 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml | 6
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseDispBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseTaskMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseTaskService.java | 105
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java | 0
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseInfo.java | 660 ++
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByBaseConsts.java | 81
dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/DyhSyncSsimApplication.java | 6
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java | 64
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java | 114
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CasePerson.java | 270 +
dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/DyhSyncSsimApplicationTest.java | 2
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtPostService.java | 109
dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/BuildCodeServiceTest.java | 11
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseInfoMapper.java | 64
/dev/null | 76
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml | 45
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java | 8
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java | 17
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/ByRegionService.java | 109
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByFlowNodeEnum.java | 83
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtuserMapper.java | 64
dyh-service/pom.xml | 4
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/controller/SyncCaseController.java | 74
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CasePersonMapper.xml | 346 +
dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml | 78
178 files changed, 14,743 insertions(+), 697 deletions(-)
diff --git a/.gitignore b/.gitignore
index efb60c2..007f03e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,10 @@
dyh-service/dyh-sys/target/
dyh-service/dyh-utils/logs/
dyh-service/dyh-utils/target/
-dyh-service/dyh-sync/logs/
-dyh-service/dyh-sync/target/
+dyh-service/dyh-syn-bydyh/logs/
+dyh-service/dyh-sync-bydyh/target/
+dyh-service/dyh-sync-ssim/logs/
+dyh-service/dyh-sync-ssim/target/
logs/
*.iml
*.class
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java
deleted file mode 100644
index 38f67cb..0000000
--- a/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package cn.huge.base.common.constant;
-
-/**
- * @title: 广州市区枚举类
- * @description: 广州市区枚举类
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-public enum GzAreaEnum {
- GZEnum_0("1601","广州市"),
-
- GZAREAEnum_1("3633","天河区"),
- GZAREAEnum_2("3634","海珠区"),
- GZAREAEnum_3("3635","荔湾区"),
- GZAREAEnum_4("3637","越秀区"),
- GZAREAEnum_5("36953","番禺区"),
- GZAREAEnum_6("50256","花都区"),
- GZAREAEnum_7("50258","白云区"),
- GZAREAEnum_8("50259","南沙区"),
- GZAREAEnum_9("50283","黄埔区"),
- GZAREAEnum_10("50284","增城区"),
- GZAREAEnum_11("50285","从化区");
-
- /**
- * 代码编号
- */
- private String index;
-
- /**
- * 名称
- */
- private String des;
-
- public String getIndex() {
- return index;
- }
-
- public void setIndex(String index) {
- this.index = index;
- }
-
- public String getDes() {
- return des;
- }
-
- public void setDes(String des) {
- this.des = des;
- }
-
- /**
- * 构造方法
- * @param index
- * @param des
- */
- GzAreaEnum(String index, String des) {
- this.index = index;
- this.des = des;
- }
-
- /**
- * 静态方法
- * @param index
- * @return
- */
- public static String getDes(String index) {
- for (GzAreaEnum constantEnum : GzAreaEnum.values()) {
- if (constantEnum.getIndex().equals(index)) {
- return constantEnum.des;
- }
- }
- return null;
- }
-}
-
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzRegionEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzRegionEnum.java
new file mode 100644
index 0000000..40a4461
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzRegionEnum.java
@@ -0,0 +1,103 @@
+package cn.huge.base.common.constant;
+
+/**
+ * @title: 广州市区枚举类
+ * @description: 广州市区枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum GzRegionEnum {
+ PROV_1("440000","广东省"),
+
+ CITY_1("440100","广州市"),
+
+ AREA_1("440106","天河区"),
+ AREA_2("440105","海珠区"),
+ AREA_3("440103","荔湾区"),
+ AREA_4("440104","越秀区"),
+ AREA_5("440113","番禺区"),
+ AREA_6("440114","花都区"),
+ AREA_7("440111","白云区"),
+ AREA_8("440115","南沙区"),
+ AREA_9("440112","黄埔区"),
+ AREA_10("440118","增城区"),
+ AREA_11("440117","从化区"),
+
+ ROAD_1("440111-002","三元里街"),
+ ROAD_2("440111-003","松洲街"),
+ ROAD_3("440111-004","景泰街"),
+ ROAD_4("440111-005","同德街道"),
+ ROAD_5("440111-006","黄石街道"),
+ ROAD_6("440111-007","棠景街道"),
+ ROAD_7("440111-008","新市街道"),
+ ROAD_8("440111-009","同和街道"),
+ ROAD_9("440111-010","京溪街道"),
+ ROAD_10("440111-011","永平街道"),
+ ROAD_11("440111-012","嘉禾街道"),
+ ROAD_12("440111-013","均禾街道"),
+ ROAD_13("440111-014","石井街道"),
+ ROAD_14("440111-015","金沙街道"),
+ ROAD_15("440111-016","云城街道"),
+ ROAD_16("440111-017","鹤龙街道"),
+ ROAD_17("440111-018","白云湖街道"),
+ ROAD_18("440111-019","石门街道"),
+ ROAD_19("440111-020","龙归街道"),
+ ROAD_20("440111-021","大源街道"),
+ ROAD_21("440111-103","人和镇"),
+ ROAD_22("440111-107","太和镇"),
+ ROAD_23("440111-108","钟落潭镇"),
+ ROAD_24("440111-113","江高镇");
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 名称
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ GzRegionEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (GzRegionEnum constantEnum : GzRegionEnum.values()) {
+ if (constantEnum.getIndex().equals(index)) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+}
+
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
index 815273f..a04a141 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
@@ -61,32 +61,45 @@
* 是否参与自动调度，0：否，1：是
*/
public static final int DISP_STATUS_0 = 0;
- public static final int DISP_STATUS_2 = 1;
+ public static final int DISP_STATUS_1 = 1;
/**
* ========================================== 单位部门 ==========================================
*/
/**
- * 组织级别，0：省，1：市级，2：区级，3：镇街级，4：村居级
+ * 组织级别，1：市级，2：区级，3：镇街级，4：村居级
*/
- public static final int UNIT_GRADE_0 = 0;
public static final int UNIT_GRADE_1 = 1;
public static final int UNIT_GRADE_2 = 2;
public static final int UNIT_GRADE_3 = 3;
public static final int UNIT_GRADE_4 = 4;
/**
- * 组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
+ * 组织类型，
+ * 调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试），
+ * 行政组织类型（201：政法委，202：其他）
*/
- public static final int UNIT_TYPE_0 = 0;
- public static final int UNIT_TYPE_1 = 1;
- public static final int UNIT_TYPE_2 = 2;
- public static final int UNIT_TYPE_3 = 3;
- public static final int UNIT_TYPE_4 = 4;
- public static final int UNIT_TYPE_5 = 5;
- public static final int UNIT_TYPE_6 = 6;
- public static final int UNIT_TYPE_9 = 9;
+ public static final int UNIT_TYPE_101 = 101;
+ public static final int UNIT_TYPE_102 = 102;
+ public static final int UNIT_TYPE_103 = 103;
+ public static final int UNIT_TYPE_104 = 104;
+ public static final int UNIT_TYPE_105 = 105;
+ public static final int UNIT_TYPE_106 = 106;
+ public static final int UNIT_TYPE_201 = 201;
+ public static final int UNIT_TYPE_202 = 202;
+
+ /**
+ * 是否是法院，0：否，1：是
+ */
+ public static final int COURT_STATUS_0 = 0;
+ public static final int COURT_STATUS_1 = 1;
+
+ /**
+ * 组织职能，1：调解组织，2：行政组织
+ */
+ public static final int UNIT_FUN_1 = 1;
+ public static final int UNIT_FUN_2 = 2;
}
/**
* -------------------_ooOoo_-------------------
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/dto/CtUnitDTO.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/dto/CtUnitDTO.java
index 95d6bab..d5d550a 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/dto/CtUnitDTO.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/dto/CtUnitDTO.java
@@ -40,14 +40,26 @@
private Integer unitGrade;
/**
+ * 组织职能，1：调解组织，2：行政组织
+ */
+ private Integer unitFun;
+
+ /**
+ * 组织类型，
+ * 调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试），
+ * 行政组织类型（201：政法委，202：其他）
+ */
+ private Integer unitType;
+
+ /**
+ * 是否是法院，0：否，1：是
+ */
+ private Integer courtStatus;
+
+ /**
* 组织名称
*/
private String unitName;
-
- /**
- * 组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
- */
- private Integer unitType;
/**
* 组织机构代码
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java
index 037e953..c62d447 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/disp/dto/CaseDispBaseDTO.java
@@ -95,7 +95,9 @@
private Integer targetUnitGrade;
/**
- * 调度目标组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
+ * 调度目标组织类型，
+ * 调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试），
+ * 行政组织类型（201：政法委，202：其他）
*/
private Integer targetUnitType;
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
index 0ab7634..b5d0f9c 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
@@ -28,6 +28,54 @@
*/
public static final int INPUT_WAY_1 = 1;
public static final int INPUT_WAY_2 = 2;
+
+ /**
+ * 是否重大矛盾纠纷，0：否，1：是
+ */
+ public static final int MAJOR_STATUS_0 = 0;
+ public static final int MAJOR_STATUS_1 = 1;
+
+ /**
+ * 小程序是否可见，0：不可见，1：可见
+ */
+ public static final int PARTY_SHOW_0 = 0;
+ public static final int PARTY_SHOW_1 = 1;
+
+ /**
+ * 是否转诉讼案件，0：不转诉讼，1：转诉讼
+ */
+ public static final int CIVIL_STATUS_0 = 0;
+ public static final int CIVIL_STATUS_1 = 1;
+
+ /**
+ * 是否转诉讼案件，0：不转诉讼，1：转诉讼
+ */
+ public static final int JUDIC_APPLY_0 = 0;
+ public static final int JUDIC_APPLY_1 = 1;
+
+ /**
+ * 是否已归档，0：未归档，1：已归档
+ */
+ public static final int FILE_STATUS_0 = 0;
+ public static final int FILE_STATUS_1 = 1;
+
+ /**
+ * 是否已归档，0：未归档，1：已归档
+ */
+ public static final int VISIT_UP_STATUS_0 = 0;
+ public static final int VISIT_UP_STATUS_1 = 1;
+
+ /**
+ * 当事人是否满意，0：不满意，1：满意
+ */
+ public static final int PARTY_JOY_0 = 0;
+ public static final int PARTY_JOY_1 = 1;
+
+ /**
+ * 是否有个人极端倾向，0：否，1：是
+ */
+ public static final int EXTREME_0 = 0;
+ public static final int EXTREME_1 = 1;
}
/**
* -------------------_ooOoo_-------------------
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java
index b7fb04f..688d0a4 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java
@@ -67,7 +67,13 @@
CARD_TYPE_14("09_00015-14", "港澳居民来往内陆通行证"),
CARD_TYPE_16("09_00015-16", "台湾居民来往大陆通行证"),
CARD_TYPE_255("09_00015-255", "其他"),
- CARD_TYPE_17("09_00015-17", "当事人未提供证件信息");
+ CARD_TYPE_17("09_00015-17", "当事人未提供证件信息"),
+
+ /**
+ * 达成协议类型
+ */
+ AGREE_TYPE_1("24_00003-1", "口头协议"),
+ AGREE_TYPE_2("24_00003-2", "书面协议");
/**
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/bytogz/controller/ByToGzController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/bytogz/controller/ByToGzController.java
deleted file mode 100644
index d235f4d..0000000
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/bytogz/controller/ByToGzController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package cn.huge.module.bytogz.controller;
-
-import cn.huge.base.common.dto.SelectTermDTO;
-import cn.huge.base.common.utils.ObjectUtils;
-import cn.huge.base.common.utils.ReturnFailUtils;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.base.config.CurrentUser;
-import cn.huge.module.bytogz.service.ByToGzService;
-import cn.huge.module.ctrole.service.CtRoleService;
-import cn.huge.module.ctuser.domain.po.CtAccount;
-import cn.huge.module.ctuser.domain.po.CtUser;
-import cn.huge.module.ctuser.dto.CtUserInfoDTO;
-import cn.huge.module.ctuser.dto.CtUserSaveDTO;
-import cn.huge.module.ctuser.service.*;
-import cn.huge.module.cust.constant.UserBaseConsts;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @title: 白云数据割接为广州数据接口api
- * @description: 白云数据割接为广州数据接口api
- * @company: hugeinfo
- * @author: liyj
- * @time: 2024-08-19 20:04:19
- * @version: 1.0.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/byToGz")
-public class ByToGzController {
-
- @Autowired(required = false)
- private HttpServletRequest request;
-
- @Autowired
- private ByToGzService service;
-
- /**
- * 用户角色更新-白云角色映射为广州角色
- * @url {ctx}/api/byToGz/upUserole
- * @return Object
- */
- @GetMapping("/upUserole")
- public Object upUserole() {
- try {
- service.upBytoGzUserole();
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 单位名称更新-白云单位名称街道办->综治中心
- * @url {ctx}/api/byToGz/upUnitNameZzzx
- * @return Object
- */
- @GetMapping("/upUnitNameZzzx")
- public Object upUnitNameZzzx() {
- try {
- service.upUnitNameZzzx();
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/bytogz/service/ByToGzService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/bytogz/service/ByToGzService.java
deleted file mode 100644
index 74a0c5b..0000000
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/bytogz/service/ByToGzService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package cn.huge.module.bytogz.service;
-
-import cn.huge.base.common.exception.ServiceException;
-import cn.huge.base.common.utils.DateUtils;
-import cn.huge.base.common.utils.IdUtils;
-import cn.huge.module.client.api.impl.UtilsClientImpl;
-import cn.huge.module.ctrole.constant.ByRoleBaseEnum;
-import cn.huge.module.ctuser.dao.mapper.CtUseroleMapper;
-import cn.huge.module.ctuser.domain.po.CtUnit;
-import cn.huge.module.ctuser.domain.po.CtUser;
-import cn.huge.module.ctuser.domain.po.CtUserole;
-import cn.huge.module.ctuser.service.CtUnitService;
-import cn.huge.module.ctuser.service.CtUserService;
-import cn.huge.module.ctuser.service.CtUseroleService;
-import cn.huge.module.cust.constant.RoleBaseEnum;
-import cn.huge.module.cust.constant.UserBaseConsts;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @title: 白云数据割接为广州数据的业务逻辑处理
- * @Description 白云数据割接为广州数据的业务逻辑处理
- * @company hugeinfo
- * @author liyj
- * @Time 2024-08-19 20:04:19
- * @version 1.0.0
- */
-@Slf4j
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class ByToGzService{
-
- @Autowired
- private RedisTemplate<String, Object> redisTemplate;
-
- @Autowired
- private CtUseroleService ctUseroleService;
- @Autowired
- private CtUserService ctUserService;
- @Autowired
- private CtUnitService ctUnitService;
-
- /**
- * 用户角色更新-白云角色映射为广州角色
- */
- public void upBytoGzUserole(){
- try{
- List<CtUserole> ctUseroleList = ctUseroleService.list();
- for (CtUserole ctUserole: ctUseroleList){
- if (ctUserole.getRoleCode().equals(ByRoleBaseEnum.ROLE_5)
- || ctUserole.getRoleCode().equals(ByRoleBaseEnum.ROLE_7)
- || ctUserole.getRoleCode().equals(ByRoleBaseEnum.ROLE_8)){
- ctUseroleService.removeById(ctUserole.getId());
- }else {
- RoleBaseEnum roleBaseEnum = ByRoleBaseEnum.getGzRole(ctUserole.getRoleCode());
- ctUserole.setRoleId(roleBaseEnum.getIndex());
- ctUserole.setRoleCode(roleBaseEnum.getIndex());
- ctUserole.setRoleName(roleBaseEnum.getDes());
- ctUseroleService.updateById(ctUserole);
- }
- }
- }catch (Exception e){
- log.error("[ByToGzService.upBytoGzUserole]调用失败，异常信息："+e, e);
- throw new ServiceException("ByToGzService.upBytoGzUserole", e);
- }
- }
-
- /**
- * 单位名称更新-白云单位名称街道办->综治中心
- */
- public void upUnitNameZzzx(){
- try{
- QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("unit_grade", UserBaseConsts.UNIT_GRADE_3);
- List<CtUnit> ctUnitList = ctUnitService.list(ctUnitQueryWrapper);
- for (CtUnit ctUnit: ctUnitList){
- ctUnit.setUnitName(ctUnit.getUnitName().replace("街道办", "街综治中心"));
- ctUnitService.updateById(ctUnit);
- // 更新人员单位名称
- UpdateWrapper<CtUser> ctUserUpdateWrapper = new UpdateWrapper<>();
- ctUserUpdateWrapper.eq("unit_id", ctUnit.getId()).set("unit_name", ctUnit.getUnitName());
- ctUserService.update(ctUserUpdateWrapper);
- }
- }catch (Exception e){
- log.error("[ByToGzService.upUnitNameZzzx]调用失败，异常信息："+e, e);
- throw new ServiceException("ByToGzService.upUnitNameZzzx", e);
- }
- }
-}
\ No newline at end of file
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/SysClient.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/SysClient.java
index b983ca9..ec0b74e 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/SysClient.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/SysClient.java
@@ -26,13 +26,6 @@
public interface SysClient {
/**
- * 公共id-获取时间Id，后四位常量
- * @url {ctx}/api/client/custUtils/getNewTimeId
- * @return Object
- */
-
-
- /**
* 根据用户token获取用户信息
*
* @param gridTokenBaseDTO
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
index d894f94..d6df878 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
@@ -8,14 +8,8 @@
import cn.huge.module.ctuser.domain.po.CtUser;
import cn.huge.module.ctuser.service.CtUnitService;
import cn.huge.module.ctuser.service.CtUserService;
-import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUnitDTO;
-import cn.huge.module.cust.dto.CtUserDTO;
-import cn.huge.module.region.domain.po.SyRegionGrid;
-import cn.huge.module.region.service.SyRegionGridService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -43,22 +37,6 @@
private CtUnitService service;
@Autowired
private CtUserService ctUserService;
-
- /**
- * 微服务调用-数据迁移-批量新增
- * @url {ctx}/api/client/ctUnit/saveCtUnitList
- * @param targetCtUnitList 实体对象
- * @return Object
- */
- @PostMapping("/saveCtUnitList")
- public Object saveCtUnitList(@RequestBody List<CtUnit> targetCtUnitList) {
- try {
- service.saveBatch(targetCtUnitList,1000);
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
/**
* 根据id查询组织信息
@@ -109,51 +87,6 @@
return ReturnSucUtils.getRepInfo(service.getBjZzzx(unitId));
} catch (Exception e) {
return ReturnFailUtils.getRepInfo(e.getMessage());
- }
- }
-
- @Autowired
- private SyRegionGridService syRegionGridService;
- /**
- * 更新组织的地域编码
- * @url {ctx}/api/client/ctUnit/update1
- * @return Object
- */
- @GetMapping("/update1")
- public Object update1() {
- try {
- List<CtUnit> ctUnitList = service.list();
- for (CtUnit ctUnit: ctUnitList){
- ctUnit.setArea("440111");
- // 镇街级
- if (StringUtils.isNotEmpty(ctUnit.getRoad())){
- QueryWrapper<SyRegionGrid> syRegionGridQueryWrapper = new QueryWrapper<>();
- syRegionGridQueryWrapper.eq("region_id", ctUnit.getRoad());
- SyRegionGrid syRegionGrid = syRegionGridService.getOne(syRegionGridQueryWrapper);
- if (ObjectUtils.isNotEmpty(syRegionGrid)){
- ctUnit.setRoad(syRegionGrid.getThirdCode());
- }
- }
- // 村社级
- if (UserBaseConsts.UNIT_GRADE_4 == ctUnit.getUnitGrade()){
- try{
- QueryWrapper<SyRegionGrid> syRegionGridQueryWrapper = new QueryWrapper<>();
- String thirdName = ctUnit.getUnitName().replace("居委会", "").replace("人民调解委员会", "");
- syRegionGridQueryWrapper.like("third_name", thirdName);
- SyRegionGrid syRegionGrid = syRegionGridService.getOne(syRegionGridQueryWrapper);
- if (ObjectUtils.isNotEmpty(syRegionGrid)){
- ctUnit.setVillage(syRegionGrid.getThirdCode());
- ctUnit.setVillageName(syRegionGrid.getThirdName());
- }
- }catch (Exception e){
- log.error("报错村社：id-"+ctUnit.getId()+"，name-"+ctUnit.getUnitName());
- }
- }
- service.updateCtUnit(ctUnit);
- }
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
}
}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
index 19a19ef..760db38 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
@@ -100,23 +100,6 @@
}
/**
- * 微服务调用-数据迁移-批量新增
- * @url {ctx}/api/web/ctAccount/saveCtAccountList
- * @param targetCtAccountList 实体对象
- * @return Object
- */
- @PostMapping("/saveCtAccountList")
- public Object saveCtAccountList(@RequestBody List<CtAccount> targetCtAccountList) {
- try {
- service.saveBatch(targetCtAccountList,1000);
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- log.info(e.getMessage(), e);
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
* web端-网格系统单点登录
* @url {ctx}/api/web/ctAccount/gridLogin
* @param gridTokenBaseDTO 网格系统token
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
index d205bea..08b51b9 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
@@ -78,7 +78,9 @@
if (StringUtils.isNotBlank(unitName)){
terms.put("unitName", unitName);
}
- // 组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
+ // 组织类型，
+ // 调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试），
+ // 行政组织类型（201：政法委，202：其他）
String unitType = request.getParameter("unitType");
if (StringUtils.isNotBlank(unitType)){
terms.put("unitType", unitType);
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
index bba5a73..efcc35f 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-19 20:04:19
+ * @time:2024-10-17 16:41:35
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUnitMapper">
@@ -51,7 +51,8 @@
<result property="workTimeWeek" column="work_time_week"/>
<result property="workTimeAm" column="work_time_am"/>
<result property="workTimePm" column="work_time_pm"/>
-
+ <result property="unitFun" column="unit_fun"/>
+ <result property="courtStatus" column="court_status"/>
</resultMap>
<!-- 表 -->
<sql id='table-name'>dyh_ct_unit</sql>
@@ -96,7 +97,9 @@
telephone,
work_time_week,
work_time_am,
- work_time_pm
+ work_time_pm,
+ unit_fun,
+ court_status
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
@@ -139,16 +142,13 @@
<if test="entity.workTimeWeek != null">work_time_week = #{entity.workTimeWeek},</if>
<if test="entity.workTimeAm != null">work_time_am = #{entity.workTimeAm},</if>
<if test="entity.workTimePm != null">work_time_pm = #{entity.workTimePm},</if>
-
-
+ <if test="entity.unitFun != null">unit_fun = #{entity.unitFun},</if>
+ <if test="entity.courtStatus != null">court_status = #{entity.courtStatus}</if>
</sql>
<!-- 条件 -->
<sql id="where-part">
<if test="terms != null">
<where>
- <if test="terms.keyword != null and terms.keyword !=''">
- and unit_name like CONCAT('%', #{terms.keyword}, '%')
- </if>
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
</if>
@@ -166,12 +166,6 @@
</if>
<if test="terms.unitType != null and terms.unitType !=''">
and unit_type = #{terms.unitType}
- </if>
- <if test="terms.unitTypes != null and terms.unitTypes.size > 0 ">
- and unit_type in
- <foreach item="unitType" collection="terms.unitTypes" separator="," open="(" close=")" index="">
- #{unitType}
- </foreach>
</if>
<if test="terms.unitCode != null and terms.unitCode !=''">
and unit_code = #{terms.unitCode}
@@ -270,6 +264,27 @@
<if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ <if test="terms.postalCode != null and terms.postalCode !=''">
+ and postal_code = #{terms.postalCode}
+ </if>
+ <if test="terms.telephone != null and terms.telephone !=''">
+ and telephone = #{terms.telephone}
+ </if>
+ <if test="terms.workTimeWeek != null and terms.workTimeWeek !=''">
+ and work_time_week = #{terms.workTimeWeek}
+ </if>
+ <if test="terms.workTimeAm != null and terms.workTimeAm !=''">
+ and work_time_am = #{terms.workTimeAm}
+ </if>
+ <if test="terms.workTimePm != null and terms.workTimePm !=''">
+ and work_time_pm = #{terms.workTimePm}
+ </if>
+ <if test="terms.unitFun != null and terms.unitFun !=''">
+ and unit_fun = #{terms.unitFun}
+ </if>
+ <if test="terms.courtStatus != null and terms.courtStatus !=''">
+ and court_status = #{terms.courtStatus}
</if>
</where>
</if>
@@ -392,4 +407,4 @@
FROM dyh_ct_unit t1 left join dyh_ct_unit_grid t2 on t1.id = t2.dyh_unit_id
where t2.third_unit_id = #{gridUnitId} limit 1
</select>
-</mapper>
\ No newline at end of file
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
index 895a3d5..5d9445c 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
@@ -14,7 +14,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-19 20:04:19
+ * @time: 2024-10-17 16:41:34
* @version 1.0.0
*/
@TableName(value = "dyh_ct_unit")
@@ -46,16 +46,30 @@
private Integer unitGrade;
/**
+ * 组织职能，1：调解组织，2：行政组织
+ */
+ @TableField(value = "unit_fun")
+ private Integer unitFun;
+
+ /**
+ * 组织类型，
+ * 调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试），
+ * 行政组织类型（201：政法委，202：其他）
+ */
+ @TableField(value = "unit_type")
+ private Integer unitType;
+
+ /**
+ * 是否是法院，0：否，1：是
+ */
+ @TableField(value = "court_status")
+ private Integer courtStatus;
+
+ /**
* 组织名称
*/
@TableField(value = "unit_name")
private String unitName;
-
- /**
- * 组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
- */
- @TableField(value = "unit_type")
- private Integer unitType;
/**
* 组织机构代码
@@ -233,32 +247,32 @@
private Date updateTime;
/**
- * 邮政编码
- */
+ * 邮政编码
+ */
@TableField(value = "postal_code")
private String postalCode;
/**
- * 联系电话
- */
+ * 联系电话
+ */
@TableField(value = "telephone")
private String telephone;
/**
- * 办公时间，周
- */
+ * 办公时间，周
+ */
@TableField(value = "work_time_week")
private String workTimeWeek;
/**
- * 办公时间，上午
- */
+ * 办公时间，上午
+ */
@TableField(value = "work_time_am")
private String workTimeAm;
/**
- * 办公时间，下午
- */
+ * 办公时间，下午
+ */
@TableField(value = "work_time_pm")
private String workTimePm;
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index 36af820..1870e34 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -332,10 +332,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
szbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){
qzzzxList.add(unitSelectTerm);
}
}
@@ -380,10 +380,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
qzbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){
zjzzzxList.add(unitSelectTerm);
}
}
@@ -514,10 +514,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){
szbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
qzzzxList.add(unitSelectTerm);
}
}
@@ -562,10 +562,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
qzbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_3 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_103 == ctUnit.getUnitType()){
zjzzzxList.add(unitSelectTerm);
}
}
@@ -661,7 +661,7 @@
ctUnitQueryWrapper.eq("id", unitId).select("parent_id");
CtUnit loginCtUnit = mapper.selectOne(ctUnitQueryWrapper);
ctUnitQueryWrapper.clear();
- ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1);
+ ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_101);
CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper);
CtUnitDTO ctUnitDTO = new CtUnitDTO();
BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO);
@@ -682,12 +682,12 @@
CtUnitDTO ctUnitDTO = new CtUnitDTO();
// 查询自己是否是综治中心
CtUnit loginCtUnit = mapper.selectById(unitId);
- if (UserBaseConsts.UNIT_TYPE_1 == loginCtUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == loginCtUnit.getUnitType()){
BeanUtils.copyProperties(loginCtUnit, ctUnitDTO);
}else {
// 查询当前单位的上级综治中心
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1);
+ ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_101);
CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper);
BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO);
}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/SyRegionGridMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/SyRegionGridMapper.java
deleted file mode 100644
index c1d423c..0000000
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/SyRegionGridMapper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.huge.module.region.dao.mapper;
-
-import cn.huge.module.region.domain.po.SyRegionGrid;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @title: 网格化平台地域字典映射表持久层业务处理
-* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
-* @company: hugeinfo
-* @author: liyj
-* @time: 2024-09-25 18:03:50
-* @version 1.0.0
-*/
-@Repository
-public interface SyRegionGridMapper extends BaseMapper<SyRegionGrid>{
-
- /**
- * 更新对象
- * @param entity 对象
- */
- void updateSyRegionGrid(@Param("entity") SyRegionGrid entity);
-
- /**
- * 条件更新对象
- * @param entity 对象
- * @param terms 条件
- */
- void updateSyRegionGridTerms(@Param("entity") SyRegionGrid entity, @Param("terms") Map<String, Object> terms);
-
- /**
- * 根据编号物理删除
- * @param id 查询条件集合
- */
- void deleteSyRegionGrid(@Param("id") String id);
-
- /**
- * 按条件查询结果集
- * @param terms 查询条件集合
- * @return List<SyRegionGrid>
- */
- List<SyRegionGrid> listTerms(@Param("terms") Map<String, Object> terms);
-
- /**
- * 按条件查询实体总数
- * @param terms 查询条件集合
- * @return long
- */
- long countTerms(@Param("terms") Map<String, Object> terms);
-
- /**
- * 按条件查询实体分页结果集
- * @param page 分页对象
- * @param terms 查询条件集合
- * @return List<SyRegionGrid>
- */
- List<SyRegionGrid> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
-
-}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/domain/bo/SyRegionGridBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/domain/bo/SyRegionGridBO.java
deleted file mode 100644
index b7188d1..0000000
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/domain/bo/SyRegionGridBO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.huge.module.region.domain.bo;
-
-import cn.huge.module.region.domain.po.SyRegionGrid;
-
-/**
- * @title: 网格化平台地域字典映射表业务扩展类
- * @description: 网格化平台地域字典映射表业务扩展类
- * @company: hugeinfo
- * @author: liyj
- * @time: 2024-09-25 18:03:50
- * @version: 1.0.0
- * @see cn.huge.module.region.domain.po.SyRegionGrid
- */
-public class SyRegionGridBO extends SyRegionGrid {
-
-
-}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/domain/po/SyRegionGrid.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/domain/po/SyRegionGrid.java
deleted file mode 100644
index 01ef0ea..0000000
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/domain/po/SyRegionGrid.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package cn.huge.module.region.domain.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @title: 网格化平台地域字典映射表数据库对应关系类
- * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
- * @company:hugeinfo
- * @author: liyj
- * @time: 2024-09-25 18:03:50
- * @version 1.0.0
- */
-@TableName(value = "dyh_sy_region_grid")
-@Data
-public class SyRegionGrid {
-
- /**
- * 主键编号
- */
- @TableId(value = "id")
- private Integer id;
-
- /**
- * 网格化平台编号
- */
- @TableField(value = "third_sys_id")
- private String thirdSysId;
-
- /**
- * 网格化平台名称
- */
- @TableField(value = "third_sys_name")
- private String thirdSysName;
-
- /**
- * 网格化地域编码
- */
- @TableField(value = "third_code")
- private String thirdCode;
-
- /**
- * 网格化地域名称
- */
- @TableField(value = "third_name")
- private String thirdName;
-
- /**
- * 网格化地域父级编码
- */
- @TableField(value = "third_parent_id")
- private String thirdParentId;
-
- /**
- * 本平台地域编码
- */
- @TableField(value = "region_id")
- private String regionId;
-
- /**
- * 层级
- */
- @TableField(value = "level")
- private Integer level;
-
- /**
- * 创建时间
- */
- @TableField(value = "create_time")
- private Date createTime;
-
- /**
- * 状态时间
- */
- @TableField(value = "update_time")
- private Date updateTime;
-
-}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/service/SyRegionGridService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/service/SyRegionGridService.java
deleted file mode 100644
index 7bd1fc5..0000000
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/service/SyRegionGridService.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package cn.huge.module.region.service;
-
-import cn.huge.base.common.exception.ServiceException;
-import cn.huge.base.common.utils.DateUtils;
-import cn.huge.base.common.utils.IdUtils;
-import cn.huge.module.client.api.impl.UtilsClientImpl;
-import cn.huge.module.region.dao.mapper.SyRegionGridMapper;
-import cn.huge.module.region.domain.po.SyRegionGrid;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @title: 网格化平台地域字典映射表业务逻辑处理
- * @Description 网格化平台地域字典映射表业务逻辑处理
- * @company hugeinfo
- * @author liyj
- * @Time 2024-09-25 18:03:50
- * @version 1.0.0
- */
-@Slf4j
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class SyRegionGridService extends ServiceImpl<SyRegionGridMapper, SyRegionGrid>{
-
- @Autowired
- private SyRegionGridMapper mapper;
-
- @Autowired
- private UtilsClientImpl utilsClient;
-
- /**
- * 更新对象
- * @param entity 对象
- */
- public void updateSyRegionGrid(SyRegionGrid entity){
- try{
- mapper.updateSyRegionGrid(entity);
- }catch (Exception e){
- log.error("[SyRegionGridService.updateSyRegionGrid]调用失败，异常信息："+e, e);
- throw new ServiceException("SyRegionGridService.updateSyRegionGrid", e);
- }
- }
-
- /**
- * 条件更新对象
- * @param entity 对象
- * @param terms 条件
- */
- public void updateSyRegionGridTerms(SyRegionGrid entity, Map<String, Object> terms){
- try{
- mapper.updateSyRegionGridTerms(entity, terms);
- }catch (Exception e){
- log.error("[SyRegionGridService.updateSyRegionGridTerms]调用失败，异常信息："+e, e);
- throw new ServiceException("SyRegionGridService.updateSyRegionGridTerms", e);
- }
- }
-
- /**
- * 根据编号物理删除
- * @param id 查询条件集合
- */
- public void deleteSyRegionGrid(String id){
- try{
- mapper.deleteSyRegionGrid(id);
- }catch (Exception e){
- log.error("[SyRegionGridService.deleteSyRegionGrid]调用失败，异常信息："+e, e);
- throw new ServiceException("SyRegionGridService.deleteSyRegionGrid", e);
- }
- }
-
- /**
- * 按条件查询
- * @param terms 条件
- * @return List
- */
- public List<SyRegionGrid> listTerms(Map<String, Object> terms){
- return mapper.listTerms(terms);
- }
-
- /**
- * 按条件统计
- * @param terms 条件
- * @return long
- */
- public long countTerms(Map<String, Object> terms){
- return mapper.countTerms(terms);
- }
-
- /**
- * 按条件分页查询
- * @param page 分页对象
- * @param terms 条件
- * @return Page
- */
- public Page<SyRegionGrid> pageQuery(PageRequest page, Map<String, Object> terms){
- long total = mapper.countTerms(terms);
- List<SyRegionGrid> content = mapper.pageTerms(page, terms);
- return new PageImpl<SyRegionGrid>(content, page, total);
- }
-
-}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java
new file mode 100644
index 0000000..9854776
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java
@@ -0,0 +1,68 @@
+package cn.huge.module.syncbydyh.client.api;
+
+import cn.huge.base.common.bo.R;
+import cn.huge.base.common.bo.ReturnBO;
+import cn.huge.module.sys.dto.GridRoleMenuDTO;
+import cn.huge.module.sys.dto.GridTokenBaseDTO;
+import cn.huge.module.sys.dto.GridUserRoleDTO;
+import cn.huge.module.sys.vo.GridRoleMenuVo;
+import cn.huge.module.sys.vo.GridUserRoleVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @title: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @description: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@FeignClient(name = "dyh-sync-bydyh")
+public interface SyncBydyhClient {
+
+ /**
+ * 数据割接-组织信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUnit
+ * @return Object
+ */
+ @GetMapping("/api/client/syncCust/byToGzCtUnit")
+ ReturnBO byToGzCtUnit();
+
+ /**
+ * 数据割接-部门信息
+ * @url {ctx}/api/client/syncCust/byToGzCtDept
+ * @return Object
+ */
+ @GetMapping("/api/client/syncCust/byToGzCtDept")
+ ReturnBO byToGzCtDept();
+
+ /**
+ * 数据割接-用户信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUser
+ * @return Object
+ */
+ @GetMapping("/api/client/syncCust/byToGzCtUser")
+ ReturnBO byToGzCtUser();
+
+ /**
+ * 数据割接-账号信息
+ * @url {ctx}/api/client/syncCust/byToGzCtAccount
+ * @return Object
+ */
+ @GetMapping("/api/client/syncCust/byToGzCtAccount")
+ ReturnBO byToGzCtAccount();
+
+ /**
+ * 数据割接-用户角色关系信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUserole
+ * @return Object
+ */
+ @GetMapping("/api/client/syncCust/byToGzCtUserole")
+ ReturnBO byToGzCtUserole();
+
+}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java
new file mode 100644
index 0000000..65147e8
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java
@@ -0,0 +1,183 @@
+package cn.huge.module.syncbydyh.client.api.impl;
+
+import cn.huge.base.common.bo.ReturnBO;
+import cn.huge.base.common.constant.ReturnConsts;
+import cn.huge.base.common.exception.ClientException;
+import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.ctuser.domain.po.*;
+import cn.huge.module.syncbydyh.client.api.SyncBydyhClient;
+import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
+import cn.huge.module.sys.dto.GridTokenBaseDTO;
+import cn.huge.module.sys.dto.GridUserBaseDTO;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @title: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @description: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@Slf4j
+@Component
+public class SyncBydyhClientImpl {
+
+ private SyncBydyhClient syncBydyhClient;
+
+ /**
+ * ObjectMapper工具类
+ */
+ private ObjectMapper objectMapper = new ObjectMapper();
+
+ @Autowired
+ public SyncBydyhClientImpl(SyncBydyhClient syncBydyhClient) {
+ this.syncBydyhClient = syncBydyhClient;
+ }
+
+ /**
+ * 数据割接-组织信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUnit
+ * @return Object
+ */
+ public List<CtUnit> byToGzCtUnit(){
+ List<CtUnit> resultList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = syncBydyhClient.byToGzCtUnit();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ CtUnit result = JSON.parseObject(JSON.toJSONString(map), CtUnit.class);
+ resultList.add(result);
+ }
+ }
+ }else{
+ log.error("Client外服务接口[SyncBydyhClient.byToGzCtUnit]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.byToGzCtUnit", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.byToGzCtUnit]调用异常："+e, e);
+ }
+ return resultList;
+ }
+
+ /**
+ * 数据割接-部门信息
+ * @url {ctx}/api/client/syncCust/byToGzCtDept
+ * @return Object
+ */
+ public List<CtDept> byToGzCtDept(){
+ List<CtDept> resultList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = syncBydyhClient.byToGzCtDept();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ CtDept result = JSON.parseObject(JSON.toJSONString(map), CtDept.class);
+ resultList.add(result);
+ }
+ }
+ }else{
+ log.error("Client外服务接口[SyncBydyhClient.byToGzCtDept]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.byToGzCtDept", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.byToGzCtDept]调用异常："+e, e);
+ }
+ return resultList;
+ }
+
+ /**
+ * 数据割接-用户信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUser
+ * @return Object
+ */
+ public List<CtUser> byToGzCtUser(){
+ List<CtUser> resultList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = syncBydyhClient.byToGzCtUser();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ CtUser result = JSON.parseObject(JSON.toJSONString(map), CtUser.class);
+ resultList.add(result);
+ }
+ }
+ }else{
+ log.error("Client外服务接口[SyncBydyhClient.byToGzCtUser]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.byToGzCtUser", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.byToGzCtUser]调用异常："+e, e);
+ }
+ return resultList;
+ }
+
+ /**
+ * 数据割接-账号信息
+ * @url {ctx}/api/client/syncCust/byToGzCtAccount
+ * @return Object
+ */
+ public List<CtAccount> byToGzCtAccount(){
+ List<CtAccount> resultList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = syncBydyhClient.byToGzCtAccount();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ CtAccount result = JSON.parseObject(JSON.toJSONString(map), CtAccount.class);
+ resultList.add(result);
+ }
+ }
+ }else{
+ log.error("Client外服务接口[SyncBydyhClient.byToGzCtAccount]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.byToGzCtAccount", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.byToGzCtAccount]调用异常："+e, e);
+ }
+ return resultList;
+ }
+
+ /**
+ * 数据割接-用户角色关系信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUserole
+ * @return Object
+ */
+ public List<CtUserole> byToGzCtUserole(){
+ List<CtUserole> resultList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = syncBydyhClient.byToGzCtUserole();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ CtUserole result = JSON.parseObject(JSON.toJSONString(map), CtUserole.class);
+ resultList.add(result);
+ }
+ }
+ }else{
+ log.error("Client外服务接口[SyncBydyhClient.byToGzCtUserole]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.byToGzCtUserole", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.byToGzCtUserole]调用异常："+e, e);
+ }
+ return resultList;
+ }
+
+}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java
new file mode 100644
index 0000000..b8390c5
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java
@@ -0,0 +1,131 @@
+package cn.huge.module.syncbydyh.controller;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.syncbydyh.service.ByToGzService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @title: 白云数据割接为广州数据接口api
+ * @description: 白云数据割接为广州数据接口api
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-08-19 20:04:19
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/syncBydyh")
+public class SyncBydyhController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private ByToGzService service;
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-组织信息
+ * @url {ctx}/api/syncBydyh/byToGzCtUnit
+ * @return Object
+ */
+ @GetMapping("/byToGzCtUnit")
+ public Object byToGzCtUnit() {
+ try {
+ service.byToGzCtUnit();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-部门信息
+ * @url {ctx}/api/syncBydyh/byToGzCtDept
+ * @return Object
+ */
+ @GetMapping("/byToGzCtDept")
+ public Object byToGzCtDept() {
+ try {
+ service.byToGzCtDept();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-用户信息
+ * @url {ctx}/api/syncBydyh/byToGzCtUser
+ * @return Object
+ */
+ @GetMapping("/byToGzCtUser")
+ public Object byToGzCtUser() {
+ try {
+ service.byToGzCtUser();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-账号信息
+ * @url {ctx}/api/syncBydyh/byToGzCtAccount
+ * @return Object
+ */
+ @GetMapping("/byToGzCtAccount")
+ public Object byToGzCtAccount() {
+ try {
+ service.byToGzCtAccount();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-用户角色关系信息
+ * @url {ctx}/api/syncBydyh/byToGzCtUserole
+ * @return Object
+ */
+ @GetMapping("/byToGzCtUserole")
+ public Object byToGzCtUserole() {
+ try {
+ service.byToGzCtUserole();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ /**
+ * 单位名称更新-白云单位名称街道办->综治中心
+ * @url {ctx}/api/byToGz/upUnitNameZzzx
+ * @return Object
+ */
+ @GetMapping("/upUnitNameZzzx")
+ public Object upUnitNameZzzx() {
+ try {
+ service.upUnitNameZzzx();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java
new file mode 100644
index 0000000..4f8bbc4
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java
@@ -0,0 +1,145 @@
+package cn.huge.module.syncbydyh.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.ctuser.domain.po.*;
+import cn.huge.module.ctuser.service.*;
+import cn.huge.module.cust.constant.RoleBaseEnum;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import cn.huge.module.syncbydyh.client.api.impl.SyncBydyhClientImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @title: 白云数据割接为广州数据的业务逻辑处理
+ * @Description 白云数据割接为广州数据的业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-08-19 20:04:19
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ByToGzService{
+
+ @Autowired
+ private SyncBydyhClientImpl syncBydyhClient;
+ @Autowired
+ private CtUnitService ctUnitService;
+ @Autowired
+ private CtDeptService ctDeptService;
+ @Autowired
+ private CtUserService ctUserService;
+ @Autowired
+ private CtAccountService ctAccountService;
+ @Autowired
+ private CtUseroleService ctUseroleService;
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-组织信息
+ */
+ public void byToGzCtUnit(){
+ try{
+ List<CtUnit> byToGzDTOList = syncBydyhClient.byToGzCtUnit();
+ for (CtUnit byToGzDTO: byToGzDTOList){
+ ctUnitService.saveOrUpdate(byToGzDTO);
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzCtUnit]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.byToGzCtUnit", e);
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-部门信息
+ */
+ public void byToGzCtDept(){
+ try{
+ List<CtDept> byToGzDTOList = syncBydyhClient.byToGzCtDept();
+ for (CtDept byToGzDTO: byToGzDTOList){
+ ctDeptService.saveOrUpdate(byToGzDTO);
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzCtDept]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.byToGzCtDept", e);
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-用户信息
+ */
+ public void byToGzCtUser(){
+ try{
+ List<CtUser> byToGzDTOList = syncBydyhClient.byToGzCtUser();
+ for (CtUser byToGzDTO: byToGzDTOList){
+ ctUserService.saveOrUpdate(byToGzDTO);
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzCtUser]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.byToGzCtUser", e);
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-账号信息
+ */
+ public void byToGzCtAccount(){
+ try{
+ List<CtAccount> byToGzDTOList = syncBydyhClient.byToGzCtAccount();
+ for (CtAccount byToGzDTO: byToGzDTOList){
+ ctAccountService.saveOrUpdate(byToGzDTO);
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzCtAccount]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.byToGzCtAccount", e);
+ }
+ }
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-用户角色关系信息
+ */
+ public void byToGzCtUserole(){
+ try{
+ List<CtUserole> byToGzDTOList = syncBydyhClient.byToGzCtUserole();
+ for (CtUserole byToGzDTO: byToGzDTOList){
+ ctUseroleService.saveOrUpdate(byToGzDTO);
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzCtUserole]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.byToGzCtUserole", e);
+ }
+ }
+
+
+
+
+
+ /**
+ * 单位名称更新-白云单位名称街道办->综治中心
+ */
+ public void upUnitNameZzzx(){
+ try{
+ QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
+ ctUnitQueryWrapper.eq("unit_grade", UserBaseConsts.UNIT_GRADE_3);
+ List<CtUnit> ctUnitList = ctUnitService.list(ctUnitQueryWrapper);
+ for (CtUnit ctUnit: ctUnitList){
+ ctUnit.setUnitName(ctUnit.getUnitName().replace("街道办", "街综治中心"));
+ ctUnitService.updateById(ctUnit);
+ // 更新人员单位名称
+ UpdateWrapper<CtUser> ctUserUpdateWrapper = new UpdateWrapper<>();
+ ctUserUpdateWrapper.eq("unit_id", ctUnit.getId()).set("unit_name", ctUnit.getUnitName());
+ ctUserService.update(ctUserUpdateWrapper);
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.upUnitNameZzzx]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.upUnitNameZzzx", e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java b/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java
index 5e60de0..3a1f6ad 100644
--- a/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java
+++ b/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java
@@ -14,14 +14,15 @@
private String basePackage = "cn.huge.module";
private String packageName = "ctuser";
private String className = "CtUnit";
- private String tableSchema = "gzdyh_dev";
+ private String tableSchema = "gzdyh_huge";
private String tableName = "dyh_ct_unit";
private String author = "liyj";
private String version = "1.0.0";
@Test
public void buildAllTest() {
- service.buildAll(basePackage, packageName, className, tableSchema, tableName, author, version);
+ service.buildPo(basePackage, packageName, className, tableSchema, tableName, author, version);
+ service.buildDaoMapperXml(basePackage, packageName, className, tableSchema, tableName, author, version);
}
diff --git a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/controller/web/CaseDispWebController.java b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/controller/web/CaseDispWebController.java
index 8bf8d8a..6d33c20 100644
--- a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/controller/web/CaseDispWebController.java
+++ b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/controller/web/CaseDispWebController.java
@@ -118,7 +118,7 @@
if (StringUtils.isNotBlank(targetUnitGrade)){
terms.put("targetUnitGrade", targetUnitGrade);
}
- // 调度目标组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
+ // 调度目标组织类型，调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试）
String targetUnitType = request.getParameter("targetUnitType");
if (StringUtils.isNotBlank(targetUnitType)){
terms.put("targetUnitType", targetUnitType);
diff --git a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml
index 94ab6ce..6eb885e 100644
--- a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml
+++ b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml
@@ -166,7 +166,7 @@
SELECT
id as unitId, unit_name as unitName, unit_grade as unitGrade, unit_type as unitType
FROM dyh_ct_unit
- where unit_type = 1
+ where unit_type = 101
<include refid="getZzzxUnitByTerms-where-part"/>
limit 1
</select>
diff --git a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/domain/po/CaseDisp.java b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/domain/po/CaseDisp.java
index 03c9704..07ec555 100644
--- a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/domain/po/CaseDisp.java
+++ b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/domain/po/CaseDisp.java
@@ -111,7 +111,7 @@
private Integer targetUnitGrade;
/**
- * 调度目标组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
+ * 调度目标组织类型，调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试）
*/
@TableField(value = "target_unit_type")
private Integer targetUnitType;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
index f6e292f..4a5b55b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
@@ -298,15 +298,15 @@
and DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待审核分页查询 -->
<select id="pageMyTaskAppearReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.appear_time as turnaroundTime, t1.appear_unit_name as organizingUnit, t1.appear_content as opinion,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_appear t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -318,7 +318,7 @@
and DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
index fac6e33..b9f8867 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
@@ -304,15 +304,15 @@
and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待审核分页查询 -->
<select id="pageMyTaskAssistReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.id as ownerId, t1.case_id as CaseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.apply_assist_unit_name as cooperatingUnit,
- t1.apply_content as reason,t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ t1.apply_content as reason,t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_assist_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -324,7 +324,7 @@
and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
index 2e4b41c..f09782e 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
@@ -193,7 +193,7 @@
and DATE_FORMAT(t1.dis_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.disTimeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -210,8 +210,8 @@
<select id="pageMyTaskBysl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
t1.case_task_time as turnaroundTime, t1.dis_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_dismiss t1 left join dyh_case_info t2 on t1.case_id = t2.id
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
index 80470bc..6d31011 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
@@ -304,7 +304,7 @@
and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</select>
@@ -312,8 +312,8 @@
<select id="pageMyTaskReturnReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.return_time as turnaroundTime, t1.return_unit_name as organizingUnit, t1.return_content as reason,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_return t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -325,7 +325,7 @@
and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
index 2dccff9..37ff3eb 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
@@ -318,7 +318,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</select>
@@ -327,8 +327,8 @@
SELECT t1.id as ownerId, t1.case_id as caseId, t1.reply_content as content, t1.sup_status as applyStatus, t1.reply_time as replyTime,
t1.sup_time as turnaroundTime, DATEADD(hour, t1.reply_term, t1.sup_time) as timeLimit, t1.sup_unit_name as organizingUnit,
t1.sup_content as opinion, t2.case_level as caseGrade, t2.canal_name as caseSource,
- concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType, concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')),
+ concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -345,7 +345,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
index 68b8150..822143f 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -408,7 +408,7 @@
and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="terms.status == 2">
and t1.handle_result in (0, 1, 2)
@@ -433,9 +433,9 @@
<select id="pageMyTaskFp" resultType="cn.huge.module.cases.domain.dto.FrontPageListFPDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t1.handle_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
concat(t2.que_area_name, t2.que_road_name) as queAddress,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -476,7 +476,7 @@
and DATE_FORMAT(t1.sign_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.signTimeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -496,8 +496,8 @@
<select id="pageMyTaskQs" resultType="cn.huge.module.cases.domain.dto.FrontPageListQSDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.sign_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -550,7 +550,7 @@
and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -571,8 +571,8 @@
<select id="pageMyTaskSl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.handle_time as taskHandleTime,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -611,7 +611,7 @@
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -632,9 +632,9 @@
<select id="pageMyTaskBlz" resultType="cn.huge.module.cases.domain.dto.FrontPageListBLZDTO">
SELECT
t1.id as ownerId, t1.case_id as caseId, t1.create_time as turnaroundTime, t2.case_level as caseGrade,
- t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType, t3.mediator as mediator,
+ t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType, t3.mediator as mediator,
t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -688,14 +688,14 @@
and DATE_FORMAT(t1.turnaroundTime,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</where>
</select>
<!-- 首页-待审核-我申请的分页查询 -->
<select id="pageMyTaskShWSQD" resultType="cn.huge.module.cases.domain.dto.FrontPageListWSQDDTO">
- select t1.*,t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ select t1.*,t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
from
(
SELECT case_id as caseId, id as ownerId, return_time as turnaroundTime, '回退' as applyType,
@@ -734,7 +734,7 @@
and DATE_FORMAT(t1.turnaroundTime,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</where>
<if test="page.sort != null">
@@ -796,7 +796,7 @@
SELECT t1.id as caseTaskId, t2.id as caseId, t1.create_time as createTime, t2.status_name as statusName,
t3.medi_result as mediResult, t3.medi_result_name as mediResultName, t3.mediator as mediator,
t1.handle_time as handleTime, t2.case_level as caseLevel, t2.canal_name as canalName,
- concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
+ concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
(select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM dyh_case_task t1
left join dyh_case_info t2 on t1.case_id = t2.id
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
index 078e0ad..76dad9b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -336,7 +336,7 @@
and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待审核分页查询 -->
@@ -344,8 +344,8 @@
SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,
t1.fail_reason as reason, t2.case_level as caseGrade, t2.canal_name as caseSource,
- concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType, concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')),
+ concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -357,7 +357,7 @@
and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -388,7 +388,7 @@
and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.applyTimeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</if>
</sql>
@@ -414,10 +414,10 @@
<if test="terms.applyStatus == 1">
t1.audit_time as turnaroundTime,
</if>
- t1.audit_unit_name as auditUnit, t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
+ t1.audit_unit_name as auditUnit, t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '') as caseType,
t3.mediator as manager, t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
t1.medi_result as mediResult, t1.medi_result_name as mediResultName, t2.status_name as caseStatusName,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')), concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
left join dyh_case_info_unfold t3 on t3.id = t2.id
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 9ad7cdd..03307d5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1199,17 +1199,17 @@
caseStatisticsAreaDTO.setAreaCode(map.get(caseStatisticsAreaDTO.getAreaName()));
}
}
- caseStatisticsAreaDTOS.sort((o1, o2) -> {
- Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
- Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
- if (totalScore1 > totalScore2) {
- return 1;
- } else if (totalScore1.equals(totalScore2)) {
- return 0;
- } else {
- return -1;
- }
- });
+// caseStatisticsAreaDTOS.sort((o1, o2) -> {
+// Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
+// Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
+// if (totalScore1 > totalScore2) {
+// return 1;
+// } else if (totalScore1.equals(totalScore2)) {
+// return 0;
+// } else {
+// return -1;
+// }
+// });
return caseStatisticsAreaDTOS;
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index bd50d15..e8ba37a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -642,6 +642,7 @@
List<CaseAssistInfo> caseAssistInfoList = caseAssistInfoService.listByCaseId(caseId);
if (CollectionUtils.isNotEmpty(caseAssistInfoList)){
LinkedList<WebAssistCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
+ int i = 0;
for (CaseAssistInfo caseAssistInfo: caseAssistInfoList){
if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
@@ -795,7 +796,9 @@
assistCaseFlowList.add(webAssistCaseFlowDTO);
}else {
WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
- webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId());
+ // i防止提供给前端的unitId重复
+ i++;
+ webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId()+"_"+i);
webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
@@ -1163,7 +1166,7 @@
if (UserBaseConsts.UNIT_GRADE_3 == caseDispBaseDTO.getTargetUnitGrade()) {
// 启动来访登记工作流
FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.getJbFlow(caseInfo.getCanal()), caseInfo.getId());
- if (UserBaseConsts.UNIT_TYPE_1 == caseDispBaseDTO.getTargetUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == caseDispBaseDTO.getTargetUnitType()){
// 调度给镇街综治中心，进入第1个任务节点-镇街综治中心待分派
CaseTask dfpCaseTask = new CaseTask();
dfpCaseTask.setId(utilsClient.getNewTimeId());
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java
new file mode 100644
index 0000000..2e577cd
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/SyncBydyhClient.java
@@ -0,0 +1,37 @@
+package cn.huge.module.syncbydyh.client.api;
+
+import cn.huge.base.common.bo.ReturnBO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @title: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @description: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@FeignClient(name = "dyh-sync-bydyh")
+public interface SyncBydyhClient {
+
+ /**
+ * 数据割接-已结束的纠纷案件信息
+ * @url {ctx}/api/client/syncCase/byToGzEndCase
+ * @param page
+ * @param size
+ * @return
+ */
+ @GetMapping("/api/client/syncCase/byToGzEndCase")
+ ReturnBO byToGzEndCase(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size);
+
+ /**
+ * 数据割接-统计已结束的纠纷案件信息
+ * @url {ctx}/api/client/syncCase/countEndCase
+ * @return
+ */
+ @GetMapping("/api/client/syncCase/countEndCase")
+ ReturnBO countEndCase();
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java
new file mode 100644
index 0000000..daaaacf
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/client/api/impl/SyncBydyhClientImpl.java
@@ -0,0 +1,96 @@
+package cn.huge.module.syncbydyh.client.api.impl;
+
+import cn.huge.base.common.bo.ReturnBO;
+import cn.huge.base.common.constant.ReturnConsts;
+import cn.huge.base.common.exception.ClientException;
+import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.syncbydyh.client.api.SyncBydyhClient;
+import cn.huge.module.syncbydyh.domain.dto.GZCaseDTO;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+
+/**
+ * @title: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @description: 白云区矛盾纠纷多元化解平台同步微服务调用接口
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@Slf4j
+@Component
+public class SyncBydyhClientImpl {
+
+ private SyncBydyhClient syncBydyhClient;
+
+ /**
+ * ObjectMapper工具类
+ */
+ private ObjectMapper objectMapper = new ObjectMapper();
+
+ @Autowired
+ public SyncBydyhClientImpl(SyncBydyhClient syncBydyhClient) {
+ this.syncBydyhClient = syncBydyhClient;
+ }
+
+ /**
+ * 数据割接-已结束的纠纷案件信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUnit
+ * @return Object
+ */
+ public List<GZCaseDTO> byToGzEndCase(int page, int size){
+ List<GZCaseDTO> resultList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = syncBydyhClient.byToGzEndCase(page, size);
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ GZCaseDTO result = JSON.parseObject(JSON.toJSONString(map), GZCaseDTO.class);
+ resultList.add(result);
+ }
+ }
+ }else{
+ log.error("Client外服务接口[SyncBydyhClient.byToGzEndCase]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.byToGzEndCase", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.byToGzEndCase]调用异常："+e, e);
+ }
+ return resultList;
+ }
+
+ /**
+ * 数据割接-统计已结束的纠纷案件信息
+ * @url {ctx}/api/client/syncCust/countEndCase
+ * @return Object
+ */
+ public int countEndCase(){
+ try{
+ ReturnBO returnBo = syncBydyhClient.countEndCase();
+ if (ReturnConsts.OK == returnBo.getCode()) {
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ return (Integer) returnBo.getData();
+ }else {
+ return 0;
+ }
+ } else {
+ log.error("Client外服务接口[SyncBydyhClient.countEndCase]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("SyncBydyhClient.countEndCase", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[SyncBydyhClient.countEndCase]调用异常："+e, e);
+ }
+ return 0;
+ }
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java
new file mode 100644
index 0000000..5f15a75
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/controller/SyncBydyhController.java
@@ -0,0 +1,47 @@
+package cn.huge.module.syncbydyh.controller;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.syncbydyh.service.ByToGzService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @title: 白云数据割接为广州数据接口api
+ * @description: 白云数据割接为广州数据接口api
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-08-19 20:04:19
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/syncBydyh")
+public class SyncBydyhController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private ByToGzService service;
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-已结束的纠纷案件信息
+ * @url {ctx}/api/syncBydyh/byToGzEndCase
+ * @return Object
+ */
+ @GetMapping("/byToGzEndCase")
+ public Object byToGzEndCase() {
+ try {
+ service.byToGzEndCase();
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/domain/dto/GZCaseDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/domain/dto/GZCaseDTO.java
new file mode 100644
index 0000000..30f5530
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/domain/dto/GZCaseDTO.java
@@ -0,0 +1,29 @@
+package cn.huge.module.syncbydyh.domain.dto;
+
+import cn.huge.module.cases.domain.po.*;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: 纠纷信息主表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:00:57
+ * @version 1.0.0
+ */
+@Data
+public class GZCaseDTO {
+
+ private CaseInfo gzCaseInfoDTO;
+
+ private CaseInfoUnfold gzCaseInfoUnfoldDTO;
+
+ private List<CasePerson> gzCasePersonDTOList;
+
+ private List<CaseAgent> gzCaseAgentDTOList;
+
+ private List<CaseTask> gzCaseTaskDTOList;
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java
new file mode 100644
index 0000000..726ba7e
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/syncbydyh/service/ByToGzService.java
@@ -0,0 +1,97 @@
+package cn.huge.module.syncbydyh.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.cases.domain.po.CaseAgent;
+import cn.huge.module.cases.domain.po.CaseInfo;
+import cn.huge.module.cases.domain.po.CasePerson;
+import cn.huge.module.cases.domain.po.CaseTask;
+import cn.huge.module.cases.service.*;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import cn.huge.module.syncbydyh.client.api.impl.SyncBydyhClientImpl;
+import cn.huge.module.syncbydyh.domain.dto.GZCaseDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @title: 白云数据割接为广州数据的业务逻辑处理
+ * @Description 白云数据割接为广州数据的业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-08-19 20:04:19
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+public class ByToGzService{
+
+ @Autowired
+ private SyncBydyhClientImpl syncBydyhClient;
+ @Autowired
+ private CaseInfoService caseInfoService;
+ @Autowired
+ private CaseInfoUnfoldService caseInfoUnfoldService;
+ @Autowired
+ private CasePersonService casePersonService;
+ @Autowired
+ private CaseAgentService caseAgentService;
+ @Autowired
+ private CaseTaskService caseTaskService;
+
+ /**
+ * 白云区矛盾纠纷多元化解平台数据割接-已结束的纠纷案件信息
+ */
+ public void byToGzEndCase(){
+ try{
+ int operSize = 100;
+// int endCaseCount = 1000;
+ int endCaseCount = syncBydyhClient.countEndCase();
+ if (endCaseCount > 0) {
+ int allPage = (endCaseCount/operSize);
+// int allPage = 1;
+ for (int operPage=1; operPage<=allPage; operPage++) {
+ try{
+ List<GZCaseDTO> byToGzDTOList = syncBydyhClient.byToGzEndCase(operPage, operSize);
+ for (GZCaseDTO byToGzDTO: byToGzDTOList){
+ caseInfoService.saveOrUpdate(byToGzDTO.getGzCaseInfoDTO());
+
+ caseInfoUnfoldService.saveOrUpdate(byToGzDTO.getGzCaseInfoUnfoldDTO());
+
+ List<CasePerson> casePersonList = byToGzDTO.getGzCasePersonDTOList();
+ if (CollectionUtils.isNotEmpty(casePersonList)) {
+ for (CasePerson casePerson : casePersonList) {
+ casePersonService.saveOrUpdate(casePerson);
+ }
+ }
+
+ List<CaseAgent> caseAgentList = byToGzDTO.getGzCaseAgentDTOList();
+ if (CollectionUtils.isNotEmpty(caseAgentList)) {
+ for (CaseAgent caseAgent : caseAgentList) {
+ caseAgentService.saveOrUpdate(caseAgent);
+ }
+ }
+
+ List<CaseTask> caseTaskList = byToGzDTO.getGzCaseTaskDTOList();
+ if (CollectionUtils.isNotEmpty(caseTaskList)) {
+ for (CaseTask caseTask : caseTaskList) {
+ caseTaskService.saveOrUpdate(caseTask);
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzEndCase]调用失败，异常信息："+e, e);
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("[ByToGzService.byToGzEndCase]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByToGzService.byToGzEndCase", e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/DyhSsimApplication.java b/dyh-service/dyh-ssim/src/main/java/cn/huge/module/DyhSsimApplication.java
deleted file mode 100644
index cd6d508..0000000
--- a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/DyhSsimApplication.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.huge.module;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@SpringBootApplication(scanBasePackages = {"cn.huge"})
-@EnableFeignClients
-@EnableEurekaClient
-@EnableScheduling
-@MapperScan("cn.huge.*.*.dao.mapper")
-public class DyhSsimApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(DyhSsimApplication.class, args);
- }
-
-}
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml b/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml
deleted file mode 100644
index 629e8a2..0000000
--- a/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-#server配置
-server:
- #端口
- port: 9009
-
-#Spring配置
-spring:
- #服务名
- application:
- name: dyh-ssim
- #数据源配置
- datasource:
- url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_ssim_dev
- username: SYSDBA
- password: hugeinfo123
- driver-class-name: dm.jdbc.driver.DmDriver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- stat-view-servlet:
- # 关闭 Druid 的统计视图
- enabled: false
- # 定期检查空闲连接的有效性
- test-while-idle: true
- # 用来验证数据库连接是否仍然可用的 SQL 查询
- validation-query: SELECT 1
-
- # redis配置，单机版，集群另外配置
- redis:
- host: 183.2.142.21
- port: 9017
- password: hugeinfo123
- # 使用的Redis数据库索引（默认为0）
- database: 0
- # 连接超时时间（毫秒）
- timeout: 5000
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 100
- # 连接池最大阻塞等待时间
- max-wait: 100000
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
-
-#注册中心配置
-eureka:
- client:
- service-url:
- #注册中心单机
- defaultZone: http://localhost:9001/eureka
- #注册中心集群
- #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
- #是否注册到注册中心
- register-with-eureka: true
- #是否从注册中心拉取注册服务列表
- fetch-registry: true
- #首次注册时间
- initial-instance-info-replication-interval-seconds: 2
- #客户端定时刷新本地缓存时间
- registry-fetch-interval-seconds: 5
- instance:
- prefer-ip-address: true
- instance-id: ${spring.cloud.client.ip-address}:${server.port}
- #心跳时间，即服务续约间隔时间（缺省为30s）
- lease-renewal-interval-in-seconds: 10
- #发呆时间，即服务续约到期时间（缺省为90s）
- lease-expiration-duration-in-seconds: 30
-
-#hystrix配置
-hystrix:
- command:
- default:
- execution:
- timeout:
- enabled: true
- isolation:
- thread:
- timeoutInMilliseconds: 30000
-
-#健康检查-按需配置
-management:
- endpoint:
- health:
- show-details: always
- endpoints:
- web:
- exposure:
- include: "*"
- server:
- #port: 9021
- servlet:
- context-path: /
- ssl:
- enabled: false
\ No newline at end of file
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml b/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml
deleted file mode 100644
index 629e8a2..0000000
--- a/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-#server配置
-server:
- #端口
- port: 9009
-
-#Spring配置
-spring:
- #服务名
- application:
- name: dyh-ssim
- #数据源配置
- datasource:
- url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_ssim_dev
- username: SYSDBA
- password: hugeinfo123
- driver-class-name: dm.jdbc.driver.DmDriver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- stat-view-servlet:
- # 关闭 Druid 的统计视图
- enabled: false
- # 定期检查空闲连接的有效性
- test-while-idle: true
- # 用来验证数据库连接是否仍然可用的 SQL 查询
- validation-query: SELECT 1
-
- # redis配置，单机版，集群另外配置
- redis:
- host: 183.2.142.21
- port: 9017
- password: hugeinfo123
- # 使用的Redis数据库索引（默认为0）
- database: 0
- # 连接超时时间（毫秒）
- timeout: 5000
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 100
- # 连接池最大阻塞等待时间
- max-wait: 100000
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
-
-#注册中心配置
-eureka:
- client:
- service-url:
- #注册中心单机
- defaultZone: http://localhost:9001/eureka
- #注册中心集群
- #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
- #是否注册到注册中心
- register-with-eureka: true
- #是否从注册中心拉取注册服务列表
- fetch-registry: true
- #首次注册时间
- initial-instance-info-replication-interval-seconds: 2
- #客户端定时刷新本地缓存时间
- registry-fetch-interval-seconds: 5
- instance:
- prefer-ip-address: true
- instance-id: ${spring.cloud.client.ip-address}:${server.port}
- #心跳时间，即服务续约间隔时间（缺省为30s）
- lease-renewal-interval-in-seconds: 10
- #发呆时间，即服务续约到期时间（缺省为90s）
- lease-expiration-duration-in-seconds: 30
-
-#hystrix配置
-hystrix:
- command:
- default:
- execution:
- timeout:
- enabled: true
- isolation:
- thread:
- timeoutInMilliseconds: 30000
-
-#健康检查-按需配置
-management:
- endpoint:
- health:
- show-details: always
- endpoints:
- web:
- exposure:
- include: "*"
- server:
- #port: 9021
- servlet:
- context-path: /
- ssl:
- enabled: false
\ No newline at end of file
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml b/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml
deleted file mode 100644
index e6d42a7..0000000
--- a/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-#server配置
-server:
- #端口
- port: 9009
-
-#Spring配置
-spring:
- #服务名
- application:
- name: dyh-ssim
- #数据源配置
- datasource:
- url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
- username: SYSDBA
- password: SYSDBA
- driver-class-name: dm.jdbc.driver.DmDriver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- stat-view-servlet:
- # 关闭 Druid 的统计视图
- enabled: false
- # 定期检查空闲连接的有效性
- test-while-idle: true
- # 用来验证数据库连接是否仍然可用的 SQL 查询
- validation-query: SELECT 1
-
- # redis配置，单机版，集群另外配置
- redis:
- host: 183.2.142.21
- port: 9017
- password: hugeinfo123
- # 使用的Redis数据库索引（默认为0）
- database: 0
- # 连接超时时间（毫秒）
- timeout: 5000
- lettuce:
- pool:
- # 连接池最大连接数
- max-active: 100
- # 连接池最大阻塞等待时间
- max-wait: 100000
- # 连接池中的最大空闲连接
- max-idle: 10
- # 连接池中的最小空闲连接
- min-idle: 0
-
-#注册中心配置
-eureka:
- client:
- service-url:
- #注册中心单机
- defaultZone: http://localhost:9001/eureka
- #注册中心集群
- #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
- #是否注册到注册中心
- register-with-eureka: true
- #是否从注册中心拉取注册服务列表
- fetch-registry: true
- #首次注册时间
- initial-instance-info-replication-interval-seconds: 2
- #客户端定时刷新本地缓存时间
- registry-fetch-interval-seconds: 5
- instance:
- prefer-ip-address: true
- instance-id: ${spring.cloud.client.ip-address}:${server.port}
- #心跳时间，即服务续约间隔时间（缺省为30s）
- lease-renewal-interval-in-seconds: 10
- #发呆时间，即服务续约到期时间（缺省为90s）
- lease-expiration-duration-in-seconds: 30
-
-#hystrix配置
-hystrix:
- command:
- default:
- execution:
- timeout:
- enabled: true
- isolation:
- thread:
- timeoutInMilliseconds: 30000
-
-#健康检查-按需配置
-management:
- endpoint:
- health:
- show-details: always
- endpoints:
- web:
- exposure:
- include: "*"
- server:
- #port: 9021
- servlet:
- context-path: /
- ssl:
- enabled: false
\ No newline at end of file
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application.yml b/dyh-service/dyh-ssim/src/main/resources/config/application.yml
deleted file mode 100644
index f2b985a..0000000
--- a/dyh-service/dyh-ssim/src/main/resources/config/application.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-#Spring配置
-spring:
- profiles:
- active:
- - dev
- # - test
- # - prod
-
- devtools:
- restart:
- enabled: true
- servlet:
- multipart:
- max-file-size: -1
- max-request-size: -1
- main:
- #可以重复命名配置
- allow-bean-definition-overriding: true
- allow-circular-references: true
-
-#server配置
-server:
- #服务时限配置
- tomcat:
- min-spare-threads: 100
- max-threads: 256
- connection-timeout: 8000
- main:
- #可以重复命名配置
- allow-bean-definition-overriding: true
-
-#ribbon配置
-ribbon:
- #服务之间调用，请求处理超时时间
- ReadTimeout: 120000
- #服务之间调用，请求连接的超时时间
- ConnectTimeout: 30000
-
-#mybatis-plus配置
-mybatis-plus:
- configuration:
- #控制台输出sql语句
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- # log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
- #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as）
- ap-underscore-to-camel-case: true
- #如何自动映射列到字段或属性，NONE：表示取消自动映射；PARTIAL：只会自动映射没有定义嵌套结果集映射的结果集。FULL：会自动映射任意复杂的结果集（无论是否嵌套）。默认是partial，这是一种全局设置
- auto-mapping-behavior: full
- global-config:
- db-config:
- #驼峰下划线转换
- column-underline: false
- #数据库大写下划线转换
- capital-mode: true
- #全局逻辑删除的实体字段名
- #logic-delete-field: flag
- #逻辑未删除值(默认为 0)，实体类字段需要加上@TableLogic
- logic-not-delete-value: 0
- #逻辑已删除值(默认为 1)
- logic-delete-value: 1
- #字段策略，IGNORED：忽略判断，NOT_NULL：非null判断，NOT_EMPTY：非空判断，DEFAULT：默认，NEVER：不加入sql
- update-strategy: IGNORED
- mapper-locations: classpath*:/cn/huge/*/*/dao/mapper/xml/*Mapper.xml
\ No newline at end of file
diff --git a/dyh-service/dyh-ssim/src/test/java/cn/huge/module/DyhSsimApplicationTest.java b/dyh-service/dyh-ssim/src/test/java/cn/huge/module/DyhSsimApplicationTest.java
deleted file mode 100644
index baea555..0000000
--- a/dyh-service/dyh-ssim/src/test/java/cn/huge/module/DyhSsimApplicationTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.huge.module;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class DyhSsimApplicationTest {
-
- @Test
- public void contextLoads() {
-
- }
-
-}
diff --git a/dyh-service/dyh-sync/pom.xml b/dyh-service/dyh-sync-bydyh/pom.xml
similarity index 96%
rename from dyh-service/dyh-sync/pom.xml
rename to dyh-service/dyh-sync-bydyh/pom.xml
index 3905d65..43950c4 100644
--- a/dyh-service/dyh-sync/pom.xml
+++ b/dyh-service/dyh-sync-bydyh/pom.xml
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.huge</groupId>
- <artifactId>dyh-sync</artifactId>
+ <artifactId>dyh-sync-bydyh</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>dyh-sync</name>
- <description>广州市综治中心应用平台矛调模块-数据同步</description>
+ <name>dyh-sync-bydyh</name>
+ <description>广州市综治中心应用平台矛调模块-数据同步-白云区矛盾纠纷多元化解平台</description>
<parent>
<groupId>cn.huge</groupId>
@@ -73,7 +73,7 @@
</dependencies>
<build>
- <finalName>dyh-sync</finalName>
+ <finalName>dyh-sync-bydyh</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -127,7 +127,7 @@
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<useUniqueVersions>false</useUniqueVersions>
- <mainClass>cn.huge.module.DyhSyncApplication</mainClass>
+ <mainClass>cn.huge.module.DyhSyncBydyhApplication</mainClass>
</manifest>
<manifestEntries>
<!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->
diff --git a/dyh-service/dyh-sync/src/main/assembly/assembly.xml b/dyh-service/dyh-sync-bydyh/src/main/assembly/assembly.xml
similarity index 100%
rename from dyh-service/dyh-sync/src/main/assembly/assembly.xml
rename to dyh-service/dyh-sync-bydyh/src/main/assembly/assembly.xml
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/DyhSyncApplication.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/DyhSyncBydyhApplication.java
similarity index 84%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/DyhSyncApplication.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/DyhSyncBydyhApplication.java
index 0fc5b83..599705a 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/DyhSyncApplication.java
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/DyhSyncBydyhApplication.java
@@ -13,9 +13,9 @@
@EnableEurekaClient
@EnableScheduling
@MapperScan("cn.huge.*.*.dao.mapper")
-public class DyhSyncApplication {
+public class DyhSyncBydyhApplication {
public static void main(String[] args) {
- SpringApplication.run(DyhSyncApplication.class, args);
+ SpringApplication.run(DyhSyncBydyhApplication.class, args);
}
}
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
similarity index 100%
copy from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
copy to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java
similarity index 100%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
similarity index 93%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
index 46ef759..aa4af65 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
@@ -22,8 +22,7 @@
t2.table_comment as 'tableComments',
t1.column_name as 'name',
t1.data_type as 'dataType',
- t1.column_comment as 'comments',
- t1.column_default as 'dataScale'
+ t1.column_comment as 'comments'
from information_schema.`columns` t1 left join information_schema.`tables` t2
on t1.table_name = t2.table_name and t1.table_schema = t2.table_schema
where t1.table_schema = #{tableSchema}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java
similarity index 100%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
similarity index 100%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java
similarity index 100%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/controller/SyncCaseController.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/controller/SyncCaseController.java
new file mode 100644
index 0000000..fc05648
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/controller/SyncCaseController.java
@@ -0,0 +1,74 @@
+package cn.huge.module.bycase.controller;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.bycase.domain.dto.GZCaseDTO;
+import cn.huge.module.bycase.service.CaseInfoService;
+import cn.huge.module.ctuser.service.*;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 数据割接-案件相关
+ * @description: 数据割接-案件相关
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-18 15:14:06
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/client/syncCase")
+public class SyncCaseController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CaseInfoService caseInfoService;
+
+ /**
+ * 数据割接-统计已结束的纠纷案件信息
+ * @url {ctx}/api/client/syncCase/countEndCase
+ * @return
+ */
+ @GetMapping("/countEndCase")
+ public Object countEndCase() {
+ try {
+ Map<String, Object> terms = Maps.newHashMap();
+ terms.put("EndProcess", "EndProcess");
+ return ReturnSucUtils.getRepInfo(caseInfoService.countTerms(terms));
+ } catch (Exception e) {
+ log.error("[SyncCustController.countEndCase]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 数据割接-已结束的纠纷案件信息
+ * @url {ctx}/api/client/syncCase/byToGzEndCase
+ * @param page
+ * @param size
+ * @return
+ */
+ @GetMapping("/byToGzEndCase")
+ public Object byToGzEndCase(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ try {
+ List<GZCaseDTO> gzCaseDTOList = caseInfoService.byToGzEndCase(page, size);
+ return ReturnSucUtils.getRepInfo(gzCaseDTOList);
+ } catch (Exception e) {
+ log.error("[SyncCustController.byToGzEndCase]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseAgentMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseAgentMapper.java
new file mode 100644
index 0000000..247a1b1
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseAgentMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.bycase.dao.mapper;
+
+import cn.huge.module.bycase.domain.po.CaseAgent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷代理人表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-21 08:46:40
+* @version 1.0.0
+*/
+@Repository
+public interface CaseAgentMapper extends BaseMapper<CaseAgent>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseAgent(@Param("entity") CaseAgent entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseAgentTerms(@Param("entity") CaseAgent entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseAgent(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseAgent>
+ */
+ List<CaseAgent> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseAgent>
+ */
+ List<CaseAgent> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseDispMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseDispMapper.java
new file mode 100644
index 0000000..4e86b9d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseDispMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.bycase.dao.mapper;
+
+import cn.huge.module.bycase.domain.po.CaseDisp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷调度单表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-21 08:46:40
+* @version 1.0.0
+*/
+@Repository
+public interface CaseDispMapper extends BaseMapper<CaseDisp>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseDisp(@Param("entity") CaseDisp entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseDispTerms(@Param("entity") CaseDisp entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseDisp(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseDisp>
+ */
+ List<CaseDisp> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseDisp>
+ */
+ List<CaseDisp> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseInfoMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseInfoMapper.java
new file mode 100644
index 0000000..02af946
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseInfoMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.bycase.dao.mapper;
+
+import cn.huge.module.bycase.domain.po.CaseInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷信息表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-21 08:46:39
+* @version 1.0.0
+*/
+@Repository
+public interface CaseInfoMapper extends BaseMapper<CaseInfo>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseInfo(@Param("entity") CaseInfo entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseInfoTerms(@Param("entity") CaseInfo entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseInfo(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseInfo>
+ */
+ List<CaseInfo> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseInfo>
+ */
+ List<CaseInfo> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CasePersonMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CasePersonMapper.java
new file mode 100644
index 0000000..302ee2f
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CasePersonMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.bycase.dao.mapper;
+
+import cn.huge.module.bycase.domain.po.CasePerson;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷当事人表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-21 08:46:40
+* @version 1.0.0
+*/
+@Repository
+public interface CasePersonMapper extends BaseMapper<CasePerson>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCasePerson(@Param("entity") CasePerson entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCasePersonTerms(@Param("entity") CasePerson entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCasePerson(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CasePerson>
+ */
+ List<CasePerson> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CasePerson>
+ */
+ List<CasePerson> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseSignMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseSignMapper.java
new file mode 100644
index 0000000..6378551
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseSignMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.bycase.dao.mapper;
+
+import cn.huge.module.bycase.domain.po.CaseSign;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷签收任务表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-21 08:46:40
+* @version 1.0.0
+*/
+@Repository
+public interface CaseSignMapper extends BaseMapper<CaseSign>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseSign(@Param("entity") CaseSign entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseSignTerms(@Param("entity") CaseSign entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseSign(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseSign>
+ */
+ List<CaseSign> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseSign>
+ */
+ List<CaseSign> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseTaskMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseTaskMapper.java
new file mode 100644
index 0000000..be58d8e
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/CaseTaskMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.bycase.dao.mapper;
+
+import cn.huge.module.bycase.domain.po.CaseTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷任务表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-21 08:46:40
+* @version 1.0.0
+*/
+@Repository
+public interface CaseTaskMapper extends BaseMapper<CaseTask>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseTask(@Param("entity") CaseTask entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseTaskTerms(@Param("entity") CaseTask entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseTask(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseTask>
+ */
+ List<CaseTask> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseTask>
+ */
+ List<CaseTask> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseAgentMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseAgentMapper.xml
new file mode 100644
index 0000000..bb99037
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseAgentMapper.xml
@@ -0,0 +1,322 @@
+<?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">
+<!--
+ * @title: 纠纷代理人表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-21 08:46:40
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.bycase.dao.mapper.CaseAgentMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.bycase.domain.po.CaseAgent">
+ <result property="id" column="id"/>
+ <result property="caseId" column="case_id"/>
+ <result property="partyUserId" column="party_user_id"/>
+ <result property="personId" column="person_id"/>
+ <result property="personName" column="person_name"/>
+ <result property="perType" column="per_type"/>
+ <result property="perClass" column="per_class"/>
+ <result property="perClassName" column="per_class_name"/>
+ <result property="trueName" column="true_name"/>
+ <result property="mobile" column="mobile"/>
+ <result property="sex" column="sex"/>
+ <result property="sexName" column="sex_name"/>
+ <result property="certiType" column="certi_type"/>
+ <result property="certiTypeName" column="certi_type_name"/>
+ <result property="certiNo" column="certi_no"/>
+ <result property="birthday" column="birthday"/>
+ <result property="prov" column="prov"/>
+ <result property="provName" column="prov_name"/>
+ <result property="city" column="city"/>
+ <result property="cityName" column="city_name"/>
+ <result property="area" column="area"/>
+ <result property="areaName" column="area_name"/>
+ <result property="road" column="road"/>
+ <result property="roadName" column="road_name"/>
+ <result property="village" column="village"/>
+ <result property="villageName" column="village_name"/>
+ <result property="addr" column="addr"/>
+ <result property="agentType" column="agent_type"/>
+ <result property="agentTypeName" column="agent_type_name"/>
+ <result property="lawFirm" column="law_firm"/>
+ <result property="wechat" column="wechat"/>
+ <result property="qq" column="qq"/>
+ <result property="mail" column="mail"/>
+ <result property="custId" column="cust_id"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_agent</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_id,
+ party_user_id,
+ person_id,
+ person_name,
+ per_type,
+ per_class,
+ per_class_name,
+ true_name,
+ mobile,
+ sex,
+ sex_name,
+ certi_type,
+ certi_type_name,
+ certi_no,
+ birthday,
+ prov,
+ prov_name,
+ city,
+ city_name,
+ area,
+ area_name,
+ road,
+ road_name,
+ village,
+ village_name,
+ addr,
+ agent_type,
+ agent_type_name,
+ law_firm,
+ wechat,
+ qq,
+ mail,
+ cust_id,
+ delete_status,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
+ <if test="entity.partyUserId != null">party_user_id = #{entity.partyUserId},</if>
+ <if test="entity.personId != null">person_id = #{entity.personId},</if>
+ <if test="entity.personName != null">person_name = #{entity.personName},</if>
+ <if test="entity.perType != null">per_type = #{entity.perType},</if>
+ <if test="entity.perClass != null">per_class = #{entity.perClass},</if>
+ <if test="entity.perClassName != null">per_class_name = #{entity.perClassName},</if>
+ <if test="entity.trueName != null">true_name = #{entity.trueName},</if>
+ <if test="entity.mobile != null">mobile = #{entity.mobile},</if>
+ <if test="entity.sex != null">sex = #{entity.sex},</if>
+ <if test="entity.sexName != null">sex_name = #{entity.sexName},</if>
+ <if test="entity.certiType != null">certi_type = #{entity.certiType},</if>
+ <if test="entity.certiTypeName != null">certi_type_name = #{entity.certiTypeName},</if>
+ <if test="entity.certiNo != null">certi_no = #{entity.certiNo},</if>
+ <if test="entity.birthday != null">birthday = #{entity.birthday},</if>
+ <if test="entity.prov != null">prov = #{entity.prov},</if>
+ <if test="entity.provName != null">prov_name = #{entity.provName},</if>
+ <if test="entity.city != null">city = #{entity.city},</if>
+ <if test="entity.cityName != null">city_name = #{entity.cityName},</if>
+ <if test="entity.area != null">area = #{entity.area},</if>
+ <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
+ <if test="entity.road != null">road = #{entity.road},</if>
+ <if test="entity.roadName != null">road_name = #{entity.roadName},</if>
+ <if test="entity.village != null">village = #{entity.village},</if>
+ <if test="entity.villageName != null">village_name = #{entity.villageName},</if>
+ <if test="entity.addr != null">addr = #{entity.addr},</if>
+ <if test="entity.agentType != null">agent_type = #{entity.agentType},</if>
+ <if test="entity.agentTypeName != null">agent_type_name = #{entity.agentTypeName},</if>
+ <if test="entity.lawFirm != null">law_firm = #{entity.lawFirm},</if>
+ <if test="entity.wechat != null">wechat = #{entity.wechat},</if>
+ <if test="entity.qq != null">qq = #{entity.qq},</if>
+ <if test="entity.mail != null">mail = #{entity.mail},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseId != null and terms.caseId !=''">
+ and case_id = #{terms.caseId}
+ </if>
+ <if test="terms.partyUserId != null and terms.partyUserId !=''">
+ and party_user_id = #{terms.partyUserId}
+ </if>
+ <if test="terms.personId != null and terms.personId !=''">
+ and person_id = #{terms.personId}
+ </if>
+ <if test="terms.personName != null and terms.personName !=''">
+ and person_name = #{terms.personName}
+ </if>
+ <if test="terms.perType != null and terms.perType !=''">
+ and per_type = #{terms.perType}
+ </if>
+ <if test="terms.perClass != null and terms.perClass !=''">
+ and per_class = #{terms.perClass}
+ </if>
+ <if test="terms.perClassName != null and terms.perClassName !=''">
+ and per_class_name = #{terms.perClassName}
+ </if>
+ <if test="terms.trueName != null and terms.trueName !=''">
+ and true_name = #{terms.trueName}
+ </if>
+ <if test="terms.mobile != null and terms.mobile !=''">
+ and mobile = #{terms.mobile}
+ </if>
+ <if test="terms.sex != null and terms.sex !=''">
+ and sex = #{terms.sex}
+ </if>
+ <if test="terms.sexName != null and terms.sexName !=''">
+ and sex_name = #{terms.sexName}
+ </if>
+ <if test="terms.certiType != null and terms.certiType !=''">
+ and certi_type = #{terms.certiType}
+ </if>
+ <if test="terms.certiTypeName != null and terms.certiTypeName !=''">
+ and certi_type_name = #{terms.certiTypeName}
+ </if>
+ <if test="terms.certiNo != null and terms.certiNo !=''">
+ and certi_no = #{terms.certiNo}
+ </if>
+ <if test="terms.birthday != null and terms.birthday !=''">
+ and birthday = #{terms.birthday}
+ </if>
+ <if test="terms.prov != null and terms.prov !=''">
+ and prov = #{terms.prov}
+ </if>
+ <if test="terms.provName != null and terms.provName !=''">
+ and prov_name = #{terms.provName}
+ </if>
+ <if test="terms.city != null and terms.city !=''">
+ and city = #{terms.city}
+ </if>
+ <if test="terms.cityName != null and terms.cityName !=''">
+ and city_name = #{terms.cityName}
+ </if>
+ <if test="terms.area != null and terms.area !=''">
+ and area = #{terms.area}
+ </if>
+ <if test="terms.areaName != null and terms.areaName !=''">
+ and area_name = #{terms.areaName}
+ </if>
+ <if test="terms.road != null and terms.road !=''">
+ and road = #{terms.road}
+ </if>
+ <if test="terms.roadName != null and terms.roadName !=''">
+ and road_name = #{terms.roadName}
+ </if>
+ <if test="terms.village != null and terms.village !=''">
+ and village = #{terms.village}
+ </if>
+ <if test="terms.villageName != null and terms.villageName !=''">
+ and village_name = #{terms.villageName}
+ </if>
+ <if test="terms.addr != null and terms.addr !=''">
+ and addr = #{terms.addr}
+ </if>
+ <if test="terms.agentType != null and terms.agentType !=''">
+ and agent_type = #{terms.agentType}
+ </if>
+ <if test="terms.agentTypeName != null and terms.agentTypeName !=''">
+ and agent_type_name = #{terms.agentTypeName}
+ </if>
+ <if test="terms.lawFirm != null and terms.lawFirm !=''">
+ and law_firm = #{terms.lawFirm}
+ </if>
+ <if test="terms.wechat != null and terms.wechat !=''">
+ and wechat = #{terms.wechat}
+ </if>
+ <if test="terms.qq != null and terms.qq !=''">
+ and qq = #{terms.qq}
+ </if>
+ <if test="terms.mail != null and terms.mail !=''">
+ and mail = #{terms.mail}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseAgent">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseAgentTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseAgent">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseDispMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseDispMapper.xml
new file mode 100644
index 0000000..b8d52c5
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseDispMapper.xml
@@ -0,0 +1,358 @@
+<?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">
+<!--
+ * @title: 纠纷调度单表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-21 08:46:40
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.bycase.dao.mapper.CaseDispMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.bycase.domain.po.CaseDisp">
+ <result property="id" column="id"/>
+ <result property="caseId" column="case_id"/>
+ <result property="caseNo" column="case_no"/>
+ <result property="serieStatus" column="serie_status"/>
+ <result property="applyCanal" column="apply_canal"/>
+ <result property="applyCanalName" column="apply_canal_name"/>
+ <result property="dispTag" column="disp_tag"/>
+ <result property="dispTagName" column="disp_tag_name"/>
+ <result property="sourceUnitId" column="source_unit_id"/>
+ <result property="sourceUnitName" column="source_unit_name"/>
+ <result property="sourceUserId" column="source_user_id"/>
+ <result property="sourceUserName" column="source_user_name"/>
+ <result property="sourceReason" column="source_reason"/>
+ <result property="sourceContent" column="source_content"/>
+ <result property="dispWay" column="disp_way"/>
+ <result property="dispWayName" column="disp_way_name"/>
+ <result property="dispType" column="disp_type"/>
+ <result property="dispTypeName" column="disp_type_name"/>
+ <result property="dispHandle" column="disp_handle"/>
+ <result property="dispHandleName" column="disp_handle_name"/>
+ <result property="dispObj" column="disp_obj"/>
+ <result property="dispObjName" column="disp_obj_name"/>
+ <result property="acceptObjId" column="accept_obj_id"/>
+ <result property="acceptObjName" column="accept_obj_name"/>
+ <result property="acceptObjSign" column="accept_obj_sign"/>
+ <result property="acceptSignTime" column="accept_sign_time"/>
+ <result property="endReason" column="end_reason"/>
+ <result property="endReasonName" column="end_reason_name"/>
+ <result property="endOtherReason" column="end_other_reason"/>
+ <result property="dispContent" column="disp_content"/>
+ <result property="dispUnitId" column="disp_unit_id"/>
+ <result property="dispUnitName" column="disp_unit_name"/>
+ <result property="dispDeptId" column="disp_dept_id"/>
+ <result property="dispDeptName" column="disp_dept_name"/>
+ <result property="dispUserId" column="disp_user_id"/>
+ <result property="dispUserName" column="disp_user_name"/>
+ <result property="dispTime" column="disp_time"/>
+ <result property="status" column="status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="lastDispId" column="last_disp_id"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_disp</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_id,
+ case_no,
+ serie_status,
+ apply_canal,
+ apply_canal_name,
+ disp_tag,
+ disp_tag_name,
+ source_unit_id,
+ source_unit_name,
+ source_user_id,
+ source_user_name,
+ source_reason,
+ source_content,
+ disp_way,
+ disp_way_name,
+ disp_type,
+ disp_type_name,
+ disp_handle,
+ disp_handle_name,
+ disp_obj,
+ disp_obj_name,
+ accept_obj_id,
+ accept_obj_name,
+ accept_obj_sign,
+ accept_sign_time,
+ end_reason,
+ end_reason_name,
+ end_other_reason,
+ disp_content,
+ disp_unit_id,
+ disp_unit_name,
+ disp_dept_id,
+ disp_dept_name,
+ disp_user_id,
+ disp_user_name,
+ disp_time,
+ status,
+ cust_id,
+ delete_status,
+ create_time,
+ update_time,
+ last_disp_id
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
+ <if test="entity.caseNo != null">case_no = #{entity.caseNo},</if>
+ <if test="entity.serieStatus != null">serie_status = #{entity.serieStatus},</if>
+ <if test="entity.applyCanal != null">apply_canal = #{entity.applyCanal},</if>
+ <if test="entity.applyCanalName != null">apply_canal_name = #{entity.applyCanalName},</if>
+ <if test="entity.dispTag != null">disp_tag = #{entity.dispTag},</if>
+ <if test="entity.dispTagName != null">disp_tag_name = #{entity.dispTagName},</if>
+ <if test="entity.sourceUnitId != null">source_unit_id = #{entity.sourceUnitId},</if>
+ <if test="entity.sourceUnitName != null">source_unit_name = #{entity.sourceUnitName},</if>
+ <if test="entity.sourceUserId != null">source_user_id = #{entity.sourceUserId},</if>
+ <if test="entity.sourceUserName != null">source_user_name = #{entity.sourceUserName},</if>
+ <if test="entity.sourceReason != null">source_reason = #{entity.sourceReason},</if>
+ <if test="entity.sourceContent != null">source_content = #{entity.sourceContent},</if>
+ <if test="entity.dispWay != null">disp_way = #{entity.dispWay},</if>
+ <if test="entity.dispWayName != null">disp_way_name = #{entity.dispWayName},</if>
+ <if test="entity.dispType != null">disp_type = #{entity.dispType},</if>
+ <if test="entity.dispTypeName != null">disp_type_name = #{entity.dispTypeName},</if>
+ <if test="entity.dispHandle != null">disp_handle = #{entity.dispHandle},</if>
+ <if test="entity.dispHandleName != null">disp_handle_name = #{entity.dispHandleName},</if>
+ <if test="entity.dispObj != null">disp_obj = #{entity.dispObj},</if>
+ <if test="entity.dispObjName != null">disp_obj_name = #{entity.dispObjName},</if>
+ <if test="entity.acceptObjId != null">accept_obj_id = #{entity.acceptObjId},</if>
+ <if test="entity.acceptObjName != null">accept_obj_name = #{entity.acceptObjName},</if>
+ <if test="entity.acceptObjSign != null">accept_obj_sign = #{entity.acceptObjSign},</if>
+ <if test="entity.acceptSignTime != null">accept_sign_time = #{entity.acceptSignTime},</if>
+ <if test="entity.endReason != null">end_reason = #{entity.endReason},</if>
+ <if test="entity.endReasonName != null">end_reason_name = #{entity.endReasonName},</if>
+ <if test="entity.endOtherReason != null">end_other_reason = #{entity.endOtherReason},</if>
+ <if test="entity.dispContent != null">disp_content = #{entity.dispContent},</if>
+ <if test="entity.dispUnitId != null">disp_unit_id = #{entity.dispUnitId},</if>
+ <if test="entity.dispUnitName != null">disp_unit_name = #{entity.dispUnitName},</if>
+ <if test="entity.dispDeptId != null">disp_dept_id = #{entity.dispDeptId},</if>
+ <if test="entity.dispDeptName != null">disp_dept_name = #{entity.dispDeptName},</if>
+ <if test="entity.dispUserId != null">disp_user_id = #{entity.dispUserId},</if>
+ <if test="entity.dispUserName != null">disp_user_name = #{entity.dispUserName},</if>
+ <if test="entity.dispTime != null">disp_time = #{entity.dispTime},</if>
+ <if test="entity.status != null">status = #{entity.status},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
+ <if test="entity.lastDispId != null">last_disp_id = #{entity.lastDispId}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseId != null and terms.caseId !=''">
+ and case_id = #{terms.caseId}
+ </if>
+ <if test="terms.caseNo != null and terms.caseNo !=''">
+ and case_no = #{terms.caseNo}
+ </if>
+ <if test="terms.serieStatus != null and terms.serieStatus !=''">
+ and serie_status = #{terms.serieStatus}
+ </if>
+ <if test="terms.applyCanal != null and terms.applyCanal !=''">
+ and apply_canal = #{terms.applyCanal}
+ </if>
+ <if test="terms.applyCanalName != null and terms.applyCanalName !=''">
+ and apply_canal_name = #{terms.applyCanalName}
+ </if>
+ <if test="terms.dispTag != null and terms.dispTag !=''">
+ and disp_tag = #{terms.dispTag}
+ </if>
+ <if test="terms.dispTagName != null and terms.dispTagName !=''">
+ and disp_tag_name = #{terms.dispTagName}
+ </if>
+ <if test="terms.sourceUnitId != null and terms.sourceUnitId !=''">
+ and source_unit_id = #{terms.sourceUnitId}
+ </if>
+ <if test="terms.sourceUnitName != null and terms.sourceUnitName !=''">
+ and source_unit_name = #{terms.sourceUnitName}
+ </if>
+ <if test="terms.sourceUserId != null and terms.sourceUserId !=''">
+ and source_user_id = #{terms.sourceUserId}
+ </if>
+ <if test="terms.sourceUserName != null and terms.sourceUserName !=''">
+ and source_user_name = #{terms.sourceUserName}
+ </if>
+ <if test="terms.sourceReason != null and terms.sourceReason !=''">
+ and source_reason = #{terms.sourceReason}
+ </if>
+ <if test="terms.sourceContent != null and terms.sourceContent !=''">
+ and source_content = #{terms.sourceContent}
+ </if>
+ <if test="terms.dispWay != null and terms.dispWay !=''">
+ and disp_way = #{terms.dispWay}
+ </if>
+ <if test="terms.dispWayName != null and terms.dispWayName !=''">
+ and disp_way_name = #{terms.dispWayName}
+ </if>
+ <if test="terms.dispType != null and terms.dispType !=''">
+ and disp_type = #{terms.dispType}
+ </if>
+ <if test="terms.dispTypeName != null and terms.dispTypeName !=''">
+ and disp_type_name = #{terms.dispTypeName}
+ </if>
+ <if test="terms.dispHandle != null and terms.dispHandle !=''">
+ and disp_handle = #{terms.dispHandle}
+ </if>
+ <if test="terms.dispHandleName != null and terms.dispHandleName !=''">
+ and disp_handle_name = #{terms.dispHandleName}
+ </if>
+ <if test="terms.dispObj != null and terms.dispObj !=''">
+ and disp_obj = #{terms.dispObj}
+ </if>
+ <if test="terms.dispObjName != null and terms.dispObjName !=''">
+ and disp_obj_name = #{terms.dispObjName}
+ </if>
+ <if test="terms.acceptObjId != null and terms.acceptObjId !=''">
+ and accept_obj_id = #{terms.acceptObjId}
+ </if>
+ <if test="terms.acceptObjName != null and terms.acceptObjName !=''">
+ and accept_obj_name = #{terms.acceptObjName}
+ </if>
+ <if test="terms.acceptObjSign != null and terms.acceptObjSign !=''">
+ and accept_obj_sign = #{terms.acceptObjSign}
+ </if>
+ <if test="terms.acceptSignTime != null and terms.acceptSignTime !=''">
+ and accept_sign_time = #{terms.acceptSignTime}
+ </if>
+ <if test="terms.endReason != null and terms.endReason !=''">
+ and end_reason = #{terms.endReason}
+ </if>
+ <if test="terms.endReasonName != null and terms.endReasonName !=''">
+ and end_reason_name = #{terms.endReasonName}
+ </if>
+ <if test="terms.endOtherReason != null and terms.endOtherReason !=''">
+ and end_other_reason = #{terms.endOtherReason}
+ </if>
+ <if test="terms.dispContent != null and terms.dispContent !=''">
+ and disp_content = #{terms.dispContent}
+ </if>
+ <if test="terms.dispUnitId != null and terms.dispUnitId !=''">
+ and disp_unit_id = #{terms.dispUnitId}
+ </if>
+ <if test="terms.dispUnitName != null and terms.dispUnitName !=''">
+ and disp_unit_name = #{terms.dispUnitName}
+ </if>
+ <if test="terms.dispDeptId != null and terms.dispDeptId !=''">
+ and disp_dept_id = #{terms.dispDeptId}
+ </if>
+ <if test="terms.dispDeptName != null and terms.dispDeptName !=''">
+ and disp_dept_name = #{terms.dispDeptName}
+ </if>
+ <if test="terms.dispUserId != null and terms.dispUserId !=''">
+ and disp_user_id = #{terms.dispUserId}
+ </if>
+ <if test="terms.dispUserName != null and terms.dispUserName !=''">
+ and disp_user_name = #{terms.dispUserName}
+ </if>
+ <if test="terms.dispTime != null and terms.dispTime !=''">
+ and disp_time = #{terms.dispTime}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and status = #{terms.status}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ <if test="terms.lastDispId != null and terms.lastDispId !=''">
+ and last_disp_id = #{terms.lastDispId}
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseDisp">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseDispTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseDisp">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseInfoMapper.xml
new file mode 100644
index 0000000..be8b21a
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseInfoMapper.xml
@@ -0,0 +1,739 @@
+<?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">
+<!--
+ * @title: 纠纷信息表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-21 08:46:39
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.bycase.dao.mapper.CaseInfoMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.bycase.domain.po.CaseInfo">
+ <result property="id" column="id"/>
+ <result property="caseTitle" column="case_title"/>
+ <result property="caseNo" column="case_no"/>
+ <result property="serieStatus" column="serie_status"/>
+ <result property="serieNo" column="serie_no"/>
+ <result property="mediateNo" column="mediate_no"/>
+ <result property="mediateBookNo" column="mediate_book_no"/>
+ <result property="mediType" column="medi_type"/>
+ <result property="mediTypeName" column="medi_type_name"/>
+ <result property="caseType" column="case_type"/>
+ <result property="caseTypeName" column="case_type_name"/>
+ <result property="inputCaseType" column="input_case_type"/>
+ <result property="source" column="source"/>
+ <result property="sourceName" column="source_name"/>
+ <result property="canal" column="canal"/>
+ <result property="canalName" column="canal_name"/>
+ <result property="peopleNum" column="people_num"/>
+ <result property="amount" column="amount"/>
+ <result property="crowd" column="crowd"/>
+ <result property="crowdName" column="crowd_name"/>
+ <result property="occurTime" column="occur_time"/>
+ <result property="prov" column="prov"/>
+ <result property="provName" column="prov_name"/>
+ <result property="city" column="city"/>
+ <result property="cityName" column="city_name"/>
+ <result property="area" column="area"/>
+ <result property="areaName" column="area_name"/>
+ <result property="road" column="road"/>
+ <result property="roadName" column="road_name"/>
+ <result property="village" column="village"/>
+ <result property="villageName" column="village_name"/>
+ <result property="addr" column="addr"/>
+ <result property="caseDes" column="case_des"/>
+ <result property="caseClaim" column="case_claim"/>
+ <result property="plaintiffs" column="plaintiffs"/>
+ <result property="pagents" column="pagents"/>
+ <result property="defendants" column="defendants"/>
+ <result property="dagents" column="dagents"/>
+ <result property="wantUnitId" column="want_unit_id"/>
+ <result property="wantUnitName" column="want_unit_name"/>
+ <result property="wantUserId" column="want_user_id"/>
+ <result property="wantUserName" column="want_user_name"/>
+ <result property="inputUnitId" column="input_unit_id"/>
+ <result property="inputUnitName" column="input_unit_name"/>
+ <result property="inputUserId" column="input_user_id"/>
+ <result property="inputUserName" column="input_user_name"/>
+ <result property="inputWay" column="input_way"/>
+ <result property="acceptTime" column="accept_time"/>
+ <result property="auditObjId" column="audit_obj_id"/>
+ <result property="auditObjName" column="audit_obj_name"/>
+ <result property="auditResult" column="audit_result"/>
+ <result property="auditResultName" column="audit_result_name"/>
+ <result property="auditTime" column="audit_time"/>
+ <result property="errorCause" column="error_cause"/>
+ <result property="errorCauseName" column="error_cause_name"/>
+ <result property="auditContent" column="audit_content"/>
+ <result property="signStatus" column="sign_status"/>
+ <result property="process" column="process"/>
+ <result property="processName" column="process_name"/>
+ <result property="mediateUnitId" column="mediate_unit_id"/>
+ <result property="mediateUnitName" column="mediate_unit_name"/>
+ <result property="mediateDeptId" column="mediate_dept_id"/>
+ <result property="mediateDeptName" column="mediate_dept_name"/>
+ <result property="mediateDeptType" column="mediate_dept_type"/>
+ <result property="mediatorId" column="mediator_id"/>
+ <result property="mediator" column="mediator"/>
+ <result property="mediatorMobile" column="mediator_mobile"/>
+ <result property="mediStartTime" column="medi_start_time"/>
+ <result property="mediEndTime" column="medi_end_time"/>
+ <result property="mediResult" column="medi_result"/>
+ <result property="mediResultName" column="medi_result_name"/>
+ <result property="agreeContent" column="agree_content"/>
+ <result property="mediContent" column="medi_content"/>
+ <result property="mediFalse" column="medi_false"/>
+ <result property="mediFalseName" column="medi_false_name"/>
+ <result property="mediFalseContent" column="medi_false_content"/>
+ <result property="civilStatus" column="civil_status"/>
+ <result property="civilNo" column="civil_no"/>
+ <result property="courtId" column="court_id"/>
+ <result property="courtName" column="court_name"/>
+ <result property="judicApply" column="judic_apply"/>
+ <result property="judicApplyName" column="judic_apply_name"/>
+ <result property="judicInfoId" column="judic_info_id"/>
+ <result property="judicResult" column="judic_result"/>
+ <result property="judicResultName" column="judic_result_name"/>
+ <result property="fileStatus" column="file_status"/>
+ <result property="fileStatusName" column="file_status_name"/>
+ <result property="fileUserId" column="file_user_id"/>
+ <result property="fileUserName" column="file_user_name"/>
+ <result property="fileTime" column="file_time"/>
+ <result property="fileYear" column="file_year"/>
+ <result property="fileBookName" column="file_book_name"/>
+ <result property="fileBookNo" column="file_book_no"/>
+ <result property="fileNo" column="file_no"/>
+ <result property="fileLimitYear" column="file_limit_year"/>
+ <result property="fileAddr" column="file_addr"/>
+ <result property="fileContent" column="file_content"/>
+ <result property="fulfilSitu" column="fulfil_situ"/>
+ <result property="fulfilSituName" column="fulfil_situ_name"/>
+ <result property="visitStatus" column="visit_status"/>
+ <result property="visitContent" column="visit_content"/>
+ <result property="partyJoy" column="party_joy"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_info</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_title,
+ case_no,
+ serie_status,
+ serie_no,
+ mediate_no,
+ mediate_book_no,
+ medi_type,
+ medi_type_name,
+ case_type,
+ case_type_name,
+ input_case_type,
+ source,
+ source_name,
+ canal,
+ canal_name,
+ people_num,
+ amount,
+ crowd,
+ crowd_name,
+ occur_time,
+ prov,
+ prov_name,
+ city,
+ city_name,
+ area,
+ area_name,
+ road,
+ road_name,
+ village,
+ village_name,
+ addr,
+ case_des,
+ case_claim,
+ plaintiffs,
+ pagents,
+ defendants,
+ dagents,
+ want_unit_id,
+ want_unit_name,
+ want_user_id,
+ want_user_name,
+ input_unit_id,
+ input_unit_name,
+ input_user_id,
+ input_user_name,
+ input_way,
+ accept_time,
+ audit_obj_id,
+ audit_obj_name,
+ audit_result,
+ audit_result_name,
+ audit_time,
+ error_cause,
+ error_cause_name,
+ audit_content,
+ sign_status,
+ process,
+ process_name,
+ mediate_unit_id,
+ mediate_unit_name,
+ mediate_dept_id,
+ mediate_dept_name,
+ mediate_dept_type,
+ mediator_id,
+ mediator,
+ mediator_mobile,
+ medi_start_time,
+ medi_end_time,
+ medi_result,
+ medi_result_name,
+ agree_content,
+ medi_content,
+ medi_false,
+ medi_false_name,
+ medi_false_content,
+ civil_status,
+ civil_no,
+ court_id,
+ court_name,
+ judic_apply,
+ judic_apply_name,
+ judic_info_id,
+ judic_result,
+ judic_result_name,
+ file_status,
+ file_status_name,
+ file_user_id,
+ file_user_name,
+ file_time,
+ file_year,
+ file_book_name,
+ file_book_no,
+ file_no,
+ file_limit_year,
+ file_addr,
+ file_content,
+ fulfil_situ,
+ fulfil_situ_name,
+ visit_status,
+ visit_content,
+ party_joy,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseTitle != null">case_title = #{entity.caseTitle},</if>
+ <if test="entity.caseNo != null">case_no = #{entity.caseNo},</if>
+ <if test="entity.serieStatus != null">serie_status = #{entity.serieStatus},</if>
+ <if test="entity.serieNo != null">serie_no = #{entity.serieNo},</if>
+ <if test="entity.mediateNo != null">mediate_no = #{entity.mediateNo},</if>
+ <if test="entity.mediateBookNo != null">mediate_book_no = #{entity.mediateBookNo},</if>
+ <if test="entity.mediType != null">medi_type = #{entity.mediType},</if>
+ <if test="entity.mediTypeName != null">medi_type_name = #{entity.mediTypeName},</if>
+ <if test="entity.caseType != null">case_type = #{entity.caseType},</if>
+ <if test="entity.caseTypeName != null">case_type_name = #{entity.caseTypeName},</if>
+ <if test="entity.inputCaseType != null">input_case_type = #{entity.inputCaseType},</if>
+ <if test="entity.source != null">source = #{entity.source},</if>
+ <if test="entity.sourceName != null">source_name = #{entity.sourceName},</if>
+ <if test="entity.canal != null">canal = #{entity.canal},</if>
+ <if test="entity.canalName != null">canal_name = #{entity.canalName},</if>
+ <if test="entity.peopleNum != null">people_num = #{entity.peopleNum},</if>
+ <if test="entity.amount != null">amount = #{entity.amount},</if>
+ <if test="entity.crowd != null">crowd = #{entity.crowd},</if>
+ <if test="entity.crowdName != null">crowd_name = #{entity.crowdName},</if>
+ <if test="entity.occurTime != null">occur_time = #{entity.occurTime},</if>
+ <if test="entity.prov != null">prov = #{entity.prov},</if>
+ <if test="entity.provName != null">prov_name = #{entity.provName},</if>
+ <if test="entity.city != null">city = #{entity.city},</if>
+ <if test="entity.cityName != null">city_name = #{entity.cityName},</if>
+ <if test="entity.area != null">area = #{entity.area},</if>
+ <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
+ <if test="entity.road != null">road = #{entity.road},</if>
+ <if test="entity.roadName != null">road_name = #{entity.roadName},</if>
+ <if test="entity.village != null">village = #{entity.village},</if>
+ <if test="entity.villageName != null">village_name = #{entity.villageName},</if>
+ <if test="entity.addr != null">addr = #{entity.addr},</if>
+ <if test="entity.caseDes != null">case_des = #{entity.caseDes},</if>
+ <if test="entity.caseClaim != null">case_claim = #{entity.caseClaim},</if>
+ <if test="entity.plaintiffs != null">plaintiffs = #{entity.plaintiffs},</if>
+ <if test="entity.pagents != null">pagents = #{entity.pagents},</if>
+ <if test="entity.defendants != null">defendants = #{entity.defendants},</if>
+ <if test="entity.dagents != null">dagents = #{entity.dagents},</if>
+ <if test="entity.wantUnitId != null">want_unit_id = #{entity.wantUnitId},</if>
+ <if test="entity.wantUnitName != null">want_unit_name = #{entity.wantUnitName},</if>
+ <if test="entity.wantUserId != null">want_user_id = #{entity.wantUserId},</if>
+ <if test="entity.wantUserName != null">want_user_name = #{entity.wantUserName},</if>
+ <if test="entity.inputUnitId != null">input_unit_id = #{entity.inputUnitId},</if>
+ <if test="entity.inputUnitName != null">input_unit_name = #{entity.inputUnitName},</if>
+ <if test="entity.inputUserId != null">input_user_id = #{entity.inputUserId},</if>
+ <if test="entity.inputUserName != null">input_user_name = #{entity.inputUserName},</if>
+ <if test="entity.inputWay != null">input_way = #{entity.inputWay},</if>
+ <if test="entity.acceptTime != null">accept_time = #{entity.acceptTime},</if>
+ <if test="entity.auditObjId != null">audit_obj_id = #{entity.auditObjId},</if>
+ <if test="entity.auditObjName != null">audit_obj_name = #{entity.auditObjName},</if>
+ <if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if>
+ <if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if>
+ <if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if>
+ <if test="entity.errorCause != null">error_cause = #{entity.errorCause},</if>
+ <if test="entity.errorCauseName != null">error_cause_name = #{entity.errorCauseName},</if>
+ <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if>
+ <if test="entity.signStatus != null">sign_status = #{entity.signStatus},</if>
+ <if test="entity.process != null">process = #{entity.process},</if>
+ <if test="entity.processName != null">process_name = #{entity.processName},</if>
+ <if test="entity.mediateUnitId != null">mediate_unit_id = #{entity.mediateUnitId},</if>
+ <if test="entity.mediateUnitName != null">mediate_unit_name = #{entity.mediateUnitName},</if>
+ <if test="entity.mediateDeptId != null">mediate_dept_id = #{entity.mediateDeptId},</if>
+ <if test="entity.mediateDeptName != null">mediate_dept_name = #{entity.mediateDeptName},</if>
+ <if test="entity.mediateDeptType != null">mediate_dept_type = #{entity.mediateDeptType},</if>
+ <if test="entity.mediatorId != null">mediator_id = #{entity.mediatorId},</if>
+ <if test="entity.mediator != null">mediator = #{entity.mediator},</if>
+ <if test="entity.mediatorMobile != null">mediator_mobile = #{entity.mediatorMobile},</if>
+ <if test="entity.mediStartTime != null">medi_start_time = #{entity.mediStartTime},</if>
+ <if test="entity.mediEndTime != null">medi_end_time = #{entity.mediEndTime},</if>
+ <if test="entity.mediResult != null">medi_result = #{entity.mediResult},</if>
+ <if test="entity.mediResultName != null">medi_result_name = #{entity.mediResultName},</if>
+ <if test="entity.agreeContent != null">agree_content = #{entity.agreeContent},</if>
+ <if test="entity.mediContent != null">medi_content = #{entity.mediContent},</if>
+ <if test="entity.mediFalse != null">medi_false = #{entity.mediFalse},</if>
+ <if test="entity.mediFalseName != null">medi_false_name = #{entity.mediFalseName},</if>
+ <if test="entity.mediFalseContent != null">medi_false_content = #{entity.mediFalseContent},</if>
+ <if test="entity.civilStatus != null">civil_status = #{entity.civilStatus},</if>
+ <if test="entity.civilNo != null">civil_no = #{entity.civilNo},</if>
+ <if test="entity.courtId != null">court_id = #{entity.courtId},</if>
+ <if test="entity.courtName != null">court_name = #{entity.courtName},</if>
+ <if test="entity.judicApply != null">judic_apply = #{entity.judicApply},</if>
+ <if test="entity.judicApplyName != null">judic_apply_name = #{entity.judicApplyName},</if>
+ <if test="entity.judicInfoId != null">judic_info_id = #{entity.judicInfoId},</if>
+ <if test="entity.judicResult != null">judic_result = #{entity.judicResult},</if>
+ <if test="entity.judicResultName != null">judic_result_name = #{entity.judicResultName},</if>
+ <if test="entity.fileStatus != null">file_status = #{entity.fileStatus},</if>
+ <if test="entity.fileStatusName != null">file_status_name = #{entity.fileStatusName},</if>
+ <if test="entity.fileUserId != null">file_user_id = #{entity.fileUserId},</if>
+ <if test="entity.fileUserName != null">file_user_name = #{entity.fileUserName},</if>
+ <if test="entity.fileTime != null">file_time = #{entity.fileTime},</if>
+ <if test="entity.fileYear != null">file_year = #{entity.fileYear},</if>
+ <if test="entity.fileBookName != null">file_book_name = #{entity.fileBookName},</if>
+ <if test="entity.fileBookNo != null">file_book_no = #{entity.fileBookNo},</if>
+ <if test="entity.fileNo != null">file_no = #{entity.fileNo},</if>
+ <if test="entity.fileLimitYear != null">file_limit_year = #{entity.fileLimitYear},</if>
+ <if test="entity.fileAddr != null">file_addr = #{entity.fileAddr},</if>
+ <if test="entity.fileContent != null">file_content = #{entity.fileContent},</if>
+ <if test="entity.fulfilSitu != null">fulfil_situ = #{entity.fulfilSitu},</if>
+ <if test="entity.fulfilSituName != null">fulfil_situ_name = #{entity.fulfilSituName},</if>
+ <if test="entity.visitStatus != null">visit_status = #{entity.visitStatus},</if>
+ <if test="entity.visitContent != null">visit_content = #{entity.visitContent},</if>
+ <if test="entity.partyJoy != null">party_joy = #{entity.partyJoy},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseTitle != null and terms.caseTitle !=''">
+ and case_title = #{terms.caseTitle}
+ </if>
+ <if test="terms.caseNo != null and terms.caseNo !=''">
+ and case_no = #{terms.caseNo}
+ </if>
+ <if test="terms.serieStatus != null and terms.serieStatus !=''">
+ and serie_status = #{terms.serieStatus}
+ </if>
+ <if test="terms.serieNo != null and terms.serieNo !=''">
+ and serie_no = #{terms.serieNo}
+ </if>
+ <if test="terms.mediateNo != null and terms.mediateNo !=''">
+ and mediate_no = #{terms.mediateNo}
+ </if>
+ <if test="terms.mediateBookNo != null and terms.mediateBookNo !=''">
+ and mediate_book_no = #{terms.mediateBookNo}
+ </if>
+ <if test="terms.mediType != null and terms.mediType !=''">
+ and medi_type = #{terms.mediType}
+ </if>
+ <if test="terms.mediTypeName != null and terms.mediTypeName !=''">
+ and medi_type_name = #{terms.mediTypeName}
+ </if>
+ <if test="terms.caseType != null and terms.caseType !=''">
+ and case_type = #{terms.caseType}
+ </if>
+ <if test="terms.caseTypeName != null and terms.caseTypeName !=''">
+ and case_type_name = #{terms.caseTypeName}
+ </if>
+ <if test="terms.inputCaseType != null and terms.inputCaseType !=''">
+ and input_case_type = #{terms.inputCaseType}
+ </if>
+ <if test="terms.source != null and terms.source !=''">
+ and source = #{terms.source}
+ </if>
+ <if test="terms.sourceName != null and terms.sourceName !=''">
+ and source_name = #{terms.sourceName}
+ </if>
+ <if test="terms.canal != null and terms.canal !=''">
+ and canal = #{terms.canal}
+ </if>
+ <if test="terms.canalName != null and terms.canalName !=''">
+ and canal_name = #{terms.canalName}
+ </if>
+ <if test="terms.peopleNum != null and terms.peopleNum !=''">
+ and people_num = #{terms.peopleNum}
+ </if>
+ <if test="terms.amount != null and terms.amount !=''">
+ and amount = #{terms.amount}
+ </if>
+ <if test="terms.crowd != null and terms.crowd !=''">
+ and crowd = #{terms.crowd}
+ </if>
+ <if test="terms.crowdName != null and terms.crowdName !=''">
+ and crowd_name = #{terms.crowdName}
+ </if>
+ <if test="terms.occurTime != null and terms.occurTime !=''">
+ and occur_time = #{terms.occurTime}
+ </if>
+ <if test="terms.prov != null and terms.prov !=''">
+ and prov = #{terms.prov}
+ </if>
+ <if test="terms.provName != null and terms.provName !=''">
+ and prov_name = #{terms.provName}
+ </if>
+ <if test="terms.city != null and terms.city !=''">
+ and city = #{terms.city}
+ </if>
+ <if test="terms.cityName != null and terms.cityName !=''">
+ and city_name = #{terms.cityName}
+ </if>
+ <if test="terms.area != null and terms.area !=''">
+ and area = #{terms.area}
+ </if>
+ <if test="terms.areaName != null and terms.areaName !=''">
+ and area_name = #{terms.areaName}
+ </if>
+ <if test="terms.road != null and terms.road !=''">
+ and road = #{terms.road}
+ </if>
+ <if test="terms.roadName != null and terms.roadName !=''">
+ and road_name = #{terms.roadName}
+ </if>
+ <if test="terms.village != null and terms.village !=''">
+ and village = #{terms.village}
+ </if>
+ <if test="terms.villageName != null and terms.villageName !=''">
+ and village_name = #{terms.villageName}
+ </if>
+ <if test="terms.addr != null and terms.addr !=''">
+ and addr = #{terms.addr}
+ </if>
+ <if test="terms.caseDes != null and terms.caseDes !=''">
+ and case_des = #{terms.caseDes}
+ </if>
+ <if test="terms.caseClaim != null and terms.caseClaim !=''">
+ and case_claim = #{terms.caseClaim}
+ </if>
+ <if test="terms.plaintiffs != null and terms.plaintiffs !=''">
+ and plaintiffs = #{terms.plaintiffs}
+ </if>
+ <if test="terms.pagents != null and terms.pagents !=''">
+ and pagents = #{terms.pagents}
+ </if>
+ <if test="terms.defendants != null and terms.defendants !=''">
+ and defendants = #{terms.defendants}
+ </if>
+ <if test="terms.dagents != null and terms.dagents !=''">
+ and dagents = #{terms.dagents}
+ </if>
+ <if test="terms.wantUnitId != null and terms.wantUnitId !=''">
+ and want_unit_id = #{terms.wantUnitId}
+ </if>
+ <if test="terms.wantUnitName != null and terms.wantUnitName !=''">
+ and want_unit_name = #{terms.wantUnitName}
+ </if>
+ <if test="terms.wantUserId != null and terms.wantUserId !=''">
+ and want_user_id = #{terms.wantUserId}
+ </if>
+ <if test="terms.wantUserName != null and terms.wantUserName !=''">
+ and want_user_name = #{terms.wantUserName}
+ </if>
+ <if test="terms.inputUnitId != null and terms.inputUnitId !=''">
+ and input_unit_id = #{terms.inputUnitId}
+ </if>
+ <if test="terms.inputUnitName != null and terms.inputUnitName !=''">
+ and input_unit_name = #{terms.inputUnitName}
+ </if>
+ <if test="terms.inputUserId != null and terms.inputUserId !=''">
+ and input_user_id = #{terms.inputUserId}
+ </if>
+ <if test="terms.inputUserName != null and terms.inputUserName !=''">
+ and input_user_name = #{terms.inputUserName}
+ </if>
+ <if test="terms.inputWay != null and terms.inputWay !=''">
+ and input_way = #{terms.inputWay}
+ </if>
+ <if test="terms.acceptTime != null and terms.acceptTime !=''">
+ and accept_time = #{terms.acceptTime}
+ </if>
+ <if test="terms.auditObjId != null and terms.auditObjId !=''">
+ and audit_obj_id = #{terms.auditObjId}
+ </if>
+ <if test="terms.auditObjName != null and terms.auditObjName !=''">
+ and audit_obj_name = #{terms.auditObjName}
+ </if>
+ <if test="terms.auditResult != null and terms.auditResult !=''">
+ and audit_result = #{terms.auditResult}
+ </if>
+ <if test="terms.auditResultName != null and terms.auditResultName !=''">
+ and audit_result_name = #{terms.auditResultName}
+ </if>
+ <if test="terms.auditTime != null and terms.auditTime !=''">
+ and audit_time = #{terms.auditTime}
+ </if>
+ <if test="terms.errorCause != null and terms.errorCause !=''">
+ and error_cause = #{terms.errorCause}
+ </if>
+ <if test="terms.errorCauseName != null and terms.errorCauseName !=''">
+ and error_cause_name = #{terms.errorCauseName}
+ </if>
+ <if test="terms.auditContent != null and terms.auditContent !=''">
+ and audit_content = #{terms.auditContent}
+ </if>
+ <if test="terms.signStatus != null and terms.signStatus !=''">
+ and sign_status = #{terms.signStatus}
+ </if>
+ <if test="terms.process != null and terms.process !=''">
+ and process = #{terms.process}
+ </if>
+ <if test="terms.processName != null and terms.processName !=''">
+ and process_name = #{terms.processName}
+ </if>
+ <if test="terms.mediateUnitId != null and terms.mediateUnitId !=''">
+ and mediate_unit_id = #{terms.mediateUnitId}
+ </if>
+ <if test="terms.mediateUnitName != null and terms.mediateUnitName !=''">
+ and mediate_unit_name = #{terms.mediateUnitName}
+ </if>
+ <if test="terms.mediateDeptId != null and terms.mediateDeptId !=''">
+ and mediate_dept_id = #{terms.mediateDeptId}
+ </if>
+ <if test="terms.mediateDeptName != null and terms.mediateDeptName !=''">
+ and mediate_dept_name = #{terms.mediateDeptName}
+ </if>
+ <if test="terms.mediateDeptType != null and terms.mediateDeptType !=''">
+ and mediate_dept_type = #{terms.mediateDeptType}
+ </if>
+ <if test="terms.mediatorId != null and terms.mediatorId !=''">
+ and mediator_id = #{terms.mediatorId}
+ </if>
+ <if test="terms.mediator != null and terms.mediator !=''">
+ and mediator = #{terms.mediator}
+ </if>
+ <if test="terms.mediatorMobile != null and terms.mediatorMobile !=''">
+ and mediator_mobile = #{terms.mediatorMobile}
+ </if>
+ <if test="terms.mediStartTime != null and terms.mediStartTime !=''">
+ and medi_start_time = #{terms.mediStartTime}
+ </if>
+ <if test="terms.mediEndTime != null and terms.mediEndTime !=''">
+ and medi_end_time = #{terms.mediEndTime}
+ </if>
+ <if test="terms.mediResult != null and terms.mediResult !=''">
+ and medi_result = #{terms.mediResult}
+ </if>
+ <if test="terms.mediResultName != null and terms.mediResultName !=''">
+ and medi_result_name = #{terms.mediResultName}
+ </if>
+ <if test="terms.agreeContent != null and terms.agreeContent !=''">
+ and agree_content = #{terms.agreeContent}
+ </if>
+ <if test="terms.mediContent != null and terms.mediContent !=''">
+ and medi_content = #{terms.mediContent}
+ </if>
+ <if test="terms.mediFalse != null and terms.mediFalse !=''">
+ and medi_false = #{terms.mediFalse}
+ </if>
+ <if test="terms.mediFalseName != null and terms.mediFalseName !=''">
+ and medi_false_name = #{terms.mediFalseName}
+ </if>
+ <if test="terms.mediFalseContent != null and terms.mediFalseContent !=''">
+ and medi_false_content = #{terms.mediFalseContent}
+ </if>
+ <if test="terms.civilStatus != null and terms.civilStatus !=''">
+ and civil_status = #{terms.civilStatus}
+ </if>
+ <if test="terms.civilNo != null and terms.civilNo !=''">
+ and civil_no = #{terms.civilNo}
+ </if>
+ <if test="terms.courtId != null and terms.courtId !=''">
+ and court_id = #{terms.courtId}
+ </if>
+ <if test="terms.courtName != null and terms.courtName !=''">
+ and court_name = #{terms.courtName}
+ </if>
+ <if test="terms.judicApply != null and terms.judicApply !=''">
+ and judic_apply = #{terms.judicApply}
+ </if>
+ <if test="terms.judicApplyName != null and terms.judicApplyName !=''">
+ and judic_apply_name = #{terms.judicApplyName}
+ </if>
+ <if test="terms.judicInfoId != null and terms.judicInfoId !=''">
+ and judic_info_id = #{terms.judicInfoId}
+ </if>
+ <if test="terms.judicResult != null and terms.judicResult !=''">
+ and judic_result = #{terms.judicResult}
+ </if>
+ <if test="terms.judicResultName != null and terms.judicResultName !=''">
+ and judic_result_name = #{terms.judicResultName}
+ </if>
+ <if test="terms.fileStatus != null and terms.fileStatus !=''">
+ and file_status = #{terms.fileStatus}
+ </if>
+ <if test="terms.fileStatusName != null and terms.fileStatusName !=''">
+ and file_status_name = #{terms.fileStatusName}
+ </if>
+ <if test="terms.fileUserId != null and terms.fileUserId !=''">
+ and file_user_id = #{terms.fileUserId}
+ </if>
+ <if test="terms.fileUserName != null and terms.fileUserName !=''">
+ and file_user_name = #{terms.fileUserName}
+ </if>
+ <if test="terms.fileTime != null and terms.fileTime !=''">
+ and file_time = #{terms.fileTime}
+ </if>
+ <if test="terms.fileYear != null and terms.fileYear !=''">
+ and file_year = #{terms.fileYear}
+ </if>
+ <if test="terms.fileBookName != null and terms.fileBookName !=''">
+ and file_book_name = #{terms.fileBookName}
+ </if>
+ <if test="terms.fileBookNo != null and terms.fileBookNo !=''">
+ and file_book_no = #{terms.fileBookNo}
+ </if>
+ <if test="terms.fileNo != null and terms.fileNo !=''">
+ and file_no = #{terms.fileNo}
+ </if>
+ <if test="terms.fileLimitYear != null and terms.fileLimitYear !=''">
+ and file_limit_year = #{terms.fileLimitYear}
+ </if>
+ <if test="terms.fileAddr != null and terms.fileAddr !=''">
+ and file_addr = #{terms.fileAddr}
+ </if>
+ <if test="terms.fileContent != null and terms.fileContent !=''">
+ and file_content = #{terms.fileContent}
+ </if>
+ <if test="terms.fulfilSitu != null and terms.fulfilSitu !=''">
+ and fulfil_situ = #{terms.fulfilSitu}
+ </if>
+ <if test="terms.fulfilSituName != null and terms.fulfilSituName !=''">
+ and fulfil_situ_name = #{terms.fulfilSituName}
+ </if>
+ <if test="terms.visitStatus != null and terms.visitStatus !=''">
+ and visit_status = #{terms.visitStatus}
+ </if>
+ <if test="terms.visitContent != null and terms.visitContent !=''">
+ and visit_content = #{terms.visitContent}
+ </if>
+ <if test="terms.partyJoy != null and terms.partyJoy !=''">
+ and party_joy = #{terms.partyJoy}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ <if test="terms.EndProcess != null and terms.EndProcess !=''">
+ and process in ('22_00006-4', '22_00006-5', '22_00006-6', '22_00006-7')
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseInfo">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseInfoTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseInfo">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CasePersonMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CasePersonMapper.xml
new file mode 100644
index 0000000..f496797
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CasePersonMapper.xml
@@ -0,0 +1,346 @@
+<?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">
+<!--
+ * @title: 纠纷当事人表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-21 08:46:40
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.bycase.dao.mapper.CasePersonMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.bycase.domain.po.CasePerson">
+ <result property="id" column="id"/>
+ <result property="caseId" column="case_id"/>
+ <result property="partyUserId" column="party_user_id"/>
+ <result property="perType" column="per_type"/>
+ <result property="perTypeName" column="per_type_name"/>
+ <result property="perClass" column="per_class"/>
+ <result property="perClassName" column="per_class_name"/>
+ <result property="trueName" column="true_name"/>
+ <result property="deputy" column="deputy"/>
+ <result property="mobile" column="mobile"/>
+ <result property="nation" column="nation"/>
+ <result property="nationName" column="nation_name"/>
+ <result property="certiType" column="certi_type"/>
+ <result property="certiTypeName" column="certi_type_name"/>
+ <result property="certiNo" column="certi_no"/>
+ <result property="birthday" column="birthday"/>
+ <result property="orgaCode" column="orga_code"/>
+ <result property="sex" column="sex"/>
+ <result property="sexName" column="sex_name"/>
+ <result property="job" column="job"/>
+ <result property="jobName" column="job_name"/>
+ <result property="prov" column="prov"/>
+ <result property="provName" column="prov_name"/>
+ <result property="city" column="city"/>
+ <result property="cityName" column="city_name"/>
+ <result property="area" column="area"/>
+ <result property="areaName" column="area_name"/>
+ <result property="road" column="road"/>
+ <result property="roadName" column="road_name"/>
+ <result property="village" column="village"/>
+ <result property="villageName" column="village_name"/>
+ <result property="addr" column="addr"/>
+ <result property="age" column="age"/>
+ <result property="wechat" column="wechat"/>
+ <result property="qq" column="qq"/>
+ <result property="agentStatus" column="agent_status"/>
+ <result property="mail" column="mail"/>
+ <result property="custId" column="cust_id"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_person</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_id,
+ party_user_id,
+ per_type,
+ per_type_name,
+ per_class,
+ per_class_name,
+ true_name,
+ deputy,
+ mobile,
+ nation,
+ nation_name,
+ certi_type,
+ certi_type_name,
+ certi_no,
+ birthday,
+ orga_code,
+ sex,
+ sex_name,
+ job,
+ job_name,
+ prov,
+ prov_name,
+ city,
+ city_name,
+ area,
+ area_name,
+ road,
+ road_name,
+ village,
+ village_name,
+ addr,
+ age,
+ wechat,
+ qq,
+ agent_status,
+ mail,
+ cust_id,
+ delete_status,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
+ <if test="entity.partyUserId != null">party_user_id = #{entity.partyUserId},</if>
+ <if test="entity.perType != null">per_type = #{entity.perType},</if>
+ <if test="entity.perTypeName != null">per_type_name = #{entity.perTypeName},</if>
+ <if test="entity.perClass != null">per_class = #{entity.perClass},</if>
+ <if test="entity.perClassName != null">per_class_name = #{entity.perClassName},</if>
+ <if test="entity.trueName != null">true_name = #{entity.trueName},</if>
+ <if test="entity.deputy != null">deputy = #{entity.deputy},</if>
+ <if test="entity.mobile != null">mobile = #{entity.mobile},</if>
+ <if test="entity.nation != null">nation = #{entity.nation},</if>
+ <if test="entity.nationName != null">nation_name = #{entity.nationName},</if>
+ <if test="entity.certiType != null">certi_type = #{entity.certiType},</if>
+ <if test="entity.certiTypeName != null">certi_type_name = #{entity.certiTypeName},</if>
+ <if test="entity.certiNo != null">certi_no = #{entity.certiNo},</if>
+ <if test="entity.birthday != null">birthday = #{entity.birthday},</if>
+ <if test="entity.orgaCode != null">orga_code = #{entity.orgaCode},</if>
+ <if test="entity.sex != null">sex = #{entity.sex},</if>
+ <if test="entity.sexName != null">sex_name = #{entity.sexName},</if>
+ <if test="entity.job != null">job = #{entity.job},</if>
+ <if test="entity.jobName != null">job_name = #{entity.jobName},</if>
+ <if test="entity.prov != null">prov = #{entity.prov},</if>
+ <if test="entity.provName != null">prov_name = #{entity.provName},</if>
+ <if test="entity.city != null">city = #{entity.city},</if>
+ <if test="entity.cityName != null">city_name = #{entity.cityName},</if>
+ <if test="entity.area != null">area = #{entity.area},</if>
+ <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
+ <if test="entity.road != null">road = #{entity.road},</if>
+ <if test="entity.roadName != null">road_name = #{entity.roadName},</if>
+ <if test="entity.village != null">village = #{entity.village},</if>
+ <if test="entity.villageName != null">village_name = #{entity.villageName},</if>
+ <if test="entity.addr != null">addr = #{entity.addr},</if>
+ <if test="entity.age != null">age = #{entity.age},</if>
+ <if test="entity.wechat != null">wechat = #{entity.wechat},</if>
+ <if test="entity.qq != null">qq = #{entity.qq},</if>
+ <if test="entity.agentStatus != null">agent_status = #{entity.agentStatus},</if>
+ <if test="entity.mail != null">mail = #{entity.mail},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseId != null and terms.caseId !=''">
+ and case_id = #{terms.caseId}
+ </if>
+ <if test="terms.partyUserId != null and terms.partyUserId !=''">
+ and party_user_id = #{terms.partyUserId}
+ </if>
+ <if test="terms.perType != null and terms.perType !=''">
+ and per_type = #{terms.perType}
+ </if>
+ <if test="terms.perTypeName != null and terms.perTypeName !=''">
+ and per_type_name = #{terms.perTypeName}
+ </if>
+ <if test="terms.perClass != null and terms.perClass !=''">
+ and per_class = #{terms.perClass}
+ </if>
+ <if test="terms.perClassName != null and terms.perClassName !=''">
+ and per_class_name = #{terms.perClassName}
+ </if>
+ <if test="terms.trueName != null and terms.trueName !=''">
+ and true_name = #{terms.trueName}
+ </if>
+ <if test="terms.deputy != null and terms.deputy !=''">
+ and deputy = #{terms.deputy}
+ </if>
+ <if test="terms.mobile != null and terms.mobile !=''">
+ and mobile = #{terms.mobile}
+ </if>
+ <if test="terms.nation != null and terms.nation !=''">
+ and nation = #{terms.nation}
+ </if>
+ <if test="terms.nationName != null and terms.nationName !=''">
+ and nation_name = #{terms.nationName}
+ </if>
+ <if test="terms.certiType != null and terms.certiType !=''">
+ and certi_type = #{terms.certiType}
+ </if>
+ <if test="terms.certiTypeName != null and terms.certiTypeName !=''">
+ and certi_type_name = #{terms.certiTypeName}
+ </if>
+ <if test="terms.certiNo != null and terms.certiNo !=''">
+ and certi_no = #{terms.certiNo}
+ </if>
+ <if test="terms.birthday != null and terms.birthday !=''">
+ and birthday = #{terms.birthday}
+ </if>
+ <if test="terms.orgaCode != null and terms.orgaCode !=''">
+ and orga_code = #{terms.orgaCode}
+ </if>
+ <if test="terms.sex != null and terms.sex !=''">
+ and sex = #{terms.sex}
+ </if>
+ <if test="terms.sexName != null and terms.sexName !=''">
+ and sex_name = #{terms.sexName}
+ </if>
+ <if test="terms.job != null and terms.job !=''">
+ and job = #{terms.job}
+ </if>
+ <if test="terms.jobName != null and terms.jobName !=''">
+ and job_name = #{terms.jobName}
+ </if>
+ <if test="terms.prov != null and terms.prov !=''">
+ and prov = #{terms.prov}
+ </if>
+ <if test="terms.provName != null and terms.provName !=''">
+ and prov_name = #{terms.provName}
+ </if>
+ <if test="terms.city != null and terms.city !=''">
+ and city = #{terms.city}
+ </if>
+ <if test="terms.cityName != null and terms.cityName !=''">
+ and city_name = #{terms.cityName}
+ </if>
+ <if test="terms.area != null and terms.area !=''">
+ and area = #{terms.area}
+ </if>
+ <if test="terms.areaName != null and terms.areaName !=''">
+ and area_name = #{terms.areaName}
+ </if>
+ <if test="terms.road != null and terms.road !=''">
+ and road = #{terms.road}
+ </if>
+ <if test="terms.roadName != null and terms.roadName !=''">
+ and road_name = #{terms.roadName}
+ </if>
+ <if test="terms.village != null and terms.village !=''">
+ and village = #{terms.village}
+ </if>
+ <if test="terms.villageName != null and terms.villageName !=''">
+ and village_name = #{terms.villageName}
+ </if>
+ <if test="terms.addr != null and terms.addr !=''">
+ and addr = #{terms.addr}
+ </if>
+ <if test="terms.age != null and terms.age !=''">
+ and age = #{terms.age}
+ </if>
+ <if test="terms.wechat != null and terms.wechat !=''">
+ and wechat = #{terms.wechat}
+ </if>
+ <if test="terms.qq != null and terms.qq !=''">
+ and qq = #{terms.qq}
+ </if>
+ <if test="terms.agentStatus != null and terms.agentStatus !=''">
+ and agent_status = #{terms.agentStatus}
+ </if>
+ <if test="terms.mail != null and terms.mail !=''">
+ and mail = #{terms.mail}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCasePerson">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCasePersonTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCasePerson">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseSignMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseSignMapper.xml
new file mode 100644
index 0000000..2d1a850
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseSignMapper.xml
@@ -0,0 +1,250 @@
+<?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">
+<!--
+ * @title: 纠纷签收任务表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-21 08:46:40
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.bycase.dao.mapper.CaseSignMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.bycase.domain.po.CaseSign">
+ <result property="id" column="id"/>
+ <result property="caseId" column="case_id"/>
+ <result property="serieStatus" column="serie_status"/>
+ <result property="dispId" column="disp_id"/>
+ <result property="dispObjType" column="disp_obj_type"/>
+ <result property="dispObjId" column="disp_obj_id"/>
+ <result property="dispObjName" column="disp_obj_name"/>
+ <result property="expireTime" column="expire_time"/>
+ <result property="handlerUnitId" column="handler_unit_id"/>
+ <result property="handlerUnitName" column="handler_unit_name"/>
+ <result property="handlerDeptId" column="handler_dept_id"/>
+ <result property="handlerDeptName" column="handler_dept_name"/>
+ <result property="handlerUserId" column="handler_user_id"/>
+ <result property="handlerUserName" column="handler_user_name"/>
+ <result property="handleResult" column="handle_result"/>
+ <result property="handleResultName" column="handle_result_name"/>
+ <result property="notsignReason" column="notsign_reason"/>
+ <result property="notsignReasonName" column="notsign_reason_name"/>
+ <result property="handleContent" column="handle_content"/>
+ <result property="status" column="status"/>
+ <result property="signTime" column="sign_time"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_sign</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_id,
+ serie_status,
+ disp_id,
+ disp_obj_type,
+ disp_obj_id,
+ disp_obj_name,
+ expire_time,
+ handler_unit_id,
+ handler_unit_name,
+ handler_dept_id,
+ handler_dept_name,
+ handler_user_id,
+ handler_user_name,
+ handle_result,
+ handle_result_name,
+ notsign_reason,
+ notsign_reason_name,
+ handle_content,
+ status,
+ sign_time,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
+ <if test="entity.serieStatus != null">serie_status = #{entity.serieStatus},</if>
+ <if test="entity.dispId != null">disp_id = #{entity.dispId},</if>
+ <if test="entity.dispObjType != null">disp_obj_type = #{entity.dispObjType},</if>
+ <if test="entity.dispObjId != null">disp_obj_id = #{entity.dispObjId},</if>
+ <if test="entity.dispObjName != null">disp_obj_name = #{entity.dispObjName},</if>
+ <if test="entity.expireTime != null">expire_time = #{entity.expireTime},</if>
+ <if test="entity.handlerUnitId != null">handler_unit_id = #{entity.handlerUnitId},</if>
+ <if test="entity.handlerUnitName != null">handler_unit_name = #{entity.handlerUnitName},</if>
+ <if test="entity.handlerDeptId != null">handler_dept_id = #{entity.handlerDeptId},</if>
+ <if test="entity.handlerDeptName != null">handler_dept_name = #{entity.handlerDeptName},</if>
+ <if test="entity.handlerUserId != null">handler_user_id = #{entity.handlerUserId},</if>
+ <if test="entity.handlerUserName != null">handler_user_name = #{entity.handlerUserName},</if>
+ <if test="entity.handleResult != null">handle_result = #{entity.handleResult},</if>
+ <if test="entity.handleResultName != null">handle_result_name = #{entity.handleResultName},</if>
+ <if test="entity.notsignReason != null">notsign_reason = #{entity.notsignReason},</if>
+ <if test="entity.notsignReasonName != null">notsign_reason_name = #{entity.notsignReasonName},</if>
+ <if test="entity.handleContent != null">handle_content = #{entity.handleContent},</if>
+ <if test="entity.status != null">status = #{entity.status},</if>
+ <if test="entity.signTime != null">sign_time = #{entity.signTime},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseId != null and terms.caseId !=''">
+ and case_id = #{terms.caseId}
+ </if>
+ <if test="terms.serieStatus != null and terms.serieStatus !=''">
+ and serie_status = #{terms.serieStatus}
+ </if>
+ <if test="terms.dispId != null and terms.dispId !=''">
+ and disp_id = #{terms.dispId}
+ </if>
+ <if test="terms.dispObjType != null and terms.dispObjType !=''">
+ and disp_obj_type = #{terms.dispObjType}
+ </if>
+ <if test="terms.dispObjId != null and terms.dispObjId !=''">
+ and disp_obj_id = #{terms.dispObjId}
+ </if>
+ <if test="terms.dispObjName != null and terms.dispObjName !=''">
+ and disp_obj_name = #{terms.dispObjName}
+ </if>
+ <if test="terms.expireTime != null and terms.expireTime !=''">
+ and expire_time = #{terms.expireTime}
+ </if>
+ <if test="terms.handlerUnitId != null and terms.handlerUnitId !=''">
+ and handler_unit_id = #{terms.handlerUnitId}
+ </if>
+ <if test="terms.handlerUnitName != null and terms.handlerUnitName !=''">
+ and handler_unit_name = #{terms.handlerUnitName}
+ </if>
+ <if test="terms.handlerDeptId != null and terms.handlerDeptId !=''">
+ and handler_dept_id = #{terms.handlerDeptId}
+ </if>
+ <if test="terms.handlerDeptName != null and terms.handlerDeptName !=''">
+ and handler_dept_name = #{terms.handlerDeptName}
+ </if>
+ <if test="terms.handlerUserId != null and terms.handlerUserId !=''">
+ and handler_user_id = #{terms.handlerUserId}
+ </if>
+ <if test="terms.handlerUserName != null and terms.handlerUserName !=''">
+ and handler_user_name = #{terms.handlerUserName}
+ </if>
+ <if test="terms.handleResult != null and terms.handleResult !=''">
+ and handle_result = #{terms.handleResult}
+ </if>
+ <if test="terms.handleResultName != null and terms.handleResultName !=''">
+ and handle_result_name = #{terms.handleResultName}
+ </if>
+ <if test="terms.notsignReason != null and terms.notsignReason !=''">
+ and notsign_reason = #{terms.notsignReason}
+ </if>
+ <if test="terms.notsignReasonName != null and terms.notsignReasonName !=''">
+ and notsign_reason_name = #{terms.notsignReasonName}
+ </if>
+ <if test="terms.handleContent != null and terms.handleContent !=''">
+ and handle_content = #{terms.handleContent}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and status = #{terms.status}
+ </if>
+ <if test="terms.signTime != null and terms.signTime !=''">
+ and sign_time = #{terms.signTime}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseSign">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseSignTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseSign">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseTaskMapper.xml
new file mode 100644
index 0000000..8529dc6
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/dao/mapper/xml/CaseTaskMapper.xml
@@ -0,0 +1,454 @@
+<?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">
+<!--
+ * @title: 纠纷任务表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-21 08:46:40
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.bycase.dao.mapper.CaseTaskMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.bycase.domain.po.CaseTask">
+ <result property="id" column="id"/>
+ <result property="caseId" column="case_id"/>
+ <result property="serieStatus" column="serie_status"/>
+ <result property="flowId" column="flow_id"/>
+ <result property="processInstanceId" column="process_instance_id"/>
+ <result property="processTaskId" column="process_task_id"/>
+ <result property="taskNode" column="task_node"/>
+ <result property="taskNodeName" column="task_node_name"/>
+ <result property="taskNodeType" column="task_node_type"/>
+ <result property="taskType" column="task_type"/>
+ <result property="handlerUnitId" column="handler_unit_id"/>
+ <result property="handlerUnitName" column="handler_unit_name"/>
+ <result property="handlerDeptId" column="handler_dept_id"/>
+ <result property="handlerDeptName" column="handler_dept_name"/>
+ <result property="handlerRoleCode" column="handler_role_code"/>
+ <result property="handlerRoleName" column="handler_role_name"/>
+ <result property="handlerUserId" column="handler_user_id"/>
+ <result property="handlerUserName" column="handler_user_name"/>
+ <result property="expireTime" column="expire_time"/>
+ <result property="status" column="status"/>
+ <result property="handleResult" column="handle_result"/>
+ <result property="errorCause" column="error_cause"/>
+ <result property="errorCauseName" column="error_cause_name"/>
+ <result property="handleContent" column="handle_content"/>
+ <result property="finishTime" column="finish_time"/>
+ <result property="mediResult" column="medi_result"/>
+ <result property="mediResultName" column="medi_result_name"/>
+ <result property="fulfilSitu" column="fulfil_situ"/>
+ <result property="fulfilSituName" column="fulfil_situ_name"/>
+ <result property="agreeContent" column="agree_content"/>
+ <result property="mediFalse" column="medi_false"/>
+ <result property="mediFalseName" column="medi_false_name"/>
+ <result property="civilStatus" column="civil_status"/>
+ <result property="civilNo" column="civil_no"/>
+ <result property="courtId" column="court_id"/>
+ <result property="courtName" column="court_name"/>
+ <result property="mediateNo" column="mediate_no"/>
+ <result property="mediateBookNo" column="mediate_book_no"/>
+ <result property="fileYear" column="file_year"/>
+ <result property="fileBookName" column="file_book_name"/>
+ <result property="fileBookNo" column="file_book_no"/>
+ <result property="fileNo" column="file_no"/>
+ <result property="fileLimitYear" column="file_limit_year"/>
+ <result property="fileAddr" column="file_addr"/>
+ <result property="fileContent" column="file_content"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="nextUserId" column="next_user_id"/>
+ <result property="nextUserName" column="next_user_name"/>
+ <result property="lastTaskId" column="last_task_id"/>
+ <result property="lastUnitId" column="last_unit_id"/>
+ <result property="lastUnitName" column="last_unit_name"/>
+ <result property="lastDeptId" column="last_dept_id"/>
+ <result property="lastDeptName" column="last_dept_name"/>
+ <result property="lastUserId" column="last_user_id"/>
+ <result property="lastUserName" column="last_user_name"/>
+ <result property="lastContent" column="last_content"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_task</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_id,
+ serie_status,
+ flow_id,
+ process_instance_id,
+ process_task_id,
+ task_node,
+ task_node_name,
+ task_node_type,
+ task_type,
+ handler_unit_id,
+ handler_unit_name,
+ handler_dept_id,
+ handler_dept_name,
+ handler_role_code,
+ handler_role_name,
+ handler_user_id,
+ handler_user_name,
+ expire_time,
+ status,
+ handle_result,
+ error_cause,
+ error_cause_name,
+ handle_content,
+ finish_time,
+ medi_result,
+ medi_result_name,
+ fulfil_situ,
+ fulfil_situ_name,
+ agree_content,
+ medi_false,
+ medi_false_name,
+ civil_status,
+ civil_no,
+ court_id,
+ court_name,
+ mediate_no,
+ mediate_book_no,
+ file_year,
+ file_book_name,
+ file_book_no,
+ file_no,
+ file_limit_year,
+ file_addr,
+ file_content,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time,
+ next_user_id,
+ next_user_name,
+ last_task_id,
+ last_unit_id,
+ last_unit_name,
+ last_dept_id,
+ last_dept_name,
+ last_user_id,
+ last_user_name,
+ last_content
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
+ <if test="entity.serieStatus != null">serie_status = #{entity.serieStatus},</if>
+ <if test="entity.flowId != null">flow_id = #{entity.flowId},</if>
+ <if test="entity.processInstanceId != null">process_instance_id = #{entity.processInstanceId},</if>
+ <if test="entity.processTaskId != null">process_task_id = #{entity.processTaskId},</if>
+ <if test="entity.taskNode != null">task_node = #{entity.taskNode},</if>
+ <if test="entity.taskNodeName != null">task_node_name = #{entity.taskNodeName},</if>
+ <if test="entity.taskNodeType != null">task_node_type = #{entity.taskNodeType},</if>
+ <if test="entity.taskType != null">task_type = #{entity.taskType},</if>
+ <if test="entity.handlerUnitId != null">handler_unit_id = #{entity.handlerUnitId},</if>
+ <if test="entity.handlerUnitName != null">handler_unit_name = #{entity.handlerUnitName},</if>
+ <if test="entity.handlerDeptId != null">handler_dept_id = #{entity.handlerDeptId},</if>
+ <if test="entity.handlerDeptName != null">handler_dept_name = #{entity.handlerDeptName},</if>
+ <if test="entity.handlerRoleCode != null">handler_role_code = #{entity.handlerRoleCode},</if>
+ <if test="entity.handlerRoleName != null">handler_role_name = #{entity.handlerRoleName},</if>
+ <if test="entity.handlerUserId != null">handler_user_id = #{entity.handlerUserId},</if>
+ <if test="entity.handlerUserName != null">handler_user_name = #{entity.handlerUserName},</if>
+ <if test="entity.expireTime != null">expire_time = #{entity.expireTime},</if>
+ <if test="entity.status != null">status = #{entity.status},</if>
+ <if test="entity.handleResult != null">handle_result = #{entity.handleResult},</if>
+ <if test="entity.errorCause != null">error_cause = #{entity.errorCause},</if>
+ <if test="entity.errorCauseName != null">error_cause_name = #{entity.errorCauseName},</if>
+ <if test="entity.handleContent != null">handle_content = #{entity.handleContent},</if>
+ <if test="entity.finishTime != null">finish_time = #{entity.finishTime},</if>
+ <if test="entity.mediResult != null">medi_result = #{entity.mediResult},</if>
+ <if test="entity.mediResultName != null">medi_result_name = #{entity.mediResultName},</if>
+ <if test="entity.fulfilSitu != null">fulfil_situ = #{entity.fulfilSitu},</if>
+ <if test="entity.fulfilSituName != null">fulfil_situ_name = #{entity.fulfilSituName},</if>
+ <if test="entity.agreeContent != null">agree_content = #{entity.agreeContent},</if>
+ <if test="entity.mediFalse != null">medi_false = #{entity.mediFalse},</if>
+ <if test="entity.mediFalseName != null">medi_false_name = #{entity.mediFalseName},</if>
+ <if test="entity.civilStatus != null">civil_status = #{entity.civilStatus},</if>
+ <if test="entity.civilNo != null">civil_no = #{entity.civilNo},</if>
+ <if test="entity.courtId != null">court_id = #{entity.courtId},</if>
+ <if test="entity.courtName != null">court_name = #{entity.courtName},</if>
+ <if test="entity.mediateNo != null">mediate_no = #{entity.mediateNo},</if>
+ <if test="entity.mediateBookNo != null">mediate_book_no = #{entity.mediateBookNo},</if>
+ <if test="entity.fileYear != null">file_year = #{entity.fileYear},</if>
+ <if test="entity.fileBookName != null">file_book_name = #{entity.fileBookName},</if>
+ <if test="entity.fileBookNo != null">file_book_no = #{entity.fileBookNo},</if>
+ <if test="entity.fileNo != null">file_no = #{entity.fileNo},</if>
+ <if test="entity.fileLimitYear != null">file_limit_year = #{entity.fileLimitYear},</if>
+ <if test="entity.fileAddr != null">file_addr = #{entity.fileAddr},</if>
+ <if test="entity.fileContent != null">file_content = #{entity.fileContent},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
+ <if test="entity.nextUserId != null">next_user_id = #{entity.nextUserId},</if>
+ <if test="entity.nextUserName != null">next_user_name = #{entity.nextUserName},</if>
+ <if test="entity.lastTaskId != null">last_task_id = #{entity.lastTaskId},</if>
+ <if test="entity.lastUnitId != null">last_unit_id = #{entity.lastUnitId},</if>
+ <if test="entity.lastUnitName != null">last_unit_name = #{entity.lastUnitName},</if>
+ <if test="entity.lastDeptId != null">last_dept_id = #{entity.lastDeptId},</if>
+ <if test="entity.lastDeptName != null">last_dept_name = #{entity.lastDeptName},</if>
+ <if test="entity.lastUserId != null">last_user_id = #{entity.lastUserId},</if>
+ <if test="entity.lastUserName != null">last_user_name = #{entity.lastUserName},</if>
+ <if test="entity.lastContent != null">last_content = #{entity.lastContent}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseId != null and terms.caseId !=''">
+ and case_id = #{terms.caseId}
+ </if>
+ <if test="terms.serieStatus != null and terms.serieStatus !=''">
+ and serie_status = #{terms.serieStatus}
+ </if>
+ <if test="terms.flowId != null and terms.flowId !=''">
+ and flow_id = #{terms.flowId}
+ </if>
+ <if test="terms.processInstanceId != null and terms.processInstanceId !=''">
+ and process_instance_id = #{terms.processInstanceId}
+ </if>
+ <if test="terms.processTaskId != null and terms.processTaskId !=''">
+ and process_task_id = #{terms.processTaskId}
+ </if>
+ <if test="terms.taskNode != null and terms.taskNode !=''">
+ and task_node = #{terms.taskNode}
+ </if>
+ <if test="terms.taskNodeName != null and terms.taskNodeName !=''">
+ and task_node_name = #{terms.taskNodeName}
+ </if>
+ <if test="terms.taskNodeType != null and terms.taskNodeType !=''">
+ and task_node_type = #{terms.taskNodeType}
+ </if>
+ <if test="terms.taskType != null and terms.taskType !=''">
+ and task_type = #{terms.taskType}
+ </if>
+ <if test="terms.handlerUnitId != null and terms.handlerUnitId !=''">
+ and handler_unit_id = #{terms.handlerUnitId}
+ </if>
+ <if test="terms.handlerUnitName != null and terms.handlerUnitName !=''">
+ and handler_unit_name = #{terms.handlerUnitName}
+ </if>
+ <if test="terms.handlerDeptId != null and terms.handlerDeptId !=''">
+ and handler_dept_id = #{terms.handlerDeptId}
+ </if>
+ <if test="terms.handlerDeptName != null and terms.handlerDeptName !=''">
+ and handler_dept_name = #{terms.handlerDeptName}
+ </if>
+ <if test="terms.handlerRoleCode != null and terms.handlerRoleCode !=''">
+ and handler_role_code = #{terms.handlerRoleCode}
+ </if>
+ <if test="terms.handlerRoleName != null and terms.handlerRoleName !=''">
+ and handler_role_name = #{terms.handlerRoleName}
+ </if>
+ <if test="terms.handlerUserId != null and terms.handlerUserId !=''">
+ and handler_user_id = #{terms.handlerUserId}
+ </if>
+ <if test="terms.handlerUserName != null and terms.handlerUserName !=''">
+ and handler_user_name = #{terms.handlerUserName}
+ </if>
+ <if test="terms.expireTime != null and terms.expireTime !=''">
+ and expire_time = #{terms.expireTime}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and status = #{terms.status}
+ </if>
+ <if test="terms.handleResult != null and terms.handleResult !=''">
+ and handle_result = #{terms.handleResult}
+ </if>
+ <if test="terms.errorCause != null and terms.errorCause !=''">
+ and error_cause = #{terms.errorCause}
+ </if>
+ <if test="terms.errorCauseName != null and terms.errorCauseName !=''">
+ and error_cause_name = #{terms.errorCauseName}
+ </if>
+ <if test="terms.handleContent != null and terms.handleContent !=''">
+ and handle_content = #{terms.handleContent}
+ </if>
+ <if test="terms.finishTime != null and terms.finishTime !=''">
+ and finish_time = #{terms.finishTime}
+ </if>
+ <if test="terms.mediResult != null and terms.mediResult !=''">
+ and medi_result = #{terms.mediResult}
+ </if>
+ <if test="terms.mediResultName != null and terms.mediResultName !=''">
+ and medi_result_name = #{terms.mediResultName}
+ </if>
+ <if test="terms.fulfilSitu != null and terms.fulfilSitu !=''">
+ and fulfil_situ = #{terms.fulfilSitu}
+ </if>
+ <if test="terms.fulfilSituName != null and terms.fulfilSituName !=''">
+ and fulfil_situ_name = #{terms.fulfilSituName}
+ </if>
+ <if test="terms.agreeContent != null and terms.agreeContent !=''">
+ and agree_content = #{terms.agreeContent}
+ </if>
+ <if test="terms.mediFalse != null and terms.mediFalse !=''">
+ and medi_false = #{terms.mediFalse}
+ </if>
+ <if test="terms.mediFalseName != null and terms.mediFalseName !=''">
+ and medi_false_name = #{terms.mediFalseName}
+ </if>
+ <if test="terms.civilStatus != null and terms.civilStatus !=''">
+ and civil_status = #{terms.civilStatus}
+ </if>
+ <if test="terms.civilNo != null and terms.civilNo !=''">
+ and civil_no = #{terms.civilNo}
+ </if>
+ <if test="terms.courtId != null and terms.courtId !=''">
+ and court_id = #{terms.courtId}
+ </if>
+ <if test="terms.courtName != null and terms.courtName !=''">
+ and court_name = #{terms.courtName}
+ </if>
+ <if test="terms.mediateNo != null and terms.mediateNo !=''">
+ and mediate_no = #{terms.mediateNo}
+ </if>
+ <if test="terms.mediateBookNo != null and terms.mediateBookNo !=''">
+ and mediate_book_no = #{terms.mediateBookNo}
+ </if>
+ <if test="terms.fileYear != null and terms.fileYear !=''">
+ and file_year = #{terms.fileYear}
+ </if>
+ <if test="terms.fileBookName != null and terms.fileBookName !=''">
+ and file_book_name = #{terms.fileBookName}
+ </if>
+ <if test="terms.fileBookNo != null and terms.fileBookNo !=''">
+ and file_book_no = #{terms.fileBookNo}
+ </if>
+ <if test="terms.fileNo != null and terms.fileNo !=''">
+ and file_no = #{terms.fileNo}
+ </if>
+ <if test="terms.fileLimitYear != null and terms.fileLimitYear !=''">
+ and file_limit_year = #{terms.fileLimitYear}
+ </if>
+ <if test="terms.fileAddr != null and terms.fileAddr !=''">
+ and file_addr = #{terms.fileAddr}
+ </if>
+ <if test="terms.fileContent != null and terms.fileContent !=''">
+ and file_content = #{terms.fileContent}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ <if test="terms.nextUserId != null and terms.nextUserId !=''">
+ and next_user_id = #{terms.nextUserId}
+ </if>
+ <if test="terms.nextUserName != null and terms.nextUserName !=''">
+ and next_user_name = #{terms.nextUserName}
+ </if>
+ <if test="terms.lastTaskId != null and terms.lastTaskId !=''">
+ and last_task_id = #{terms.lastTaskId}
+ </if>
+ <if test="terms.lastUnitId != null and terms.lastUnitId !=''">
+ and last_unit_id = #{terms.lastUnitId}
+ </if>
+ <if test="terms.lastUnitName != null and terms.lastUnitName !=''">
+ and last_unit_name = #{terms.lastUnitName}
+ </if>
+ <if test="terms.lastDeptId != null and terms.lastDeptId !=''">
+ and last_dept_id = #{terms.lastDeptId}
+ </if>
+ <if test="terms.lastDeptName != null and terms.lastDeptName !=''">
+ and last_dept_name = #{terms.lastDeptName}
+ </if>
+ <if test="terms.lastUserId != null and terms.lastUserId !=''">
+ and last_user_id = #{terms.lastUserId}
+ </if>
+ <if test="terms.lastUserName != null and terms.lastUserName !=''">
+ and last_user_name = #{terms.lastUserName}
+ </if>
+ <if test="terms.lastContent != null and terms.lastContent !=''">
+ and last_content = #{terms.lastContent}
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseTask">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseTaskTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseTask">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseAgentBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseAgentBO.java
new file mode 100644
index 0000000..9684dc7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseAgentBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.bycase.domain.bo;
+
+import cn.huge.module.bycase.domain.po.CaseAgent;
+
+/**
+ * @title: 纠纷代理人表业务扩展类
+ * @description: 纠纷代理人表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version: 1.0.0
+ * @see CaseAgent
+ */
+public class CaseAgentBO extends CaseAgent {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseDispBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseDispBO.java
new file mode 100644
index 0000000..481373d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseDispBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.bycase.domain.bo;
+
+import cn.huge.module.bycase.domain.po.CaseDisp;
+
+/**
+ * @title: 纠纷调度单表业务扩展类
+ * @description: 纠纷调度单表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version: 1.0.0
+ * @see CaseDisp
+ */
+public class CaseDispBO extends CaseDisp {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseInfoBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseInfoBO.java
new file mode 100644
index 0000000..9c944c9
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseInfoBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.bycase.domain.bo;
+
+import cn.huge.module.bycase.domain.po.CaseInfo;
+
+/**
+ * @title: 纠纷信息表业务扩展类
+ * @description: 纠纷信息表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:39
+ * @version: 1.0.0
+ * @see CaseInfo
+ */
+public class CaseInfoBO extends CaseInfo {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CasePersonBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CasePersonBO.java
new file mode 100644
index 0000000..7086447
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CasePersonBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.bycase.domain.bo;
+
+import cn.huge.module.bycase.domain.po.CasePerson;
+
+/**
+ * @title: 纠纷当事人表业务扩展类
+ * @description: 纠纷当事人表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version: 1.0.0
+ * @see CasePerson
+ */
+public class CasePersonBO extends CasePerson {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseSignBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseSignBO.java
new file mode 100644
index 0000000..35b4ad6
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseSignBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.bycase.domain.bo;
+
+import cn.huge.module.bycase.domain.po.CaseSign;
+
+/**
+ * @title: 纠纷签收任务表业务扩展类
+ * @description: 纠纷签收任务表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version: 1.0.0
+ * @see CaseSign
+ */
+public class CaseSignBO extends CaseSign {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseTaskBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseTaskBO.java
new file mode 100644
index 0000000..7815579
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/bo/CaseTaskBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.bycase.domain.bo;
+
+import cn.huge.module.bycase.domain.po.CaseTask;
+
+/**
+ * @title: 纠纷任务表业务扩展类
+ * @description: 纠纷任务表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version: 1.0.0
+ * @see CaseTask
+ */
+public class CaseTaskBO extends CaseTask {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseAgentDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseAgentDTO.java
new file mode 100644
index 0000000..c34f5d7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseAgentDTO.java
@@ -0,0 +1,299 @@
+package cn.huge.module.bycase.domain.dto;
+
+import cn.huge.module.sys.dto.FileTypeInfoBaseDTO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @title: 纠纷代理人信息表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:48:17
+ * @version 1.0.0
+ */
+@Data
+public class GZCaseAgentDTO {
+
+ /**
+ * 主键编号
+ */
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ private String caseId;
+
+ /**
+ * 公众用户编号
+ */
+ private String partyUserId;
+
+ /**
+ * 当事人地位
+ */
+ private String perType;
+
+ /**
+ * 当事人地位名称
+ */
+ private String perTypeName;
+
+ /**
+ * 代理人类型
+ */
+ private String perClass;
+
+ /**
+ * 代理人类型名称
+ */
+ private String perClassName;
+
+ /**
+ * 姓名
+ */
+ private String trueName;
+
+ /**
+ * 联系方式
+ */
+ private String mobile;
+
+ /**
+ * 证件类型
+ */
+ private String certiType;
+
+ /**
+ * 证件类型名称
+ */
+ private String certiTypeName;
+
+ /**
+ * 证件号码
+ */
+ private String certiNo;
+
+ /**
+ * 联系地址省
+ */
+ private String prov;
+
+ /**
+ * 联系地址省名称
+ */
+ private String provName;
+
+ /**
+ * 联系地址市
+ */
+ private String city;
+
+ /**
+ * 联系/企业/机构地址市名称
+ */
+ private String cityName;
+
+ /**
+ * 联系/企业/机构地址区
+ */
+ private String area;
+
+ /**
+ * 联系/企业/机构地址区名称
+ */
+ private String areaName;
+
+ /**
+ * 联地址街道
+ */
+ private String road;
+
+ /**
+ * 联系地址街道名称
+ */
+ private String roadName;
+
+ /**
+ * 联系地址社区
+ */
+ private String village;
+
+ /**
+ * 联系地址社区名称
+ */
+ private String villageName;
+
+ /**
+ * 联系地址详细地址
+ */
+ private String addr;
+
+ /**
+ * 户籍地址省
+ */
+ private String placeProv;
+
+ /**
+ * 户籍地址省名称
+ */
+ private String placeProvName;
+
+ /**
+ * 户籍地址市
+ */
+ private String placeCity;
+
+ /**
+ * 户籍地址市名称
+ */
+ private String placeCityName;
+
+ /**
+ * 户籍地址区
+ */
+ private String placeArea;
+
+ /**
+ * 户籍地址区名称
+ */
+ private String placeAreaName;
+
+ /**
+ * 户籍地址街道
+ */
+ private String placeRoad;
+
+ /**
+ * 户籍地址街道名称
+ */
+ private String placeRoadName;
+
+ /**
+ * 户籍地址社区
+ */
+ private String placeVillage;
+
+ /**
+ * 户籍地址社区名称
+ */
+ private String placeVillageName;
+
+ /**
+ * 户籍地址详细地址
+ */
+ private String placeAddr;
+
+ /**
+ * 工作单位
+ */
+ private String workUnit;
+
+ /**
+ * 民族
+ */
+ private String nation;
+
+ /**
+ * 民族名称
+ */
+ private String nationName;
+
+ /**
+ * 性别
+ */
+ private String sex;
+
+ /**
+ * 性别名称
+ */
+ private String sexName;
+
+ /**
+ * 是否有个人极端倾向，0：否，1：是
+ */
+ private Integer extreme;
+
+ /**
+ * 委托关系
+ */
+ private String agentRelate;
+
+ /**
+ * 委托关系名称
+ */
+ private String agentRelateName;
+
+ /**
+ * 委托类型
+ */
+ private String agentType;
+
+ /**
+ * 委托类型名称
+ */
+ private String agentTypeName;
+
+ /**
+ * 代理当事人编号，多个用,隔开
+ */
+ private String personId;
+
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 职业
+ */
+ private String job;
+
+ /**
+ * 职业名称
+ */
+ private String jobName;
+
+ /**
+ * 出生日期
+ */
+ private String birthday;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 有无代理人，0：无，1：有
+ */
+ private Integer agentStatus;
+
+ /**
+ * 顾客编号
+ */
+ private String custId;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ @TableLogic
+ private Integer deleteStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseDTO.java
new file mode 100644
index 0000000..db23953
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseDTO.java
@@ -0,0 +1,28 @@
+package cn.huge.module.bycase.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: 纠纷信息主表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:00:57
+ * @version 1.0.0
+ */
+@Data
+public class GZCaseDTO {
+
+ private GZCaseInfoDTO gzCaseInfoDTO;
+
+ private GZCaseInfoUnfoldDTO gzCaseInfoUnfoldDTO;
+
+ private List<GZCasePersonDTO> gzCasePersonDTOList;
+
+ private List<GZCaseAgentDTO> gzCaseAgentDTOList;
+
+ private List<GZCaseTaskDTO> gzCaseTaskDTOList;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoDTO.java
new file mode 100644
index 0000000..dfcdcf4
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoDTO.java
@@ -0,0 +1,378 @@
+package cn.huge.module.bycase.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷信息主表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:00:57
+ * @version 1.0.0
+ */
+@Data
+public class GZCaseInfoDTO {
+
+ /**
+ * 主键编号
+ */
+ private String id;
+
+ /**
+ * 事项标题
+ */
+ private String caseTitle;
+
+ /**
+ * 事项编号
+ */
+ private String caseRef;
+
+ /**
+ * 事项等级
+ */
+ private Integer caseLevel;
+
+ /**
+ * 来访时间
+ */
+ private Date visitTime;
+
+ /**
+ * 来访人数
+ */
+ private Integer visitPeopleNum;
+
+ /**
+ * 调解类型
+ */
+ private String mediType;
+
+ /**
+ * 调解类型名称
+ */
+ private String mediTypeName;
+
+ /**
+ * 纠纷一级类型
+ */
+ private String caseTypeFirst;
+
+ /**
+ * 纠纷一级类型名称
+ */
+ private String caseTypeFirstName;
+
+ /**
+ * 纠纷类型
+ */
+ private String caseType;
+
+ /**
+ * 纠纷类型名称
+ */
+ private String caseTypeName;
+
+ /**
+ * 纠纷发生时间
+ */
+ private Date occurTime;
+
+ /**
+ * 纠纷发生地详细地址
+ */
+ private String addr;
+
+ /**
+ * 纠纷发生地经度
+ */
+ private String lng;
+
+ /**
+ * 纠纷发生地纬度
+ */
+ private String lat;
+
+ /**
+ * 纠纷发生地网格地址
+ */
+ private String wgAddr;
+
+ /**
+ * 纠纷发生地网格地址经度
+ */
+ private String wgLng;
+
+ /**
+ * 纠纷发生地网格地址纬度
+ */
+ private String wgLat;
+
+ /**
+ * 问题属地省
+ */
+ private String queProv;
+
+ /**
+ * 问题属地省名称
+ */
+ private String queProvName;
+
+ /**
+ * 问题属地市
+ */
+ private String queCity;
+
+ /**
+ * 问题属地市名称
+ */
+ private String queCityName;
+
+ /**
+ * 问题属地区
+ */
+ private String queArea;
+
+ /**
+ * 问题属地区名称
+ */
+ private String queAreaName;
+
+ /**
+ * 问题属地街道
+ */
+ private String queRoad;
+
+ /**
+ * 问题属地街道名称
+ */
+ private String queRoadName;
+
+ /**
+ * 问题属地社区
+ */
+ private String queVillage;
+
+ /**
+ * 问题属地社区名称
+ */
+ private String queVillageName;
+
+ /**
+ * 涉及人数
+ */
+ private Integer peopleNum;
+
+ /**
+ * 涉及金额
+ */
+ private Double amount;
+
+ /**
+ * 涉及人群
+ */
+ private String crowd;
+
+ /**
+ * 涉及人群名称
+ */
+ private String crowdName;
+
+ /**
+ * 事项来源
+ */
+ private String canal;
+
+ /**
+ * 事项来源名称
+ */
+ private String canalName;
+
+ /**
+ * 来访形式
+ */
+ private String visitWay;
+
+ /**
+ * 来访形式名称
+ */
+ private String visitWayName;
+
+ /**
+ * 是否自行受理，0：否，1：是
+ */
+ private Integer zxslStatus;
+
+ /**
+ * 事项概况
+ */
+ private String caseDes;
+
+ /**
+ * 事项申请
+ */
+ private String caseClaim;
+
+ /**
+ * 是否重大矛盾纠纷，0：否，1：是
+ */
+ private Integer majorStatus;
+
+ /**
+ * 纠纷来源
+ */
+ private String source;
+
+ /**
+ * 纠纷来源名称
+ */
+ private String sourceName;
+
+ /**
+ * 矛调号
+ */
+ private String caseNo;
+
+ /**
+ * 民诉前调号
+ */
+ private String mediateNo;
+
+ /**
+ * 民诉前调书号
+ */
+ private String mediateBookNo;
+
+ /**
+ * 诉讼案号
+ */
+ private String civilNo;
+
+ /**
+ * 申请方当事人名称
+ */
+ private String plaintiffs;
+
+ /**
+ * 申请方代理人名称
+ */
+ private String pagents;
+
+ /**
+ * 被申请方当事人名称
+ */
+ private String defendants;
+
+ /**
+ * 被申请方代理人名称
+ */
+ private String dagents;
+
+ /**
+ * 登记组织编号
+ */
+ private String inputUnitId;
+
+ /**
+ * 登记组织名称
+ */
+ private String inputUnitName;
+
+ /**
+ * 登记人编号
+ */
+ private String inputUserId;
+
+ /**
+ * 登记人名称
+ */
+ private String inputUserName;
+
+ /**
+ * 登记方式，1：正常登记，2：案件导入
+ */
+ private Integer inputWay;
+
+ /**
+ * 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档，8：不予受理
+ */
+ private Integer status;
+
+ /**
+ * 事项状态名称
+ */
+ private String statusName;
+
+ /**
+ * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档，7：不予受理
+ */
+ private Integer process;
+
+ /**
+ * 事项进度名称
+ */
+ private String processName;
+
+ /**
+ * 对外展示事项进度，1：待受理，2：化解中，3：已结案，4：不予受理
+ */
+ private Integer infoProcess;
+
+ /**
+ * 对外展示事项进度
+ */
+ private String infoProcessName;
+
+ /**
+ * 小程序是否可见，0：不可见，1：可见
+ */
+ private Integer partyShow;
+
+ /**
+ * 意向调解组织编号
+ */
+ private String wantUnitId;
+
+ /**
+ * 意向调解组织名称
+ */
+ private String wantUnitName;
+
+ /**
+ * 意向调解员编号
+ */
+ private String wantUserId;
+
+ /**
+ * 意向调解员名称
+ */
+ private String wantUserName;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ private Integer deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoUnfoldDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoUnfoldDTO.java
new file mode 100644
index 0000000..462a93d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseInfoUnfoldDTO.java
@@ -0,0 +1,256 @@
+package cn.huge.module.bycase.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷信息扩展表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-09-09 19:58:25
+ * @version 1.0.0
+ */
+@Data
+public class GZCaseInfoUnfoldDTO {
+
+ /**
+ * 纠纷编号
+ */
+ private String id;
+
+ /**
+ * 受理时间
+ */
+ private Date acceptTime;
+
+ /**
+ * 实际调解组织编号
+ */
+ private String mediateUnitId;
+
+ /**
+ * 实际调解组织名称
+ */
+ private String mediateUnitName;
+
+ /**
+ * 实际调解部门编号
+ */
+ private String mediateDeptId;
+
+ /**
+ * 实际调解部门名称
+ */
+ private String mediateDeptName;
+
+ /**
+ * 实际调解员编号
+ */
+ private String mediatorId;
+
+ /**
+ * 实际调解员
+ */
+ private String mediator;
+
+ /**
+ * 实际调解员手机号码
+ */
+ private String mediatorMobile;
+
+ /**
+ * 配合组织，多个用,隔开
+ */
+ private String assistUnitId;
+
+ /**
+ * 配合组织名称，多个用、隔开
+ */
+ private String assistUnitName;
+
+ /**
+ * 调解开始时间
+ */
+ private Date mediStartTime;
+
+ /**
+ * 调解结束时间
+ */
+ private Date mediEndTime;
+
+ /**
+ * 调解结果
+ */
+ private String mediResult;
+
+ /**
+ * 调解结果名称
+ */
+ private String mediResultName;
+
+ /**
+ * 达成协议类型
+ */
+ private String agreeType;
+
+ /**
+ * 达成协议类型名称
+ */
+ private String agreeTypeName;
+
+ /**
+ * 已达成协议
+ */
+ private String agreeContent;
+
+ /**
+ * 结案意见
+ */
+ private String windupContent;
+
+ /**
+ * 调解不成功原因
+ */
+ private String mediFalse;
+
+ /**
+ * 调解不成功原因名称
+ */
+ private String mediFalseName;
+
+ /**
+ * 是否转诉讼案件，0：不转诉讼，1：转诉讼
+ */
+ private Integer civilStatus;
+
+ /**
+ * 诉讼法院编号
+ */
+ private String courtId;
+
+ /**
+ * 诉讼法院名称
+ */
+ private String courtName;
+
+ /**
+ * 办结时间
+ */
+ private Date closeTime;
+
+ /**
+ * 是否申请司法确认，0：未申请，1：已申请
+ */
+ private Integer judicApply;
+
+ /**
+ * 司法确认结果
+ */
+ private String judicResult;
+
+ /**
+ * 司法确认结果名称
+ */
+ private String judicResultName;
+
+ /**
+ * 是否已归档，0：未归档，1：已归档
+ */
+ private Integer fileStatus;
+
+ /**
+ * 归档人编号
+ */
+ private String fileUserId;
+
+ /**
+ * 归档人名称
+ */
+ private String fileUserName;
+
+ /**
+ * 归档时间
+ */
+ private Date fileTime;
+
+ /**
+ * 档案年度
+ */
+ private String fileYear;
+
+ /**
+ * 档案卷名
+ */
+ private String fileBookName;
+
+ /**
+ * 档案卷号
+ */
+ private String fileBookNo;
+
+ /**
+ * 档案编号
+ */
+ private String fileNo;
+
+ /**
+ * 档案保管年限，单位：年
+ */
+ private Integer fileLimitYear;
+
+ /**
+ * 档案存档位置
+ */
+ private String fileAddr;
+
+ /**
+ * 卷宗情况说明
+ */
+ private String fileContent;
+
+ /**
+ * 履行情况
+ */
+ private String fulfilSitu;
+
+ /**
+ * 履行情况名称
+ */
+ private String fulfilSituName;
+
+ /**
+ * 是否已回访，0：未回访，1：已回访
+ */
+ private Integer visitUpStatus;
+
+ /**
+ * 回访情况
+ */
+ private String visitUpContent;
+
+ /**
+ * 当事人是否满意，0：不满意，1：满意
+ */
+ private Integer partyJoy;
+
+ /**
+ * 顾客编号
+ */
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCasePersonDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCasePersonDTO.java
new file mode 100644
index 0000000..458544b
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCasePersonDTO.java
@@ -0,0 +1,303 @@
+package cn.huge.module.bycase.domain.dto;
+
+import cn.huge.module.sys.dto.FileTypeInfoBaseDTO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @title: 纠纷当事人信息表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:48:18
+ * @version 1.0.0
+ */
+@Data
+public class GZCasePersonDTO {
+
+ /**
+ * 主键编号
+ */
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ private String caseId;
+
+ /**
+ * 公众用户编号
+ */
+ private String partyUserId;
+
+ /**
+ * 企业信息编号
+ */
+ private String companyId;
+
+ /**
+ * 当事人地位
+ */
+ private String perType;
+
+ /**
+ * 当事人地位名称
+ */
+ private String perTypeName;
+
+ /**
+ * 当事人类型
+ */
+ private String perClass;
+
+ /**
+ * 当事人类型名称
+ */
+ private String perClassName;
+
+ /**
+ * 姓名/企业/机构名称
+ */
+ private String trueName;
+
+ /**
+ * 联系方式
+ */
+ private String mobile;
+
+ /**
+ * 组织机构代码
+ */
+ private String orgaCode;
+
+ /**
+ * 法定/机构代表人名称
+ */
+ private String deputy;
+
+ /**
+ * 企业/机构类型
+ */
+ private String orgaType;
+
+ /**
+ * 企业/机构类型名称
+ */
+ private String orgaTypeName;
+
+ /**
+ * 证件类型
+ */
+ private String certiType;
+
+ /**
+ * 证件类型名称
+ */
+ private String certiTypeName;
+
+ /**
+ * 证件号码
+ */
+ private String certiNo;
+
+ /**
+ * 联系/企业/机构地址省
+ */
+ private String prov;
+
+ /**
+ * 联系/企业/机构地址省名称
+ */
+ private String provName;
+
+ /**
+ * 联系/企业/机构地址市
+ */
+ private String city;
+
+ /**
+ * 联系/企业/机构地址市名称
+ */
+ private String cityName;
+
+ /**
+ * 联系/企业/机构地址区
+ */
+ private String area;
+
+ /**
+ * 联系/企业/机构地址区名称
+ */
+ private String areaName;
+
+ /**
+ * 联系/企业/机构地址街道
+ */
+ private String road;
+
+ /**
+ * 联系/企业/机构地址街道名称
+ */
+ private String roadName;
+
+ /**
+ * 联系/企业/机构地址社区
+ */
+ private String village;
+
+ /**
+ * 联系/企业/机构地址社区名称
+ */
+ private String villageName;
+
+ /**
+ * 联系/企业/机构地址详细地址
+ */
+ private String addr;
+
+ /**
+ * 户籍/住所地址省
+ */
+ private String placeProv;
+
+ /**
+ * 户籍/住所地址省名称
+ */
+ private String placeProvName;
+
+ /**
+ * 户籍/住所地址市
+ */
+ private String placeCity;
+
+ /**
+ * 户籍/住所地址市名称
+ */
+ private String placeCityName;
+
+ /**
+ * 户籍/住所地址区
+ */
+ private String placeArea;
+
+ /**
+ * 户籍/住所地址区名称
+ */
+ private String placeAreaName;
+
+ /**
+ * 户籍/住所地址街道
+ */
+ private String placeRoad;
+
+ /**
+ * 户籍/住所地址街道名称
+ */
+ private String placeRoadName;
+
+ /**
+ * 户籍/住所地址社区
+ */
+ private String placeVillage;
+
+ /**
+ * 户籍/住所地址社区名称
+ */
+ private String placeVillageName;
+
+ /**
+ * 户籍/住所地址详细地址
+ */
+ private String placeAddr;
+
+ /**
+ * 工作单位编号
+ */
+ private String workUnitId;
+
+ /**
+ * 工作单位
+ */
+ private String workUnit;
+
+ /**
+ * 民族
+ */
+ private String nation;
+
+ /**
+ * 民族名称
+ */
+ private String nationName;
+
+ /**
+ * 性别
+ */
+ private String sex;
+
+ /**
+ * 性别名称
+ */
+ private String sexName;
+
+ /**
+ * 是否有个人极端倾向，0：否，1：是
+ */
+ private Integer extreme;
+
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 职业
+ */
+ private String job;
+
+ /**
+ * 职业名称
+ */
+ private String jobName;
+
+ /**
+ * 出生日期
+ */
+ private String birthday;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 有无代理人，0：无，1：有
+ */
+ private Integer agentStatus;
+
+ /**
+ * 顾客编号
+ */
+ private String custId;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ private Integer deleteStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseTaskDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseTaskDTO.java
new file mode 100644
index 0000000..bc7acfb
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/dto/GZCaseTaskDTO.java
@@ -0,0 +1,248 @@
+package cn.huge.module.bycase.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷任务表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-10 10:45:05
+ * @version 1.0.0
+ */
+@Data
+public class GZCaseTaskDTO {
+
+ /**
+ * 纠纷任务编号
+ */
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ private String caseId;
+
+ /**
+ * 工作流流程定义编号
+ */
+ private String flowableId;
+
+ /**
+ * 工作流流程实例编号
+ */
+ private String processInstanceId;
+
+ /**
+ * 工作流流程实例任务编号
+ */
+ private String processTaskId;
+
+ /**
+ * 工作流节点类型，1：首节点，2：普通节点，3：结束节点
+ */
+ private Integer nodeType;
+
+ /**
+ * 工作流节点
+ */
+ private String nodeId;
+
+ /**
+ * 工作流节点名称
+ */
+ private String nodeName;
+
+ /**
+ * 业务流程
+ */
+ private String flowId;
+
+ /**
+ * 流程页面展示名称
+ */
+ private String nodeShowName;
+
+ /**
+ * 纠纷任务类型，1：承办，2：配合
+ */
+ private Integer caseTaskType;
+
+ /**
+ * 任务所属组织编号
+ */
+ private String candeUnitId;
+
+ /**
+ * 任务所属组织名称
+ */
+ private String candeUnitName;
+
+ /**
+ * 任务所属部门编号
+ */
+ private String candeDeptId;
+
+ /**
+ * 任务所属部门名称
+ */
+ private String candeDeptName;
+
+ /**
+ * 任务所属角色编号
+ */
+ private String candeRoleCode;
+
+ /**
+ * 任务所属角色名称
+ */
+ private String candeRoleName;
+
+ /**
+ * 任务所属人员编号
+ */
+ private String candeUserId;
+
+ /**
+ * 任务所属人员名称
+ */
+ private String candeUserName;
+
+ /**
+ * 任务签收状态，0：不用签收，1：未签收，:2：已签收
+ */
+ private Integer signStatus;
+
+ /**
+ * 任务签收到期时间
+ */
+ private Date signExpireTime;
+
+ /**
+ * 任务签收时间
+ */
+ private Date signTime;
+
+ /**
+ * 任务签收单位编号
+ */
+ private String signUnitId;
+
+ /**
+ * 任务签收单位名称
+ */
+ private String signUnitName;
+
+ /**
+ * 任务签收人编号
+ */
+ private String signUserId;
+
+ /**
+ * 任务签收人名称
+ */
+ private String signUserName;
+
+ /**
+ * 任务到期时间
+ */
+ private Date expireTime;
+
+ /**
+ * 任务进度，1：进行中，2：已完成
+ */
+ private Integer status;
+
+ /**
+ * 任务处理单位编号
+ */
+ private String handleUnitId;
+
+ /**
+ * 任务处理单位名称
+ */
+ private String handleUnitName;
+
+ /**
+ * 任务处理部门编号
+ */
+ private String handleDeptId;
+
+ /**
+ * 任务处理部门名称
+ */
+ private String handleDeptName;
+
+ /**
+ * 任务处理人编号
+ */
+ private String handleUserId;
+
+ /**
+ * 任务处理人名称
+ */
+ private String handleUserName;
+
+ /**
+ * 处理结果，0：正常流转，1：审核通过，2：审核不通过，3：不予受理，4：回退，5：上报
+ */
+ private Integer handleResult;
+
+ /**
+ * 任务处理意见
+ */
+ private String handleContent;
+
+ /**
+ * 任务处理系统说明
+ */
+ private String handleIllust;
+
+ /**
+ * 任任务处理时间
+ */
+ private Date handleTime;
+
+ /**
+ * 任务处理耗时，单位：小时
+ */
+ private Integer usetimeHour;
+
+ /**
+ * 任务超时状态，0：未超时，1：已超时
+ */
+ private Integer overtimeStatus;
+
+ /**
+ * 任务处理超时，单位：小时
+ */
+ private Integer overtimeHour;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ @TableLogic
+ private Integer deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseAgent.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseAgent.java
new file mode 100644
index 0000000..631e85e
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseAgent.java
@@ -0,0 +1,246 @@
+package cn.huge.module.bycase.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷代理人表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_agent")
+@Data
+public class CaseAgent {
+
+ /**
+ * 代理人编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ @TableField(value = "case_id")
+ private String caseId;
+
+ /**
+ * 公众用户编号
+ */
+ @TableField(value = "party_user_id")
+ private String partyUserId;
+
+ /**
+ * 当事人编号
+ */
+ @TableField(value = "person_id")
+ private String personId;
+
+ /**
+ * 当事人名称
+ */
+ @TableField(value = "person_name")
+ private String personName;
+
+ /**
+ * 当事人地位
+ */
+ @TableField(value = "per_type")
+ private String perType;
+
+ /**
+ * 代理人类型
+ */
+ @TableField(value = "per_class")
+ private String perClass;
+
+ /**
+ * 代理人类型名称
+ */
+ @TableField(value = "per_class_name")
+ private String perClassName;
+
+ /**
+ * 代理人名称
+ */
+ @TableField(value = "true_name")
+ private String trueName;
+
+ /**
+ * 联系方式
+ */
+ @TableField(value = "mobile")
+ private String mobile;
+
+ /**
+ * 性别
+ */
+ @TableField(value = "sex")
+ private String sex;
+
+ /**
+ * 性别名称
+ */
+ @TableField(value = "sex_name")
+ private String sexName;
+
+ /**
+ * 证件类型
+ */
+ @TableField(value = "certi_type")
+ private String certiType;
+
+ /**
+ * 证件类型名称
+ */
+ @TableField(value = "certi_type_name")
+ private String certiTypeName;
+
+ /**
+ * 证件号码
+ */
+ @TableField(value = "certi_no")
+ private String certiNo;
+
+ /**
+ * 出生日期
+ */
+ @TableField(value = "birthday")
+ private String birthday;
+
+ /**
+ * 地址省
+ */
+ @TableField(value = "prov")
+ private String prov;
+
+ /**
+ * 地址省名称
+ */
+ @TableField(value = "prov_name")
+ private String provName;
+
+ /**
+ * 地址市
+ */
+ @TableField(value = "city")
+ private String city;
+
+ /**
+ * 地址市名称
+ */
+ @TableField(value = "city_name")
+ private String cityName;
+
+ /**
+ * 地址区
+ */
+ @TableField(value = "area")
+ private String area;
+
+ /**
+ * 地址区名称
+ */
+ @TableField(value = "area_name")
+ private String areaName;
+
+ /**
+ * 地址街道
+ */
+ @TableField(value = "road")
+ private String road;
+
+ /**
+ * 地址街道名称
+ */
+ @TableField(value = "road_name")
+ private String roadName;
+
+ /**
+ * 地址社区
+ */
+ @TableField(value = "village")
+ private String village;
+
+ /**
+ * 地址社区名称
+ */
+ @TableField(value = "village_name")
+ private String villageName;
+
+ /**
+ * 地址详细地址
+ */
+ @TableField(value = "addr")
+ private String addr;
+
+ /**
+ * 委托类型
+ */
+ @TableField(value = "agent_type")
+ private String agentType;
+
+ /**
+ * 委托类型名称
+ */
+ @TableField(value = "agent_type_name")
+ private String agentTypeName;
+
+ /**
+ * 所在律所
+ */
+ @TableField(value = "law_firm")
+ private String lawFirm;
+
+ /**
+ * 微信
+ */
+ @TableField(value = "wechat")
+ private String wechat;
+
+ /**
+ * QQ
+ */
+ @TableField(value = "qq")
+ private String qq;
+
+ /**
+ * 邮箱
+ */
+ @TableField(value = "mail")
+ private String mail;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 删除状态，1：未删除（默认值），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseDisp.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseDisp.java
new file mode 100644
index 0000000..d07574f
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseDisp.java
@@ -0,0 +1,282 @@
+package cn.huge.module.bycase.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷调度单表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_disp")
+@Data
+public class CaseDisp {
+
+ /**
+ * 纠纷调度单编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ @TableField(value = "case_id")
+ private String caseId;
+
+ /**
+ * 案号
+ */
+ @TableField(value = "case_no")
+ private String caseNo;
+
+ /**
+ * 系列案状态，1：正常案件，2：系列案
+ */
+ @TableField(value = "serie_status")
+ private String serieStatus;
+
+ /**
+ * 申请渠道，22_00001-1：窗口登记，22_00001-2：当事人微信小程序，22_00001-3：外部系统转入
+ */
+ @TableField(value = "apply_canal")
+ private String applyCanal;
+
+ /**
+ * 申请渠道名称
+ */
+ @TableField(value = "apply_canal_name")
+ private String applyCanalName;
+
+ /**
+ * 调度标签，22_00011-1：首次调度，22_00011-2：再次申请，22_00011-3：拒绝签收，22_00011-4：超时未签收，22_00011-5：预审异常重新调度
+ */
+ @TableField(value = "disp_tag")
+ private String dispTag;
+
+ /**
+ * 调度标签名称
+ */
+ @TableField(value = "disp_tag_name")
+ private String dispTagName;
+
+ /**
+ * 调度来源人组织编号
+ */
+ @TableField(value = "source_unit_id")
+ private String sourceUnitId;
+
+ /**
+ * 调度来源人组织名称
+ */
+ @TableField(value = "source_unit_name")
+ private String sourceUnitName;
+
+ /**
+ * 调度来源人编号
+ */
+ @TableField(value = "source_user_id")
+ private String sourceUserId;
+
+ /**
+ * 调度来源人名称
+ */
+ @TableField(value = "source_user_name")
+ private String sourceUserName;
+
+ /**
+ * 调度来源原因
+ */
+ @TableField(value = "source_reason")
+ private String sourceReason;
+
+ /**
+ * 调度来源说明
+ */
+ @TableField(value = "source_content")
+ private String sourceContent;
+
+ /**
+ * 调度方式，1：系统调度，2：人工调度
+ */
+ @TableField(value = "disp_way")
+ private String dispWay;
+
+ /**
+ * 调度方式名称
+ */
+ @TableField(value = "disp_way_name")
+ private String dispWayName;
+
+ /**
+ * 调度类型：22_00012-1：归口分流，22_00012-2：加入抢单池
+ */
+ @TableField(value = "disp_type")
+ private String dispType;
+
+ /**
+ * 调度类型名称
+ */
+ @TableField(value = "disp_type_name")
+ private String dispTypeName;
+
+ /**
+ * 调度处理，22_00013-1：正常调度，22_00013-2：重新调度，22_00013-3：退回申请人，22_00013-4：不予受理
+ */
+ @TableField(value = "disp_handle")
+ private String dispHandle;
+
+ /**
+ * 调度处理名称
+ */
+ @TableField(value = "disp_handle_name")
+ private String dispHandleName;
+
+ /**
+ * 受理对象选项，22_00038-1：调度给调解组织，22_00038-2：调度给调解员
+ */
+ @TableField(value = "disp_obj")
+ private String dispObj;
+
+ /**
+ * 受理对象选项名称
+ */
+ @TableField(value = "disp_obj_name")
+ private String dispObjName;
+
+ /**
+ * 具体受理对象编号
+ */
+ @TableField(value = "accept_obj_id")
+ private String acceptObjId;
+
+ /**
+ * 具体受理对象名称
+ */
+ @TableField(value = "accept_obj_name")
+ private String acceptObjName;
+
+ /**
+ * 具体受理对象签收状态
+ */
+ @TableField(value = "accept_obj_sign")
+ private String acceptObjSign;
+
+ /**
+ * 具体受理对象签收操作时间
+ */
+ @TableField(value = "accept_sign_time")
+ private Date acceptSignTime;
+
+ /**
+ * 不予受理原因
+ */
+ @TableField(value = "end_reason")
+ private String endReason;
+
+ /**
+ * 不予受理原因名称
+ */
+ @TableField(value = "end_reason_name")
+ private String endReasonName;
+
+ /**
+ * 不予受理其他原因
+ */
+ @TableField(value = "end_other_reason")
+ private String endOtherReason;
+
+ /**
+ * 调度意见/退回理由
+ */
+ @TableField(value = "disp_content")
+ private String dispContent;
+
+ /**
+ * 调度处理组织编号
+ */
+ @TableField(value = "disp_unit_id")
+ private String dispUnitId;
+
+ /**
+ * 调度处理组织名称
+ */
+ @TableField(value = "disp_unit_name")
+ private String dispUnitName;
+
+ /**
+ * 调度处理部门编号
+ */
+ @TableField(value = "disp_dept_id")
+ private String dispDeptId;
+
+ /**
+ * 调度处理部门名称
+ */
+ @TableField(value = "disp_dept_name")
+ private String dispDeptName;
+
+ /**
+ * 调度处理人编号
+ */
+ @TableField(value = "disp_user_id")
+ private String dispUserId;
+
+ /**
+ * 调度处理人名称
+ */
+ @TableField(value = "disp_user_name")
+ private String dispUserName;
+
+ /**
+ * 调度时间
+ */
+ @TableField(value = "disp_time")
+ private Date dispTime;
+
+ /**
+ * 调度进度，1：待调度，2：已调度
+ */
+ @TableField(value = "status")
+ private String status;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 删除状态，1：未删除（默认值），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+ /**
+ * 上一调度单编号
+ */
+ @TableField(value = "last_disp_id")
+ private String lastDispId;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseInfo.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseInfo.java
new file mode 100644
index 0000000..089e7f6
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseInfo.java
@@ -0,0 +1,660 @@
+package cn.huge.module.bycase.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷信息表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:39
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_info")
+@Data
+public class CaseInfo {
+
+ /**
+ * 纠纷信息编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷标题
+ */
+ @TableField(value = "case_title")
+ private String caseTitle;
+
+ /**
+ * 案号
+ */
+ @TableField(value = "case_no")
+ private String caseNo;
+
+ /**
+ * 系列案状态，1：正常案件，2：系列案
+ */
+ @TableField(value = "serie_status")
+ private String serieStatus;
+
+ /**
+ * 系列案编号，系列案状态为1时是纠纷编号，为2时是系列案编号
+ */
+ @TableField(value = "serie_no")
+ private String serieNo;
+
+ /**
+ * 民诉前调号
+ */
+ @TableField(value = "mediate_no")
+ private String mediateNo;
+
+ /**
+ * 民诉前调书号
+ */
+ @TableField(value = "mediate_book_no")
+ private String mediateBookNo;
+
+ /**
+ * 调解类型
+ */
+ @TableField(value = "medi_type")
+ private String mediType;
+
+ /**
+ * 调解类型名称
+ */
+ @TableField(value = "medi_type_name")
+ private String mediTypeName;
+
+ /**
+ * 纠纷类型
+ */
+ @TableField(value = "case_type")
+ private String caseType;
+
+ /**
+ * 纠纷类型名称
+ */
+ @TableField(value = "case_type_name")
+ private String caseTypeName;
+
+ /**
+ * 导入纠纷类型名称
+ */
+ @TableField(value = "input_case_type")
+ private String inputCaseType;
+
+ /**
+ * 纠纷来源，22_00036-1：地方政府委托移送，22_00036-2：依法申请调解，22_00036-3：主动调解，22_00036-4：法援委托移送，22_00036-5：检察院委托移送，22_00036-6：公安机关委托移送，22_00036-7：信访记录委托移送，22_00036-8：劳动站移交，22_00036-9：派出所移交，22_00036-10：其他部门委托移送，22_00036-11：接受委托移送调解
+ */
+ @TableField(value = "source")
+ private String source;
+
+ /**
+ * 纠纷来源名称
+ */
+ @TableField(value = "source_name")
+ private String sourceName;
+
+ /**
+ * 申请渠道，22_00001-1：机构登记，22_00001-2：小程序，22_00001-3：其他渠道
+ */
+ @TableField(value = "canal")
+ private String canal;
+
+ /**
+ * 申请渠道名称
+ */
+ @TableField(value = "canal_name")
+ private String canalName;
+
+ /**
+ * 涉及人数
+ */
+ @TableField(value = "people_num")
+ private Integer peopleNum;
+
+ /**
+ * 涉及金额
+ */
+ @TableField(value = "amount")
+ private Double amount;
+
+ /**
+ * 涉及人群，22_00035-1：未成年人，22_00035-2：残疾人，22_00035-3：外来农民工，22_00035-4：待下岗，22_00035-5：妇女，22_00035-6：失业，22_00035-7：在职，22_00035-8：老年人，22_00035-9：其他，
+ */
+ @TableField(value = "crowd")
+ private String crowd;
+
+ /**
+ * 涉及人群名称
+ */
+ @TableField(value = "crowd_name")
+ private String crowdName;
+
+ /**
+ * 纠纷发生时间
+ */
+ @TableField(value = "occur_time")
+ private Date occurTime;
+
+ /**
+ * 纠纷发生地省
+ */
+ @TableField(value = "prov")
+ private String prov;
+
+ /**
+ * 纠纷发生地省名称
+ */
+ @TableField(value = "prov_name")
+ private String provName;
+
+ /**
+ * 纠纷发生地市
+ */
+ @TableField(value = "city")
+ private String city;
+
+ /**
+ * 纠纷发生地市名称
+ */
+ @TableField(value = "city_name")
+ private String cityName;
+
+ /**
+ * 纠纷发生地区
+ */
+ @TableField(value = "area")
+ private String area;
+
+ /**
+ * 纠纷发生地区名称
+ */
+ @TableField(value = "area_name")
+ private String areaName;
+
+ /**
+ * 纠纷发生地街道
+ */
+ @TableField(value = "road")
+ private String road;
+
+ /**
+ * 纠纷发生地街道名称
+ */
+ @TableField(value = "road_name")
+ private String roadName;
+
+ /**
+ * 纠纷发生地社区
+ */
+ @TableField(value = "village")
+ private String village;
+
+ /**
+ * 纠纷发生地社区名称
+ */
+ @TableField(value = "village_name")
+ private String villageName;
+
+ /**
+ * 纠纷发生地详细地址
+ */
+ @TableField(value = "addr")
+ private String addr;
+
+ /**
+ * 纠纷描述
+ */
+ @TableField(value = "case_des")
+ private String caseDes;
+
+ /**
+ * 调解请求
+ */
+ @TableField(value = "case_claim")
+ private String caseClaim;
+
+ /**
+ * 当事人申请人名称，多个用,隔开
+ */
+ @TableField(value = "plaintiffs")
+ private String plaintiffs;
+
+ /**
+ * 申请人代理人名称
+ */
+ @TableField(value = "pagents")
+ private String pagents;
+
+ /**
+ * 当事人被申请人名称，多个用,隔开
+ */
+ @TableField(value = "defendants")
+ private String defendants;
+
+ /**
+ * 被申请人代理人申请人名称，多个用,隔开
+ */
+ @TableField(value = "dagents")
+ private String dagents;
+
+ /**
+ * 意向调解组织编号
+ */
+ @TableField(value = "want_unit_id")
+ private String wantUnitId;
+
+ /**
+ * 意向调解组织名称
+ */
+ @TableField(value = "want_unit_name")
+ private String wantUnitName;
+
+ /**
+ * 意向调解员编号
+ */
+ @TableField(value = "want_user_id")
+ private String wantUserId;
+
+ /**
+ * 意向调解员名称
+ */
+ @TableField(value = "want_user_name")
+ private String wantUserName;
+
+ /**
+ * 登记组织编号
+ */
+ @TableField(value = "input_unit_id")
+ private String inputUnitId;
+
+ /**
+ * 登记组织名称
+ */
+ @TableField(value = "input_unit_name")
+ private String inputUnitName;
+
+ /**
+ * 登记人编号
+ */
+ @TableField(value = "input_user_id")
+ private String inputUserId;
+
+ /**
+ * 登记人名称
+ */
+ @TableField(value = "input_user_name")
+ private String inputUserName;
+
+ /**
+ * 登记方式，1：正常登记，2：案件导入
+ */
+ @TableField(value = "input_way")
+ private String inputWay;
+
+ /**
+ * 纠纷受理时间
+ */
+ @TableField(value = "accept_time")
+ private Date acceptTime;
+
+ /**
+ * 纠纷审查操作对象编号
+ */
+ @TableField(value = "audit_obj_id")
+ private String auditObjId;
+
+ /**
+ * 纠纷审查操作对象名称
+ */
+ @TableField(value = "audit_obj_name")
+ private String auditObjName;
+
+ /**
+ * 纠纷审查结果，22_00037-1：签收受理，22_00037-2：退回申请人，22_00037-3：不予受理
+ */
+ @TableField(value = "audit_result")
+ private String auditResult;
+
+ /**
+ * 纠纷审查结果名称
+ */
+ @TableField(value = "audit_result_name")
+ private String auditResultName;
+
+ /**
+ * 纠纷审查时间
+ */
+ @TableField(value = "audit_time")
+ private Date auditTime;
+
+ /**
+ * 纠纷审查异常原因
+ */
+ @TableField(value = "error_cause")
+ private String errorCause;
+
+ /**
+ * 纠纷审查异常原因名称
+ */
+ @TableField(value = "error_cause_name")
+ private String errorCauseName;
+
+ /**
+ * 纠纷审查说明
+ */
+ @TableField(value = "audit_content")
+ private String auditContent;
+
+ /**
+ * 签收状态，1：未签收，2：已签收，3：超时未签收，99：拒绝签收
+ */
+ @TableField(value = "sign_status")
+ private String signStatus;
+
+ /**
+ * 纠纷进度，22_00006-1：待受理，22_00006-2：待调解，22_00006-3：调解中，22_00006-4：调解结束，22_00006-5：退回申请人，22_00006-6：不予受理，22_00006-7：申请人撤回
+ */
+ @TableField(value = "process")
+ private String process;
+
+ /**
+ * 纠纷进度名称
+ */
+ @TableField(value = "process_name")
+ private String processName;
+
+ /**
+ * 实际调解组织编号
+ */
+ @TableField(value = "mediate_unit_id")
+ private String mediateUnitId;
+
+ /**
+ * 实际调解组织名称
+ */
+ @TableField(value = "mediate_unit_name")
+ private String mediateUnitName;
+
+ /**
+ * 实际调解部门编号
+ */
+ @TableField(value = "mediate_dept_id")
+ private String mediateDeptId;
+
+ /**
+ * 实际调解部门名称
+ */
+ @TableField(value = "mediate_dept_name")
+ private String mediateDeptName;
+
+ /**
+ * 实际调解部门类型，1：正常部门，2：特殊部门（调委会等）
+ */
+ @TableField(value = "mediate_dept_type")
+ private String mediateDeptType;
+
+ /**
+ * 主调解员编号
+ */
+ @TableField(value = "mediator_id")
+ private String mediatorId;
+
+ /**
+ * 主调解员
+ */
+ @TableField(value = "mediator")
+ private String mediator;
+
+ /**
+ * 主调解员手机号码
+ */
+ @TableField(value = "mediator_mobile")
+ private String mediatorMobile;
+
+ /**
+ * 调解开始时间
+ */
+ @TableField(value = "medi_start_time")
+ private Date mediStartTime;
+
+ /**
+ * 调解结束时间
+ */
+ @TableField(value = "medi_end_time")
+ private Date mediEndTime;
+
+ /**
+ * 调解结果
+ */
+ @TableField(value = "medi_result")
+ private String mediResult;
+
+ /**
+ * 调解结果名称
+ */
+ @TableField(value = "medi_result_name")
+ private String mediResultName;
+
+ /**
+ * 已达成协议
+ */
+ @TableField(value = "agree_content")
+ private String agreeContent;
+
+ /**
+ * 调解备注
+ */
+ @TableField(value = "medi_content")
+ private String mediContent;
+
+ /**
+ * 调解不成功原因，22_00019-1：当事人未能就调解协议达成一致，22_00019-2：当事人拒绝调解，22_00019-3：提前终止调解，22_00019-4：当事人撤销调解请求，22_00019-9：其他
+ */
+ @TableField(value = "medi_false")
+ private String mediFalse;
+
+ /**
+ * 调解不成功原因名称
+ */
+ @TableField(value = "medi_false_name")
+ private String mediFalseName;
+
+ /**
+ * 调解不成功原因说明
+ */
+ @TableField(value = "medi_false_content")
+ private String mediFalseContent;
+
+ /**
+ * 是否转诉讼案件，1：不转诉讼，2：转诉讼
+ */
+ @TableField(value = "civil_status")
+ private String civilStatus;
+
+ /**
+ * 诉讼案号
+ */
+ @TableField(value = "civil_no")
+ private String civilNo;
+
+ /**
+ * 诉讼法院编号
+ */
+ @TableField(value = "court_id")
+ private String courtId;
+
+ /**
+ * 诉讼法院名称
+ */
+ @TableField(value = "court_name")
+ private String courtName;
+
+ /**
+ * 司法确认申请情况（调解成功才有），1：未申请，2：已申请
+ */
+ @TableField(value = "judic_apply")
+ private String judicApply;
+
+ /**
+ * 司法确认申请情况名称
+ */
+ @TableField(value = "judic_apply_name")
+ private String judicApplyName;
+
+ /**
+ * 司法确认信息编号
+ */
+ @TableField(value = "judic_info_id")
+ private String judicInfoId;
+
+ /**
+ * 司法确认结果，22_00028-0：未申请，22_00028-1：未达成，22_00028-2：已达成
+ */
+ @TableField(value = "judic_result")
+ private String judicResult;
+
+ /**
+ * 司法确认结果名称
+ */
+ @TableField(value = "judic_result_name")
+ private String judicResultName;
+
+ /**
+ * 归档状态，1：未归档，2：已归档
+ */
+ @TableField(value = "file_status")
+ private String fileStatus;
+
+ /**
+ * 归档状态名称
+ */
+ @TableField(value = "file_status_name")
+ private String fileStatusName;
+
+ /**
+ * 归档人编号
+ */
+ @TableField(value = "file_user_id")
+ private String fileUserId;
+
+ /**
+ * 归档人名称
+ */
+ @TableField(value = "file_user_name")
+ private String fileUserName;
+
+ /**
+ * 归档时间
+ */
+ @TableField(value = "file_time")
+ private Date fileTime;
+
+ /**
+ * 档案年度
+ */
+ @TableField(value = "file_year")
+ private String fileYear;
+
+ /**
+ * 档案卷名
+ */
+ @TableField(value = "file_book_name")
+ private String fileBookName;
+
+ /**
+ * 档案卷号
+ */
+ @TableField(value = "file_book_no")
+ private String fileBookNo;
+
+ /**
+ * 档案编号
+ */
+ @TableField(value = "file_no")
+ private String fileNo;
+
+ /**
+ * 档案保管年限，单位：年
+ */
+ @TableField(value = "file_limit_year")
+ private Integer fileLimitYear;
+
+ /**
+ * 档案存档位置
+ */
+ @TableField(value = "file_addr")
+ private String fileAddr;
+
+ /**
+ * 卷宗情况说明
+ */
+ @TableField(value = "file_content")
+ private String fileContent;
+
+ /**
+ * 履行情况，22_00008-1：未履行，22_00008-2：当场履行，22_00008-3：分期履行
+ */
+ @TableField(value = "fulfil_situ")
+ private String fulfilSitu;
+
+ /**
+ * 履行情况名称
+ */
+ @TableField(value = "fulfil_situ_name")
+ private String fulfilSituName;
+
+ /**
+ * 回访状态，1：未回访，2：已回访
+ */
+ @TableField(value = "visit_status")
+ private String visitStatus;
+
+ /**
+ * 回访情况
+ */
+ @TableField(value = "visit_content")
+ private String visitContent;
+
+ /**
+ * 当事人是否满意，1：不满意，2：满意
+ */
+ @TableField(value = "party_joy")
+ private String partyJoy;
+
+ /**
+ * 删除状态，1：未删除（默认值），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CasePerson.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CasePerson.java
new file mode 100644
index 0000000..dfe273d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CasePerson.java
@@ -0,0 +1,270 @@
+package cn.huge.module.bycase.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷当事人表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_person")
+@Data
+public class CasePerson {
+
+ /**
+ * 纠纷信息编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ @TableField(value = "case_id")
+ private String caseId;
+
+ /**
+ * 公众用户编号
+ */
+ @TableField(value = "party_user_id")
+ private String partyUserId;
+
+ /**
+ * 当事人地位
+ */
+ @TableField(value = "per_type")
+ private String perType;
+
+ /**
+ * 当事人地位名称
+ */
+ @TableField(value = "per_type_name")
+ private String perTypeName;
+
+ /**
+ * 当事人类型
+ */
+ @TableField(value = "per_class")
+ private String perClass;
+
+ /**
+ * 当事人类型名称
+ */
+ @TableField(value = "per_class_name")
+ private String perClassName;
+
+ /**
+ * 姓名/企业/机构名称
+ */
+ @TableField(value = "true_name")
+ private String trueName;
+
+ /**
+ * 法定代表人名称
+ */
+ @TableField(value = "deputy")
+ private String deputy;
+
+ /**
+ * 联系方式
+ */
+ @TableField(value = "mobile")
+ private String mobile;
+
+ /**
+ * 民族
+ */
+ @TableField(value = "nation")
+ private String nation;
+
+ /**
+ * 民族名称
+ */
+ @TableField(value = "nation_name")
+ private String nationName;
+
+ /**
+ * 证件类型
+ */
+ @TableField(value = "certi_type")
+ private String certiType;
+
+ /**
+ * 证件类型名称
+ */
+ @TableField(value = "certi_type_name")
+ private String certiTypeName;
+
+ /**
+ * 证件号码
+ */
+ @TableField(value = "certi_no")
+ private String certiNo;
+
+ /**
+ * 出生日期
+ */
+ @TableField(value = "birthday")
+ private String birthday;
+
+ /**
+ * 组织机构代码
+ */
+ @TableField(value = "orga_code")
+ private String orgaCode;
+
+ /**
+ * 性别
+ */
+ @TableField(value = "sex")
+ private String sex;
+
+ /**
+ * 性别名称
+ */
+ @TableField(value = "sex_name")
+ private String sexName;
+
+ /**
+ * 职业
+ */
+ @TableField(value = "job")
+ private String job;
+
+ /**
+ * 职业名称
+ */
+ @TableField(value = "job_name")
+ private String jobName;
+
+ /**
+ * 地址省
+ */
+ @TableField(value = "prov")
+ private String prov;
+
+ /**
+ * 地址省名称
+ */
+ @TableField(value = "prov_name")
+ private String provName;
+
+ /**
+ * 地址市
+ */
+ @TableField(value = "city")
+ private String city;
+
+ /**
+ * 地址市名称
+ */
+ @TableField(value = "city_name")
+ private String cityName;
+
+ /**
+ * 地址区
+ */
+ @TableField(value = "area")
+ private String area;
+
+ /**
+ * 地址区名称
+ */
+ @TableField(value = "area_name")
+ private String areaName;
+
+ /**
+ * 地址街道
+ */
+ @TableField(value = "road")
+ private String road;
+
+ /**
+ * 地址街道名称
+ */
+ @TableField(value = "road_name")
+ private String roadName;
+
+ /**
+ * 地址社区
+ */
+ @TableField(value = "village")
+ private String village;
+
+ /**
+ * 地址社区名称
+ */
+ @TableField(value = "village_name")
+ private String villageName;
+
+ /**
+ * 地址详细地址
+ */
+ @TableField(value = "addr")
+ private String addr;
+
+ /**
+ * 年龄
+ */
+ @TableField(value = "age")
+ private Integer age;
+
+ /**
+ * 微信
+ */
+ @TableField(value = "wechat")
+ private String wechat;
+
+ /**
+ * QQ
+ */
+ @TableField(value = "qq")
+ private String qq;
+
+ /**
+ * 有无代理人，1：无，2：有
+ */
+ @TableField(value = "agent_status")
+ private String agentStatus;
+
+ /**
+ * 邮箱
+ */
+ @TableField(value = "mail")
+ private String mail;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 删除状态，1：未删除（默认值），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseSign.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseSign.java
new file mode 100644
index 0000000..a619e71
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseSign.java
@@ -0,0 +1,174 @@
+package cn.huge.module.bycase.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷签收任务表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_sign")
+@Data
+public class CaseSign {
+
+ /**
+ * 纠纷签收任务编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ @TableField(value = "case_id")
+ private String caseId;
+
+ /**
+ * 系列案状态，1：正常案件，2：系列案
+ */
+ @TableField(value = "serie_status")
+ private String serieStatus;
+
+ /**
+ * 调度单编号
+ */
+ @TableField(value = "disp_id")
+ private String dispId;
+
+ /**
+ * 调度处理对象类型，22_00038-1：调度给调解组织，22_00038-2：调度给调解员
+ */
+ @TableField(value = "disp_obj_type")
+ private String dispObjType;
+
+ /**
+ * 调度处理对象编号
+ */
+ @TableField(value = "disp_obj_id")
+ private String dispObjId;
+
+ /**
+ * 调度处理对象名称
+ */
+ @TableField(value = "disp_obj_name")
+ private String dispObjName;
+
+ /**
+ * 到期时间
+ */
+ @TableField(value = "expire_time")
+ private Date expireTime;
+
+ /**
+ * 经办人组织编号
+ */
+ @TableField(value = "handler_unit_id")
+ private String handlerUnitId;
+
+ /**
+ * 经办人组织名称
+ */
+ @TableField(value = "handler_unit_name")
+ private String handlerUnitName;
+
+ /**
+ * 经办人部门编号
+ */
+ @TableField(value = "handler_dept_id")
+ private String handlerDeptId;
+
+ /**
+ * 经办人部门名称
+ */
+ @TableField(value = "handler_dept_name")
+ private String handlerDeptName;
+
+ /**
+ * 经办人编号
+ */
+ @TableField(value = "handler_user_id")
+ private String handlerUserId;
+
+ /**
+ * 经办人名称
+ */
+ @TableField(value = "handler_user_name")
+ private String handlerUserName;
+
+ /**
+ * 签收意见，22_00010-1：同意签收，22_00010-2：拒绝签收
+ */
+ @TableField(value = "handle_result")
+ private String handleResult;
+
+ /**
+ * 签收意见名称
+ */
+ @TableField(value = "handle_result_name")
+ private String handleResultName;
+
+ /**
+ * 拒签原因，22_00009-1：人民法院已经受理或正在受理的，22_00009-2：一方当事人不同意调解的，22_00009-3：已构成犯罪或构成违反治安管理处罚行为的，22_00009-4：已通过其他渠道受理或处理，22_00009-5：材料不全或不合格，22_00009-6：不属于管辖受理范围
+ */
+ @TableField(value = "notsign_reason")
+ private String notsignReason;
+
+ /**
+ * 拒签原因名称
+ */
+ @TableField(value = "notsign_reason_name")
+ private String notsignReasonName;
+
+ /**
+ * 签收说明
+ */
+ @TableField(value = "handle_content")
+ private String handleContent;
+
+ /**
+ * 签收进度，1：未签收，2：已签收，3：超时未签收，99：拒绝签收
+ */
+ @TableField(value = "status")
+ private String status;
+
+ /**
+ * 签收时间
+ */
+ @TableField(value = "sign_time")
+ private Date signTime;
+
+ /**
+ * 删除状态，1：未删除（默认值），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseTask.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseTask.java
new file mode 100644
index 0000000..7fdbf66
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/domain/po/CaseTask.java
@@ -0,0 +1,378 @@
+package cn.huge.module.bycase.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷任务表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_task")
+@Data
+public class CaseTask {
+
+ /**
+ * 纠纷任务编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ @TableField(value = "case_id")
+ private String caseId;
+
+ /**
+ * 系列案状态，1：正常案件，2：系列案
+ */
+ @TableField(value = "serie_status")
+ private String serieStatus;
+
+ /**
+ * 流程编号
+ */
+ @TableField(value = "flow_id")
+ private String flowId;
+
+ /**
+ * 流程实例编号
+ */
+ @TableField(value = "process_instance_id")
+ private String processInstanceId;
+
+ /**
+ * 当前流程任务编号
+ */
+ @TableField(value = "process_task_id")
+ private String processTaskId;
+
+ /**
+ * 任务节点
+ */
+ @TableField(value = "task_node")
+ private String taskNode;
+
+ /**
+ * 任务节点名称
+ */
+ @TableField(value = "task_node_name")
+ private String taskNodeName;
+
+ /**
+ * 任务节点类型，1：首节点，2：普通节点，3：结束节点
+ */
+ @TableField(value = "task_node_type")
+ private String taskNodeType;
+
+ /**
+ * 任务类型，1：正常任务，2：退回任务
+ */
+ @TableField(value = "task_type")
+ private String taskType;
+
+ /**
+ * 经办人组织编号
+ */
+ @TableField(value = "handler_unit_id")
+ private String handlerUnitId;
+
+ /**
+ * 经办人组织名称
+ */
+ @TableField(value = "handler_unit_name")
+ private String handlerUnitName;
+
+ /**
+ * 经办人部门编号
+ */
+ @TableField(value = "handler_dept_id")
+ private String handlerDeptId;
+
+ /**
+ * 经办人部门名称
+ */
+ @TableField(value = "handler_dept_name")
+ private String handlerDeptName;
+
+ /**
+ * 经办人角色代码编号
+ */
+ @TableField(value = "handler_role_code")
+ private String handlerRoleCode;
+
+ /**
+ * 经办人角色名称
+ */
+ @TableField(value = "handler_role_name")
+ private String handlerRoleName;
+
+ /**
+ * 经办人编号
+ */
+ @TableField(value = "handler_user_id")
+ private String handlerUserId;
+
+ /**
+ * 经办人名称
+ */
+ @TableField(value = "handler_user_name")
+ private String handlerUserName;
+
+ /**
+ * 到期时间
+ */
+ @TableField(value = "expire_time")
+ private Date expireTime;
+
+ /**
+ * 任务进度，1：进行中，2：已完成
+ */
+ @TableField(value = "status")
+ private String status;
+
+ /**
+ * 处理结果，1：通过，2：退回，3：终止流程
+ */
+ @TableField(value = "handle_result")
+ private String handleResult;
+
+ /**
+ * 异常原因（退回、终止流程是异常）
+ */
+ @TableField(value = "error_cause")
+ private String errorCause;
+
+ /**
+ * 异常原因名称
+ */
+ @TableField(value = "error_cause_name")
+ private String errorCauseName;
+
+ /**
+ * 处理说明
+ */
+ @TableField(value = "handle_content")
+ private String handleContent;
+
+ /**
+ * 任务完成时间，进度为已完成才有
+ */
+ @TableField(value = "finish_time")
+ private Date finishTime;
+
+ /**
+ * 调解结果
+ */
+ @TableField(value = "medi_result")
+ private String mediResult;
+
+ /**
+ * 调解结果名称
+ */
+ @TableField(value = "medi_result_name")
+ private String mediResultName;
+
+ /**
+ * 履行情况，22_00008-1：未履行，22_00008-2：当场履行，22_00008-3：分期履行
+ */
+ @TableField(value = "fulfil_situ")
+ private String fulfilSitu;
+
+ /**
+ * 履行情况名称
+ */
+ @TableField(value = "fulfil_situ_name")
+ private String fulfilSituName;
+
+ /**
+ * 已达成协议
+ */
+ @TableField(value = "agree_content")
+ private String agreeContent;
+
+ /**
+ * 调解不成功原因，22_00019-1：当事人未能就调解协议达成一致，22_00019-2：当事人拒绝调解，22_00019-3：提前终止调解，22_00019-4：当事人撤销调解请求
+ */
+ @TableField(value = "medi_false")
+ private String mediFalse;
+
+ /**
+ * 调解不成功原因名称
+ */
+ @TableField(value = "medi_false_name")
+ private String mediFalseName;
+
+ /**
+ * 是否转诉讼案件（调解不成功才有），1：不转诉讼，2：转诉讼
+ */
+ @TableField(value = "civil_status")
+ private String civilStatus;
+
+ /**
+ * 诉讼案号
+ */
+ @TableField(value = "civil_no")
+ private String civilNo;
+
+ /**
+ * 诉讼法院编号
+ */
+ @TableField(value = "court_id")
+ private String courtId;
+
+ /**
+ * 诉讼法院名称
+ */
+ @TableField(value = "court_name")
+ private String courtName;
+
+ /**
+ * 民诉前调号
+ */
+ @TableField(value = "mediate_no")
+ private String mediateNo;
+
+ /**
+ * 民诉前调书号
+ */
+ @TableField(value = "mediate_book_no")
+ private String mediateBookNo;
+
+ /**
+ * 档案年度
+ */
+ @TableField(value = "file_year")
+ private String fileYear;
+
+ /**
+ * 档案卷名
+ */
+ @TableField(value = "file_book_name")
+ private String fileBookName;
+
+ /**
+ * 档案卷号
+ */
+ @TableField(value = "file_book_no")
+ private String fileBookNo;
+
+ /**
+ * 档案编号
+ */
+ @TableField(value = "file_no")
+ private String fileNo;
+
+ /**
+ * 档案保管年限，单位：年
+ */
+ @TableField(value = "file_limit_year")
+ private Integer fileLimitYear;
+
+ /**
+ * 档案存档位置
+ */
+ @TableField(value = "file_addr")
+ private String fileAddr;
+
+ /**
+ * 卷宗情况说明
+ */
+ @TableField(value = "file_content")
+ private String fileContent;
+
+ /**
+ * 删除状态，1：未删除（默认值），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+ /**
+ * 下一级处理人编号，已完成才有，冗余显示
+ */
+ @TableField(value = "next_user_id")
+ private String nextUserId;
+
+ /**
+ * 下一级处理人名称，已完成才有，冗余显示
+ */
+ @TableField(value = "next_user_name")
+ private String nextUserName;
+
+ /**
+ * 上一任务编号，冗余显示
+ */
+ @TableField(value = "last_task_id")
+ private String lastTaskId;
+
+ /**
+ * 上一任务经办单位编号，冗余显示
+ */
+ @TableField(value = "last_unit_id")
+ private String lastUnitId;
+
+ /**
+ * 上一任务经办单位名称，冗余显示
+ */
+ @TableField(value = "last_unit_name")
+ private String lastUnitName;
+
+ /**
+ * 上一任务经办部门编号，冗余显示
+ */
+ @TableField(value = "last_dept_id")
+ private String lastDeptId;
+
+ /**
+ * 上一任务经办部门名称，冗余显示
+ */
+ @TableField(value = "last_dept_name")
+ private String lastDeptName;
+
+ /**
+ * 上一任务经办人编号，冗余显示
+ */
+ @TableField(value = "last_user_id")
+ private String lastUserId;
+
+ /**
+ * 上一任务经办人名称，冗余显示
+ */
+ @TableField(value = "last_user_name")
+ private String lastUserName;
+
+ /**
+ * 上一任务处理说明，冗余显示
+ */
+ @TableField(value = "last_content")
+ private String lastContent;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseAgentService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseAgentService.java
new file mode 100644
index 0000000..266c257
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseAgentService.java
@@ -0,0 +1,105 @@
+package cn.huge.module.bycase.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.bycase.domain.po.CaseAgent;
+import cn.huge.module.bycase.dao.mapper.CaseAgentMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷代理人表业务逻辑处理
+ * @Description 纠纷代理人表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseAgentService extends ServiceImpl<CaseAgentMapper, CaseAgent>{
+
+ @Autowired
+ private CaseAgentMapper mapper;
+
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseAgent(CaseAgent entity){
+ try{
+ mapper.updateCaseAgent(entity);
+ }catch (Exception e){
+ log.error("[CaseAgentService.updateCaseAgent]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAgentService.updateCaseAgent", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseAgentTerms(CaseAgent entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseAgentTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseAgentService.updateCaseAgentTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAgentService.updateCaseAgentTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseAgent(String id){
+ try{
+ mapper.deleteCaseAgent(id);
+ }catch (Exception e){
+ log.error("[CaseAgentService.deleteCaseAgent]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAgentService.deleteCaseAgent", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseAgent> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseAgent> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseAgent> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseAgent>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseDispService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseDispService.java
new file mode 100644
index 0000000..1041087
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseDispService.java
@@ -0,0 +1,105 @@
+package cn.huge.module.bycase.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.bycase.domain.po.CaseDisp;
+import cn.huge.module.bycase.dao.mapper.CaseDispMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷调度单表业务逻辑处理
+ * @Description 纠纷调度单表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseDispService extends ServiceImpl<CaseDispMapper, CaseDisp>{
+
+ @Autowired
+ private CaseDispMapper mapper;
+
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseDisp(CaseDisp entity){
+ try{
+ mapper.updateCaseDisp(entity);
+ }catch (Exception e){
+ log.error("[CaseDispService.updateCaseDisp]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDispService.updateCaseDisp", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseDispTerms(CaseDisp entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseDispTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseDispService.updateCaseDispTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDispService.updateCaseDispTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseDisp(String id){
+ try{
+ mapper.deleteCaseDisp(id);
+ }catch (Exception e){
+ log.error("[CaseDispService.deleteCaseDisp]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDispService.deleteCaseDisp", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseDisp> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseDisp> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseDisp> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseDisp>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseInfoService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseInfoService.java
new file mode 100644
index 0000000..92cb758
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseInfoService.java
@@ -0,0 +1,505 @@
+package cn.huge.module.bycase.service;
+
+import cn.huge.base.common.constant.GzRegionEnum;
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.bycase.domain.dto.*;
+import cn.huge.module.bycase.domain.po.CaseAgent;
+import cn.huge.module.bycase.domain.po.CaseInfo;
+import cn.huge.module.bycase.dao.mapper.CaseInfoMapper;
+import cn.huge.module.bycase.domain.po.CasePerson;
+import cn.huge.module.bycase.domain.po.CaseTask;
+import cn.huge.module.client.api.impl.UtilsClientImpl;
+import cn.huge.module.constant.*;
+import cn.huge.module.mediate.constant.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.management.Query;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷信息表业务逻辑处理
+ * @Description 纠纷信息表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-21 08:46:39
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseInfoService extends ServiceImpl<CaseInfoMapper, CaseInfo>{
+
+ @Autowired
+ private CaseInfoMapper mapper;
+ @Autowired
+ private UtilsClientImpl utilsClient;
+ @Autowired
+ private CasePersonService casePersonService;
+ @Autowired
+ private CaseAgentService caseAgentService;
+ @Autowired
+ private CaseTaskService caseTaskService;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseInfo(CaseInfo entity){
+ try{
+ mapper.updateCaseInfo(entity);
+ }catch (Exception e){
+ log.error("[CaseInfoService.updateCaseInfo]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoService.updateCaseInfo", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseInfoTerms(CaseInfo entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseInfoTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseInfoService.updateCaseInfoTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoService.updateCaseInfoTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseInfo(String id){
+ try{
+ mapper.deleteCaseInfo(id);
+ }catch (Exception e){
+ log.error("[CaseInfoService.deleteCaseInfo]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoService.deleteCaseInfo", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseInfo> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseInfo> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseInfo> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseInfo>(content, page, total);
+ }
+
+ /**
+ * 数据割接-已结束的纠纷案件信息
+ * @return
+ */
+ public List<GZCaseDTO> byToGzEndCase(int page, int size){
+ List<GZCaseDTO> gzCaseDTOList = new ArrayList<>();
+ Map<String, Object> terms = Maps.newHashMap();
+ terms.put("EndProcess", "EndProcess");
+ Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
+ PageRequest pageRequest = PageRequest.of(page-1, size, sort);
+ Page<CaseInfo> caseInfoPage = this.pageQuery(pageRequest, terms);
+ for (CaseInfo caseInfo: caseInfoPage){
+ GZCaseDTO gzCaseDTO = new GZCaseDTO();
+ // 封装案件信息
+ GZCaseInfoDTO gzCaseInfoDTO = new GZCaseInfoDTO();
+ BeanUtils.copyProperties(caseInfo, gzCaseInfoDTO);
+ // 生成事项编号
+ gzCaseInfoDTO.setCaseRef(utilsClient.createCaseRef());
+ // 都是3级事件
+ gzCaseInfoDTO.setCaseLevel(CaseBaseConsts.CASE_LEVEL_3);
+ // 映射来访时间
+ gzCaseInfoDTO.setVisitTime(caseInfo.getAcceptTime());
+ // 映射来访人数
+ gzCaseInfoDTO.setVisitPeopleNum(caseInfo.getPeopleNum());
+ // 映射纠纷类型
+// gzCaseInfoDTO.setCaseTypeFirst();
+// gzCaseInfoDTO.setCaseTypeFirstName();
+// gzCaseInfoDTO.setCaseType();
+// gzCaseInfoDTO.setCaseTypeName();
+ // 映射问题属地
+ gzCaseInfoDTO.setQueProv(GzRegionEnum.PROV_1.getIndex());
+ gzCaseInfoDTO.setQueProvName(GzRegionEnum.PROV_1.getDes());
+ gzCaseInfoDTO.setQueCity(GzRegionEnum.CITY_1.getIndex());
+ gzCaseInfoDTO.setQueCityName(GzRegionEnum.CITY_1.getDes());
+ gzCaseInfoDTO.setQueArea(GzRegionEnum.AREA_7.getIndex());
+ gzCaseInfoDTO.setQueAreaName(GzRegionEnum.AREA_7.getDes());
+ if (StringUtils.isNotEmpty(caseInfo.getRoad())) {
+ gzCaseInfoDTO.setQueRoad(ByRegionEnum.getGZRegion(caseInfo.getRoad()).getIndex());
+ gzCaseInfoDTO.setQueRoadName(ByRegionEnum.getGZRegion(caseInfo.getRoad()).getDes());
+ }
+ gzCaseInfoDTO.setQueVillage(null);
+ gzCaseInfoDTO.setQueVillageName(null);
+ if ("2".equals(caseInfo.getInputWay())) {
+ gzCaseInfoDTO.setInputWay(2);
+ }else {
+ gzCaseInfoDTO.setInputWay(1);
+ }
+ // 映射事项来源、来访形式
+ if (ByCaseConstsEnum.CASE_CANAL_1.getIndex().equals(caseInfo.getCanal())){
+ if (caseInfo.getMediateUnitId().equals(caseInfo.getInputUnitId())){
+ // 事项来源
+ gzCaseInfoDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_3.getIndex());
+ gzCaseInfoDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_3.getDes());
+ // 来访形式
+ gzCaseInfoDTO.setVisitWay(CaseBaseConstsEnum.getVisitWayByCanal(gzCaseInfoDTO.getCanal()).getIndex());
+ gzCaseInfoDTO.setVisitWayName(CaseBaseConstsEnum.getVisitWayByCanal(gzCaseInfoDTO.getCanal()).getDes());
+ }else {
+ // 事项来源
+ gzCaseInfoDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
+ gzCaseInfoDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
+ // 来访形式
+ gzCaseInfoDTO.setVisitWay(CaseBaseConstsEnum.getVisitWayByCanal(gzCaseInfoDTO.getCanal()).getIndex());
+ gzCaseInfoDTO.setVisitWayName(CaseBaseConstsEnum.getVisitWayByCanal(gzCaseInfoDTO.getCanal()).getDes());
+ }
+ }else if (ByCaseConstsEnum.CASE_CANAL_2.getIndex().equals(caseInfo.getCanal())){
+ // 事项来源
+ gzCaseInfoDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
+ gzCaseInfoDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
+ // 来访形式
+ gzCaseInfoDTO.setVisitWay(CaseBaseConstsEnum.getVisitWayByCanal(gzCaseInfoDTO.getCanal()).getIndex());
+ gzCaseInfoDTO.setVisitWayName(CaseBaseConstsEnum.getVisitWayByCanal(gzCaseInfoDTO.getCanal()).getDes());
+ }
+ // 映射是否自行受理
+ gzCaseInfoDTO.setZxslStatus(CaseBaseConsts.ZXSL_STATUS_0);
+ // 是否重大矛盾纠纷
+ gzCaseInfoDTO.setMajorStatus(CaseBaseConsts.MAJOR_STATUS_0);
+ // 映射事项状态、事项进度、对外展示事项进度
+ if (ByCaseConstsEnum.CASE_PROCESS_1.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }else if (ByCaseConstsEnum.CASE_PROCESS_2.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }else if (ByCaseConstsEnum.CASE_PROCESS_3.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_4.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_4.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }else if (ByCaseConstsEnum.CASE_PROCESS_4.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_7.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_7.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }else if (ByCaseConstsEnum.CASE_PROCESS_5.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_8.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }else if (ByCaseConstsEnum.CASE_PROCESS_6.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_8.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }else if (ByCaseConstsEnum.CASE_PROCESS_7.getIndex().equals(caseInfo.getProcess())){
+ // 事项状态
+ gzCaseInfoDTO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex());
+ gzCaseInfoDTO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_8.getDes());
+ // 事项进度
+ gzCaseInfoDTO.setProcess(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getIndex());
+ gzCaseInfoDTO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(gzCaseInfoDTO.getStatus()).getDes());
+ // 对外展示事项进度
+ gzCaseInfoDTO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getIndex());
+ gzCaseInfoDTO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(gzCaseInfoDTO.getProcess()).getDes());
+ }
+ // 映射小程序是否可见
+ gzCaseInfoDTO.setPartyShow(CaseBaseConsts.PARTY_SHOW_1);
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(caseInfo.getDeleteStatus())) {
+ gzCaseInfoDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ }else {
+ gzCaseInfoDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ gzCaseDTO.setGzCaseInfoDTO(gzCaseInfoDTO);
+
+ // 封装案件扩展信息
+ GZCaseInfoUnfoldDTO gzCaseInfoUnfoldDTO = new GZCaseInfoUnfoldDTO();
+ BeanUtils.copyProperties(caseInfo, gzCaseInfoUnfoldDTO);
+ // 映射调解结果名称
+ gzCaseInfoUnfoldDTO.setMediResultName(MediResultBaseConstsEnum.getDes(caseInfo.getMediResult()));
+ // 映射达成协议类型
+ if (ByCaseConstsEnum.CASE_PROCESS_4.getIndex().equals(caseInfo.getProcess())){
+ // 调解成功
+ if (ByCaseConstsEnum.MEDI_RESULT_1.getIndex().equals(caseInfo.getMediResult())){
+ if (StringUtils.isNotEmpty(caseInfo.getAgreeContent())){
+ gzCaseInfoUnfoldDTO.setAgreeType(CaseBaseConstsEnum.AGREE_TYPE_1.getIndex());
+ gzCaseInfoUnfoldDTO.setAgreeTypeName(CaseBaseConstsEnum.AGREE_TYPE_1.getDes());
+ }else {
+ gzCaseInfoUnfoldDTO.setAgreeType(CaseBaseConstsEnum.AGREE_TYPE_2.getIndex());
+ gzCaseInfoUnfoldDTO.setAgreeTypeName(CaseBaseConstsEnum.AGREE_TYPE_2.getDes());
+ }
+ }
+ }
+ // 映射结案意见
+ gzCaseInfoUnfoldDTO.setWindupContent(caseInfo.getMediContent());
+ // 映射是否转诉讼案件
+ if (ByCaseConsts.CIVIL_STATUS_2 == caseInfo.getCivilStatus()){
+ gzCaseInfoUnfoldDTO.setCivilStatus(CaseBaseConsts.CIVIL_STATUS_1);
+ }else {
+ gzCaseInfoUnfoldDTO.setCivilStatus(CaseBaseConsts.CIVIL_STATUS_0);
+ }
+ // 映射办结时间
+ if (ObjectUtils.isNotEmpty(caseInfo.getFileTime())) {
+ gzCaseInfoUnfoldDTO.setCloseTime(caseInfo.getFileTime());
+ }else if (ObjectUtils.isNotEmpty(caseInfo.getMediEndTime())){
+ gzCaseInfoUnfoldDTO.setCloseTime(caseInfo.getMediEndTime());
+ }else {
+ gzCaseInfoUnfoldDTO.setCloseTime(caseInfo.getUpdateTime());
+ }
+ // 映射是否申请司法确认
+ if (ByCaseConsts.JUDIC_APPLY_2 == caseInfo.getCivilStatus()){
+ gzCaseInfoUnfoldDTO.setJudicApply(CaseBaseConsts.JUDIC_APPLY_1);
+ }else {
+ gzCaseInfoUnfoldDTO.setJudicApply(CaseBaseConsts.JUDIC_APPLY_0);
+ }
+ // 映射是否已归档
+ if (ByCaseConsts.FILE_STATUS_2 == caseInfo.getCivilStatus()){
+ gzCaseInfoUnfoldDTO.setFileStatus(CaseBaseConsts.FILE_STATUS_1);
+ }else {
+ gzCaseInfoUnfoldDTO.setFileStatus(CaseBaseConsts.FILE_STATUS_0);
+ }
+ // 映射是否已回访
+ if (ByCaseConsts.VISIT_STATUS_2 == caseInfo.getCivilStatus()){
+ gzCaseInfoUnfoldDTO.setVisitUpStatus(CaseBaseConsts.VISIT_UP_STATUS_1);
+ }else {
+ gzCaseInfoUnfoldDTO.setVisitUpStatus(CaseBaseConsts.VISIT_UP_STATUS_0);
+ }
+ // 映射当事人是否满意
+ if (ByCaseConsts.PARTY_JOY_2 == caseInfo.getCivilStatus()){
+ gzCaseInfoUnfoldDTO.setPartyJoy(CaseBaseConsts.PARTY_JOY_1);
+ }else {
+ gzCaseInfoUnfoldDTO.setPartyJoy(CaseBaseConsts.PARTY_JOY_0);
+ }
+ gzCaseDTO.setGzCaseInfoUnfoldDTO(gzCaseInfoUnfoldDTO);
+
+ // 封装当事人信息
+ QueryWrapper<CasePerson> casePersonQueryWrapper = new QueryWrapper<>();
+ casePersonQueryWrapper.eq("case_id", caseInfo.getId());
+ List<CasePerson> casePersonList = casePersonService.list(casePersonQueryWrapper);
+ if (CollectionUtils.isNotEmpty(casePersonList)){
+ List<GZCasePersonDTO> gzCasePersonDTOList = new ArrayList<>();
+ for (CasePerson casePerson: casePersonList){
+ GZCasePersonDTO gzCasePersonDTO = new GZCasePersonDTO();
+ BeanUtils.copyProperties(casePerson, gzCasePersonDTO);
+ // 映射是否有个人极端倾向
+ gzCasePersonDTO.setExtreme(CaseBaseConsts.EXTREME_0);
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(casePerson.getDeleteStatus())) {
+ gzCasePersonDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ }else {
+ gzCasePersonDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ gzCasePersonDTOList.add(gzCasePersonDTO);
+ }
+ gzCaseDTO.setGzCasePersonDTOList(gzCasePersonDTOList);
+ }
+
+ // 封装当事人代理人信息
+ QueryWrapper<CaseAgent> caseAgentQueryWrapper = new QueryWrapper<>();
+ caseAgentQueryWrapper.eq("case_id", caseInfo.getId());
+ List<CaseAgent> caseAgentList = caseAgentService.list(caseAgentQueryWrapper);
+ if (CollectionUtils.isNotEmpty(caseAgentList)){
+ List<GZCaseAgentDTO> gzCaseAgentDTOList = new ArrayList<>();
+ for (CaseAgent caseAgent: caseAgentList){
+ GZCaseAgentDTO gzCaseAgentDTO = new GZCaseAgentDTO();
+ BeanUtils.copyProperties(caseAgent, gzCaseAgentDTO);
+ // 映射是否有个人极端倾向
+ gzCaseAgentDTO.setExtreme(CaseBaseConsts.EXTREME_0);
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(caseAgent.getDeleteStatus())) {
+ gzCaseAgentDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ }else {
+ gzCaseAgentDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ gzCaseAgentDTOList.add(gzCaseAgentDTO);
+ }
+ gzCaseDTO.setGzCaseAgentDTOList(gzCaseAgentDTOList);
+ }
+
+ // 封装案件任务信息
+ QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
+ caseTaskQueryWrapper.eq("case_id", caseInfo.getId()).orderByAsc("create_time");
+ List<CaseTask> caseTaskList = caseTaskService.list(caseTaskQueryWrapper);
+ if (CollectionUtils.isNotEmpty(caseTaskList)){
+ List<GZCaseTaskDTO> gzCaseTaskDTOList = new ArrayList<>();
+ for (CaseTask caseTask: caseTaskList){
+ GZCaseTaskDTO gzCaseTaskDTO = new GZCaseTaskDTO();
+ BeanUtils.copyProperties(caseTask, gzCaseTaskDTO);
+ // 映射工作流流程定义编号
+ if (CaseBaseConstsEnum.CASE_CANAL_3.getIndex().equals(gzCaseInfoDTO.getCanal())){
+ gzCaseTaskDTO.setFlowableId(GZFlowableConsts.GZDYH_JB_ZXPC_V1);
+ gzCaseTaskDTO.setFlowId("20241002");
+ }else {
+ gzCaseTaskDTO.setFlowableId(GZFlowableConsts.GZDYH_JB_LFDJ_V1);
+ gzCaseTaskDTO.setFlowId("20241001");
+ }
+ // 映射工作流节点类型
+ if ("1".equals(caseTask.getTaskNodeType())) {
+ gzCaseTaskDTO.setNodeType(1);
+ }
+ if ("2".equals(caseTask.getTaskNodeType())) {
+ gzCaseTaskDTO.setNodeType(2);
+ }
+ if ("3".equals(caseTask.getTaskNodeType())) {
+ gzCaseTaskDTO.setNodeType(3);
+ }
+ // 指派调解员节点
+ if (ByFlowNodeEnum.FLOW_NODE_2.getIndex().equals(caseTask.getTaskNode())){
+ gzCaseTaskDTO.setNodeId(GZFlowNodeEnum.FLOW_NODE_DSL.getIndex());
+ gzCaseTaskDTO.setNodeName(GZFlowNodeEnum.FLOW_NODE_DSL.getDes());
+ gzCaseTaskDTO.setNodeShowName("事件流转");
+ // 映射签收状态
+ gzCaseTaskDTO.setSignStatus(GZCaseTaskConsts.SIGN_STATUS_2);
+ gzCaseTaskDTO.setSignTime(caseTask.getCreateTime());
+ gzCaseTaskDTO.setSignUnitId(caseTask.getHandlerUnitId());
+ gzCaseTaskDTO.setSignUnitName(caseTask.getHandlerUnitName());
+ gzCaseTaskDTO.setSignUserId(caseTask.getHandlerUserId());
+ gzCaseTaskDTO.setSignUserName(caseTask.getHandlerUserName());
+ if (CaseBaseConstsEnum.CASE_CANAL_3.getIndex().equals(gzCaseInfoDTO.getCanal())){
+ // 自行受理
+ gzCaseTaskDTO.setHandleIllust("自行受理");
+ }else {
+ // 自行受理
+ gzCaseTaskDTO.setHandleIllust("派单至："+caseTask.getHandlerUnitName());
+ }
+ }
+ // 纠纷调解节点
+ if (ByFlowNodeEnum.FLOW_NODE_3.getIndex().equals(caseTask.getTaskNode())){
+ gzCaseTaskDTO.setNodeId(GZFlowNodeEnum.FLOW_NODE_BLFK.getIndex());
+ gzCaseTaskDTO.setNodeName(GZFlowNodeEnum.FLOW_NODE_BLFK.getDes());
+ gzCaseTaskDTO.setNodeShowName("办理反馈");
+ // 映射签收状态
+ gzCaseTaskDTO.setSignStatus(GZCaseTaskConsts.SIGN_STATUS_0);
+ }
+ // 结案归档节点
+ if (ByFlowNodeEnum.FLOW_NODE_4.getIndex().equals(caseTask.getTaskNode())
+ || ByFlowNodeEnum.FLOW_NODE_5.getIndex().equals(caseTask.getTaskNode()) ){
+ gzCaseTaskDTO.setNodeId(GZFlowNodeEnum.FLOW_NODE_JAGD.getIndex());
+ gzCaseTaskDTO.setNodeName(GZFlowNodeEnum.FLOW_NODE_JAGD.getDes());
+ gzCaseTaskDTO.setNodeShowName("结案归档");
+ // 映射签收状态
+ gzCaseTaskDTO.setSignStatus(GZCaseTaskConsts.SIGN_STATUS_0);
+ }
+ // 映射纠纷任务类型
+ gzCaseTaskDTO.setCaseTaskType(GZCaseTaskConsts.CASE_TASK_TYPE_1);
+ // 映射任务所属
+ gzCaseTaskDTO.setCandeUnitId(caseTask.getHandlerUnitId());
+ gzCaseTaskDTO.setCandeUnitName(caseTask.getHandlerUnitName());
+ gzCaseTaskDTO.setCandeDeptId(caseTask.getHandlerDeptId());
+ gzCaseTaskDTO.setCandeDeptName(caseTask.getHandlerDeptName());
+ gzCaseTaskDTO.setCandeUserId(caseTask.getHandlerUserId());
+ gzCaseTaskDTO.setCandeUserName(caseTask.getHandlerUserName());
+ // 任务处理
+ if ("2".equals(caseTask.getStatus())) {
+ gzCaseTaskDTO.setStatus(GZCaseTaskConsts.TASK_STATUS_2);
+ }else {
+ gzCaseTaskDTO.setStatus(GZCaseTaskConsts.TASK_STATUS_1);
+ }
+ gzCaseTaskDTO.setHandleUnitId(caseTask.getHandlerUnitId());
+ gzCaseTaskDTO.setHandleUnitName(caseTask.getHandlerUnitName());
+ gzCaseTaskDTO.setHandleDeptId(caseTask.getHandlerDeptId());
+ gzCaseTaskDTO.setHandleDeptName(caseTask.getHandlerDeptName());
+ gzCaseTaskDTO.setHandleUserId(caseTask.getHandlerUserId());
+ gzCaseTaskDTO.setHandleUserName(caseTask.getHandlerUserName());
+ // 映射处理结果
+ if ("2".equals(caseTask.getHandleResult())){
+ gzCaseTaskDTO.setHandleResult(GZCaseTaskConsts.HANDLE_RESULT_4);
+ }else if ("3".equals(caseTask.getHandleResult())){
+ gzCaseTaskDTO.setHandleResult(GZCaseTaskConsts.HANDLE_RESULT_3);
+ }else {
+ gzCaseTaskDTO.setHandleResult(GZCaseTaskConsts.HANDLE_RESULT_0);
+ }
+ // 映射任任务处理时间
+ gzCaseTaskDTO.setHandleTime(caseTask.getFinishTime());
+ // 计算任务耗时、是否超时、超时多少
+ gzCaseTaskDTO.setUsetimeHour(GZTaskUsetimeUtils.getUsetimeHour(gzCaseTaskDTO.getHandleTime(), gzCaseTaskDTO.getCreateTime()));
+ gzCaseTaskDTO.setOvertimeStatus(GZTaskUsetimeUtils.getOvertimeStatus(gzCaseTaskDTO.getHandleTime(), gzCaseTaskDTO.getExpireTime()));
+ gzCaseTaskDTO.setOvertimeHour(GZTaskUsetimeUtils.getOvertimeHour(gzCaseTaskDTO.getHandleTime(), gzCaseTaskDTO.getExpireTime()));
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(caseTask.getDeleteStatus())) {
+ gzCaseTaskDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ }else {
+ gzCaseTaskDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ gzCaseTaskDTOList.add(gzCaseTaskDTO);
+ }
+ gzCaseDTO.setGzCaseTaskDTOList(gzCaseTaskDTOList);
+ }
+ gzCaseDTOList.add(gzCaseDTO);
+ }
+ return gzCaseDTOList;
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CasePersonService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CasePersonService.java
new file mode 100644
index 0000000..4abfd02
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CasePersonService.java
@@ -0,0 +1,105 @@
+package cn.huge.module.bycase.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.bycase.domain.po.CasePerson;
+import cn.huge.module.bycase.dao.mapper.CasePersonMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷当事人表业务逻辑处理
+ * @Description 纠纷当事人表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CasePersonService extends ServiceImpl<CasePersonMapper, CasePerson>{
+
+ @Autowired
+ private CasePersonMapper mapper;
+
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCasePerson(CasePerson entity){
+ try{
+ mapper.updateCasePerson(entity);
+ }catch (Exception e){
+ log.error("[CasePersonService.updateCasePerson]调用失败，异常信息："+e, e);
+ throw new ServiceException("CasePersonService.updateCasePerson", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCasePersonTerms(CasePerson entity, Map<String, Object> terms){
+ try{
+ mapper.updateCasePersonTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CasePersonService.updateCasePersonTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CasePersonService.updateCasePersonTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCasePerson(String id){
+ try{
+ mapper.deleteCasePerson(id);
+ }catch (Exception e){
+ log.error("[CasePersonService.deleteCasePerson]调用失败，异常信息："+e, e);
+ throw new ServiceException("CasePersonService.deleteCasePerson", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CasePerson> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CasePerson> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CasePerson> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CasePerson>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseSignService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseSignService.java
new file mode 100644
index 0000000..7c10068
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseSignService.java
@@ -0,0 +1,105 @@
+package cn.huge.module.bycase.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.bycase.dao.mapper.CaseSignMapper;
+import cn.huge.module.bycase.domain.po.CaseSign;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷签收任务表业务逻辑处理
+ * @Description 纠纷签收任务表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseSignService extends ServiceImpl<CaseSignMapper, CaseSign>{
+
+ @Autowired
+ private CaseSignMapper mapper;
+
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseSign(CaseSign entity){
+ try{
+ mapper.updateCaseSign(entity);
+ }catch (Exception e){
+ log.error("[CaseSignService.updateCaseSign]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseSignService.updateCaseSign", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseSignTerms(CaseSign entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseSignTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseSignService.updateCaseSignTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseSignService.updateCaseSignTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseSign(String id){
+ try{
+ mapper.deleteCaseSign(id);
+ }catch (Exception e){
+ log.error("[CaseSignService.deleteCaseSign]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseSignService.deleteCaseSign", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseSign> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseSign> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseSign> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseSign>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseTaskService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseTaskService.java
new file mode 100644
index 0000000..921340d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/bycase/service/CaseTaskService.java
@@ -0,0 +1,105 @@
+package cn.huge.module.bycase.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.bycase.dao.mapper.CaseTaskMapper;
+import cn.huge.module.bycase.domain.po.CaseTask;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷任务表业务逻辑处理
+ * @Description 纠纷任务表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-21 08:46:40
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseTaskService extends ServiceImpl<CaseTaskMapper, CaseTask>{
+
+ @Autowired
+ private CaseTaskMapper mapper;
+
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseTask(CaseTask entity){
+ try{
+ mapper.updateCaseTask(entity);
+ }catch (Exception e){
+ log.error("[CaseTaskService.updateCaseTask]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.updateCaseTask", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseTaskTerms(CaseTask entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseTaskTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseTaskService.updateCaseTaskTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.updateCaseTaskTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseTask(String id){
+ try{
+ mapper.deleteCaseTask(id);
+ }catch (Exception e){
+ log.error("[CaseTaskService.deleteCaseTask]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.deleteCaseTask", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseTask> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseTask> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseTask> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseTask>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/UtilsClient.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/UtilsClient.java
new file mode 100644
index 0000000..13e0bd7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/UtilsClient.java
@@ -0,0 +1,59 @@
+package cn.huge.module.client.api;
+
+import cn.huge.base.common.bo.ReturnBO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @title: 公共工具微服务调用接口
+ * @description: 公共工具微服务调用接口
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@FeignClient(name = "dyh-utils")
+public interface UtilsClient {
+
+ /**
+ * 公共工具-id工具-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeId
+ * @return ReturnBO
+ */
+ @GetMapping("/api/client/mediateUtils/getNewTimeId")
+ ReturnBO getNewTimeId();
+
+ /**
+ * 案件id-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeCaseId
+ * @return Object
+ */
+ @GetMapping("/api/client/mediateUtils/getNewTimeCaseId")
+ ReturnBO getNewTimeCaseId();
+
+ /**
+ * 生成新的调解案号
+ * @url {ctx}/api/client/mediateUtils/createCaseNo
+ * @param area 区
+ * @return Object
+ */
+ @GetMapping("/api/client/mediateUtils/createCaseNo")
+ ReturnBO createCaseNo(@RequestParam(value = "area") String area);
+
+ /**
+ * 生成新的事项编号
+ * @url {ctx}/common/api/caseNoUtils/createCaseRef
+ * @return Object
+ */
+ @GetMapping("/api/client/mediateUtils/createCaseRef")
+ ReturnBO createCaseRef();
+
+ /**
+ * 公共工具-sys服务id工具-获取时间Id，后四位常量
+ * @url {ctx}/api/client/sysUtils/getNewTimeId
+ * @return ReturnBO
+ */
+ @GetMapping("/api/client/sysUtils/getNewTimeId")
+ ReturnBO getNewTimeSysId();
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java
new file mode 100644
index 0000000..5bce048
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java
@@ -0,0 +1,138 @@
+package cn.huge.module.client.api.impl;
+
+import cn.huge.base.common.bo.ReturnBO;
+import cn.huge.base.common.constant.ReturnConsts;
+import cn.huge.base.common.exception.ClientException;
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.module.client.api.UtilsClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @title: 公共工具微服务调用接口
+ * @description: 公共工具微服务调用接口
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@Slf4j
+@Component
+public class UtilsClientImpl {
+
+ private UtilsClient utilsClient;
+
+ @Autowired
+ public UtilsClientImpl(UtilsClient utilsClient) {
+ this.utilsClient = utilsClient;
+ }
+
+ /**
+ * 公共工具-id工具-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeId
+ * @return ReturnBO
+ */
+ public String getNewTimeId(){
+ try{
+ ReturnBO returnBo = utilsClient.getNewTimeId();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ String id = (String) returnBo.getData();
+ return id;
+ }else{
+ log.error("Client外服务接口[UtilsClientImpl.getNewTimeId]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("UtilsClientImpl.getNewTimeId", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[UtilsClientImpl.getNewTimeId]请求成功，处理异常："+e, e);
+ throw new ServiceException("UtilsClientImpl.getNewTimeId", e);
+ }
+ }
+
+ /**
+ * 公共工具-id工具-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeCaseId
+ * @return ReturnBO
+ */
+ public String getNewTimeCaseId(){
+ try{
+ ReturnBO returnBo = utilsClient.getNewTimeCaseId();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ String id = (String) returnBo.getData();
+ return id;
+ }else{
+ log.error("Client外服务接口[UtilsClientImpl.getNewTimeCaseId]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("UtilsClientImpl.getNewTimeCaseId", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[UtilsClientImpl.getNewTimeCaseId]请求成功，处理异常："+e, e);
+ throw new ServiceException("UtilsClientImpl.getNewTimeCaseId", e);
+ }
+ }
+
+ /**
+ * 生成新的调解案号
+ * @url {ctx}/api/client/mediateUtils/createCaseNo
+ * @param area 区
+ * @return Object
+ */
+ public String createCaseNo(String area){
+ try{
+ ReturnBO returnBo = utilsClient.createCaseNo(area);
+ if (ReturnConsts.OK == returnBo.getCode()){
+ String caseNo = (String) returnBo.getData();
+ return caseNo;
+ }else{
+ log.error("Client外服务接口[UtilsClientImpl.createCaseNo]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("UtilsClientImpl.createCaseNo", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[UtilsClientImpl.createCaseNo]请求成功，处理异常："+e, e);
+ throw new ServiceException("UtilsClientImpl.createCaseNo", e);
+ }
+ }
+
+ /**
+ * 生成新的事项编号
+ * @url {ctx}/common/api/caseNoUtils/createCaseRef
+ * @return Object
+ */
+ public String createCaseRef(){
+ try{
+ ReturnBO returnBo = utilsClient.createCaseRef();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ String caseNo = (String) returnBo.getData();
+ return caseNo;
+ }else{
+ log.error("Client外服务接口[UtilsClientImpl.createCaseRef]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("UtilsClientImpl.createCaseRef", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[UtilsClientImpl.createCaseRef]请求成功，处理异常："+e, e);
+ throw new ServiceException("UtilsClientImpl.createCaseRef", e);
+ }
+ }
+
+ /**
+ * 公共工具-sys服务id工具-获取时间Id，后四位常量
+ * @url {ctx}/api/client/sysUtils/getNewTimeId
+ * @return ReturnBO
+ */
+ public String getNewTimeSysId(){
+ try{
+ ReturnBO returnBo = utilsClient.getNewTimeSysId();
+ if (ReturnConsts.OK == returnBo.getCode()){
+ String id = (String) returnBo.getData();
+ return id;
+ }else{
+ log.error("Client外服务接口[UtilsClientImpl.getNewTimeSysId]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("UtilsClientImpl.getNewTimeSysId", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[UtilsClientImpl.getNewTimeSysId]请求成功，处理异常："+e, e);
+ throw new ServiceException("UtilsClientImpl.getNewTimeSysId", e);
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/config/MybatisPlusConfig.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/config/MybatisPlusConfig.java
similarity index 100%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/config/MybatisPlusConfig.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/config/MybatisPlusConfig.java
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByBaseConsts.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByBaseConsts.java
new file mode 100644
index 0000000..872b9c7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByBaseConsts.java
@@ -0,0 +1,81 @@
+package cn.huge.module.constant;
+
+/**
+ * @title: 系统配置相关常量类
+ * @description: 存放系统配置相关常量
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class ByBaseConsts {
+
+ /**
+ * 根节点标志
+ */
+ public static final String ROOT = "root";
+ public static final int LEVEL_ROOT = 1;
+ public static final int LEVEL_2 = 2;
+
+ /**
+ * 状态，1：未删除（默认值），99：已删除
+ */
+ public static final String DELETE_STATUS_1 = "1";
+ public static final String DELETE_STATUS_99 = "99";
+
+ /**
+ * 公用符合
+ */
+ public static final String SLANT = "/";
+ public static final String DOT = ".";
+ public static final String UNDER = "_";
+ public static final String HENG_ZW = "—";
+ public static final String HENG_YW = "-";
+ public static final String COMMA = ",";
+ public static final String COMMA_ZW = "，";
+ public static final String DUN = "、";
+ public static final String SEMI = ";";
+ public static final String AND = "&";
+ public static final String DYH = "'";
+ public static final String JIN = "#";
+ public static final String SHU = "|";
+ public static final String ZKH_YW = "(";
+ public static final String ZKH_ZW = "（";
+ public static final String YKH_YW = ")";
+ public static final String YKH_ZW = "）";
+ public static final String ZH_ZKZ = "【";
+ public static final String EN_ZKZ = "[";
+ public static final String ZH_ZKY = "】";
+ public static final String EH_ZKY = "]";
+
+ /**
+ * 公用单位
+ */
+ public static final String B = "B";
+ public static final String KB = "KB";
+ public static final String MB = "MB";
+ public static final String GB = "GB";
+
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConsts.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConsts.java
new file mode 100644
index 0000000..c6c1c12
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConsts.java
@@ -0,0 +1,135 @@
+package cn.huge.module.constant;
+
+/**
+ * @title: 调解相关常量类
+ * @description: 调解相关常量类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class ByCaseConsts {
+
+ /**
+ * 登记状态，1：草稿案件，2：正式案件
+ */
+ public static final String INPUT_STATUS_1 = "1";
+ public static final String INPUT_STATUS_2 = "2";
+
+ /**
+ * 登记方式，1：正常登记，2：案件导入
+ */
+ public static final String INPUT_WAY_1 = "1";
+ public static final String INPUT_WAY_2 = "2";
+
+ /**
+ * 回访状态，1：未回访，2：已回访
+ */
+ public static final String VISIT_STATUS_1 = "1";
+ public static final String VISIT_STATUS_2 = "2";
+
+ /**
+ * 当事人是否满意，1：不满意，2：满意
+ */
+ public static final String PARTY_JOY_1 = "1";
+ public static final String PARTY_JOY_2 = "2";
+
+ /**
+ * 系列案状态，1：正常案件，2：系列案
+ */
+ public static final String SERIE_STATUS_1 = "1";
+ public static final String SERIE_STATUS_2 = "2";
+
+ /**
+ * 是否转诉讼案件，1：不转诉讼，2：转诉讼
+ */
+ public static final String CIVIL_STATUS_1 = "1";
+ public static final String CIVIL_STATUS_2 = "2";
+
+ /**
+ * 签收状态，1：未签收，2：已签收，3：超时未签收，99：拒绝签收
+ */
+ public static final String SIGN_STATUS_1 = "1";
+ public static final String SIGN_STATUS_2 = "2";
+ public static final String SIGN_STATUS_3 = "3";
+ public static final String SIGN_STATUS_99 = "99";
+
+ /**
+ * 是否是登记人 1:是 2：否
+ */
+ public static final String WHETHER_INPUT_1 = "1";
+ public static final String WHETHER_INPUT_2 = "2";
+
+ /**
+ * 开始调解类型，1：计划内调解，2：计划外调解
+ */
+ public static final String START_MEDIATE_TYPE_1 = "1";
+ public static final String START_MEDIATE_TYPE_2 = "2";
+
+ /**
+ * 调解协议状态，1：有效协议，99：历史记录
+ */
+ public static final String AGREES_STATUS_1 = "1";
+ public static final String AGREES_STATUS_99 = "99";
+
+ /**
+ * 有无代理人，1：无，2：有
+ */
+ public static final String AGENT_STATUS_1 = "1";
+ public static final String AGENT_STATUS_2 = "2";
+
+ /**
+ * 云会议室主持默认密码
+ */
+ public static final String CLOUD_CIPHER_HOST = "888888";
+
+ /**
+ * 云会议室入会默认密码
+ */
+ public static final String CLOUD_CIPHER_JOIN = "888888";
+
+ /**
+ * 云会议室名后缀
+ */
+ public static final String CLOUD_NAME = "远程视频云会议";
+
+ /**
+ * 云会议渠道，22_00034-1：小鱼易连，22_00034-2：umeet
+ */
+ public static final String CLOUD_SOURCE_1 = "22_00034-1";
+ public static final String CLOUD_SOURCE_2 = "22_00034-2";
+
+ /**
+ * 司法确认申请情况（调解成功才有），1：未申请，2：已申请
+ */
+ public static final String JUDIC_APPLY_1 = "1";
+ public static final String JUDIC_APPLY_2 = "2";
+
+ /**
+ * 归档状态，1：未归档，2：已归档
+ */
+ public static final String FILE_STATUS_1 = "1";
+ public static final String FILE_STATUS_2 = "2";
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConstsEnum.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConstsEnum.java
new file mode 100644
index 0000000..fee9ff3
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByCaseConstsEnum.java
@@ -0,0 +1,305 @@
+package cn.huge.module.constant;
+
+
+/**
+ * @title: 调解相关常量枚举类
+ * @description: 调解相关常量枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum ByCaseConstsEnum {
+
+ /**
+ * 纠纷来源，22_00036-1：地方政府委托移送，22_00036-2：依申请调解，22_00036-3：主动调解，22_00036-4：法援委托移送，
+ * 22_00036-5：检察院委托移送，22_00036-6：公安机关委托移送，22_00036-7：信访记录委托移送，22_00036-8：劳动站移交，
+ * 22_00036-9：派出所移交，22_00036-10：其他部门委托移送，22_00036-11：接受委托移送调解
+ */
+ CASE_SOURCE_1("22_00036-1", "地方政府委托移送"),
+ CASE_SOURCE_2("22_00036-2", "依申请调解"),
+ CASE_SOURCE_3("22_00036-3", "主动调解"),
+ CASE_SOURCE_4("22_00036-4", "法援委托移送"),
+ CASE_SOURCE_5("22_00036-5", "检察院委托移送"),
+ CASE_SOURCE_6("22_00036-6", "公安机关委托移送"),
+ CASE_SOURCE_7("22_00036-7", "信访记录委托移送"),
+ CASE_SOURCE_8("22_00036-8", "劳动站移交"),
+ CASE_SOURCE_9("22_00036-9", "派出所移交"),
+ CASE_SOURCE_10("22_00036-10", "其他部门委托移送"),
+ CASE_SOURCE_11("22_00036-11", "接受委托移送调解"),
+ CASE_SOURCE_12("22_00036-12", "12345"),
+
+ /**
+ * 申请渠道，22_00001-1：机构登记，22_00001-2：小程序，22_00001-3：其他渠道，22_00001-4：市人民调解系统，22_00001-5：网格联动
+ */
+ CASE_CANAL_1("22_00001-1", "机构登记"),
+ CASE_CANAL_2("22_00001-2", "小程序"),
+ CASE_CANAL_3("22_00001-3", "其他"),
+ CASE_CANAL_4("22_00001-4", "市人民调解系统"),
+ CASE_CANAL_5("22_00001-5", "网格联动"),
+
+ /**
+ * 签收意见，22_00010-1：同意签收，22_00010-2：拒绝签收
+ */
+ SIGN_RESULT_1("22_00010-1", "签收受理"),
+ SIGN_RESULT_2("22_00010-2", "拒绝签收"),
+
+ /**
+ * 纠纷审查结果，22_00037-1：签收受理，22_00037-2：拒绝签收，22_00037-3：退回申请人，22_00037-4：不予受理
+ */
+ AUDIT_RESULT_1("22_00037-1", "签收受理"),
+ AUDIT_RESULT_2("22_00037-2", "拒绝签收"),
+ AUDIT_RESULT_3("22_00037-3", "退回申请人"),
+ AUDIT_RESULT_4("22_00037-3", "不予受理"),
+
+ /**
+ * 当事人地位
+ */
+ PERSON_TYPE_1("15_020008-1", "申请人"),
+ PERSON_TYPE_2("15_020008-2", "被申请人"),
+ PERSON_TYPE_5("15_020008-5", "第三人"),
+
+ /**
+ * 当事人类型类型
+ */
+ PERSON_CLASS_1("09_01001-1", "自然人"),
+ PERSON_CLASS_2("09_01001-2", "法人"),
+ PERSON_CLASS_3("09_01001-3", "非法人组织"),
+
+ /**
+ * 代理人类型
+ */
+ AGENT_CLASS_1("09_01010-1", "律师"),
+ AGENT_CLASS_3("09_01010-3", "监护人"),
+ AGENT_CLASS_4("09_01010-4", "亲友"),
+ AGENT_CLASS_5("09_01010-5", "社会团体推荐的公民"),
+ AGENT_CLASS_6("09_01010-6", "所在单位推荐的人"),
+ AGENT_CLASS_8("09_01010-8", "法律工作者"),
+ AGENT_CLASS_9("09_01010-9", "所在社区推荐的公民"),
+
+ /**
+ * 性别
+ */
+ SEX_1("09_00003-1", "男"),
+ SEX_2("09_00003-2", "女"),
+
+ /**
+ * 证件类型
+ */
+ CARD_TYPE_1("09_00015-1", "身份证"),
+ CARD_TYPE_11("09_00015-11", "户口簿"),
+ CARD_TYPE_12("09_00015-12", "中国护照"),
+ CARD_TYPE_13("09_00015-13", "外国护照"),
+ CARD_TYPE_14("09_00015-14", "港澳居民来往内陆通行证"),
+ CARD_TYPE_16("09_00015-16", "台湾居民来往大陆通行证"),
+ CARD_TYPE_255("09_00015-255", "其他"),
+ CARD_TYPE_17("09_00015-17", "当事人未提供证件信息"),
+
+ /**
+ * 纠纷进度，22_00006-1：待受理，22_00006-2：待调解，22_00006-3：调解中，22_00006-4：调解结束，22_00006-5：退回申请人，22_00006-6：不予受理，22_00006-7：申请人撤回
+ */
+ CASE_PROCESS_1("22_00006-1", "待受理"),
+ CASE_PROCESS_2("22_00006-2", "待调解"),
+ CASE_PROCESS_3("22_00006-3", "调解中"),
+ CASE_PROCESS_4("22_00006-4", "调解结束"),
+ CASE_PROCESS_5("22_00006-5", "退回申请人"),
+ CASE_PROCESS_6("22_00006-6", "不予受理"),
+ CASE_PROCESS_7("22_00006-7", "申请人撤回"),
+
+ /**
+ * 调解结果
+ */
+ MEDI_RESULT_1("22_00025-1", "调解成功"),
+ MEDI_RESULT_2("22_00025-2", "调解不成功"),
+
+ /**
+ * 履行情况，22_00008-1：未履行，22_00008-2：当场履行，22_00008-3：分期履行
+ */
+ FULFIL_STATUS_1("22_00008-1", "未履行"),
+ FULFIL_STATUS_2("22_00008-2", "当场履行"),
+ FULFIL_STATUS_3("22_00008-3", "分期履行"),
+
+ /**
+ * 调解不成功原因，22_00019-1：当事人未能就调解协议达成一致，22_00019-2：当事人拒绝调解，22_00019-3：提前终止调解，22_00019-9：其他
+ */
+ MEDI_FALSE_1("22_00019-1", "当事人未能就调解协议达成一致"),
+ MEDI_FALSE_2("22_00019-2", "当事人拒绝调解"),
+ MEDI_FALSE_3("22_00019-3", "提前终止调解"),
+ MEDI_FALSE_4("22_00019-4", "当事人撤销调解请求"),
+ MEDI_FALSE_9("22_00019-9", "其他"),
+
+ /**
+ * 司法确认申请情况
+ */
+ JUDGE_APPLY_1("1", "未申请"),
+ JUDGE_APPLY_2("2", "已申请"),
+
+ /**
+ * 归档状态
+ */
+ CASE_FILE_STATUS_1("1", "未归档"),
+ CASE_FILE_STATUS_2("2", "已归档"),
+
+ /**
+ * 调解类型
+ */
+ MEDI_TYPE_1("22_00002-1", "人民调解"),
+ MEDI_TYPE_2("22_00002-2", "司法调解"),
+ MEDI_TYPE_3("22_00002-3", "诉讼调解"),
+ MEDI_TYPE_4("22_00002-4", "行政调解");
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String desc) {
+ this.des = desc;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ ByCaseConstsEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (ByCaseConstsEnum constantEnum : ByCaseConstsEnum.values()) {
+ if (constantEnum.getIndex().equals(index)) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static String getIndex(String des) {
+ for (ByCaseConstsEnum constantEnum : ByCaseConstsEnum.values()) {
+ if (constantEnum.getDes().equals(des)) {
+ return constantEnum.index;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法4
+ * @param index
+ * @return
+ */
+ public static String getCaseWxProcess(String index) {
+ // 微信纠纷进度，1：待受理，2：待调解，3：调解中，4：调解结束，5：退回申请人，6：不予受理，7：申请人撤回
+ String WX_PROCESS_1 = "1";
+ String WX_PROCESS_2 = "2";
+ String WX_PROCESS_3 = "3";
+ String WX_PROCESS_4 = "4";
+ String WX_PROCESS_5 = "5";
+ String WX_PROCESS_6 = "6";
+ String WX_PROCESS_7 = "7";
+ if (CASE_PROCESS_1.index.equals(index)){
+ return WX_PROCESS_1;
+ }
+ if (CASE_PROCESS_2.index.equals(index)){
+ return WX_PROCESS_2;
+ }
+ if (CASE_PROCESS_3.index.equals(index)){
+ return WX_PROCESS_3;
+ }
+ if (CASE_PROCESS_4.index.equals(index)){
+ return WX_PROCESS_4;
+ }
+ if (CASE_PROCESS_5.index.equals(index)){
+ return WX_PROCESS_5;
+ }
+ if (CASE_PROCESS_6.index.equals(index)){
+ return WX_PROCESS_6;
+ }
+ if (CASE_PROCESS_7.index.equals(index)){
+ return WX_PROCESS_7;
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法4
+ * @param index
+ * @return
+ */
+ public static String getCaseProcess(String index) {
+ // 微信纠纷进度，1：待受理，2：待调解，3：调解中，4：调解结束，5：退回申请人，6：不予受理，7：申请人撤回
+ String WX_PROCESS_1 = "1";
+ String WX_PROCESS_2 = "2";
+ String WX_PROCESS_3 = "3";
+ String WX_PROCESS_4 = "4";
+ String WX_PROCESS_5 = "5";
+ String WX_PROCESS_6 = "6";
+ String WX_PROCESS_7 = "7";
+ if (WX_PROCESS_1.equals(index)){
+ return CASE_PROCESS_1.index;
+ }
+ if (WX_PROCESS_2.equals(index)){
+ return CASE_PROCESS_2.index;
+ }
+ if (WX_PROCESS_3.equals(index)){
+ return CASE_PROCESS_3.index;
+ }
+ if (WX_PROCESS_4.equals(index)){
+ return CASE_PROCESS_4.index;
+ }
+ if (WX_PROCESS_5.equals(index)){
+ return CASE_PROCESS_5.index;
+ }
+ if (WX_PROCESS_6.equals(index)){
+ return CASE_PROCESS_6.index;
+ }
+ if (WX_PROCESS_7.equals(index)){
+ return CASE_PROCESS_7.index;
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法4
+ * @param index
+ * @return
+ */
+ public static String getFileStatusDes(String index) {
+ if (CASE_FILE_STATUS_1.index.equals(index)){
+ return CASE_FILE_STATUS_1.des;
+ }
+ if (CASE_FILE_STATUS_2.index.equals(index)){
+ return CASE_FILE_STATUS_2.des;
+ }
+ return null;
+ }
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByFlowNodeEnum.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByFlowNodeEnum.java
new file mode 100644
index 0000000..e42ddce
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByFlowNodeEnum.java
@@ -0,0 +1,83 @@
+package cn.huge.module.constant;
+
+/**
+ * @title": 工作流节点枚举类
+ * @description": 工作流节点枚举类
+ * @company": hugeinfo
+ * @author": liyj
+ * @time": 2021-11-05 16":51":48
+ * @version": 1.0.0
+ */
+public enum ByFlowNodeEnum {
+
+ /**
+ * 节点
+ */
+ FLOW_NODE_2("F22_00019-2", "指派调解员"),
+ FLOW_NODE_3("F22_00019-3", "纠纷调解"),
+ FLOW_NODE_4("F22_00019-4", "结果确认"),
+ FLOW_NODE_5("F22_00019-5", "结案归档");
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 名称
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+
+ ByFlowNodeEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (ByFlowNodeEnum fileOwnerTypeBaseEnum : ByFlowNodeEnum.values()) {
+ if (fileOwnerTypeBaseEnum.getIndex().equals(index)) {
+ return fileOwnerTypeBaseEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static ByFlowNodeEnum getByIndex(final String index) {
+ switch (index) {
+ case "F22_00019-2":
+ return FLOW_NODE_2;
+ case "F22_00019-3":
+ return FLOW_NODE_3;
+ case "F22_00019-5":
+ return FLOW_NODE_5;
+ default:
+ return null;
+ }
+ }
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRegionEnum.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRegionEnum.java
new file mode 100644
index 0000000..af5f7d7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRegionEnum.java
@@ -0,0 +1,188 @@
+package cn.huge.module.constant;
+
+import cn.huge.base.common.constant.GzRegionEnum;
+import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @title: 广州市区枚举类
+ * @description: 广州市区枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum ByRegionEnum {
+ CITY_1("1601","广州市"),
+
+ AREA_1("3633","天河区"),
+ AREA_2("3634","海珠区"),
+ AREA_3("3635","荔湾区"),
+ AREA_4("3637","越秀区"),
+ AREA_5("36953","番禺区"),
+ AREA_6("50256","花都区"),
+ AREA_7("50258","白云区"),
+ AREA_8("50259","南沙区"),
+ AREA_9("50283","黄埔区"),
+ AREA_10("50284","增城区"),
+ AREA_11("50285","从化区"),
+
+ ROAD_1("62833","三元里街"),
+ ROAD_2("62855","松洲街"),
+ ROAD_3("62834","景泰街"),
+ ROAD_4("62856","同德街道"),
+ ROAD_5("62835","黄石街道"),
+ ROAD_6("62836","棠景街道"),
+ ROAD_7("62857","新市街道"),
+ ROAD_8("62858","同和街道"),
+ ROAD_9("62859","京溪街道"),
+ ROAD_10("62860","永平街道"),
+ ROAD_11("62837","嘉禾街道"),
+ ROAD_12("62838","均禾街道"),
+ ROAD_13("62839","石井街道"),
+ ROAD_14("62840","金沙街道"),
+ ROAD_15("129164","云城街道"),
+ ROAD_16("129166","鹤龙街道"),
+ ROAD_17("129167","白云湖街道"),
+ ROAD_18("129165","石门街道"),
+ ROAD_19("71879","龙归街道"),
+ ROAD_20("71880","大源街道"),
+ ROAD_21("50374","人和镇"),
+ ROAD_22("50375","太和镇"),
+ ROAD_23("50377","钟落潭镇"),
+ ROAD_24("50373","江高镇");
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 名称
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ ByRegionEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (ByRegionEnum constantEnum : ByRegionEnum.values()) {
+ if (constantEnum.getIndex().equals(index)) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param regionCode
+ * @return
+ */
+ public static GzRegionEnum getGZRegion(String regionCode) {
+ if (CITY_1.getIndex().equals(regionCode)) {
+ return GzRegionEnum.PROV_1;
+ } else if (AREA_1.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_1;
+ }else if (AREA_2.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_2;
+ }else if (AREA_3.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_3;
+ }else if (AREA_4.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_4;
+ }else if (AREA_5.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_5;
+ }else if (AREA_6.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_6;
+ }else if (AREA_7.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_7;
+ }else if (AREA_8.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_8;
+ }else if (AREA_9.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_9;
+ }else if (AREA_10.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_10;
+ }else if (AREA_11.getIndex().equals(regionCode)) {
+ return GzRegionEnum.AREA_11;
+ } else if (ROAD_1.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_1;
+ }else if (ROAD_2.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_2;
+ }else if (ROAD_3.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_3;
+ }else if (ROAD_4.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_4;
+ }else if (ROAD_5.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_5;
+ }else if (ROAD_6.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_6;
+ }else if (ROAD_7.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_7;
+ }else if (ROAD_8.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_8;
+ }else if (ROAD_9.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_9;
+ }else if (ROAD_10.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_10;
+ }else if (ROAD_11.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_11;
+ }else if (ROAD_12.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_12;
+ }else if (ROAD_13.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_13;
+ }else if (ROAD_14.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_14;
+ }else if (ROAD_15.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_15;
+ }else if (ROAD_16.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_16;
+ }else if (ROAD_17.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_17;
+ }else if (ROAD_18.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_18;
+ }else if (ROAD_19.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_19;
+ }else if (ROAD_20.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_20;
+ }else if (ROAD_21.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_21;
+ }else if (ROAD_22.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_22;
+ }else if (ROAD_23.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_23;
+ }else if (ROAD_24.getIndex().equals(regionCode)) {
+ return GzRegionEnum.ROAD_24;
+ }else {
+ return null;
+ }
+ }
+}
+
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/constant/ByRoleBaseEnum.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRoleEnum.java
similarity index 88%
rename from dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/constant/ByRoleBaseEnum.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRoleEnum.java
index dbe1d8f..6622574 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/constant/ByRoleBaseEnum.java
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByRoleEnum.java
@@ -1,17 +1,18 @@
-package cn.huge.module.ctrole.constant;
-
+package cn.huge.module.constant;
import cn.huge.module.cust.constant.RoleBaseEnum;
+import cn.huge.module.cust.dto.CtUserDTO;
+import org.apache.commons.lang3.StringUtils;
/**
- * @title: 白云多元化的角色相关常量枚举类
- * @description: 白云多元化的角色相关常量枚举类
+ * @title: 调解相关常量枚举类
+ * @description: 调解相关常量枚举类
* @company: hugeinfo
* @author: liyj
* @time: 2021-11-05 16:51:48
* @version: 1.0.0
*/
-public enum ByRoleBaseEnum {
+public enum ByRoleEnum {
/**
* 平台基础角色
@@ -58,7 +59,7 @@
* @param index
* @param des
*/
- ByRoleBaseEnum(String index, String des) {
+ ByRoleEnum(String index, String des) {
this.index = index;
this.des = des;
}
@@ -69,7 +70,7 @@
* @return
*/
public static String getDes(String index) {
- for (ByRoleBaseEnum constantEnum : ByRoleBaseEnum.values()) {
+ for (ByRoleEnum constantEnum : ByRoleEnum.values()) {
if (constantEnum.getIndex().equals(index)) {
return constantEnum.des;
}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByUserConsts.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByUserConsts.java
new file mode 100644
index 0000000..b4e1a74
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/ByUserConsts.java
@@ -0,0 +1,132 @@
+package cn.huge.module.constant;
+
+/**
+ * @title: 用户相关常量类
+ * @description: 用户相关常量
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class ByUserConsts {
+
+ /**
+ * 授权凭证明文
+ */
+ public static final String MR_CIPHER = "byzfw2023!";
+
+ /**
+ * 部门类型，1：正常部门，2：特殊部门（调委会等）
+ */
+ public static final String DEPT_TYPE_1 = "1";
+ public static final String DEPT_TYPE_2 = "2";
+
+ /**
+ * 角色类型，1：自定义角色（默认），2：基础角色，3：平台管理角色
+ */
+ public static final String ROLE_TYPE_1 = "1";
+ public static final String ROLE_TYPE_2 = "2";
+ public static final String ROLE_TYPE_3 = "3";
+
+ /**
+ * 是否基础角色，基础角色无法自己删除，1：否（默认），2：是
+ */
+ public static final String IS_ROLE_1 = "1";
+ public static final String NO_ROLE_2 = "2";
+
+ /**
+ * 用户状态，1：在职/有效（默认），2：停用，99：离职
+ */
+ public static final String USER_STATUS_1 = "1";
+ public static final String USER_STATUS_2 = "2";
+ public static final String USER_STATUS_99 = "99";
+
+ /**
+ * 帐号类型，22_00027-1：pc帐号（默认），22_00027-2：微信小程序，22_00027-3：政数局统一平台
+ */
+ public static final String ACC_TYPE_1 = "22_00027-1";
+ public static final String ACC_TYPE_2 = "22_00027-2";
+ public static final String ACC_TYPE_3 = "22_00027-3";
+
+ /**
+ * 人脸认证状态，1：已认证，99：未认证（默认）
+ */
+ public static final String FACE_STATUS_1 = "1";
+ public static final String FACE_STATUS_99 = "99";
+
+ /**
+ * 加入方式，1：系统创建（默认），2：自主申请
+ */
+ public static final String JOIN_WAY_1 = "1";
+ public static final String JOIN_WAY_2 = "2";
+
+ /**
+ * 实名认证状态，1：通过，99：未通过（默认）
+ */
+ public static final String REAL_STATUS_1 = "1";
+ public static final String REAL_STATUS_99 = "99";
+
+ /**
+ * 配岗类型，1：主岗(默认)，2：兼岗
+ */
+ public static final String MATCH_TYPE_1 = "1";
+ public static final String MATCH_TYPE_2 = "2";
+
+ /**
+ * 是否可以找他调（小程序），0：否，1：是
+ */
+ public static final String FIND_STATUS_1 = "1";
+ public static final String FIND_STATUS_2 = "2";
+
+ /**
+ * 是否参与自动调度，0：否，1：是
+ */
+ public static final String DISP_STATUS_1 = "1";
+ public static final String DISP_STATUS_2 = "2";
+
+ /**
+ * 是否归类为法院，1：否，2：是
+ */
+ public static final String COURT_STATUS_1 = "1";
+ public static final String COURT_STATUS_2 = "2";
+
+ /**
+ * 组织类型，1：指挥中心，2：职能部门，3：镇街，:4：村居社区，5：行、专业，6：企、事业，7：测试，9：其他
+ */
+ public static final String UNIT_TYPE_1 = "1";
+ public static final String UNIT_TYPE_2 = "2";
+ public static final String UNIT_TYPE_3 = "3";
+ public static final String UNIT_TYPE_4 = "4";
+ public static final String UNIT_TYPE_5 = "5";
+ public static final String UNIT_TYPE_6 = "6";
+ public static final String UNIT_TYPE_7 = "7";
+ public static final String UNIT_TYPE_9 = "9";
+
+ /**
+ * 性别，09_00003-1：男，09_00003-2：女
+ */
+ public static final String SEX_1 = "09_00003-1";
+ public static final String SEX_2 = "09_00003-2";
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZCaseTaskConsts.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZCaseTaskConsts.java
new file mode 100644
index 0000000..47ad513
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZCaseTaskConsts.java
@@ -0,0 +1,90 @@
+package cn.huge.module.constant;
+
+/**
+ * @title: 用户相关常量类
+ * @description: 用户相关常量
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class GZCaseTaskConsts {
+
+ /**
+ * 纠纷任务类型，1：承办，2：配合
+ */
+ public static final int CASE_TASK_TYPE_1 = 1;
+ public static final int CASE_TASK_TYPE_2 = 2;
+
+ /**
+ * 任务候选执行者类型：1：所有人，2：上一步骤选择，3：上一步骤执行者，4：自定义指定（单位部门角色人组合）
+ */
+ public static final int CANDE_TYPE_1 = 1;
+ public static final int CANDE_TYPE_2 = 2;
+ public static final int CANDE_TYPE_3 = 3;
+ public static final int CANDE_TYPE_4 = 4;
+
+ /**
+ * 任务签收状态，0：不用签收，1：未签收，:2：已签收
+ */
+ public static final int SIGN_STATUS_0 = 0;
+ public static final int SIGN_STATUS_1 = 1;
+ public static final int SIGN_STATUS_2 = 2;
+
+ /**
+ * 任务进度，1：进行中，2：已完成
+ */
+ public static final int TASK_STATUS_1 = 1;
+ public static final int TASK_STATUS_2 = 2;
+
+ /**
+ * 处理结果，0：正常流转，1：审核通过，2：审核不通过，3：不予受理，4：回退，5：上报
+ */
+ public static final int HANDLE_RESULT_0 = 0;
+ public static final int HANDLE_RESULT_1 = 1;
+ public static final int HANDLE_RESULT_2 = 2;
+ public static final int HANDLE_RESULT_3 = 3;
+ public static final int HANDLE_RESULT_4 = 4;
+ public static final int HANDLE_RESULT_5 = 5;
+
+ /**
+ * 配合状态，0：配合，1：回退，2：承办部门回退
+ */
+ public static final int ASSIST_STATUS_0 = 0;
+ public static final int ASSIST_STATUS_1 = 1;
+ public static final int ASSIST_STATUS_2 = 2;
+
+ /**
+ * 经办类型，1：承办组织，2：配合组织
+ */
+ public static final int HANDLE_TYPE_1 = 1;
+ public static final int HANDLE_TYPE_2 = 2;
+
+ /**
+ * 任务超时状态，0：未超时，1：已超时
+ */
+ public static final int OVERTIME_STATUS_0 = 0;
+ public static final int OVERTIME_STATUS_1 = 1;
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowNodeEnum.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowNodeEnum.java
new file mode 100644
index 0000000..5e253e3
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowNodeEnum.java
@@ -0,0 +1,156 @@
+package cn.huge.module.constant;
+
+/**
+ * @title": 工作流节点枚举类
+ * @description": 工作流节点枚举类
+ * @company": hugeinfo
+ * @author": liyj
+ * @time": 2021-11-05 16":51":48
+ * @version": 1.0.0
+ */
+public enum GZFlowNodeEnum {
+
+ /**
+ * 节点
+ */
+ FLOW_NODE_DFP("DFP", "待分派"),
+ FLOW_NODE_DSL("DSL", "待受理"),
+ FLOW_NODE_HTSH("HTSH", "回退审核"),
+ FLOW_NODE_BLFK("BLFK", "办理反馈"),
+ FLOW_NODE_JASQ("JASQ", "结案申请"),
+ FLOW_NODE_JASH("JASH", "本级结案审核"),
+ FLOW_NODE_JASH_YJ("JASH_YJ", "一级结案审核"),
+ FLOW_NODE_JASH_EJ("JASH_EJ", "二级结案审核"),
+ FLOW_NODE_DSRPJ("DSRPJ", "当事人评价"),
+ FLOW_NODE_JAGD("JAGD", "结案归档"),
+ // 镇街级
+ FLOW_NODE_ZJ_DFP("ZJ_DFP", "镇街综治中心待分派"),
+ FLOW_NODE_ZJ_DSL("ZJ_DSL", "镇街级组织待受理"),
+ FLOW_NODE_ZJ_HTSH("ZJ_HTSH", "镇街综治中心回退待审核"),
+ // 区级
+ FLOW_NODE_QJ_SBSH("QJ_SBSH", "区综治中心上报待审核"),
+ FLOW_NODE_QJ_DFP("QJ_DFP", "区综治中心待分派"),
+ FLOW_NODE_QJ_DSL("QJ_DSL", "区级组织待受理"),
+ FLOW_NODE_QJ_HTSH("QJ_HTSH", "区综治中心回退待审核"),
+ // 市级
+ FLOW_NODE_SJ_SBSH("SJ_SBSH", "市综治中心上报待审核"),
+ FLOW_NODE_SJ_DFP("SJ_DFP", "市综治中心待分派"),
+ FLOW_NODE_SJ_DSL("SJ_DSL", "市级组织待受理"),
+ FLOW_NODE_SJ_HTSH("SJ_HTSH", "市综治中心回退待审核");
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 名称
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+
+ GZFlowNodeEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (GZFlowNodeEnum flowNodeEnum : GZFlowNodeEnum.values()) {
+ if (flowNodeEnum.getIndex().equals(index)) {
+ return flowNodeEnum.des;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param des
+ * @return
+ */
+ public static String getIndex(String des) {
+ for (GZFlowNodeEnum flowNodeEnum : GZFlowNodeEnum.values()) {
+ if (flowNodeEnum.getDes().equals(des)) {
+ return flowNodeEnum.index;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static GZFlowNodeEnum getByIndex(final String index) {
+ switch (index) {
+ case "DFP":
+ return FLOW_NODE_DFP;
+ case "DSL":
+ return FLOW_NODE_DSL;
+ case "HTSH":
+ return FLOW_NODE_HTSH;
+ case "BLFK":
+ return FLOW_NODE_BLFK;
+ case "JASQ":
+ return FLOW_NODE_JASQ;
+ case "JASH":
+ return FLOW_NODE_JASH;
+ case "JASH_YJ":
+ return FLOW_NODE_JASH_YJ;
+ case "JASH_EJ":
+ return FLOW_NODE_JASH_EJ;
+ case "DSRPJ":
+ return FLOW_NODE_DSRPJ;
+ case "JAGD":
+ return FLOW_NODE_JAGD;
+
+ case "ZJ_DFP":
+ return FLOW_NODE_ZJ_DFP;
+ case "ZJ_DSL":
+ return FLOW_NODE_ZJ_DSL;
+ case "ZJ_HTSH":
+ return FLOW_NODE_ZJ_HTSH;
+
+ case "QJ_SBSH":
+ return FLOW_NODE_QJ_SBSH;
+ case "QJ_DFP":
+ return FLOW_NODE_QJ_DFP;
+ case "QJ_DSL":
+ return FLOW_NODE_QJ_DSL;
+ case "QJ_HTSH":
+ return FLOW_NODE_SJ_HTSH;
+
+ case "SJ_SBSH":
+ return FLOW_NODE_SJ_SBSH;
+ case "SJ_DFP":
+ return FLOW_NODE_SJ_DFP;
+ case "SJ_DSL":
+ return FLOW_NODE_SJ_DSL;
+ case "SJ_HTSH":
+ return FLOW_NODE_SJ_HTSH;
+ default:
+ return null;
+ }
+ }
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowableConsts.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowableConsts.java
new file mode 100644
index 0000000..a1bac31
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZFlowableConsts.java
@@ -0,0 +1,104 @@
+package cn.huge.module.constant;
+
+import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
+
+/**
+ * @title: 用户相关常量类
+ * @description: 用户相关常量
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class GZFlowableConsts {
+ /**
+ * 两个默认流程定义编号
+ * 自行受理：GZDYH_ZXSL_3LEVEL_V1
+ * 来访登记：GZDYH_LFDJ_3LEVEL_V1
+ * 联合处置：GZDYH_LHCZ_3LEVEL_V1
+ */
+ public static final String GZDYH_JB_LFDJ_V1 = "GZDYH_JB_LFDJ_V1";
+ public static final String GZDYH_JB_ZXPC_V1 = "GZDYH_JB_ZXPC_V1";
+ public static final String GZDYH_ZXSL_LFDJ_V1 = "GZDYH_ZXSL_LFDJ_V1";
+ public static final String GZDYH_ZXSL_ZXPC_V1 = "GZDYH_ZXSL_ZXPC_V1";
+ public static final String GZDYH_LHCZ_V1 = "GZDYH_LHCZ_V1";
+
+ /**
+ * 工作流通用任务条件，
+ * 前进：forward，退回：back，
+ */
+ public static final String OPERATION_forward = "forward";
+ public static final String OPERATION_back = "back";
+
+ /**
+ * 工作流业务任务条件，
+ * 自行受理：zxsl
+ * 交办给直属组织：jb_zszz，交办给综治中心：jb_zzzx
+ * 受理：sl
+ * 回退申请：htsq，回退审核同意：htsh_ty，回退审核不同意：htsh_bty，htsh_bty_qj，htsh_bty_sj
+ * 上报：sb，上报审核同意：sbsh_ty，上报审核不同意：sbsh_bty
+ * 结案审核同意：jash_ty，同意申请上级审核：jash_ty_sq，结案审核不同意：jash_bty，
+ */
+ public static final String OPERATION_jb_zszz = "jb_zszz";
+ public static final String OPERATION_jb_zzzx = "jb_zzzx";
+ public static final String OPERATION_sl = "sl";
+ public static final String OPERATION_htsq = "htsq";
+ public static final String OPERATION_htsh_ty = "htsh_ty";
+ public static final String OPERATION_htsh_bty = "htsh_bty";
+ public static final String OPERATION_htsh_bty_qj = "htsh_bty_qj";
+ public static final String OPERATION_htsh_bty_sj = "htsh_bty_sj";
+ public static final String OPERATION_sb = "sb";
+ public static final String OPERATION_sbsh_ty = "sbsh_ty";
+ public static final String OPERATION_sbsh_bty = "sbsh_bty";
+ public static final String OPERATION_jash_ty = "jash_ty";
+ public static final String OPERATION_jash_ty_sq = "jash_ty_sq";
+ public static final String OPERATION_jash_bty = "jash_bty";
+
+ /**
+ * 根据事项来源获取交办流程
+ * @param canal
+ * @return
+ */
+ public static String getJbFlow(String canal){
+ if (CaseBaseConstsEnum.CASE_CANAL_3.getIndex().equals(canal)){
+ return GZDYH_JB_ZXPC_V1;
+ }else {
+ return GZDYH_JB_LFDJ_V1;
+ }
+ }
+
+ /**
+ * 根据事项来源获取自行受理流程
+ * @param canal
+ * @return
+ */
+ public static String getZxslFlow(String canal){
+ if (CaseBaseConstsEnum.CASE_CANAL_3.getIndex().equals(canal)){
+ return GZDYH_ZXSL_ZXPC_V1;
+ }else {
+ return GZDYH_ZXSL_LFDJ_V1;
+ }
+ }
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZTaskUsetimeUtils.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZTaskUsetimeUtils.java
new file mode 100644
index 0000000..bfd4cfa
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/constant/GZTaskUsetimeUtils.java
@@ -0,0 +1,81 @@
+package cn.huge.module.constant;
+
+import cn.huge.base.common.utils.DateUtils;
+
+import java.util.Date;
+
+/**
+ * @title: 任务处理耗时计算攻击类
+ * @description: 任务处理耗时计算攻击类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class GZTaskUsetimeUtils {
+
+ /**
+ * 任务超时状态，0：未超时，1：已超时
+ */
+ public static final int OVER_TIME_STATUS_0 = 0;
+ public static final int OVER_TIME_STATUS_1 = 1;
+
+ /**
+ * 获取任务处理耗时多少小时
+ * @param handleTime 任务处理时间
+ * @param createTime 任务下达时间
+ * @return
+ */
+ public static int getUsetimeHour(Date handleTime, Date createTime) {
+ return DateUtils.getDifferHour(handleTime, createTime);
+ }
+
+ /**
+ * 判断任务处理是否超时
+ * @param handleTime 任务处理时间
+ * @param expireTime 任务处理时限
+ * @return
+ */
+ public static int getOvertimeStatus(Date handleTime, Date expireTime) {
+ int overtimeHour = DateUtils.getDifferHour(handleTime, expireTime);
+ if (overtimeHour > 0) {
+ // 已超时
+ return OVER_TIME_STATUS_1;
+ }else {
+ // 未超时
+ return OVER_TIME_STATUS_0;
+ }
+ }
+
+ /**
+ * 判断任务处理超时多少小时
+ * @param handleTime 任务处理时间
+ * @param expireTime 任务处理时限
+ * @return
+ */
+ public static int getOvertimeHour(Date handleTime, Date expireTime) {
+ return DateUtils.getDifferHour(handleTime, expireTime);
+ }
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/controller/SyncCustController.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/controller/SyncCustController.java
new file mode 100644
index 0000000..af6625a
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/controller/SyncCustController.java
@@ -0,0 +1,123 @@
+package cn.huge.module.ctuser.controller;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.ctuser.domain.po.ByRegion;
+import cn.huge.module.ctuser.service.*;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @title: 数据割接-用户相关
+ * @description: 数据割接-用户相关
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-18 15:14:06
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/client/syncCust")
+public class SyncCustController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CtUnitService ctUnitService;
+ @Autowired
+ private CtDeptService ctDeptService;
+ @Autowired
+ private CtuserService ctuserService;
+ @Autowired
+ private CtAccountService ctAccountService;
+ @Autowired
+ private CtUseroleService ctUseroleService;
+
+ /**
+ * 数据割接-组织信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUnit
+ * @return Object
+ */
+ @GetMapping("/byToGzCtUnit")
+ public Object byToGzCtUnit() {
+ try {
+ return ReturnSucUtils.getRepInfo(ctUnitService.byToGzCtUnit());
+ } catch (Exception e) {
+ log.error("[SyncCustController.byToGzCtUnit]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 数据割接-部门信息
+ * @url {ctx}/api/client/syncCust/byToGzCtDept
+ * @return Object
+ */
+ @GetMapping("/byToGzCtDept")
+ public Object byToGzCtDept() {
+ try {
+ return ReturnSucUtils.getRepInfo(ctDeptService.byToGzCtDept());
+ } catch (Exception e) {
+ log.error("[SyncCustController.byToGzCtDept]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 数据割接-用户信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUser
+ * @return Object
+ */
+ @GetMapping("/byToGzCtUser")
+ public Object byToGzCtUser() {
+ try {
+ return ReturnSucUtils.getRepInfo(ctuserService.byToGzCtUser());
+ } catch (Exception e) {
+ log.error("[SyncCustController.byToGzCtUser]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 数据割接-账号信息
+ * @url {ctx}/api/client/syncCust/byToGzCtAccount
+ * @return Object
+ */
+ @GetMapping("/byToGzCtAccount")
+ public Object byToGzCtAccount() {
+ try {
+ return ReturnSucUtils.getRepInfo(ctAccountService.byToGzCtAccount());
+ } catch (Exception e) {
+ log.error("[SyncCustController.byToGzCtAccount]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 数据割接-用户角色关系信息
+ * @url {ctx}/api/client/syncCust/byToGzCtUserole
+ * @return Object
+ */
+ @GetMapping("/byToGzCtUserole")
+ public Object byToGzCtUserole() {
+ try {
+ return ReturnSucUtils.getRepInfo(ctUseroleService.byToGzCtUserole());
+ } catch (Exception e) {
+ log.error("[SyncCustController.byToGzCtAccount]请求失败，异常信息："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/ByRegionMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/ByRegionMapper.java
new file mode 100644
index 0000000..b6ceeea
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/ByRegionMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.ByRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 地域字典表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-18 15:14:06
+* @version 1.0.0
+*/
+@Repository
+public interface ByRegionMapper extends BaseMapper<ByRegion>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateByRegion(@Param("entity") ByRegion entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateByRegionTerms(@Param("entity") ByRegion entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteByRegion(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<ByRegion>
+ */
+ List<ByRegion> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<ByRegion>
+ */
+ List<ByRegion> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java
new file mode 100644
index 0000000..f444b49
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.CtAccount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户用户账号表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:46
+* @version 1.0.0
+*/
+@Repository
+public interface CtAccountMapper extends BaseMapper<CtAccount>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtAccount(@Param("entity") CtAccount entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtAccountTerms(@Param("entity") CtAccount entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtAccount(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CtAccount>
+ */
+ List<CtAccount> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CtAccount>
+ */
+ List<CtAccount> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java
new file mode 100644
index 0000000..2bc9945
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.CtDept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户部门表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:46
+* @version 1.0.0
+*/
+@Repository
+public interface CtDeptMapper extends BaseMapper<CtDept>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtDept(@Param("entity") CtDept entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtDeptTerms(@Param("entity") CtDept entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtDept(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CtDept>
+ */
+ List<CtDept> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CtDept>
+ */
+ List<CtDept> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java
new file mode 100644
index 0000000..944eabe
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.CtPost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户岗位表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:47
+* @version 1.0.0
+*/
+@Repository
+public interface CtPostMapper extends BaseMapper<CtPost>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtPost(@Param("entity") CtPost entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtPostTerms(@Param("entity") CtPost entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtPost(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CtPost>
+ */
+ List<CtPost> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CtPost>
+ */
+ List<CtPost> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java
new file mode 100644
index 0000000..8be8b51
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.CtUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户组织表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:46
+* @version 1.0.0
+*/
+@Repository
+public interface CtUnitMapper extends BaseMapper<CtUnit>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtUnit(@Param("entity") CtUnit entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtUnitTerms(@Param("entity") CtUnit entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtUnit(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CtUnit>
+ */
+ List<CtUnit> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CtUnit>
+ */
+ List<CtUnit> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java
new file mode 100644
index 0000000..b4a6809
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.CtUsepost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户用户配岗表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:47
+* @version 1.0.0
+*/
+@Repository
+public interface CtUsepostMapper extends BaseMapper<CtUsepost>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtUsepost(@Param("entity") CtUsepost entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtUsepostTerms(@Param("entity") CtUsepost entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtUsepost(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CtUsepost>
+ */
+ List<CtUsepost> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CtUsepost>
+ */
+ List<CtUsepost> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java
new file mode 100644
index 0000000..013f3e6
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.CtUserole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户用户角色表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:46
+* @version 1.0.0
+*/
+@Repository
+public interface CtUseroleMapper extends BaseMapper<CtUserole>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtUserole(@Param("entity") CtUserole entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtUseroleTerms(@Param("entity") CtUserole entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtUserole(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CtUserole>
+ */
+ List<CtUserole> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CtUserole>
+ */
+ List<CtUserole> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtuserMapper.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtuserMapper.java
new file mode 100644
index 0000000..dbffb8a
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/CtuserMapper.java
@@ -0,0 +1,64 @@
+package cn.huge.module.ctuser.dao.mapper;
+
+import cn.huge.module.ctuser.domain.po.Ctuser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 客户用户表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-10-17 17:31:45
+* @version 1.0.0
+*/
+@Repository
+public interface CtuserMapper extends BaseMapper<Ctuser>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCtuser(@Param("entity") Ctuser entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCtuserTerms(@Param("entity") Ctuser entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCtuser(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<Ctuser>
+ */
+ List<Ctuser> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<Ctuser>
+ */
+ List<Ctuser> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/ByRegionMapper.xml
similarity index 61%
rename from dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/ByRegionMapper.xml
index d6a6c09..639f5c4 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/ByRegionMapper.xml
@@ -1,53 +1,41 @@
<?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">
<!--
- * @title: 网格化平台地域字典映射表
+ * @title: 地域字典表
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-25 18:03:50
+ * @time:2024-10-18 15:14:06
* @version 1.0.0
-->
-<mapper namespace="cn.huge.module.region.dao.mapper.SyRegionGridMapper">
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.ByRegionMapper">
<!-- 结果集 -->
- <resultMap id="dataResult" type="cn.huge.module.region.domain.po.SyRegionGrid">
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.ByRegion">
<result property="id" column="id"/>
- <result property="thirdSysId" column="third_sys_id"/>
- <result property="thirdSysName" column="third_sys_name"/>
<result property="thirdCode" column="third_code"/>
<result property="thirdName" column="third_name"/>
<result property="thirdParentId" column="third_parent_id"/>
<result property="regionId" column="region_id"/>
<result property="level" column="level"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
</resultMap>
<!-- 表 -->
- <sql id='table-name'>dyh_sy_region_grid</sql>
+ <sql id='table-name'>dyh_sy_region_by</sql>
<!-- 字段 -->
<sql id="column-part">
id,
- third_sys_id,
- third_sys_name,
third_code,
third_name,
third_parent_id,
region_id,
- level,
- create_time,
- update_time
+ level
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
- <if test="entity.thirdSysId != null">third_sys_id = #{entity.thirdSysId},</if>
- <if test="entity.thirdSysName != null">third_sys_name = #{entity.thirdSysName},</if>
<if test="entity.thirdCode != null">third_code = #{entity.thirdCode},</if>
<if test="entity.thirdName != null">third_name = #{entity.thirdName},</if>
<if test="entity.thirdParentId != null">third_parent_id = #{entity.thirdParentId},</if>
<if test="entity.regionId != null">region_id = #{entity.regionId},</if>
- <if test="entity.level != null">level = #{entity.level},</if>
- <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
- <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ <if test="entity.level != null">level = #{entity.level}</if>
</sql>
<!-- 条件 -->
<sql id="where-part">
@@ -55,12 +43,6 @@
<where>
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
- </if>
- <if test="terms.thirdSysId != null and terms.thirdSysId !=''">
- and third_sys_id = #{terms.thirdSysId}
- </if>
- <if test="terms.thirdSysName != null and terms.thirdSysName !=''">
- and third_sys_name = #{terms.thirdSysName}
</if>
<if test="terms.thirdCode != null and terms.thirdCode !=''">
and third_code = #{terms.thirdCode}
@@ -77,25 +59,11 @@
<if test="terms.level != null and terms.level !=''">
and level = #{terms.level}
</if>
- <if test="terms.createTime != null and terms.createTime !=''">
- and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
- </if>
- <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
- and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
- and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
- </if>
- <if test="terms.updateTime != null and terms.updateTime !=''">
- and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
- </if>
- <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
- and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
- and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
- </if>
</where>
</if>
</sql>
<!-- 更新对象 -->
- <update id="updateSyRegionGrid">
+ <update id="updateByRegion">
update
<include refid="table-name"/>
<set>
@@ -106,7 +74,7 @@
</where>
</update>
<!-- 条件更新对象 -->
- <update id="updateSyRegionGridTerms">
+ <update id="updateByRegionTerms">
update
<include refid="table-name"/>
<set>
@@ -115,7 +83,7 @@
<include refid="where-part"/>
</update>
<!-- 根据编号物理删除 -->
- <delete id="deleteSyRegionGrid">
+ <delete id="deleteByRegion">
delete from
<include refid="table-name" />
where id = #{id}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml
new file mode 100644
index 0000000..93d1ac5
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml
@@ -0,0 +1,178 @@
+<?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">
+<!--
+ * @title: 客户用户账号表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-17 17:31:46
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtAccountMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.CtAccount">
+ <result property="id" column="id"/>
+ <result property="userId" column="user_id"/>
+ <result property="accType" column="acc_type"/>
+ <result property="acc" column="acc"/>
+ <result property="cipher" column="cipher"/>
+ <result property="cipherOpen" column="cipher_open"/>
+ <result property="cipherTime" column="cipher_time"/>
+ <result property="limitTime" column="limit_time"/>
+ <result property="loginTime" column="login_time"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_ct_account</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ user_id,
+ acc_type,
+ acc,
+ cipher,
+ cipher_open,
+ cipher_time,
+ limit_time,
+ login_time,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.userId != null">user_id = #{entity.userId},</if>
+ <if test="entity.accType != null">acc_type = #{entity.accType},</if>
+ <if test="entity.acc != null">acc = #{entity.acc},</if>
+ <if test="entity.cipher != null">cipher = #{entity.cipher},</if>
+ <if test="entity.cipherOpen != null">cipher_open = #{entity.cipherOpen},</if>
+ <if test="entity.cipherTime != null">cipher_time = #{entity.cipherTime},</if>
+ <if test="entity.limitTime != null">limit_time = #{entity.limitTime},</if>
+ <if test="entity.loginTime != null">login_time = #{entity.loginTime},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.userId != null and terms.userId !=''">
+ and user_id = #{terms.userId}
+ </if>
+ <if test="terms.accType != null and terms.accType !=''">
+ and acc_type = #{terms.accType}
+ </if>
+ <if test="terms.acc != null and terms.acc !=''">
+ and acc = #{terms.acc}
+ </if>
+ <if test="terms.cipher != null and terms.cipher !=''">
+ and cipher = #{terms.cipher}
+ </if>
+ <if test="terms.cipherOpen != null and terms.cipherOpen !=''">
+ and cipher_open = #{terms.cipherOpen}
+ </if>
+ <if test="terms.cipherTime != null and terms.cipherTime !=''">
+ and cipher_time = #{terms.cipherTime}
+ </if>
+ <if test="terms.limitTime != null and terms.limitTime !=''">
+ and limit_time = #{terms.limitTime}
+ </if>
+ <if test="terms.loginTime != null and terms.loginTime !=''">
+ and login_time = #{terms.loginTime}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCtAccount">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCtAccountTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCtAccount">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml
new file mode 100644
index 0000000..e5f20c7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml
@@ -0,0 +1,190 @@
+<?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">
+<!--
+ * @title: 客户部门表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-17 17:31:46
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtDeptMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.CtDept">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="des" column="des"/>
+ <result property="type" column="type"/>
+ <result property="parentId" column="parent_id"/>
+ <result property="unitId" column="unit_id"/>
+ <result property="goodField" column="good_field"/>
+ <result property="goodFieldName" column="good_field_name"/>
+ <result property="canField" column="can_field"/>
+ <result property="canFieldName" column="can_field_name"/>
+ <result property="level" column="level"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_ct_dept</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ name,
+ des,
+ type,
+ parent_id,
+ unit_id,
+ good_field,
+ good_field_name,
+ can_field,
+ can_field_name,
+ level,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.name != null">name = #{entity.name},</if>
+ <if test="entity.des != null">des = #{entity.des},</if>
+ <if test="entity.type != null">type = #{entity.type},</if>
+ <if test="entity.parentId != null">parent_id = #{entity.parentId},</if>
+ <if test="entity.unitId != null">unit_id = #{entity.unitId},</if>
+ <if test="entity.goodField != null">good_field = #{entity.goodField},</if>
+ <if test="entity.goodFieldName != null">good_field_name = #{entity.goodFieldName},</if>
+ <if test="entity.canField != null">can_field = #{entity.canField},</if>
+ <if test="entity.canFieldName != null">can_field_name = #{entity.canFieldName},</if>
+ <if test="entity.level != null">level = #{entity.level},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.name != null and terms.name !=''">
+ and name = #{terms.name}
+ </if>
+ <if test="terms.des != null and terms.des !=''">
+ and des = #{terms.des}
+ </if>
+ <if test="terms.type != null and terms.type !=''">
+ and type = #{terms.type}
+ </if>
+ <if test="terms.parentId != null and terms.parentId !=''">
+ and parent_id = #{terms.parentId}
+ </if>
+ <if test="terms.unitId != null and terms.unitId !=''">
+ and unit_id = #{terms.unitId}
+ </if>
+ <if test="terms.goodField != null and terms.goodField !=''">
+ and good_field = #{terms.goodField}
+ </if>
+ <if test="terms.goodFieldName != null and terms.goodFieldName !=''">
+ and good_field_name = #{terms.goodFieldName}
+ </if>
+ <if test="terms.canField != null and terms.canField !=''">
+ and can_field = #{terms.canField}
+ </if>
+ <if test="terms.canFieldName != null and terms.canFieldName !=''">
+ and can_field_name = #{terms.canFieldName}
+ </if>
+ <if test="terms.level != null and terms.level !=''">
+ and level = #{terms.level}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCtDept">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCtDeptTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCtDept">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml
similarity index 60%
copy from dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
copy to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml
index d6a6c09..b79b9c8 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml
@@ -1,51 +1,45 @@
<?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">
<!--
- * @title: 网格化平台地域字典映射表
+ * @title: 客户岗位表
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-25 18:03:50
+ * @time:2024-10-17 17:31:47
* @version 1.0.0
-->
-<mapper namespace="cn.huge.module.region.dao.mapper.SyRegionGridMapper">
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtPostMapper">
<!-- 结果集 -->
- <resultMap id="dataResult" type="cn.huge.module.region.domain.po.SyRegionGrid">
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.CtPost">
<result property="id" column="id"/>
- <result property="thirdSysId" column="third_sys_id"/>
- <result property="thirdSysName" column="third_sys_name"/>
- <result property="thirdCode" column="third_code"/>
- <result property="thirdName" column="third_name"/>
- <result property="thirdParentId" column="third_parent_id"/>
- <result property="regionId" column="region_id"/>
- <result property="level" column="level"/>
+ <result property="name" column="name"/>
+ <result property="des" column="des"/>
+ <result property="unitId" column="unit_id"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<!-- 表 -->
- <sql id='table-name'>dyh_sy_region_grid</sql>
+ <sql id='table-name'>dyh_ct_post</sql>
<!-- 字段 -->
<sql id="column-part">
id,
- third_sys_id,
- third_sys_name,
- third_code,
- third_name,
- third_parent_id,
- region_id,
- level,
+ name,
+ des,
+ unit_id,
+ delete_status,
+ cust_id,
create_time,
update_time
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
- <if test="entity.thirdSysId != null">third_sys_id = #{entity.thirdSysId},</if>
- <if test="entity.thirdSysName != null">third_sys_name = #{entity.thirdSysName},</if>
- <if test="entity.thirdCode != null">third_code = #{entity.thirdCode},</if>
- <if test="entity.thirdName != null">third_name = #{entity.thirdName},</if>
- <if test="entity.thirdParentId != null">third_parent_id = #{entity.thirdParentId},</if>
- <if test="entity.regionId != null">region_id = #{entity.regionId},</if>
- <if test="entity.level != null">level = #{entity.level},</if>
+ <if test="entity.name != null">name = #{entity.name},</if>
+ <if test="entity.des != null">des = #{entity.des},</if>
+ <if test="entity.unitId != null">unit_id = #{entity.unitId},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
<if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
</sql>
@@ -56,26 +50,23 @@
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
</if>
- <if test="terms.thirdSysId != null and terms.thirdSysId !=''">
- and third_sys_id = #{terms.thirdSysId}
+ <if test="terms.name != null and terms.name !=''">
+ and name = #{terms.name}
</if>
- <if test="terms.thirdSysName != null and terms.thirdSysName !=''">
- and third_sys_name = #{terms.thirdSysName}
+ <if test="terms.des != null and terms.des !=''">
+ and des = #{terms.des}
</if>
- <if test="terms.thirdCode != null and terms.thirdCode !=''">
- and third_code = #{terms.thirdCode}
+ <if test="terms.unitId != null and terms.unitId !=''">
+ and unit_id = #{terms.unitId}
</if>
- <if test="terms.thirdName != null and terms.thirdName !=''">
- and third_name = #{terms.thirdName}
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
</if>
- <if test="terms.thirdParentId != null and terms.thirdParentId !=''">
- and third_parent_id = #{terms.thirdParentId}
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
</if>
- <if test="terms.regionId != null and terms.regionId !=''">
- and region_id = #{terms.regionId}
- </if>
- <if test="terms.level != null and terms.level !=''">
- and level = #{terms.level}
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
</if>
<if test="terms.createTime != null and terms.createTime !=''">
and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
@@ -95,7 +86,7 @@
</if>
</sql>
<!-- 更新对象 -->
- <update id="updateSyRegionGrid">
+ <update id="updateCtPost">
update
<include refid="table-name"/>
<set>
@@ -106,7 +97,7 @@
</where>
</update>
<!-- 条件更新对象 -->
- <update id="updateSyRegionGridTerms">
+ <update id="updateCtPostTerms">
update
<include refid="table-name"/>
<set>
@@ -115,7 +106,7 @@
<include refid="where-part"/>
</update>
<!-- 根据编号物理删除 -->
- <delete id="deleteSyRegionGrid">
+ <delete id="deleteCtPost">
delete from
<include refid="table-name" />
where id = #{id}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
new file mode 100644
index 0000000..071e109
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
@@ -0,0 +1,334 @@
+<?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">
+<!--
+ * @title: 客户组织表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-17 17:31:46
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUnitMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.CtUnit">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="unitType" column="unit_type"/>
+ <result property="courtStatus" column="court_status"/>
+ <result property="unitCode" column="unit_code"/>
+ <result property="des" column="des"/>
+ <result property="dutyName" column="duty_name"/>
+ <result property="dutyMobile" column="duty_mobile"/>
+ <result property="dutyIdcard" column="duty_idcard"/>
+ <result property="joinWay" column="join_way"/>
+ <result property="prov" column="prov"/>
+ <result property="provName" column="prov_name"/>
+ <result property="city" column="city"/>
+ <result property="cityName" column="city_name"/>
+ <result property="area" column="area"/>
+ <result property="areaName" column="area_name"/>
+ <result property="road" column="road"/>
+ <result property="roadName" column="road_name"/>
+ <result property="village" column="village"/>
+ <result property="villageName" column="village_name"/>
+ <result property="addr" column="addr"/>
+ <result property="lng" column="lng"/>
+ <result property="lat" column="lat"/>
+ <result property="parentId" column="parent_id"/>
+ <result property="goodField" column="good_field"/>
+ <result property="goodFieldName" column="good_field_name"/>
+ <result property="canField" column="can_field"/>
+ <result property="canFieldName" column="can_field_name"/>
+ <result property="findStatus" column="find_status"/>
+ <result property="dispStatus" column="disp_status"/>
+ <result property="countCase" column="count_case"/>
+ <result property="level" column="level"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="custProv" column="cust_prov"/>
+ <result property="custCity" column="cust_city"/>
+ <result property="custArea" column="cust_area"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_ct_unit</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ name,
+ unit_type,
+ court_status,
+ unit_code,
+ des,
+ duty_name,
+ duty_mobile,
+ duty_idcard,
+ join_way,
+ prov,
+ prov_name,
+ city,
+ city_name,
+ area,
+ area_name,
+ road,
+ road_name,
+ village,
+ village_name,
+ addr,
+ lng,
+ lat,
+ parent_id,
+ good_field,
+ good_field_name,
+ can_field,
+ can_field_name,
+ find_status,
+ disp_status,
+ count_case,
+ level,
+ delete_status,
+ cust_id,
+ cust_prov,
+ cust_city,
+ cust_area,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.name != null">name = #{entity.name},</if>
+ <if test="entity.unitType != null">unit_type = #{entity.unitType},</if>
+ <if test="entity.courtStatus != null">court_status = #{entity.courtStatus},</if>
+ <if test="entity.unitCode != null">unit_code = #{entity.unitCode},</if>
+ <if test="entity.des != null">des = #{entity.des},</if>
+ <if test="entity.dutyName != null">duty_name = #{entity.dutyName},</if>
+ <if test="entity.dutyMobile != null">duty_mobile = #{entity.dutyMobile},</if>
+ <if test="entity.dutyIdcard != null">duty_idcard = #{entity.dutyIdcard},</if>
+ <if test="entity.joinWay != null">join_way = #{entity.joinWay},</if>
+ <if test="entity.prov != null">prov = #{entity.prov},</if>
+ <if test="entity.provName != null">prov_name = #{entity.provName},</if>
+ <if test="entity.city != null">city = #{entity.city},</if>
+ <if test="entity.cityName != null">city_name = #{entity.cityName},</if>
+ <if test="entity.area != null">area = #{entity.area},</if>
+ <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
+ <if test="entity.road != null">road = #{entity.road},</if>
+ <if test="entity.roadName != null">road_name = #{entity.roadName},</if>
+ <if test="entity.village != null">village = #{entity.village},</if>
+ <if test="entity.villageName != null">village_name = #{entity.villageName},</if>
+ <if test="entity.addr != null">addr = #{entity.addr},</if>
+ <if test="entity.lng != null">lng = #{entity.lng},</if>
+ <if test="entity.lat != null">lat = #{entity.lat},</if>
+ <if test="entity.parentId != null">parent_id = #{entity.parentId},</if>
+ <if test="entity.goodField != null">good_field = #{entity.goodField},</if>
+ <if test="entity.goodFieldName != null">good_field_name = #{entity.goodFieldName},</if>
+ <if test="entity.canField != null">can_field = #{entity.canField},</if>
+ <if test="entity.canFieldName != null">can_field_name = #{entity.canFieldName},</if>
+ <if test="entity.findStatus != null">find_status = #{entity.findStatus},</if>
+ <if test="entity.dispStatus != null">disp_status = #{entity.dispStatus},</if>
+ <if test="entity.countCase != null">count_case = #{entity.countCase},</if>
+ <if test="entity.level != null">level = #{entity.level},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.custProv != null">cust_prov = #{entity.custProv},</if>
+ <if test="entity.custCity != null">cust_city = #{entity.custCity},</if>
+ <if test="entity.custArea != null">cust_area = #{entity.custArea},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.name != null and terms.name !=''">
+ and name = #{terms.name}
+ </if>
+ <if test="terms.unitType != null and terms.unitType !=''">
+ and unit_type = #{terms.unitType}
+ </if>
+ <if test="terms.courtStatus != null and terms.courtStatus !=''">
+ and court_status = #{terms.courtStatus}
+ </if>
+ <if test="terms.unitCode != null and terms.unitCode !=''">
+ and unit_code = #{terms.unitCode}
+ </if>
+ <if test="terms.des != null and terms.des !=''">
+ and des = #{terms.des}
+ </if>
+ <if test="terms.dutyName != null and terms.dutyName !=''">
+ and duty_name = #{terms.dutyName}
+ </if>
+ <if test="terms.dutyMobile != null and terms.dutyMobile !=''">
+ and duty_mobile = #{terms.dutyMobile}
+ </if>
+ <if test="terms.dutyIdcard != null and terms.dutyIdcard !=''">
+ and duty_idcard = #{terms.dutyIdcard}
+ </if>
+ <if test="terms.joinWay != null and terms.joinWay !=''">
+ and join_way = #{terms.joinWay}
+ </if>
+ <if test="terms.prov != null and terms.prov !=''">
+ and prov = #{terms.prov}
+ </if>
+ <if test="terms.provName != null and terms.provName !=''">
+ and prov_name = #{terms.provName}
+ </if>
+ <if test="terms.city != null and terms.city !=''">
+ and city = #{terms.city}
+ </if>
+ <if test="terms.cityName != null and terms.cityName !=''">
+ and city_name = #{terms.cityName}
+ </if>
+ <if test="terms.area != null and terms.area !=''">
+ and area = #{terms.area}
+ </if>
+ <if test="terms.areaName != null and terms.areaName !=''">
+ and area_name = #{terms.areaName}
+ </if>
+ <if test="terms.road != null and terms.road !=''">
+ and road = #{terms.road}
+ </if>
+ <if test="terms.roadName != null and terms.roadName !=''">
+ and road_name = #{terms.roadName}
+ </if>
+ <if test="terms.village != null and terms.village !=''">
+ and village = #{terms.village}
+ </if>
+ <if test="terms.villageName != null and terms.villageName !=''">
+ and village_name = #{terms.villageName}
+ </if>
+ <if test="terms.addr != null and terms.addr !=''">
+ and addr = #{terms.addr}
+ </if>
+ <if test="terms.lng != null and terms.lng !=''">
+ and lng = #{terms.lng}
+ </if>
+ <if test="terms.lat != null and terms.lat !=''">
+ and lat = #{terms.lat}
+ </if>
+ <if test="terms.parentId != null and terms.parentId !=''">
+ and parent_id = #{terms.parentId}
+ </if>
+ <if test="terms.goodField != null and terms.goodField !=''">
+ and good_field = #{terms.goodField}
+ </if>
+ <if test="terms.goodFieldName != null and terms.goodFieldName !=''">
+ and good_field_name = #{terms.goodFieldName}
+ </if>
+ <if test="terms.canField != null and terms.canField !=''">
+ and can_field = #{terms.canField}
+ </if>
+ <if test="terms.canFieldName != null and terms.canFieldName !=''">
+ and can_field_name = #{terms.canFieldName}
+ </if>
+ <if test="terms.findStatus != null and terms.findStatus !=''">
+ and find_status = #{terms.findStatus}
+ </if>
+ <if test="terms.dispStatus != null and terms.dispStatus !=''">
+ and disp_status = #{terms.dispStatus}
+ </if>
+ <if test="terms.countCase != null and terms.countCase !=''">
+ and count_case = #{terms.countCase}
+ </if>
+ <if test="terms.level != null and terms.level !=''">
+ and level = #{terms.level}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.custProv != null and terms.custProv !=''">
+ and cust_prov = #{terms.custProv}
+ </if>
+ <if test="terms.custCity != null and terms.custCity !=''">
+ and cust_city = #{terms.custCity}
+ </if>
+ <if test="terms.custArea != null and terms.custArea !=''">
+ and cust_area = #{terms.custArea}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCtUnit">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCtUnitTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCtUnit">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml
similarity index 61%
copy from dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
copy to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml
index d6a6c09..74f5628 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml
@@ -1,51 +1,51 @@
<?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">
<!--
- * @title: 网格化平台地域字典映射表
+ * @title: 客户用户配岗表
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-25 18:03:50
+ * @time:2024-10-17 17:31:47
* @version 1.0.0
-->
-<mapper namespace="cn.huge.module.region.dao.mapper.SyRegionGridMapper">
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUsepostMapper">
<!-- 结果集 -->
- <resultMap id="dataResult" type="cn.huge.module.region.domain.po.SyRegionGrid">
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.CtUsepost">
<result property="id" column="id"/>
- <result property="thirdSysId" column="third_sys_id"/>
- <result property="thirdSysName" column="third_sys_name"/>
- <result property="thirdCode" column="third_code"/>
- <result property="thirdName" column="third_name"/>
- <result property="thirdParentId" column="third_parent_id"/>
- <result property="regionId" column="region_id"/>
- <result property="level" column="level"/>
+ <result property="userId" column="user_id"/>
+ <result property="postId" column="post_id"/>
+ <result property="postName" column="post_name"/>
+ <result property="unitId" column="unit_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="matchType" column="match_type"/>
+ <result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<!-- 表 -->
- <sql id='table-name'>dyh_sy_region_grid</sql>
+ <sql id='table-name'>dyh_ct_usepost</sql>
<!-- 字段 -->
<sql id="column-part">
id,
- third_sys_id,
- third_sys_name,
- third_code,
- third_name,
- third_parent_id,
- region_id,
- level,
+ user_id,
+ post_id,
+ post_name,
+ unit_id,
+ dept_id,
+ match_type,
+ cust_id,
create_time,
update_time
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
- <if test="entity.thirdSysId != null">third_sys_id = #{entity.thirdSysId},</if>
- <if test="entity.thirdSysName != null">third_sys_name = #{entity.thirdSysName},</if>
- <if test="entity.thirdCode != null">third_code = #{entity.thirdCode},</if>
- <if test="entity.thirdName != null">third_name = #{entity.thirdName},</if>
- <if test="entity.thirdParentId != null">third_parent_id = #{entity.thirdParentId},</if>
- <if test="entity.regionId != null">region_id = #{entity.regionId},</if>
- <if test="entity.level != null">level = #{entity.level},</if>
+ <if test="entity.userId != null">user_id = #{entity.userId},</if>
+ <if test="entity.postId != null">post_id = #{entity.postId},</if>
+ <if test="entity.postName != null">post_name = #{entity.postName},</if>
+ <if test="entity.unitId != null">unit_id = #{entity.unitId},</if>
+ <if test="entity.deptId != null">dept_id = #{entity.deptId},</if>
+ <if test="entity.matchType != null">match_type = #{entity.matchType},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
<if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
</sql>
@@ -56,26 +56,26 @@
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
</if>
- <if test="terms.thirdSysId != null and terms.thirdSysId !=''">
- and third_sys_id = #{terms.thirdSysId}
+ <if test="terms.userId != null and terms.userId !=''">
+ and user_id = #{terms.userId}
</if>
- <if test="terms.thirdSysName != null and terms.thirdSysName !=''">
- and third_sys_name = #{terms.thirdSysName}
+ <if test="terms.postId != null and terms.postId !=''">
+ and post_id = #{terms.postId}
</if>
- <if test="terms.thirdCode != null and terms.thirdCode !=''">
- and third_code = #{terms.thirdCode}
+ <if test="terms.postName != null and terms.postName !=''">
+ and post_name = #{terms.postName}
</if>
- <if test="terms.thirdName != null and terms.thirdName !=''">
- and third_name = #{terms.thirdName}
+ <if test="terms.unitId != null and terms.unitId !=''">
+ and unit_id = #{terms.unitId}
</if>
- <if test="terms.thirdParentId != null and terms.thirdParentId !=''">
- and third_parent_id = #{terms.thirdParentId}
+ <if test="terms.deptId != null and terms.deptId !=''">
+ and dept_id = #{terms.deptId}
</if>
- <if test="terms.regionId != null and terms.regionId !=''">
- and region_id = #{terms.regionId}
+ <if test="terms.matchType != null and terms.matchType !=''">
+ and match_type = #{terms.matchType}
</if>
- <if test="terms.level != null and terms.level !=''">
- and level = #{terms.level}
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
</if>
<if test="terms.createTime != null and terms.createTime !=''">
and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
@@ -95,7 +95,7 @@
</if>
</sql>
<!-- 更新对象 -->
- <update id="updateSyRegionGrid">
+ <update id="updateCtUsepost">
update
<include refid="table-name"/>
<set>
@@ -106,7 +106,7 @@
</where>
</update>
<!-- 条件更新对象 -->
- <update id="updateSyRegionGridTerms">
+ <update id="updateCtUsepostTerms">
update
<include refid="table-name"/>
<set>
@@ -115,7 +115,7 @@
<include refid="where-part"/>
</update>
<!-- 根据编号物理删除 -->
- <delete id="deleteSyRegionGrid">
+ <delete id="deleteCtUsepost">
delete from
<include refid="table-name" />
where id = #{id}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml
similarity index 60%
copy from dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
copy to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml
index d6a6c09..3303640 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/region/dao/mapper/xml/SyRegionGridMapper.xml
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml
@@ -1,51 +1,45 @@
<?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">
<!--
- * @title: 网格化平台地域字典映射表
+ * @title: 客户用户角色表
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-25 18:03:50
+ * @time:2024-10-17 17:31:46
* @version 1.0.0
-->
-<mapper namespace="cn.huge.module.region.dao.mapper.SyRegionGridMapper">
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUseroleMapper">
<!-- 结果集 -->
- <resultMap id="dataResult" type="cn.huge.module.region.domain.po.SyRegionGrid">
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.CtUserole">
<result property="id" column="id"/>
- <result property="thirdSysId" column="third_sys_id"/>
- <result property="thirdSysName" column="third_sys_name"/>
- <result property="thirdCode" column="third_code"/>
- <result property="thirdName" column="third_name"/>
- <result property="thirdParentId" column="third_parent_id"/>
- <result property="regionId" column="region_id"/>
- <result property="level" column="level"/>
+ <result property="userId" column="user_id"/>
+ <result property="roleId" column="role_id"/>
+ <result property="roleCode" column="role_code"/>
+ <result property="roleName" column="role_name"/>
+ <result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<!-- 表 -->
- <sql id='table-name'>dyh_sy_region_grid</sql>
+ <sql id='table-name'>dyh_ct_userole</sql>
<!-- 字段 -->
<sql id="column-part">
id,
- third_sys_id,
- third_sys_name,
- third_code,
- third_name,
- third_parent_id,
- region_id,
- level,
+ user_id,
+ role_id,
+ role_code,
+ role_name,
+ cust_id,
create_time,
update_time
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
- <if test="entity.thirdSysId != null">third_sys_id = #{entity.thirdSysId},</if>
- <if test="entity.thirdSysName != null">third_sys_name = #{entity.thirdSysName},</if>
- <if test="entity.thirdCode != null">third_code = #{entity.thirdCode},</if>
- <if test="entity.thirdName != null">third_name = #{entity.thirdName},</if>
- <if test="entity.thirdParentId != null">third_parent_id = #{entity.thirdParentId},</if>
- <if test="entity.regionId != null">region_id = #{entity.regionId},</if>
- <if test="entity.level != null">level = #{entity.level},</if>
+ <if test="entity.userId != null">user_id = #{entity.userId},</if>
+ <if test="entity.roleId != null">role_id = #{entity.roleId},</if>
+ <if test="entity.roleCode != null">role_code = #{entity.roleCode},</if>
+ <if test="entity.roleName != null">role_name = #{entity.roleName},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
<if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
</sql>
@@ -56,26 +50,20 @@
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
</if>
- <if test="terms.thirdSysId != null and terms.thirdSysId !=''">
- and third_sys_id = #{terms.thirdSysId}
+ <if test="terms.userId != null and terms.userId !=''">
+ and user_id = #{terms.userId}
</if>
- <if test="terms.thirdSysName != null and terms.thirdSysName !=''">
- and third_sys_name = #{terms.thirdSysName}
+ <if test="terms.roleId != null and terms.roleId !=''">
+ and role_id = #{terms.roleId}
</if>
- <if test="terms.thirdCode != null and terms.thirdCode !=''">
- and third_code = #{terms.thirdCode}
+ <if test="terms.roleCode != null and terms.roleCode !=''">
+ and role_code = #{terms.roleCode}
</if>
- <if test="terms.thirdName != null and terms.thirdName !=''">
- and third_name = #{terms.thirdName}
+ <if test="terms.roleName != null and terms.roleName !=''">
+ and role_name = #{terms.roleName}
</if>
- <if test="terms.thirdParentId != null and terms.thirdParentId !=''">
- and third_parent_id = #{terms.thirdParentId}
- </if>
- <if test="terms.regionId != null and terms.regionId !=''">
- and region_id = #{terms.regionId}
- </if>
- <if test="terms.level != null and terms.level !=''">
- and level = #{terms.level}
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
</if>
<if test="terms.createTime != null and terms.createTime !=''">
and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
@@ -95,7 +83,7 @@
</if>
</sql>
<!-- 更新对象 -->
- <update id="updateSyRegionGrid">
+ <update id="updateCtUserole">
update
<include refid="table-name"/>
<set>
@@ -106,7 +94,7 @@
</where>
</update>
<!-- 条件更新对象 -->
- <update id="updateSyRegionGridTerms">
+ <update id="updateCtUseroleTerms">
update
<include refid="table-name"/>
<set>
@@ -115,7 +103,7 @@
<include refid="where-part"/>
</update>
<!-- 根据编号物理删除 -->
- <delete id="deleteSyRegionGrid">
+ <delete id="deleteCtUserole">
delete from
<include refid="table-name" />
where id = #{id}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtuserMapper.xml b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtuserMapper.xml
new file mode 100644
index 0000000..03304cd
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtuserMapper.xml
@@ -0,0 +1,352 @@
+<?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">
+<!--
+ * @title: 客户用户表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-10-17 17:31:45
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtuserMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.ctuser.domain.po.Ctuser">
+ <result property="id" column="id"/>
+ <result property="trueName" column="true_name"/>
+ <result property="sex" column="sex"/>
+ <result property="sexName" column="sex_name"/>
+ <result property="mobile" column="mobile"/>
+ <result property="idcard" column="idcard"/>
+ <result property="email" column="email"/>
+ <result property="wechat" column="wechat"/>
+ <result property="qq" column="qq"/>
+ <result property="prov" column="prov"/>
+ <result property="provName" column="prov_name"/>
+ <result property="city" column="city"/>
+ <result property="cityName" column="city_name"/>
+ <result property="area" column="area"/>
+ <result property="areaName" column="area_name"/>
+ <result property="road" column="road"/>
+ <result property="roadName" column="road_name"/>
+ <result property="village" column="village"/>
+ <result property="villageName" column="village_name"/>
+ <result property="addr" column="addr"/>
+ <result property="avatar" column="avatar"/>
+ <result property="acc" column="acc"/>
+ <result property="unitId" column="unit_id"/>
+ <result property="unitName" column="unit_name"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="deptType" column="dept_type"/>
+ <result property="joinWay" column="join_way"/>
+ <result property="realStatus" column="real_status"/>
+ <result property="faceStatus" column="face_status"/>
+ <result property="status" column="status"/>
+ <result property="goodField" column="good_field"/>
+ <result property="goodFieldName" column="good_field_name"/>
+ <result property="canField" column="can_field"/>
+ <result property="canFieldName" column="can_field_name"/>
+ <result property="findStatus" column="find_status"/>
+ <result property="dispStatus" column="disp_status"/>
+ <result property="countCase" column="count_case"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_ct_user</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ true_name,
+ sex,
+ sex_name,
+ mobile,
+ idcard,
+ email,
+ wechat,
+ qq,
+ prov,
+ prov_name,
+ city,
+ city_name,
+ area,
+ area_name,
+ road,
+ road_name,
+ village,
+ village_name,
+ addr,
+ avatar,
+ acc,
+ unit_id,
+ unit_name,
+ dept_id,
+ dept_name,
+ dept_type,
+ join_way,
+ real_status,
+ face_status,
+ status,
+ good_field,
+ good_field_name,
+ can_field,
+ can_field_name,
+ find_status,
+ disp_status,
+ count_case,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.trueName != null">true_name = #{entity.trueName},</if>
+ <if test="entity.sex != null">sex = #{entity.sex},</if>
+ <if test="entity.sexName != null">sex_name = #{entity.sexName},</if>
+ <if test="entity.mobile != null">mobile = #{entity.mobile},</if>
+ <if test="entity.idcard != null">idcard = #{entity.idcard},</if>
+ <if test="entity.email != null">email = #{entity.email},</if>
+ <if test="entity.wechat != null">wechat = #{entity.wechat},</if>
+ <if test="entity.qq != null">qq = #{entity.qq},</if>
+ <if test="entity.prov != null">prov = #{entity.prov},</if>
+ <if test="entity.provName != null">prov_name = #{entity.provName},</if>
+ <if test="entity.city != null">city = #{entity.city},</if>
+ <if test="entity.cityName != null">city_name = #{entity.cityName},</if>
+ <if test="entity.area != null">area = #{entity.area},</if>
+ <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
+ <if test="entity.road != null">road = #{entity.road},</if>
+ <if test="entity.roadName != null">road_name = #{entity.roadName},</if>
+ <if test="entity.village != null">village = #{entity.village},</if>
+ <if test="entity.villageName != null">village_name = #{entity.villageName},</if>
+ <if test="entity.addr != null">addr = #{entity.addr},</if>
+ <if test="entity.avatar != null">avatar = #{entity.avatar},</if>
+ <if test="entity.acc != null">acc = #{entity.acc},</if>
+ <if test="entity.unitId != null">unit_id = #{entity.unitId},</if>
+ <if test="entity.unitName != null">unit_name = #{entity.unitName},</if>
+ <if test="entity.deptId != null">dept_id = #{entity.deptId},</if>
+ <if test="entity.deptName != null">dept_name = #{entity.deptName},</if>
+ <if test="entity.deptType != null">dept_type = #{entity.deptType},</if>
+ <if test="entity.joinWay != null">join_way = #{entity.joinWay},</if>
+ <if test="entity.realStatus != null">real_status = #{entity.realStatus},</if>
+ <if test="entity.faceStatus != null">face_status = #{entity.faceStatus},</if>
+ <if test="entity.status != null">status = #{entity.status},</if>
+ <if test="entity.goodField != null">good_field = #{entity.goodField},</if>
+ <if test="entity.goodFieldName != null">good_field_name = #{entity.goodFieldName},</if>
+ <if test="entity.canField != null">can_field = #{entity.canField},</if>
+ <if test="entity.canFieldName != null">can_field_name = #{entity.canFieldName},</if>
+ <if test="entity.findStatus != null">find_status = #{entity.findStatus},</if>
+ <if test="entity.dispStatus != null">disp_status = #{entity.dispStatus},</if>
+ <if test="entity.countCase != null">count_case = #{entity.countCase},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.trueName != null and terms.trueName !=''">
+ and true_name = #{terms.trueName}
+ </if>
+ <if test="terms.sex != null and terms.sex !=''">
+ and sex = #{terms.sex}
+ </if>
+ <if test="terms.sexName != null and terms.sexName !=''">
+ and sex_name = #{terms.sexName}
+ </if>
+ <if test="terms.mobile != null and terms.mobile !=''">
+ and mobile = #{terms.mobile}
+ </if>
+ <if test="terms.idcard != null and terms.idcard !=''">
+ and idcard = #{terms.idcard}
+ </if>
+ <if test="terms.email != null and terms.email !=''">
+ and email = #{terms.email}
+ </if>
+ <if test="terms.wechat != null and terms.wechat !=''">
+ and wechat = #{terms.wechat}
+ </if>
+ <if test="terms.qq != null and terms.qq !=''">
+ and qq = #{terms.qq}
+ </if>
+ <if test="terms.prov != null and terms.prov !=''">
+ and prov = #{terms.prov}
+ </if>
+ <if test="terms.provName != null and terms.provName !=''">
+ and prov_name = #{terms.provName}
+ </if>
+ <if test="terms.city != null and terms.city !=''">
+ and city = #{terms.city}
+ </if>
+ <if test="terms.cityName != null and terms.cityName !=''">
+ and city_name = #{terms.cityName}
+ </if>
+ <if test="terms.area != null and terms.area !=''">
+ and area = #{terms.area}
+ </if>
+ <if test="terms.areaName != null and terms.areaName !=''">
+ and area_name = #{terms.areaName}
+ </if>
+ <if test="terms.road != null and terms.road !=''">
+ and road = #{terms.road}
+ </if>
+ <if test="terms.roadName != null and terms.roadName !=''">
+ and road_name = #{terms.roadName}
+ </if>
+ <if test="terms.village != null and terms.village !=''">
+ and village = #{terms.village}
+ </if>
+ <if test="terms.villageName != null and terms.villageName !=''">
+ and village_name = #{terms.villageName}
+ </if>
+ <if test="terms.addr != null and terms.addr !=''">
+ and addr = #{terms.addr}
+ </if>
+ <if test="terms.avatar != null and terms.avatar !=''">
+ and avatar = #{terms.avatar}
+ </if>
+ <if test="terms.acc != null and terms.acc !=''">
+ and acc = #{terms.acc}
+ </if>
+ <if test="terms.unitId != null and terms.unitId !=''">
+ and unit_id = #{terms.unitId}
+ </if>
+ <if test="terms.unitName != null and terms.unitName !=''">
+ and unit_name = #{terms.unitName}
+ </if>
+ <if test="terms.deptId != null and terms.deptId !=''">
+ and dept_id = #{terms.deptId}
+ </if>
+ <if test="terms.deptName != null and terms.deptName !=''">
+ and dept_name = #{terms.deptName}
+ </if>
+ <if test="terms.deptType != null and terms.deptType !=''">
+ and dept_type = #{terms.deptType}
+ </if>
+ <if test="terms.joinWay != null and terms.joinWay !=''">
+ and join_way = #{terms.joinWay}
+ </if>
+ <if test="terms.realStatus != null and terms.realStatus !=''">
+ and real_status = #{terms.realStatus}
+ </if>
+ <if test="terms.faceStatus != null and terms.faceStatus !=''">
+ and face_status = #{terms.faceStatus}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and status = #{terms.status}
+ </if>
+ <if test="terms.goodField != null and terms.goodField !=''">
+ and good_field = #{terms.goodField}
+ </if>
+ <if test="terms.goodFieldName != null and terms.goodFieldName !=''">
+ and good_field_name = #{terms.goodFieldName}
+ </if>
+ <if test="terms.canField != null and terms.canField !=''">
+ and can_field = #{terms.canField}
+ </if>
+ <if test="terms.canFieldName != null and terms.canFieldName !=''">
+ and can_field_name = #{terms.canFieldName}
+ </if>
+ <if test="terms.findStatus != null and terms.findStatus !=''">
+ and find_status = #{terms.findStatus}
+ </if>
+ <if test="terms.dispStatus != null and terms.dispStatus !=''">
+ and disp_status = #{terms.dispStatus}
+ </if>
+ <if test="terms.countCase != null and terms.countCase !=''">
+ and count_case = #{terms.countCase}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 1
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCtuser">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCtuserTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCtuser">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/ByRegionBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/ByRegionBO.java
new file mode 100644
index 0000000..65fb026
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/ByRegionBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.ByRegion;
+
+/**
+ * @title: 地域字典表业务扩展类
+ * @description: 地域字典表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-18 15:14:06
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.ByRegion
+ */
+public class ByRegionBO extends ByRegion {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java
new file mode 100644
index 0000000..c448565
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.CtAccount;
+
+/**
+ * @title: 客户用户账号表业务扩展类
+ * @description: 客户用户账号表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.CtAccount
+ */
+public class CtAccountBO extends CtAccount {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java
new file mode 100644
index 0000000..ca743a2
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.CtDept;
+
+/**
+ * @title: 客户部门表业务扩展类
+ * @description: 客户部门表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.CtDept
+ */
+public class CtDeptBO extends CtDept {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java
new file mode 100644
index 0000000..e8d1ad7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.CtPost;
+
+/**
+ * @title: 客户岗位表业务扩展类
+ * @description: 客户岗位表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:47
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.CtPost
+ */
+public class CtPostBO extends CtPost {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java
new file mode 100644
index 0000000..643d84d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.CtUnit;
+
+/**
+ * @title: 客户组织表业务扩展类
+ * @description: 客户组织表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.CtUnit
+ */
+public class CtUnitBO extends CtUnit {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java
new file mode 100644
index 0000000..9481f51
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.CtUsepost;
+
+/**
+ * @title: 客户用户配岗表业务扩展类
+ * @description: 客户用户配岗表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:47
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.CtUsepost
+ */
+public class CtUsepostBO extends CtUsepost {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java
new file mode 100644
index 0000000..ed3ff89
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.CtUserole;
+
+/**
+ * @title: 客户用户角色表业务扩展类
+ * @description: 客户用户角色表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.CtUserole
+ */
+public class CtUseroleBO extends CtUserole {
+
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtuserBO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtuserBO.java
new file mode 100644
index 0000000..140c31e
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/bo/CtuserBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.ctuser.domain.bo;
+
+import cn.huge.module.ctuser.domain.po.Ctuser;
+
+/**
+ * @title: 客户用户表业务扩展类
+ * @description: 客户用户表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:45
+ * @version: 1.0.0
+ * @see cn.huge.module.ctuser.domain.po.Ctuser
+ */
+public class CtuserBO extends Ctuser {
+
+
+}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/target/TargetCtAccount.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtAccountDTO.java
similarity index 74%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/target/TargetCtAccount.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtAccountDTO.java
index 75e5f7a..553dfa0 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/target/TargetCtAccount.java
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtAccountDTO.java
@@ -1,4 +1,4 @@
-package cn.huge.module.sync.domain.target;
+package cn.huge.module.ctuser.domain.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -17,85 +17,71 @@
* @version 1.0.0
*/
@Data
-public class TargetCtAccount {
+public class GZCtAccountDTO {
/**
* 账号编号
*/
- @TableId(value = "id")
private String id;
/**
* 用户编号
*/
- @TableField(value = "user_id")
private String userId;
/**
* 帐号类型，1：平台web端，2：平台小程序
*/
- @TableField(value = "acc_type")
private Integer accType;
/**
* 身份唯一标识（存储唯一标识，比如账号、邮箱、手机号、第三方获取的唯一标识等）
*/
- @TableField(value = "acc")
private String acc;
/**
* 授权凭证（比如密码 第三方登录的token等）
*/
- @TableField(value = "cipher")
private String cipher;
/**
* 授权凭证明文
*/
- @TableField(value = "cipher_open")
private String cipherOpen;
/**
* 密码最新更新时间
*/
- @TableField(value = "cipher_time")
private Date cipherTime;
/**
* 最新登录时间
*/
- @TableField(value = "login_time")
private Date loginTime;
/**
* 限制登录时间（密码错误次数超过限制，默认30分钟）
*/
- @TableField(value = "limit_time")
private Date limitTime;
/**
* 删除状态，0：未删除，1：已删除
*/
- @TableLogic
- @TableField(value = "delete_status")
private Integer deleteStatus;
/**
* 顾客编号
*/
- @TableField(value = "cust_id")
private String custId;
/**
* 创建时间
*/
- @TableField(value = "create_time")
private Date createTime;
/**
* 更新时间
*/
- @TableField(value = "update_time")
private Date updateTime;
}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtDeptDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtDeptDTO.java
new file mode 100644
index 0000000..e5b6c9f
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtDeptDTO.java
@@ -0,0 +1,94 @@
+package cn.huge.module.ctuser.domain.dto;
+
+import cn.huge.module.ctuser.domain.po.CtDept;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @title: 客户部门表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-08-19 20:04:19
+ * @version 1.0.0
+ */
+@Data
+public class GZCtDeptDTO {
+
+ /**
+ * 部门编号
+ */
+ private String id;
+
+ /**
+ * 层级
+ */
+ private Integer level;
+
+ /**
+ * 父级部门，根级默认root
+ */
+ private String parentId;
+
+ /**
+ * 部门名称
+ */
+ private String name;
+
+ /**
+ * 描述
+ */
+ private String des;
+
+ /**
+ * 组织编号
+ */
+ private String unitId;
+
+ /**
+ * 调解专长，多个用,隔开
+ */
+ private String goodField;
+
+ /**
+ * 调解专长名称，多个用,隔开
+ */
+ private String goodFieldName;
+
+ /**
+ * 调解范围，多个用,隔开
+ */
+ private String canField;
+
+ /**
+ * 调解范围名称，多个用,隔开
+ */
+ private String canFieldName;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ private Integer deleteStatus;
+
+ /**
+ * 所属客户编号
+ */
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/target/TargetCtUnit.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUnitDTO.java
similarity index 66%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/target/TargetCtUnit.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUnitDTO.java
index 87f8fe2..c990108 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/target/TargetCtUnit.java
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUnitDTO.java
@@ -1,232 +1,237 @@
-package cn.huge.module.sync.domain.target;
+package cn.huge.module.ctuser.domain.dto;
+import cn.huge.module.ctuser.domain.po.CtDept;
+import cn.huge.module.ctuser.domain.po.CtUnit;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @title: 客户组织信息表数据库对应关系类
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-19 20:04:19
+ * @time: 2024-10-17 16:41:34
* @version 1.0.0
*/
@Data
-public class TargetCtUnit {
+public class GZCtUnitDTO {
/**
* 组织编号
*/
- @TableId(value = "id")
private String id;
/**
* 层级
*/
- @TableField(value = "level")
private Integer level;
/**
* 父级组织，根级为root
*/
- @TableField(value = "parent_id")
private String parentId;
/**
* 组织级别，1：市级，2：区级，3：镇街级，4：村居级
*/
- @TableField(value = "unit_grade")
private Integer unitGrade;
+
+ /**
+ * 组织职能，1：调解组织，2：行政组织
+ */
+ private Integer unitFun;
+
+ /**
+ * 组织类型，
+ * 调解组织类型（101：综治中心，102：直属部门，103：村居社区，104：行专业调委会，105：企事业调委会，106：演示测试），
+ * 行政组织类型（201：政法委，202：其他）
+ */
+ private Integer unitType;
+
+ /**
+ * 是否是法院，0：否，1：是
+ */
+ private Integer courtStatus;
/**
* 组织名称
*/
- @TableField(value = "unit_name")
private String unitName;
-
- /**
- * 组织类型，0：政法委，1：综治中心，2：直属部门，3：法院，4：行专业调委会，5：企事业调委会，6：演示测试，9：其他
- */
- @TableField(value = "unit_type")
- private Integer unitType;
/**
* 组织机构代码
*/
- @TableField(value = "unit_code")
private String unitCode;
/**
* 描述
*/
- @TableField(value = "unit_des")
private String unitDes;
/**
* 单位负责人姓名
*/
- @TableField(value = "duty_name")
private String dutyName;
/**
* 单位负责人手机号码
*/
- @TableField(value = "duty_mobile")
private String dutyMobile;
/**
* 单位负责人身份证
*/
- @TableField(value = "duty_idcard")
private String dutyIdcard;
/**
* 加入方式，1：系统创建，2：自主申请
*/
- @TableField(value = "join_way")
private Integer joinWay;
/**
* 组织地址省
*/
- @TableField(value = "prov")
private String prov;
/**
* 组织地址省名称
*/
- @TableField(value = "prov_name")
private String provName;
/**
* 组织地址市
*/
- @TableField(value = "city")
private String city;
/**
* 组织地址市名称
*/
- @TableField(value = "city_name")
private String cityName;
/**
* 组织地址区
*/
- @TableField(value = "area")
private String area;
/**
* 组织地址区名称
*/
- @TableField(value = "area_name")
private String areaName;
/**
* 组织地址街道
*/
- @TableField(value = "road")
private String road;
/**
* 组织地址街道名称
*/
- @TableField(value = "road_name")
private String roadName;
/**
* 组织地址社区
*/
- @TableField(value = "village")
private String village;
/**
* 组织地址社区名称
*/
- @TableField(value = "village_name")
private String villageName;
/**
* 组织详细地址
*/
- @TableField(value = "addr")
private String addr;
/**
* 组织经度
*/
- @TableField(value = "lng")
private String lng;
/**
* 组织纬度
*/
- @TableField(value = "lat")
private String lat;
/**
* 调解专长，多个用,隔开
*/
- @TableField(value = "good_field")
private String goodField;
/**
* 调解专长名称，多个用,隔开
*/
- @TableField(value = "good_field_name")
private String goodFieldName;
/**
* 调解范围，多个用,隔开
*/
- @TableField(value = "can_field")
private String canField;
/**
* 调解范围名称，多个用,隔开
*/
- @TableField(value = "can_field_name")
private String canFieldName;
/**
* 是否可以找他调（小程序），0：否，1：是
*/
- @TableField(value = "find_status")
private Integer findStatus;
/**
* 是否参与自动调度，0：否，1：是
*/
- @TableField(value = "disp_status")
private Integer dispStatus;
/**
* 删除状态，0：未删除，1：已删除
*/
- @TableLogic
- @TableField(value = "delete_status")
private Integer deleteStatus;
/**
* 所属客户编号
*/
- @TableField(value = "cust_id")
private String custId;
/**
* 创建时间
*/
- @TableField(value = "create_time")
private Date createTime;
/**
* 更新时间
*/
- @TableField(value = "update_time")
private Date updateTime;
+ /**
+ * 邮政编码
+ */
+ private String postalCode;
+
+ /**
+ * 联系电话
+ */
+ private String telephone;
+
+ /**
+ * 办公时间，周
+ */
+ private String workTimeWeek;
+
+ /**
+ * 办公时间，上午
+ */
+ private String workTimeAm;
+
+ /**
+ * 办公时间，下午
+ */
+ private String workTimePm;
+
}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUserDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUserDTO.java
new file mode 100644
index 0000000..68e03ab
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUserDTO.java
@@ -0,0 +1,220 @@
+package cn.huge.module.ctuser.domain.dto;
+
+import cn.huge.module.ctuser.domain.po.CtUsepost;
+import cn.huge.module.ctuser.domain.po.CtUserole;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @title: 客户用户表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-08-19 20:04:19
+ * @version 1.0.0
+ */
+@Data
+public class GZCtUserDTO {
+
+ /**
+ * 客户用户编号
+ */
+ private String id;
+
+ /**
+ * 姓名
+ */
+ private String trueName;
+
+ /**
+ * 平台账号
+ */
+ private String acc;
+
+ /**
+ * 性别
+ */
+ private String sex;
+
+ /**
+ * 性别名称
+ */
+ private String sexName;
+
+ /**
+ * 手机号码
+ */
+ private String mobile;
+
+ /**
+ * 身份证号
+ */
+ private String idcard;
+
+ /**
+ * 电子邮箱
+ */
+ private String email;
+
+ /**
+ * 微信号
+ */
+ private String wechat;
+
+ /**
+ * QQ号
+ */
+ private String qq;
+
+ /**
+ * 现居地省
+ */
+ private String prov;
+
+ /**
+ * 现居地省名称
+ */
+ private String provName;
+
+ /**
+ * 现居地市
+ */
+ private String city;
+
+ /**
+ * 现居地市名称
+ */
+ private String cityName;
+
+ /**
+ * 现居地区
+ */
+ private String area;
+
+ /**
+ * 现居地区名称
+ */
+ private String areaName;
+
+ /**
+ * 现居地街道
+ */
+ private String road;
+
+ /**
+ * 现居地街道名称
+ */
+ private String roadName;
+
+ /**
+ * 现居地社区
+ */
+ private String village;
+
+ /**
+ * 现居地社区名称
+ */
+ private String villageName;
+
+ /**
+ * 现居地详细地址
+ */
+ private String addr;
+
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 组织编号
+ */
+ private String unitId;
+
+ /**
+ * 组织名称
+ */
+ private String unitName;
+
+ /**
+ * 部门编号
+ */
+ private String deptId;
+
+ /**
+ * 部门名称
+ */
+ private String deptName;
+
+ /**
+ * 加入方式，1：系统创建（默认），2：自主申请
+ */
+ private Integer joinWay;
+
+ /**
+ * 实名认证状态，0：未认证，1：已认证
+ */
+ private Integer realStatus;
+
+ /**
+ * 用户状态，1：有效（默认），2：停用，3：离职
+ */
+ private Integer status;
+
+ /**
+ * 调解专长，多个用,隔开
+ */
+ private String goodField;
+
+ /**
+ * 调解专长名称，多个用,隔开
+ */
+ private String goodFieldName;
+
+ /**
+ * 调解范围，多个用,隔开
+ */
+ private String canField;
+
+ /**
+ * 调解范围名称，多个用,隔开
+ */
+ private String canFieldName;
+
+ /**
+ * 是否可以找他调（小程序），0：否，1：是
+ */
+ private Integer findStatus;
+
+ /**
+ * 是否参与自动调度，0：否，1：是
+ */
+ private Integer dispStatus;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ @TableLogic
+ private Integer deleteStatus;
+
+ /**
+ * 所属客户编号
+ */
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUseroleDTO.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUseroleDTO.java
new file mode 100644
index 0000000..c05f485
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/dto/GZCtUseroleDTO.java
@@ -0,0 +1,61 @@
+package cn.huge.module.ctuser.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 客户用户角色表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-08-19 20:04:19
+ * @version 1.0.0
+ */
+@Data
+public class GZCtUseroleDTO {
+
+ /**
+ * 用户角色编号
+ */
+ private String id;
+
+ /**
+ * 用户编号
+ */
+ private String userId;
+
+ /**
+ * 角色编号
+ */
+ private String roleId;
+
+ /**
+ * 角色代码
+ */
+ private String roleCode;
+
+ /**
+ * 角色名称
+ */
+ private String roleName;
+
+ /**
+ * 顾客编号
+ */
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/ByRegion.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/ByRegion.java
new file mode 100644
index 0000000..bae7fcd
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/ByRegion.java
@@ -0,0 +1,58 @@
+package cn.huge.module.ctuser.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+/**
+ * @title: 地域字典表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-18 15:14:06
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_sy_region_by")
+@Data
+public class ByRegion {
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Integer id;
+
+ /**
+ * 地域编码
+ */
+ @TableField(value = "third_code")
+ private String thirdCode;
+
+ /**
+ * 地域名称
+ */
+ @TableField(value = "third_name")
+ private String thirdName;
+
+ /**
+ * 所属父级代码编号，根级默认root
+ */
+ @TableField(value = "third_parent_id")
+ private String thirdParentId;
+
+ /**
+ * 映射id
+ */
+ @TableField(value = "region_id")
+ private String regionId;
+
+ /**
+ * 级别
+ */
+ @TableField(value = "level")
+ private Integer level;
+
+}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/source/SourceCtAccount.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java
similarity index 85%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/source/SourceCtAccount.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java
index 125715f..1ebcab1 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/source/SourceCtAccount.java
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java
@@ -1,4 +1,4 @@
-package cn.huge.module.sync.domain.source;
+package cn.huge.module.ctuser.domain.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,16 +9,16 @@
import java.util.Date;
/**
- * @title: 客户用户账号表
+ * @title: 客户用户账号表数据库对应关系类
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
- * @author: chenx
- * @time: 2022-02-22 15:24:51
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
* @version 1.0.0
*/
@TableName(value = "dyh_ct_account")
@Data
-public class SourceCtAccount {
+public class CtAccount {
/**
* 账号编号
@@ -33,7 +33,7 @@
private String userId;
/**
- * 帐号类型，22_00027-1：pc帐号（默认），22_00027-2：微信小程序，22_00027-3：政数局统一平台
+ * 帐号类型，1：pc帐号（默认），2：微信小程序，3：政数局统一平台
*/
@TableField(value = "acc_type")
private String accType;
@@ -63,19 +63,19 @@
private Date cipherTime;
/**
- * 最新登录时间
- */
- @TableField(value = "login_time")
- private Date loginTime;
-
- /**
* 限制登录时间（密码错误次数超过限制，默认30分钟）
*/
@TableField(value = "limit_time")
private Date limitTime;
/**
- * 删除状态，0：未删除，1：已删除
+ * 最新登录时间
+ */
+ @TableField(value = "login_time")
+ private Date loginTime;
+
+ /**
+ * 删除状态，1：未删除（默认），99：已删除
*/
@TableLogic
@TableField(value = "delete_status")
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java
new file mode 100644
index 0000000..40aa1b8
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java
@@ -0,0 +1,114 @@
+package cn.huge.module.ctuser.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 客户部门表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_ct_dept")
+@Data
+public class CtDept {
+
+ /**
+ * 部门编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 部门名称
+ */
+ @TableField(value = "name")
+ private String name;
+
+ /**
+ * 描述
+ */
+ @TableField(value = "des")
+ private String des;
+
+ /**
+ * 部门类型，1：正常部门，2：特殊部门（调委会等）
+ */
+ @TableField(value = "type")
+ private String type;
+
+ /**
+ * 父级部门，根级默认root
+ */
+ @TableField(value = "parent_id")
+ private String parentId;
+
+ /**
+ * 组织编号
+ */
+ @TableField(value = "unit_id")
+ private String unitId;
+
+ /**
+ * 调解专长，多个用,隔开
+ */
+ @TableField(value = "good_field")
+ private String goodField;
+
+ /**
+ * 调解专长名称，多个用,隔开
+ */
+ @TableField(value = "good_field_name")
+ private String goodFieldName;
+
+ /**
+ * 调解范围，多个用,隔开
+ */
+ @TableField(value = "can_field")
+ private String canField;
+
+ /**
+ * 调解范围名称，多个用,隔开
+ */
+ @TableField(value = "can_field_name")
+ private String canFieldName;
+
+ /**
+ * 级别
+ */
+ @TableField(value = "level")
+ private Integer level;
+
+ /**
+ * 删除状态，1：未删除（默认），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java
new file mode 100644
index 0000000..ed0cfca
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java
@@ -0,0 +1,72 @@
+package cn.huge.module.ctuser.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 客户岗位表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:47
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_ct_post")
+@Data
+public class CtPost {
+
+ /**
+ * 编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 岗位名称
+ */
+ @TableField(value = "name")
+ private String name;
+
+ /**
+ * 描述
+ */
+ @TableField(value = "des")
+ private String des;
+
+ /**
+ * 单位编号
+ */
+ @TableField(value = "unit_id")
+ private String unitId;
+
+ /**
+ * 删除状态，1：未删除（默认），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/source/SourceCtUnit.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
similarity index 86%
rename from dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/source/SourceCtUnit.java
rename to dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
index 555dc73..ef4e3b2 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/domain/source/SourceCtUnit.java
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
@@ -1,4 +1,4 @@
-package cn.huge.module.sync.domain.source;
+package cn.huge.module.ctuser.domain.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,16 +9,16 @@
import java.util.Date;
/**
- * @title: 客户组织表
+ * @title: 客户组织表数据库对应关系类
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
- * @author: chenx
- * @time: 2022-02-22 14:19:41
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
* @version 1.0.0
*/
@TableName(value = "dyh_ct_unit")
@Data
-public class SourceCtUnit {
+public class CtUnit {
/**
* 组织编号
@@ -39,8 +39,8 @@
private String unitType;
/**
- * 是否归类为法院，1：否，2：是
- */
+ * 是否归类为法院，1：否，2：是
+ */
@TableField(value = "court_status")
private String courtStatus;
@@ -165,55 +165,55 @@
private String parentId;
/**
- * 调解专长，多个用,隔开
- */
+ * 调解专长，多个用,隔开
+ */
@TableField(value = "good_field")
private String goodField;
/**
- * 调解专长名称，多个用,隔开
- */
+ * 调解专长名称，多个用,隔开
+ */
@TableField(value = "good_field_name")
private String goodFieldName;
/**
- * 调解范围，多个用,隔开
- */
+ * 调解范围，多个用,隔开
+ */
@TableField(value = "can_field")
private String canField;
/**
- * 调解范围名称，多个用,隔开
- */
+ * 调解范围名称，多个用,隔开
+ */
@TableField(value = "can_field_name")
private String canFieldName;
/**
- * 是否可以找他调（小程序），1：否，2：是
- */
+ * 是否可以找他调（小程序），1：否，2：是
+ */
@TableField(value = "find_status")
private String findStatus;
/**
- * 是否参与自动调度，1：否，2：是
- */
+ * 是否参与自动调度，1：否，2：是
+ */
@TableField(value = "disp_status")
private String dispStatus;
/**
- * 累计调解数量
- */
+ * 累计调解数量
+ */
@TableField(value = "count_case")
- private String countCase;
+ private Integer countCase;
/**
- * 级别
- */
+ * 级别
+ */
@TableField(value = "level")
private Integer level;
/**
- * 删除状态，0：未删除，1：已删除
+ * 删除状态，1：未删除（默认），99：已删除
*/
@TableLogic
@TableField(value = "delete_status")
@@ -254,4 +254,5 @@
*/
@TableField(value = "update_time")
private Date updateTime;
+
}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java
new file mode 100644
index 0000000..9d00c7d
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java
@@ -0,0 +1,83 @@
+package cn.huge.module.ctuser.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 客户用户配岗表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:47
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_ct_usepost")
+@Data
+public class CtUsepost {
+
+ /**
+ * 配岗编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 用户编号
+ */
+ @TableField(value = "user_id")
+ private String userId;
+
+ /**
+ * 岗位编号
+ */
+ @TableField(value = "post_id")
+ private String postId;
+
+ /**
+ * 岗位名称
+ */
+ @TableField(value = "post_name")
+ private String postName;
+
+ /**
+ * 组织编号
+ */
+ @TableField(value = "unit_id")
+ private String unitId;
+
+ /**
+ * 部门编号
+ */
+ @TableField(value = "dept_id")
+ private String deptId;
+
+ /**
+ * 配岗类型，1：主岗(默认)，2：兼岗
+ */
+ @TableField(value = "match_type")
+ private String matchType;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java
new file mode 100644
index 0000000..f71bb60
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java
@@ -0,0 +1,71 @@
+package cn.huge.module.ctuser.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 客户用户角色表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:46
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_ct_userole")
+@Data
+public class CtUserole {
+
+ /**
+ * 用户角色编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 用户编号
+ */
+ @TableField(value = "user_id")
+ private String userId;
+
+ /**
+ * 角色编号
+ */
+ @TableField(value = "role_id")
+ private String roleId;
+
+ /**
+ * 角色代码
+ */
+ @TableField(value = "role_code")
+ private String roleCode;
+
+ /**
+ * 角色名称
+ */
+ @TableField(value = "role_name")
+ private String roleName;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/Ctuser.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/Ctuser.java
new file mode 100644
index 0000000..06c4dc7
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/domain/po/Ctuser.java
@@ -0,0 +1,276 @@
+package cn.huge.module.ctuser.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 客户用户表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-10-17 17:31:45
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_ct_user")
+@Data
+public class Ctuser {
+
+ /**
+ * 客户用户编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 姓名
+ */
+ @TableField(value = "true_name")
+ private String trueName;
+
+ /**
+ * 性别
+ */
+ @TableField(value = "sex")
+ private String sex;
+
+ /**
+ * 性别名称
+ */
+ @TableField(value = "sex_name")
+ private String sexName;
+
+ /**
+ * 手机号码
+ */
+ @TableField(value = "mobile")
+ private String mobile;
+
+ /**
+ * 身份证号
+ */
+ @TableField(value = "idcard")
+ private String idcard;
+
+ /**
+ * 电子邮箱
+ */
+ @TableField(value = "email")
+ private String email;
+
+ /**
+ * 微信号
+ */
+ @TableField(value = "wechat")
+ private String wechat;
+
+ /**
+ * QQ号
+ */
+ @TableField(value = "qq")
+ private String qq;
+
+ /**
+ * 现居地省
+ */
+ @TableField(value = "prov")
+ private String prov;
+
+ /**
+ * 现居地省名称
+ */
+ @TableField(value = "prov_name")
+ private String provName;
+
+ /**
+ * 现居地市
+ */
+ @TableField(value = "city")
+ private String city;
+
+ /**
+ * 现居地市名称
+ */
+ @TableField(value = "city_name")
+ private String cityName;
+
+ /**
+ * 现居地区
+ */
+ @TableField(value = "area")
+ private String area;
+
+ /**
+ * 现居地区名称
+ */
+ @TableField(value = "area_name")
+ private String areaName;
+
+ /**
+ * 现居地街道
+ */
+ @TableField(value = "road")
+ private String road;
+
+ /**
+ * 现居地街道名称
+ */
+ @TableField(value = "road_name")
+ private String roadName;
+
+ /**
+ * 现居地社区
+ */
+ @TableField(value = "village")
+ private String village;
+
+ /**
+ * 现居地社区名称
+ */
+ @TableField(value = "village_name")
+ private String villageName;
+
+ /**
+ * 现居地详细地址
+ */
+ @TableField(value = "addr")
+ private String addr;
+
+ /**
+ * 头像
+ */
+ @TableField(value = "avatar")
+ private String avatar;
+
+ /**
+ * 平台账号
+ */
+ @TableField(value = "acc")
+ private String acc;
+
+ /**
+ * 组织编号
+ */
+ @TableField(value = "unit_id")
+ private String unitId;
+
+ /**
+ * 组织名称
+ */
+ @TableField(value = "unit_name")
+ private String unitName;
+
+ /**
+ * 部门编号
+ */
+ @TableField(value = "dept_id")
+ private String deptId;
+
+ /**
+ * 部门名称
+ */
+ @TableField(value = "dept_name")
+ private String deptName;
+
+ /**
+ * 部门类型，1：正常部门，2：特殊部门（调委会等）
+ */
+ @TableField(value = "dept_type")
+ private String deptType;
+
+ /**
+ * 加入方式，1：系统创建（默认），2：自主申请
+ */
+ @TableField(value = "join_way")
+ private String joinWay;
+
+ /**
+ * 实名认证状态，1：通过，99：未通过（默认）
+ */
+ @TableField(value = "real_status")
+ private String realStatus;
+
+ /**
+ * 人脸认证状态，1：已认证，99：未认证（默认）
+ */
+ @TableField(value = "face_status")
+ private String faceStatus;
+
+ /**
+ * 用户状态，1：有效（默认），2：停用，99：离职
+ */
+ @TableField(value = "status")
+ private String status;
+
+ /**
+ * 调解专长，多个用,隔开
+ */
+ @TableField(value = "good_field")
+ private String goodField;
+
+ /**
+ * 调解专长名称，多个用,隔开
+ */
+ @TableField(value = "good_field_name")
+ private String goodFieldName;
+
+ /**
+ * 调解范围，多个用,隔开
+ */
+ @TableField(value = "can_field")
+ private String canField;
+
+ /**
+ * 调解范围名称，多个用,隔开
+ */
+ @TableField(value = "can_field_name")
+ private String canFieldName;
+
+ /**
+ * 是否可以找他调（小程序），1：否，2：是
+ */
+ @TableField(value = "find_status")
+ private String findStatus;
+
+ /**
+ * 是否参与自动调度，1：否，2：是
+ */
+ @TableField(value = "disp_status")
+ private String dispStatus;
+
+ /**
+ * 累计调解数量
+ */
+ @TableField(value = "count_case")
+ private Integer countCase;
+
+ /**
+ * 删除状态，1：未删除（默认），99：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private String deleteStatus;
+
+ /**
+ * 所属客户编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/ByRegionService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/ByRegionService.java
new file mode 100644
index 0000000..f838de9
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/ByRegionService.java
@@ -0,0 +1,109 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.ctuser.dao.mapper.ByRegionMapper;
+import cn.huge.module.ctuser.domain.po.ByRegion;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 地域字典表业务逻辑处理
+ * @Description 地域字典表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-18 15:14:06
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ByRegionService extends ServiceImpl<ByRegionMapper, ByRegion>{
+
+ @Autowired
+ private ByRegionMapper mapper;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateByRegion(ByRegion entity){
+ try{
+ mapper.updateByRegion(entity);
+ }catch (Exception e){
+ log.error("[ByRegionService.updateByRegion]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByRegionService.updateByRegion", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateByRegionTerms(ByRegion entity, Map<String, Object> terms){
+ try{
+ mapper.updateByRegionTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[ByRegionService.updateByRegionTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByRegionService.updateByRegionTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteByRegion(String id){
+ try{
+ mapper.deleteByRegion(id);
+ }catch (Exception e){
+ log.error("[ByRegionService.deleteByRegion]调用失败，异常信息："+e, e);
+ throw new ServiceException("ByRegionService.deleteByRegion", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<ByRegion> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<ByRegion> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<ByRegion> content = mapper.pageTerms(page, terms);
+ return new PageImpl<ByRegion>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
new file mode 100644
index 0000000..2484ff0
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -0,0 +1,152 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.constant.BaseConsts;
+import cn.huge.module.constant.ByBaseConsts;
+import cn.huge.module.constant.ByUserConsts;
+import cn.huge.module.ctuser.dao.mapper.CtAccountMapper;
+import cn.huge.module.ctuser.domain.dto.GZCtAccountDTO;
+import cn.huge.module.ctuser.domain.dto.GZCtUserDTO;
+import cn.huge.module.ctuser.domain.po.CtAccount;
+import cn.huge.module.ctuser.domain.po.Ctuser;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 客户用户账号表业务逻辑处理
+ * @Description 客户用户账号表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:46
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtAccountService extends ServiceImpl<CtAccountMapper, CtAccount>{
+
+ @Autowired
+ private CtAccountMapper mapper;
+
+ @Autowired
+ private CtuserService ctuserService;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtAccount(CtAccount entity){
+ try{
+ mapper.updateCtAccount(entity);
+ }catch (Exception e){
+ log.error("[CtAccountService.updateCtAccount]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtAccountService.updateCtAccount", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtAccountTerms(CtAccount entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtAccountTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtAccountService.updateCtAccountTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtAccountService.updateCtAccountTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtAccount(String id){
+ try{
+ mapper.deleteCtAccount(id);
+ }catch (Exception e){
+ log.error("[CtAccountService.deleteCtAccount]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtAccountService.deleteCtAccount", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CtAccount> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CtAccount> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CtAccount> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CtAccount>(content, page, total);
+ }
+
+ /**
+ * 数据割接-账号信息
+ * @return
+ */
+ public List<GZCtAccountDTO> byToGzCtAccount(){
+ List<GZCtAccountDTO> gzCtAccountDTOList = new ArrayList<>();
+ List<CtAccount> ctAccountList = this.list();
+ for (CtAccount ctAccount: ctAccountList){
+ Ctuser ctuser = ctuserService.getById(ctAccount.getUserId());
+ if (ObjectUtils.isNotEmpty(ctuser)) {
+ GZCtAccountDTO gzCtAccountDTO = new GZCtAccountDTO();
+ BeanUtils.copyProperties(ctAccount, gzCtAccountDTO);
+ // 帐号类型
+ if (ByUserConsts.ACC_TYPE_1.equals(ctAccount.getAccType())){
+ gzCtAccountDTO.setAccType(UserBaseConsts.ACC_TYPE_1);
+ }else if (ByUserConsts.ACC_TYPE_2.equals(ctAccount.getAccType())){
+ gzCtAccountDTO.setAccType(UserBaseConsts.ACC_TYPE_2);
+ }
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(ctAccount.getDeleteStatus())) {
+ gzCtAccountDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ } else {
+ gzCtAccountDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ gzCtAccountDTOList.add(gzCtAccountDTO);
+ }
+ }
+ return gzCtAccountDTOList;
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java
new file mode 100644
index 0000000..0e44d66
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java
@@ -0,0 +1,153 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.constant.BaseConsts;
+import cn.huge.module.constant.ByBaseConsts;
+import cn.huge.module.constant.ByUserConsts;
+import cn.huge.module.ctuser.dao.mapper.CtDeptMapper;
+import cn.huge.module.ctuser.domain.dto.GZCtDeptDTO;
+import cn.huge.module.ctuser.domain.dto.GZCtUnitDTO;
+import cn.huge.module.ctuser.domain.po.CtDept;
+import cn.huge.module.ctuser.domain.po.CtUnit;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 客户部门表业务逻辑处理
+ * @Description 客户部门表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:46
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtDeptService extends ServiceImpl<CtDeptMapper, CtDept>{
+
+ @Autowired
+ private CtDeptMapper mapper;
+
+ @Autowired
+ private CtUnitService ctUnitService;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtDept(CtDept entity){
+ try{
+ mapper.updateCtDept(entity);
+ }catch (Exception e){
+ log.error("[CtDeptService.updateCtDept]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtDeptService.updateCtDept", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtDeptTerms(CtDept entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtDeptTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtDeptService.updateCtDeptTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtDeptService.updateCtDeptTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtDept(String id){
+ try{
+ mapper.deleteCtDept(id);
+ }catch (Exception e){
+ log.error("[CtDeptService.deleteCtDept]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtDeptService.deleteCtDept", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CtDept> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CtDept> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CtDept> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CtDept>(content, page, total);
+ }
+
+ /**
+ * 数据割接-部门信息
+ * @return
+ */
+ public List<GZCtDeptDTO> byToGzCtDept(){
+ List<GZCtDeptDTO> gzCtDeptDTOList = new ArrayList<>();
+ List<CtDept> ctDeptList = this.list();
+ for (CtDept ctDept: ctDeptList){
+ CtUnit ctUnit = ctUnitService.getById(ctDept.getUnitId());
+ if (ObjectUtils.isNotEmpty(ctUnit)) {
+ GZCtDeptDTO gzCtDeptDTO = new GZCtDeptDTO();
+ BeanUtils.copyProperties(ctDept, gzCtDeptDTO);
+ // 映射层级
+ gzCtDeptDTO.setLevel(1);
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(ctDept.getDeleteStatus())) {
+ gzCtDeptDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ } else {
+ gzCtDeptDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ // 清除调解专长、调解范围
+ gzCtDeptDTO.setGoodField(null);
+ gzCtDeptDTO.setGoodFieldName(null);
+ gzCtDeptDTO.setCanField(null);
+ gzCtDeptDTO.setCanFieldName(null);
+ gzCtDeptDTOList.add(gzCtDeptDTO);
+ }
+ }
+ return gzCtDeptDTOList;
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtPostService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtPostService.java
new file mode 100644
index 0000000..c447593
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtPostService.java
@@ -0,0 +1,109 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.ctuser.dao.mapper.CtPostMapper;
+import cn.huge.module.ctuser.domain.po.CtPost;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 客户岗位表业务逻辑处理
+ * @Description 客户岗位表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:47
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtPostService extends ServiceImpl<CtPostMapper, CtPost>{
+
+ @Autowired
+ private CtPostMapper mapper;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtPost(CtPost entity){
+ try{
+ mapper.updateCtPost(entity);
+ }catch (Exception e){
+ log.error("[CtPostService.updateCtPost]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtPostService.updateCtPost", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtPostTerms(CtPost entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtPostTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtPostService.updateCtPostTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtPostService.updateCtPostTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtPost(String id){
+ try{
+ mapper.deleteCtPost(id);
+ }catch (Exception e){
+ log.error("[CtPostService.deleteCtPost]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtPostService.deleteCtPost", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CtPost> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CtPost> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CtPost> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CtPost>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
new file mode 100644
index 0000000..ae54ed6
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -0,0 +1,251 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.*;
+import cn.huge.module.constant.BaseConsts;
+import cn.huge.module.constant.ByBaseConsts;
+import cn.huge.module.constant.ByUserConsts;
+import cn.huge.module.ctuser.dao.mapper.CtUnitMapper;
+import cn.huge.module.ctuser.domain.dto.GZCtUnitDTO;
+import cn.huge.module.ctuser.domain.po.ByRegion;
+import cn.huge.module.ctuser.domain.po.CtUnit;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 客户组织表业务逻辑处理
+ * @Description 客户组织表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:46
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtUnitService extends ServiceImpl<CtUnitMapper, CtUnit>{
+
+ @Autowired
+ private CtUnitMapper mapper;
+
+ @Autowired
+ private ByRegionService byRegionService;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtUnit(CtUnit entity){
+ try{
+ mapper.updateCtUnit(entity);
+ }catch (Exception e){
+ log.error("[CtUnitService.updateCtUnit]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUnitService.updateCtUnit", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtUnitTerms(CtUnit entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtUnitTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtUnitService.updateCtUnitTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUnitService.updateCtUnitTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtUnit(String id){
+ try{
+ mapper.deleteCtUnit(id);
+ }catch (Exception e){
+ log.error("[CtUnitService.deleteCtUnit]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUnitService.deleteCtUnit", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CtUnit> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CtUnit> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CtUnit> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CtUnit>(content, page, total);
+ }
+
+ /**
+ * 数据割接-组织信息
+ * @return
+ */
+ public List<GZCtUnitDTO> byToGzCtUnit(){
+ List<GZCtUnitDTO> gzCtUnitDTOList = new ArrayList<>();
+ List<CtUnit> ctUnitList = this.list();
+ for (CtUnit ctUnit: ctUnitList){
+ GZCtUnitDTO gzCtUnitDTO = new GZCtUnitDTO();
+ BeanUtils.copyProperties(ctUnit, gzCtUnitDTO);
+ // 映射层级
+ if (ByUserConsts.UNIT_TYPE_1.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setLevel(2);
+ }else if (ByUserConsts.UNIT_TYPE_2.equals(ctUnit.getUnitType())
+ || ByUserConsts.UNIT_TYPE_3.equals(ctUnit.getUnitType())
+ || ByUserConsts.UNIT_TYPE_7.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setLevel(3);
+ }else {
+ gzCtUnitDTO.setLevel(4);
+ }
+ gzCtUnitDTO.setParentId(ctUnit.getParentId());
+ // 映射级别
+ if (ByUserConsts.UNIT_TYPE_1.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_2);
+ }else if (ByUserConsts.UNIT_TYPE_2.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_2);
+ }else if (ByUserConsts.UNIT_TYPE_3.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_3);
+ }else if (ByUserConsts.UNIT_TYPE_4.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_4);
+ }else if (ByUserConsts.UNIT_TYPE_5.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_2);
+ }else if (ByUserConsts.UNIT_TYPE_6.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_2);
+ }else if (ByUserConsts.UNIT_TYPE_7.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_3);
+ }else if (ByUserConsts.UNIT_TYPE_9.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitGrade(UserBaseConsts.UNIT_GRADE_2);
+ }
+ // 映射组织职能
+ if (ByUserConsts.UNIT_TYPE_1.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitFun(UserBaseConsts.UNIT_FUN_2);
+ }else {
+ gzCtUnitDTO.setUnitFun(UserBaseConsts.UNIT_FUN_1);
+ }
+ // 映射组织类型
+ if (ByUserConsts.UNIT_TYPE_1.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_201);
+ }else if (ByUserConsts.UNIT_TYPE_2.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_102);
+ }else if (ByUserConsts.UNIT_TYPE_3.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_101);
+ }else if (ByUserConsts.UNIT_TYPE_4.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_103);
+ }else if (ByUserConsts.UNIT_TYPE_5.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_104);
+ }else if (ByUserConsts.UNIT_TYPE_6.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_105);
+ }else if (ByUserConsts.UNIT_TYPE_7.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_106);
+ }else if (ByUserConsts.UNIT_TYPE_9.equals(ctUnit.getUnitType())){
+ gzCtUnitDTO.setUnitType(UserBaseConsts.UNIT_TYPE_102);
+ }
+ // 映射是否是法院
+ if (ByUserConsts.COURT_STATUS_2.equals(ctUnit.getCourtStatus())) {
+ gzCtUnitDTO.setCourtStatus(UserBaseConsts.COURT_STATUS_1);
+ }else {
+ gzCtUnitDTO.setCourtStatus(UserBaseConsts.COURT_STATUS_0);
+ }
+ // 映射组织名称
+ gzCtUnitDTO.setUnitName(ctUnit.getName());
+ // 映射描述
+ gzCtUnitDTO.setUnitDes(ctUnit.getDes());
+ // 映射是否可以找他调
+ if (ByUserConsts.FIND_STATUS_2.equals(ctUnit.getFindStatus())) {
+ gzCtUnitDTO.setFindStatus(UserBaseConsts.FIND_STATUS_1);
+ }else {
+ gzCtUnitDTO.setFindStatus(UserBaseConsts.FIND_STATUS_0);
+ }
+ // 映射是否参与自动调度
+ if (ByUserConsts.DISP_STATUS_2.equals(ctUnit.getDispStatus())) {
+ gzCtUnitDTO.setDispStatus(UserBaseConsts.DISP_STATUS_1);
+ }else {
+ gzCtUnitDTO.setDispStatus(UserBaseConsts.DISP_STATUS_0);
+ }
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(ctUnit.getDeleteStatus())) {
+ gzCtUnitDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ }else {
+ gzCtUnitDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ // 清除调解专长、调解范围
+ gzCtUnitDTO.setGoodField(null);
+ gzCtUnitDTO.setGoodFieldName(null);
+ gzCtUnitDTO.setCanField(null);
+ gzCtUnitDTO.setCanFieldName(null);
+
+ // 修改地域编码
+ gzCtUnitDTO.setArea("440111");
+ // 镇街级
+ if (StringUtils.isNotEmpty(gzCtUnitDTO.getRoad())){
+ QueryWrapper<ByRegion> byRegionQueryWrapper = new QueryWrapper<>();
+ byRegionQueryWrapper.eq("region_id", gzCtUnitDTO.getRoad());
+ ByRegion byRegion = byRegionService.getOne(byRegionQueryWrapper);
+ if (ObjectUtils.isNotEmpty(byRegion)){
+ gzCtUnitDTO.setRoad(byRegion.getThirdCode());
+ }
+ }
+ // 村社级
+ if (UserBaseConsts.UNIT_GRADE_4 == gzCtUnitDTO.getUnitGrade()){
+ try{
+ QueryWrapper<ByRegion> byRegionQueryWrapper = new QueryWrapper<>();
+ String thirdName = gzCtUnitDTO.getUnitName().replace("居委会", "")
+ .replace("人民调解委员会", "");
+ byRegionQueryWrapper.like("third_name", thirdName);
+ ByRegion byRegion = byRegionService.getOne(byRegionQueryWrapper);
+ if (ObjectUtils.isNotEmpty(byRegion)){
+ gzCtUnitDTO.setVillage(byRegion.getThirdCode());
+ gzCtUnitDTO.setVillageName(byRegion.getThirdName());
+ }
+ }catch (Exception e){
+ log.error("报错村社：id-"+gzCtUnitDTO.getId()+"，name-"+gzCtUnitDTO.getUnitName());
+ }
+ }
+ gzCtUnitDTOList.add(gzCtUnitDTO);
+ }
+ return gzCtUnitDTOList;
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java
new file mode 100644
index 0000000..b9c0a81
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java
@@ -0,0 +1,109 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.ctuser.dao.mapper.CtUsepostMapper;
+import cn.huge.module.ctuser.domain.po.CtUsepost;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 客户用户配岗表业务逻辑处理
+ * @Description 客户用户配岗表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:47
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtUsepostService extends ServiceImpl<CtUsepostMapper, CtUsepost>{
+
+ @Autowired
+ private CtUsepostMapper mapper;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtUsepost(CtUsepost entity){
+ try{
+ mapper.updateCtUsepost(entity);
+ }catch (Exception e){
+ log.error("[CtUsepostService.updateCtUsepost]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUsepostService.updateCtUsepost", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtUsepostTerms(CtUsepost entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtUsepostTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtUsepostService.updateCtUsepostTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUsepostService.updateCtUsepostTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtUsepost(String id){
+ try{
+ mapper.deleteCtUsepost(id);
+ }catch (Exception e){
+ log.error("[CtUsepostService.deleteCtUsepost]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUsepostService.deleteCtUsepost", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CtUsepost> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CtUsepost> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CtUsepost> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CtUsepost>(content, page, total);
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java
new file mode 100644
index 0000000..7b9a4c5
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java
@@ -0,0 +1,154 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.constant.BaseConsts;
+import cn.huge.module.constant.ByBaseConsts;
+import cn.huge.module.constant.ByRoleEnum;
+import cn.huge.module.constant.ByUserConsts;
+import cn.huge.module.ctuser.dao.mapper.CtUseroleMapper;
+import cn.huge.module.ctuser.domain.dto.GZCtUserDTO;
+import cn.huge.module.ctuser.domain.dto.GZCtUseroleDTO;
+import cn.huge.module.ctuser.domain.po.CtUserole;
+import cn.huge.module.ctuser.domain.po.Ctuser;
+import cn.huge.module.cust.constant.RoleBaseEnum;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.*;
+
+/**
+ * @title: 客户用户角色表业务逻辑处理
+ * @Description 客户用户角色表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:46
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtUseroleService extends ServiceImpl<CtUseroleMapper, CtUserole>{
+
+ @Autowired
+ private CtUseroleMapper mapper;
+ @Autowired
+ private CtuserService ctuserService;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtUserole(CtUserole entity){
+ try{
+ mapper.updateCtUserole(entity);
+ }catch (Exception e){
+ log.error("[CtUseroleService.updateCtUserole]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUseroleService.updateCtUserole", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtUseroleTerms(CtUserole entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtUseroleTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtUseroleService.updateCtUseroleTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUseroleService.updateCtUseroleTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtUserole(String id){
+ try{
+ mapper.deleteCtUserole(id);
+ }catch (Exception e){
+ log.error("[CtUseroleService.deleteCtUserole]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUseroleService.deleteCtUserole", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CtUserole> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CtUserole> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CtUserole> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CtUserole>(content, page, total);
+ }
+
+ /**
+ * 数据割接-用户角色关系信息
+ * @return
+ */
+ public List<GZCtUseroleDTO> byToGzCtUserole(){
+ List<GZCtUseroleDTO> gzCtUseroleDTOList = new ArrayList<>();
+ List<Ctuser> ctuserList = ctuserService.list();
+ QueryWrapper<CtUserole> ctUseroleQueryWrapper = new QueryWrapper<>();
+ for (Ctuser ctuser: ctuserList){
+ ctUseroleQueryWrapper.clear();
+ ctUseroleQueryWrapper.eq("user_id", ctuser.getId());
+ List<CtUserole> ctUseroleList = this.list(ctUseroleQueryWrapper);
+ // 映射角色编号并去重
+ Map<String, CtUserole> ctUseroleMaps = Maps.newHashMap();
+ for (CtUserole ctUserole: ctUseroleList){
+ RoleBaseEnum roleBaseEnum = ByRoleEnum.getGzRole(ctUserole.getRoleCode());
+ ctUserole.setRoleId(roleBaseEnum.getIndex());
+ ctUserole.setRoleCode(roleBaseEnum.getIndex());
+ ctUserole.setRoleName(roleBaseEnum.getDes());
+ ctUseroleMaps.put(ctUserole.getRoleId(), ctUserole);
+ }
+ // 封装数据格式
+ Set<String> roleIds = ctUseroleMaps.keySet();
+ for (String role: roleIds){
+ CtUserole ctUserole = ctUseroleMaps.get(role);
+ GZCtUseroleDTO gzCtUseroleDTO = new GZCtUseroleDTO();
+ BeanUtils.copyProperties(ctUserole, gzCtUseroleDTO);
+ gzCtUseroleDTOList.add(gzCtUseroleDTO);
+ }
+ }
+ return gzCtUseroleDTOList;
+ }
+
+}
diff --git a/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtuserService.java b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtuserService.java
new file mode 100644
index 0000000..a1965e4
--- /dev/null
+++ b/dyh-service/dyh-sync-bydyh/src/main/java/cn/huge/module/ctuser/service/CtuserService.java
@@ -0,0 +1,181 @@
+package cn.huge.module.ctuser.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.constant.BaseConsts;
+import cn.huge.module.constant.ByBaseConsts;
+import cn.huge.module.constant.ByUserConsts;
+import cn.huge.module.ctuser.dao.mapper.CtuserMapper;
+import cn.huge.module.ctuser.domain.dto.GZCtDeptDTO;
+import cn.huge.module.ctuser.domain.dto.GZCtUserDTO;
+import cn.huge.module.ctuser.domain.po.CtDept;
+import cn.huge.module.ctuser.domain.po.Ctuser;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 客户用户表业务逻辑处理
+ * @Description 客户用户表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-10-17 17:31:45
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CtuserService extends ServiceImpl<CtuserMapper, Ctuser>{
+
+ @Autowired
+ private CtuserMapper mapper;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCtuser(Ctuser entity){
+ try{
+ mapper.updateCtuser(entity);
+ }catch (Exception e){
+ log.error("[CtuserService.updateCtuser]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtuserService.updateCtuser", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCtuserTerms(Ctuser entity, Map<String, Object> terms){
+ try{
+ mapper.updateCtuserTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CtuserService.updateCtuserTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtuserService.updateCtuserTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCtuser(String id){
+ try{
+ mapper.deleteCtuser(id);
+ }catch (Exception e){
+ log.error("[CtuserService.deleteCtuser]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtuserService.deleteCtuser", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<Ctuser> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<Ctuser> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<Ctuser> content = mapper.pageTerms(page, terms);
+ return new PageImpl<Ctuser>(content, page, total);
+ }
+
+ /**
+ * 数据割接-用户信息
+ * @return
+ */
+ public List<GZCtUserDTO> byToGzCtUser(){
+ List<GZCtUserDTO> gzCtUserDTOList = new ArrayList<>();
+ List<Ctuser> ctuserList = this.list();
+ for (Ctuser ctuser: ctuserList){
+ GZCtUserDTO gzCtUserDTO = new GZCtUserDTO();
+ BeanUtils.copyProperties(ctuser, gzCtUserDTO);
+ // 映射实名认证状态
+ if (ByUserConsts.REAL_STATUS_1.equals(ctuser.getRealStatus())) {
+ gzCtUserDTO.setRealStatus(UserBaseConsts.REAL_STATUS_1);
+ }else {
+ gzCtUserDTO.setRealStatus(UserBaseConsts.REAL_STATUS_0);
+ }
+ // 用户状态
+ if (ByUserConsts.USER_STATUS_1.equals(ctuser.getStatus())) {
+ gzCtUserDTO.setRealStatus(UserBaseConsts.USER_STATUS_1);
+ }else if (ByUserConsts.USER_STATUS_2.equals(ctuser.getStatus())) {
+ gzCtUserDTO.setRealStatus(UserBaseConsts.USER_STATUS_2);
+ }else {
+ gzCtUserDTO.setRealStatus(UserBaseConsts.USER_STATUS_3);
+ }
+ // 映射是否可以找他调
+ if (ByUserConsts.FIND_STATUS_2.equals(ctuser.getFindStatus())) {
+ gzCtUserDTO.setFindStatus(UserBaseConsts.FIND_STATUS_1);
+ }else {
+ gzCtUserDTO.setFindStatus(UserBaseConsts.FIND_STATUS_0);
+ }
+ // 映射是否参与自动调度
+ if (ByUserConsts.DISP_STATUS_2.equals(ctuser.getDispStatus())) {
+ gzCtUserDTO.setDispStatus(UserBaseConsts.DISP_STATUS_1);
+ }else {
+ gzCtUserDTO.setDispStatus(UserBaseConsts.DISP_STATUS_0);
+ }
+ // 映射删除状态
+ if (ByBaseConsts.DELETE_STATUS_99.equals(ctuser.getDeleteStatus())) {
+ gzCtUserDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_1);
+ }else {
+ gzCtUserDTO.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ }
+ // 清除用户区域字段值
+ gzCtUserDTO.setProv(null);
+ gzCtUserDTO.setProvName(null);
+ gzCtUserDTO.setCity(null);
+ gzCtUserDTO.setCityName(null);
+ gzCtUserDTO.setArea(null);
+ gzCtUserDTO.setAreaName(null);
+ gzCtUserDTO.setRoad(null);
+ gzCtUserDTO.setRoadName(null);
+ gzCtUserDTO.setVillage(null);
+ gzCtUserDTO.setVillageName(null);
+ // 清除调解专长、调解范围
+ gzCtUserDTO.setGoodField(null);
+ gzCtUserDTO.setGoodFieldName(null);
+ gzCtUserDTO.setCanField(null);
+ gzCtUserDTO.setCanFieldName(null);
+ gzCtUserDTOList.add(gzCtUserDTO);
+ }
+ return gzCtUserDTOList;
+ }
+
+}
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application-dev.yml
similarity index 95%
rename from dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
rename to dyh-service/dyh-sync-bydyh/src/main/resources/config/application-dev.yml
index 49750e6..e9c5341 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application-dev.yml
@@ -7,7 +7,7 @@
spring:
#服务名
application:
- name: dyh-sync
+ name: dyh-sync-bydyh
#数据源配置
datasource:
url: jdbc:mysql://120.79.193.119:3306/bydyh2.0_v101_prod?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
@@ -24,7 +24,7 @@
client:
service-url:
#注册中心单机
- defaultZone: http://localhost:9001/eureka
+ defaultZone: http://localhost:9000/eureka
#注册中心集群
#defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
#是否注册到注册中心
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application-prod.yml
similarity index 95%
copy from dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
copy to dyh-service/dyh-sync-bydyh/src/main/resources/config/application-prod.yml
index 49750e6..e9c5341 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application-prod.yml
@@ -7,7 +7,7 @@
spring:
#服务名
application:
- name: dyh-sync
+ name: dyh-sync-bydyh
#数据源配置
datasource:
url: jdbc:mysql://120.79.193.119:3306/bydyh2.0_v101_prod?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
@@ -24,7 +24,7 @@
client:
service-url:
#注册中心单机
- defaultZone: http://localhost:9001/eureka
+ defaultZone: http://localhost:9000/eureka
#注册中心集群
#defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
#是否注册到注册中心
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application-test.yml
similarity index 95%
copy from dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
copy to dyh-service/dyh-sync-bydyh/src/main/resources/config/application-test.yml
index 49750e6..e9c5341 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application-test.yml
@@ -7,7 +7,7 @@
spring:
#服务名
application:
- name: dyh-sync
+ name: dyh-sync-bydyh
#数据源配置
datasource:
url: jdbc:mysql://120.79.193.119:3306/bydyh2.0_v101_prod?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
@@ -24,7 +24,7 @@
client:
service-url:
#注册中心单机
- defaultZone: http://localhost:9001/eureka
+ defaultZone: http://localhost:9000/eureka
#注册中心集群
#defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
#是否注册到注册中心
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application.yml b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application.yml
similarity index 97%
rename from dyh-service/dyh-sync/src/main/resources/config/application.yml
rename to dyh-service/dyh-sync-bydyh/src/main/resources/config/application.yml
index bd0819a..9d26152 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application.yml
+++ b/dyh-service/dyh-sync-bydyh/src/main/resources/config/application.yml
@@ -2,8 +2,8 @@
spring:
profiles:
active:
-# - dev
- - test
+ - dev
+# - test
# - prod
devtools:
restart:
@@ -24,7 +24,7 @@
tomcat:
min-spare-threads: 100
max-threads: 256
- connection-timeout: 8000
+ connection-timeout: 80000
#ribbon配置
ribbon:
diff --git a/dyh-service/dyh-sync/src/main/resources/logback-spring.xml b/dyh-service/dyh-sync-bydyh/src/main/resources/logback-spring.xml
similarity index 100%
rename from dyh-service/dyh-sync/src/main/resources/logback-spring.xml
rename to dyh-service/dyh-sync-bydyh/src/main/resources/logback-spring.xml
diff --git a/dyh-service/dyh-sync/src/test/java/cn/huge/base/common/base/BaseServiceTest.java b/dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/base/common/base/BaseServiceTest.java
similarity index 100%
rename from dyh-service/dyh-sync/src/test/java/cn/huge/base/common/base/BaseServiceTest.java
rename to dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/base/common/base/BaseServiceTest.java
diff --git a/dyh-service/dyh-sync/src/test/java/cn/huge/module/BuildCodeServiceTest.java b/dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/BuildCodeServiceTest.java
similarity index 74%
rename from dyh-service/dyh-sync/src/test/java/cn/huge/module/BuildCodeServiceTest.java
rename to dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/BuildCodeServiceTest.java
index c7516a6..3df4e4b 100644
--- a/dyh-service/dyh-sync/src/test/java/cn/huge/module/BuildCodeServiceTest.java
+++ b/dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/BuildCodeServiceTest.java
@@ -11,16 +11,21 @@
private BuildCodeService service;
private String basePackage = "cn.huge.module";
- private String packageName = "";
+ private String packageName = "cases";
private String className = "";
- private String tableSchema = "gzdyh_dev";
+ private String tableSchema = "bydyh2.0_v101_prod";
private String tableName = "";
private String author = "liyj";
private String version = "1.0.0";
@Test
public void buildAllTest() {
- service.buildAll(basePackage, packageName, className, tableSchema, tableName, author, version);
+ service.buildAll(basePackage, packageName, "CaseInfo", tableSchema, "dyh_case_info", author, version);
+ service.buildAll(basePackage, packageName, "CasePerson", tableSchema, "dyh_case_person", author, version);
+ service.buildAll(basePackage, packageName, "CaseAgent", tableSchema, "dyh_case_agent", author, version);
+ service.buildAll(basePackage, packageName, "CaseTask", tableSchema, "dyh_case_task", author, version);
+ service.buildAll(basePackage, packageName, "CaseDisp", tableSchema, "dyh_case_disp", author, version);
+ service.buildAll(basePackage, packageName, "CaseSign", tableSchema, "dyh_case_sign", author, version);
}
/********************************************************
diff --git a/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java b/dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/DyhSyncBydyhApplicationTest.java
similarity index 86%
copy from dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
copy to dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/DyhSyncBydyhApplicationTest.java
index ea13d11..a5bdae5 100644
--- a/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
+++ b/dyh-service/dyh-sync-bydyh/src/test/java/cn/huge/module/DyhSyncBydyhApplicationTest.java
@@ -7,7 +7,7 @@
@RunWith(SpringRunner.class)
@SpringBootTest
-public class DyhSyncApplicationTest {
+public class DyhSyncBydyhApplicationTest {
@Test
public void contextLoads() {
diff --git a/dyh-service/dyh-ssim/pom.xml b/dyh-service/dyh-sync-ssim/pom.xml
similarity index 96%
rename from dyh-service/dyh-ssim/pom.xml
rename to dyh-service/dyh-sync-ssim/pom.xml
index 5ba9793..9a920c5 100644
--- a/dyh-service/dyh-ssim/pom.xml
+++ b/dyh-service/dyh-sync-ssim/pom.xml
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.huge</groupId>
- <artifactId>dyh-ssim</artifactId>
+ <artifactId>dyh-sync-ssim</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>dyh-ssim</name>
- <description>广州市综治中心应用平台矛调模块-一期综治中心数据对接微服务</description>
+ <name>dyh-sync-ssim</name>
+ <description>广州市综治中心应用平台矛调模块-数据同步-数广综治中心一期</description>
<parent>
<groupId>cn.huge</groupId>
@@ -55,7 +55,7 @@
</dependencies>
<build>
- <finalName>dyh-ssim</finalName>
+ <finalName>dyh-sync-ssim</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -109,7 +109,7 @@
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<useUniqueVersions>false</useUniqueVersions>
- <mainClass>cn.huge.module.DyhSsimApplication</mainClass>
+ <mainClass>cn.huge.module.DyhSyncSsimApplication</mainClass>
</manifest>
<manifestEntries>
<!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->
diff --git a/dyh-service/dyh-ssim/src/main/assembly/assembly.xml b/dyh-service/dyh-sync-ssim/src/main/assembly/assembly.xml
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/assembly/assembly.xml
rename to dyh-service/dyh-sync-ssim/src/main/assembly/assembly.xml
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/DyhSyncApplication.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/DyhSyncSsimApplication.java
similarity index 84%
copy from dyh-service/dyh-sync/src/main/java/cn/huge/module/DyhSyncApplication.java
copy to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/DyhSyncSsimApplication.java
index 0fc5b83..4694aab 100644
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/DyhSyncApplication.java
+++ b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/DyhSyncSsimApplication.java
@@ -7,15 +7,15 @@
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
-
@SpringBootApplication(scanBasePackages = {"cn.huge"})
@EnableFeignClients
@EnableEurekaClient
@EnableScheduling
@MapperScan("cn.huge.*.*.dao.mapper")
-public class DyhSyncApplication {
+public class DyhSyncSsimApplication {
public static void main(String[] args) {
- SpringApplication.run(DyhSyncApplication.class, args);
+ SpringApplication.run(DyhSyncSsimApplication.class, args);
}
+
}
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/BuildCodeMapper.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/dao/mapper/xml/BuildCodeMapper.xml
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/domain/bo/UserTabColsBO.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/buildcode/utils/DbDataTypeToJavaType.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/CustClient.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/CustClient.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/CustClient.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/CustClient.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/UtilsClient.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/UtilsClient.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/UtilsClient.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/UtilsClient.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/client/api/impl/UtilsClientImpl.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/config/MybatisPlusConfig.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/config/MybatisPlusConfig.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/config/MybatisPlusConfig.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/config/MybatisPlusConfig.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/constant/CacheConsts.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/constant/CacheConsts.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/constant/CacheConsts.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/constant/CacheConsts.java
diff --git a/dyh-service/dyh-ssim/src/main/java/cn/huge/module/utils/ConfigUtils.java b/dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/utils/ConfigUtils.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/java/cn/huge/module/utils/ConfigUtils.java
rename to dyh-service/dyh-sync-ssim/src/main/java/cn/huge/module/utils/ConfigUtils.java
diff --git a/dyh-service/dyh-ssim/src/main/resources/logback-spring.xml b/dyh-service/dyh-sync-ssim/src/main/resources/logback-spring.xml
similarity index 100%
rename from dyh-service/dyh-ssim/src/main/resources/logback-spring.xml
rename to dyh-service/dyh-sync-ssim/src/main/resources/logback-spring.xml
diff --git a/dyh-service/dyh-ssim/src/test/java/cn/huge/base/common/base/BaseServiceTest.java b/dyh-service/dyh-sync-ssim/src/test/java/cn/huge/base/common/base/BaseServiceTest.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/test/java/cn/huge/base/common/base/BaseServiceTest.java
rename to dyh-service/dyh-sync-ssim/src/test/java/cn/huge/base/common/base/BaseServiceTest.java
diff --git a/dyh-service/dyh-ssim/src/test/java/cn/huge/module/BuildCodeServiceTest.java b/dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/BuildCodeServiceTest.java
similarity index 100%
rename from dyh-service/dyh-ssim/src/test/java/cn/huge/module/BuildCodeServiceTest.java
rename to dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/BuildCodeServiceTest.java
diff --git a/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java b/dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/DyhSyncSsimApplicationTest.java
similarity index 87%
rename from dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
rename to dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/DyhSyncSsimApplicationTest.java
index ea13d11..e80dcea 100644
--- a/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
+++ b/dyh-service/dyh-sync-ssim/src/test/java/cn/huge/module/DyhSyncSsimApplicationTest.java
@@ -7,7 +7,7 @@
@RunWith(SpringRunner.class)
@SpringBootTest
-public class DyhSyncApplicationTest {
+public class DyhSyncSsimApplicationTest {
@Test
public void contextLoads() {
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
deleted file mode 100644
index ff1368c..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/buildcode/controller/BuildCodeController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cn.huge.module.buildcode.controller;
-
-
-import cn.huge.module.buildcode.service.BuildCodeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @title: 控代码生成器控制器类
- * @description: 控代码生成器控制器类
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/buildcode")
-public class BuildCodeController {
-
- @Autowired
- private BuildCodeService buildCodeService;
-
-
- @GetMapping("/buildAll")
- public Object buildAll(String moduleName, String className, String tableName, String author) {
- return null;
- }
-
- @PostConstruct
- public void init() {
- log.debug("==================== BuildCodeController initi.............. ===================");
- }
-
-}
-/**
- * -------------------_ooOoo_-------------------
- * ------------------o8888888o------------------
- * ------------------88" . "88------------------
- * ------------------(| -_- |)------------------
- * ------------------O\ = /O------------------
- * ---------------____/`---'\____---------------
- * -------------.' \\| |// `.-------------
- * ------------/ \\||| : |||// \------------
- * -----------/ _||||| -:- |||||- \-----------
- * -----------| | \\\ - /// | |-----------
- * -----------| \_| ''\---/'' | |-----------
- * -----------\ .-\__ `-` ___/-. /-----------
- * ---------___`. .' /--.--\ `. . __----------
- * ------."" '< `.___\_<|>_/___.' >'"".-------
- * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
- * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
- * ======`-.____`-.___\_____/___.-`____.-'======
- * -------------------`=---='
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * ---------佛祖保佑---hugeinfo---永无BUG----------
- */
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/api/CustClient.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/api/CustClient.java
deleted file mode 100644
index 112ce1b..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/api/CustClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.huge.module.client.api;
-
-import cn.huge.base.common.bo.ReturnBO;
-
-import cn.huge.module.sync.domain.target.TargetCtAccount;
-import cn.huge.module.sync.domain.target.TargetCtUnit;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-/**
- * @title: 客户用户中心微服务调用接口
- * @description: 客户用户中心微服务调用接口
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-@FeignClient(name = "dyh-cust")
-public interface CustClient {
-
- /**
- * 微服务调用-数据迁移-批量新增
- * @url {ctx}/api/client/ctUnit/saveCtUnitList
- * @param targetTableList 批量数据
- * @return ReturnBO
- */
- @GetMapping("/api/client/ctUnit/saveCtUnitList")
- ReturnBO saveTableList(@RequestBody List<TargetCtUnit> targetTableList);
-
- /**
- * 微服务调用-数据迁移-批量新增
- * @url {ctx}/api/client/ctUnit/saveCtUnitList
- * @param targetTableList 批量数据
- * @return ReturnBO
- */
- @GetMapping("/api/web/ctAccount/saveCtAccountList")
- ReturnBO saveTableList1(@RequestBody List<TargetCtAccount> targetTableList);
-}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
deleted file mode 100644
index 2e962c0..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package cn.huge.module.client.api.impl;
-
-import cn.huge.base.common.bo.ReturnBO;
-import cn.huge.base.common.constant.ReturnConsts;
-import cn.huge.base.common.dto.SelectTermDTO;
-import cn.huge.base.common.exception.ClientException;
-import cn.huge.base.common.exception.ServiceException;
-import cn.huge.module.client.api.CustClient;
-import cn.huge.module.cust.dto.CtUserDTO;
-import cn.huge.module.cust.dto.PaUserDTO;
-import cn.huge.module.sync.domain.target.TargetCtAccount;
-import cn.huge.module.sync.domain.target.TargetCtUnit;
-import com.alibaba.fastjson.JSON;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-/**
- * @title: 客户用户中心微服务调用接口实现
- * @description: 客户用户中心微服务调用接口实现
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-@Slf4j
-@Component
-public class CustClientImpl {
-
- private CustClient custClient;
-
- @Autowired
- public CustClientImpl(CustClient custClient) {
- this.custClient = custClient;
- }
-
- /**
- * ObjectMapper工具类
- */
- private ObjectMapper objectMapper = new ObjectMapper();
-
- /**
- * 微服务调用-数据迁移-批量新增
- * @param targetTableList 批量数据
- * @return
- */
- public CtUserDTO saveTableList(List<TargetCtUnit> targetTableList){
- try{
- ReturnBO returnBo = custClient.saveTableList(targetTableList);
- if (ReturnConsts.OK == returnBo.getCode()){
- CtUserDTO loginUser = objectMapper.convertValue(returnBo.getData(), CtUserDTO.class);
- return loginUser;
- }else{
- log.error("Client外服务接口[CustClientImpl.saveTableList]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
- throw new ClientException("CustClientImpl.saveTableList", returnBo.getMsg());
- }
- }catch (Exception e){
- log.error("service方法[CustClientImpl.saveTableList]调用异常："+e, e);
- throw new ServiceException("CustClientImpl.saveTableList", e);
- }
- }
-
- /**
- * 微服务调用-数据迁移-批量新增
- * @param targetTableList 批量数据
- * @return
- */
- public CtUserDTO saveTableList1(List<TargetCtAccount> targetTableList){
- try{
- ReturnBO returnBo = custClient.saveTableList1(targetTableList);
- if (ReturnConsts.OK == returnBo.getCode()){
- CtUserDTO loginUser = objectMapper.convertValue(returnBo.getData(), CtUserDTO.class);
- return loginUser;
- }else{
- log.error("Client外服务接口[CustClientImpl.saveTableList1]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
- throw new ClientException("CustClientImpl.saveTableList1", returnBo.getMsg());
- }
- }catch (Exception e){
- log.error("service方法[CustClientImpl.saveTableList1]调用异常："+e, e);
- throw new ServiceException("CustClientImpl.saveTableList1", e);
- }
- }
-}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/constant/SysConsts.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/constant/SysConsts.java
deleted file mode 100644
index 496c593..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/constant/SysConsts.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.huge.module.client.constant;
-
-/**
- * @title: 配置微服务相关常量类
- * @description: 存放配置微服务相关常量
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-public class SysConsts {
-
-}
-/**
- * -------------------_ooOoo_-------------------
- * ------------------o8888888o------------------
- * ------------------88" . "88------------------
- * ------------------(| -_- |)------------------
- * ------------------O\ = /O------------------
- * ---------------____/`---'\____---------------
- * -------------.' \\| |// `.-------------
- * ------------/ \\||| : |||// \------------
- * -----------/ _||||| -:- |||||- \-----------
- * -----------| | \\\ - /// | |-----------
- * -----------| \_| ''\---/'' | |-----------
- * -----------\ .-\__ `-` ___/-. /-----------
- * ---------___`. .' /--.--\ `. . __----------
- * ------."" '< `.___\_<|>_/___.' >'"".-------
- * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
- * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
- * ======`-.____`-.___\_____/___.-`____.-'======
- * -------------------`=---='
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * ---------佛祖保佑---hugeinfo---永无BUG----------
- */
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/utils/SysUtils.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/utils/SysUtils.java
deleted file mode 100644
index f9fb4c5..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/client/utils/SysUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.huge.module.client.utils;
-
-/**
- * @title: 配置微服务相关工具类
- * @description: 存放配置微服务相关工具方法
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-public class SysUtils {
-
-}
-/**
- * -------------------_ooOoo_-------------------
- * ------------------o8888888o------------------
- * ------------------88" . "88------------------
- * ------------------(| -_- |)------------------
- * ------------------O\ = /O------------------
- * ---------------____/`---'\____---------------
- * -------------.' \\| |// `.-------------
- * ------------/ \\||| : |||// \------------
- * -----------/ _||||| -:- |||||- \-----------
- * -----------| | \\\ - /// | |-----------
- * -----------| \_| ''\---/'' | |-----------
- * -----------\ .-\__ `-` ___/-. /-----------
- * ---------___`. .' /--.--\ `. . __----------
- * ------."" '< `.___\_<|>_/___.' >'"".-------
- * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
- * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
- * ======`-.____`-.___\_____/___.-`____.-'======
- * -------------------`=---='
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * ---------佛祖保佑---hugeinfo---永无BUG----------
- */
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/controller/SyncController.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/controller/SyncController.java
deleted file mode 100644
index 3c21f2e..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/controller/SyncController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.huge.module.sync.controller;
-
-import cn.huge.base.common.utils.ReturnFailUtils;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.sync.service.SyncService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @title: 客户组织信息表接口api-web端
- * @description: 客户组织信息表接口api-web端
- * @company: hugeinfo
- * @author: liyj
- * @time: 2024-08-17 15:30:57
- * @version: 1.0.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/sync")
-public class SyncController {
-
- @Autowired(required = false)
- private HttpServletRequest request;
-
- private final SyncService syncService;
-
- public SyncController(SyncService syncService) {
- this.syncService = syncService;
- }
-
- /**
- * 数据迁移通用接口
- * @url {ctx}/api/sync/ctUnit/universalSync
- * @return Object
- */
- @GetMapping("/universalSync")
- public Object universalSync() {
- try {
- syncService.syncData();
- return ReturnSucUtils.getRepInfo( "处理成功", null);
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
-
-}
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/dao/mapper/SyncMapper.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/dao/mapper/SyncMapper.java
deleted file mode 100644
index e0c8db1..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/dao/mapper/SyncMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.huge.module.sync.dao.mapper;
-
-import cn.huge.module.sync.domain.source.SourceCtAccount;
-import cn.huge.module.sync.domain.source.SourceCtUnit;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @title: 客户用户账号表持久层业务处理
- * @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
- * @company: hugeinfo
- * @author: liyj
- * @time: 2024-08-17 15:30:56
- * @version 1.0.0
- */
-@Repository
-public interface SyncMapper{
-
- /**
- * 按条件查询结果集
- * @param mysqlTableName 表名
- * @param page 分页对象
- * @return List<CtAccount>
- */
- List<SourceCtAccount> pageInfo(@Param("mysqlTableName") String mysqlTableName, @Param("page") PageRequest page);
-
- /**
- * 按条件查询结果集
- * @param mysqlTableName 表名
- * @return List<CtAccount>
- */
- int countData(@Param("mysqlTableName") String mysqlTableName);
-
-
-}
-
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/dao/mapper/xml/SyncMapper.xml b/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/dao/mapper/xml/SyncMapper.xml
deleted file mode 100644
index 9fe706d..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/dao/mapper/xml/SyncMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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">
-<!--
- * @title: 客户用户账号表
- * @description: 自定义sql，请自行实现业务逻辑
- * @company: hugeinfo
- * @author: liyj
- * @time:2024-08-17 15:30:56
- * @version 1.0.0
--->
-<mapper namespace="cn.huge.module.sync.dao.mapper.SyncMapper">
-
- <resultMap id="dataResult" type="cn.huge.module.sync.domain.source.SourceCtAccount">
- <result property="id" column="id"/>
- <result property="userId" column="user_id"/>
- <result property="accType" column="acc_type"/>
- <result property="acc" column="acc"/>
- <result property="cipher" column="cipher"/>
- <result property="cipherOpen" column="cipher_open"/>
- <result property="cipherTime" column="cipher_time"/>
- <result property="loginTime" column="login_time"/>
- <result property="limitTime" column="limit_time"/>
- <result property="deleteStatus" column="delete_status"/>
- <result property="custId" column="cust_id"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- </resultMap>
-
- <!-- 根据条件分页查询 -->
- <select id="pageInfo" resultMap = "dataResult">
- SELECT
- *
- FROM
- ${mysqlTableName}
- <if test="page.sort != null">
- <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
- ${s.property} ${s.direction}
- </foreach>
- </if>
- <if test="page.sort == null">
- order by create_time asc
- </if>
- limit #{page.offset}, #{page.size}
- </select>
-
- <!-- 根据条件分页查询 -->
- <select id="countData" resultType="int">
- SELECT
- count(1)
- FROM
- ${mysqlTableName}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/service/SyncService.java b/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/service/SyncService.java
deleted file mode 100644
index 266534e..0000000
--- a/dyh-service/dyh-sync/src/main/java/cn/huge/module/sync/service/SyncService.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package cn.huge.module.sync.service;
-
-import cn.huge.module.client.api.impl.CustClientImpl;
-import cn.huge.module.sync.dao.mapper.SyncMapper;
-import cn.huge.module.sync.domain.source.SourceCtAccount;
-import cn.huge.module.sync.domain.source.SourceCtUnit;
-import cn.huge.module.sync.domain.target.TargetCtAccount;
-import cn.huge.module.sync.domain.target.TargetCtUnit;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.converters.DateConverter;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * @author liyj
- * @version 1.0.0
- * @title: 客户用户账号表业务逻辑处理
- * @Description 客户用户账号表业务逻辑处理
- * @company hugeinfo
- * @Time 2024-08-17 15:30:56
- */
-@Slf4j
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class SyncService {
- @Autowired
- private SyncMapper syncMapper;
- @Autowired
- private CustClientImpl custClient;
-
- private static final String MYSQL_TABLE = "dyh_ct_account";
-
- public void syncData() {
- try {
- List<SourceCtAccount> sourceTableList = new ArrayList<>();
-
- int page = 1;
- int size = 1000;
-
- //查询mysql总量
- int total = syncMapper.countData(MYSQL_TABLE);
-
- //查出最大页数
- int maxPage = 1;
- maxPage = (total / size);
- if (0 != total % size) {
- maxPage += 1;
- }
-
- for (int i = 1; i <= maxPage; i++) {
- // 查询MySQL表结构
- Sort sort = Sort.by(Sort.Direction.ASC, "create_time");
- PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- sourceTableList = syncMapper.pageInfo(MYSQL_TABLE, pageRequest);
- page++;
-
- List<TargetCtAccount> targetTableList = new ArrayList<>();
- for(SourceCtAccount sourceTable: sourceTableList){
- TargetCtAccount tagetTable = new TargetCtAccount();
- ConvertUtils.register(new DateConverter(null), java.util.Date.class);
- BeanUtils.copyProperties(tagetTable, sourceTable);
-// for(Field field: sourceCtUnit.getClass().getDeclaredFields()){
-// convertType(field.get(sourceCtUnit), field.getName(), targetCtUnit);
-// }
- //字段名不一致，手动set
- tagetTable.setCipher(sourceTable.getCipher());
- tagetTable.setAccType(1);
- targetTableList.add(tagetTable);
- }
- if(CollectionUtils.isNotEmpty(targetTableList)){
- custClient.saveTableList1(targetTableList);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 时间转换的时候，调用初始化，时间类型转换
- * 使用：直接在实体中加上一个注解形式。
- */
- public static void initDate(){
-// 时间注册
- DateConverter converter = new DateConverter(null);
- converter.setPattern(new String("yyyy-MM-dd HH:mm:ss"));
- ConvertUtils.register(converter, Date.class);
- }
-
-
- public void convertType(Object value, String columnName, TargetCtUnit targetCtUnit) {
- if (value == null) {
- targetCtUnit.setUnitType(Integer.valueOf("NULL"));
- }else if("unitType".equals(columnName) || "joinWay".equals(columnName) || "findStatus".equals(columnName)
- || "dispStatus".equals(columnName)|| "deleteStatus".equals(columnName)){
- targetCtUnit.setUnitType(Integer.parseInt((String) value));
- }
-
- }
-}
\ No newline at end of file
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml b/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml
deleted file mode 100644
index 23c474d..0000000
--- a/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-#server配置
-server:
- #端口
- port: 9010
-
-#Spring配置
-spring:
- #服务名
- application:
- name: dyh-sync
- #数据源配置
- datasource:
- url: jdbc:dm://localhost:9016?schema=gzdyh_dev
- username: SYSDBA
- password: SYSDBA
- driver-class-name: dm.jdbc.driver.DmDriver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- stat-view-servlet:
- # 关闭 Druid 的统计视图
- enabled: false
- # 定期检查空闲连接的有效性
- test-while-idle: true
- # 用来验证数据库连接是否仍然可用的 SQL 查询
- validation-query: SELECT 1
-
-#注册中心配置
-eureka:
- client:
- service-url:
- #注册中心单机
- defaultZone: http://localhost:9001/eureka
- #注册中心集群
- #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
- #是否注册到注册中心
- register-with-eureka: true
- #是否从注册中心拉取注册服务列表
- fetch-registry: true
- #首次注册时间
- initial-instance-info-replication-interval-seconds: 2
- #客户端定时刷新本地缓存时间
- registry-fetch-interval-seconds: 5
- instance:
- prefer-ip-address: true
- instance-id: ${spring.cloud.client.ip-address}:${server.port}
- #心跳时间，即服务续约间隔时间（缺省为30s）
- lease-renewal-interval-in-seconds: 10
- #发呆时间，即服务续约到期时间（缺省为90s）
- lease-expiration-duration-in-seconds: 30
-
-#hystrix配置
-hystrix:
- command:
- default:
- execution:
- timeout:
- enabled: true
- isolation:
- thread:
- timeoutInMilliseconds: 30000
-
-#健康检查-按需配置
-management:
- endpoint:
- health:
- show-details: always
- endpoints:
- web:
- exposure:
- include: "*"
- server:
- #port: 9021
- servlet:
- context-path: /
- ssl:
- enabled: false
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-test.yml b/dyh-service/dyh-sync/src/main/resources/config/application-test.yml
deleted file mode 100644
index a917395..0000000
--- a/dyh-service/dyh-sync/src/main/resources/config/application-test.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-#server配置
-server:
- #端口
- port: 9010
-
-#Spring配置
-spring:
- #服务名
- application:
- name: dyh-sync
- #数据源配置
- datasource:
- url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
- username: SYSDBA
- password: SYSDBA
- driver-class-name: dm.jdbc.driver.DmDriver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- stat-view-servlet:
- # 关闭 Druid 的统计视图
- enabled: false
- # 定期检查空闲连接的有效性
- test-while-idle: true
- # 用来验证数据库连接是否仍然可用的 SQL 查询
- validation-query: SELECT 1
-
-#注册中心配置
-eureka:
- client:
- service-url:
- #注册中心单机
- defaultZone: http://localhost:9011/eureka
- #注册中心集群
- #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
- #是否注册到注册中心
- register-with-eureka: true
- #是否从注册中心拉取注册服务列表
- fetch-registry: true
- #首次注册时间
- initial-instance-info-replication-interval-seconds: 2
- #客户端定时刷新本地缓存时间
- registry-fetch-interval-seconds: 5
- instance:
- prefer-ip-address: true
- instance-id: ${spring.cloud.client.ip-address}:${server.port}
- #心跳时间，即服务续约间隔时间（缺省为30s）
- lease-renewal-interval-in-seconds: 10
- #发呆时间，即服务续约到期时间（缺省为90s）
- lease-expiration-duration-in-seconds: 30
-
-#hystrix配置
-hystrix:
- command:
- default:
- execution:
- timeout:
- enabled: true
- isolation:
- thread:
- timeoutInMilliseconds: 30000
-
-#健康检查-按需配置
-management:
- endpoint:
- health:
- show-details: always
- endpoints:
- web:
- exposure:
- include: "*"
- server:
- #port: 9021
- servlet:
- context-path: /
- ssl:
- enabled: false
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java
index b7b0228..6b01f3e 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/wechat/SyregionWechatController.java
@@ -1,10 +1,9 @@
package cn.huge.module.kind.controller.wechat;
-import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.constant.GzRegionEnum;
import cn.huge.base.common.utils.*;
import cn.huge.module.kind.domain.po.SyRegion;
import cn.huge.module.kind.service.SyRegionService;
-import cn.huge.module.sys.dto.QueAddrBaseDTO;
import cn.huge.module.utils.BaiduMapAddrDTO;
import cn.huge.module.utils.BaiduMapUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -55,7 +54,7 @@
syRegionQueryWrapper.like("name", baiduMapAddrDTO.getDistrict());
SyRegion district = service.getOne(syRegionQueryWrapper);
if (ObjectUtils.isNotEmpty(district)) {
- if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(district.getId())) {
+ if (GzRegionEnum.AREA_7.getIndex().equals(district.getId())) {
return ReturnSucUtils.getRepInfo(true);
} else {
return ReturnSucUtils.getRepInfo("反映诉求服务目前仅支持纠纷发生地为白云区内的申请。", false);
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
index 55f6c97..14fc9af 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
@@ -315,17 +315,17 @@
areaBO.setSort(map.get(areaBO.getLabel()));
}
}
- list.sort((o1, o2) -> {
- Integer totalScore1 = Integer.valueOf(o1.getSort());
- Integer totalScore2 = Integer.valueOf(o2.getSort());
- if (totalScore1 > totalScore2) {
- return 1;
- } else if (totalScore1.equals(totalScore2)) {
- return 0;
- } else {
- return -1;
- }
- });
+// list.sort((o1, o2) -> {
+// Integer totalScore1 = Integer.valueOf(o1.getSort());
+// Integer totalScore2 = Integer.valueOf(o2.getSort());
+// if (totalScore1 > totalScore2) {
+// return 1;
+// } else if (totalScore1.equals(totalScore2)) {
+// return 0;
+// } else {
+// return -1;
+// }
+// });
return list;
}
@@ -336,17 +336,17 @@
for (AreaBO selectTermDTO : termsSet) {
termsList.add(selectTermDTO);
}
- termsList.sort((o1, o2)->{
- Double totalScore1 = Double.valueOf(o1.getValue());
- Double totalScore2 = Double.valueOf(o2.getValue());
- if(totalScore1 > totalScore2) {
- return 1;
- }else if (totalScore1.equals(totalScore2)) {
- return 0;
- }else {
- return -1;
- }
- });
+// termsList.sort((o1, o2)->{
+// Double totalScore1 = Double.valueOf(o1.getValue());
+// Double totalScore2 = Double.valueOf(o2.getValue());
+// if(totalScore1 > totalScore2) {
+// return 1;
+// }else if (totalScore1.equals(totalScore2)) {
+// return 0;
+// }else {
+// return -1;
+// }
+// });
}
return termsList;
}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
index e430dea..1db1dd2 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
@@ -1,6 +1,6 @@
package cn.huge.module.mediate.controller.client;
-import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.constant.GzRegionEnum;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
@@ -16,7 +16,6 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -83,7 +82,7 @@
int year = DateUtils.getYear(new Date());
String caseNoLogo = caseInfoService.getCaseNoLogo(area);
if (StringUtils.isEmpty(caseNoLogo)){
- caseNoLogo = caseInfoService.getCaseNoLogo(GzAreaEnum.GZEnum_0.getIndex());
+ caseNoLogo = caseInfoService.getCaseNoLogo(GzRegionEnum.CITY_1.getIndex());
}
String caseNoPrefix = "（" + year + "）"+caseNoLogo;
String newCaseNo = caseInfoService.getNewCaseNo(caseNoPrefix);
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/web/CaseUtilsWebController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/web/CaseUtilsWebController.java
index 8e13be1..1542e8e 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/web/CaseUtilsWebController.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/web/CaseUtilsWebController.java
@@ -1,22 +1,17 @@
package cn.huge.module.mediate.controller.web;
-import cn.huge.base.common.constant.GzAreaEnum;
-import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.mediate.service.CaseInfoService;
import cn.huge.module.mediate.service.JudicInfoService;
import cn.huge.module.mediate.utils.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
/**
* @title: 提供前端生成id公共api-纠纷相关
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
index 09a0738..6349f1f 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
@@ -1,6 +1,6 @@
package cn.huge.module.mediate.utils;
-import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.constant.GzRegionEnum;
import cn.huge.base.common.utils.DateUtils;
/**
@@ -70,27 +70,27 @@
* @return
*/
public synchronized static Boolean getFlag(String area){
- if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ if (GzRegionEnum.AREA_1.getIndex().equals(area)){
return CASE_NO_FLAG_TH;
- }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_2.getIndex().equals(area)){
return CASE_NO_FLAG_HZ;
- }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_3.getIndex().equals(area)){
return CASE_NO_FLAG_LW;
- }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_4.getIndex().equals(area)){
return CASE_NO_FLAG_YX;
- }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_5.getIndex().equals(area)){
return CASE_NO_FLAG_PY;
- }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_6.getIndex().equals(area)){
return CASE_NO_FLAG_HD;
- }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_7.getIndex().equals(area)){
return CASE_NO_FLAG_BY;
- }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_8.getIndex().equals(area)){
return CASE_NO_FLAG_NS;
- }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_9.getIndex().equals(area)){
return CASE_NO_FLAG_HP;
- }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_10.getIndex().equals(area)){
return CASE_NO_FLAG_ZC;
- }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_11.getIndex().equals(area)){
return CASE_NO_FLAG_CH;
}else {
return CASE_NO_FLAG;
@@ -102,27 +102,27 @@
* @return
*/
public synchronized static void setCount(String area, int num){
- if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ if (GzRegionEnum.AREA_1.getIndex().equals(area)){
CASE_NO_COUNT_TH = num;
- }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_2.getIndex().equals(area)){
CASE_NO_COUNT_HZ = num;
- }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_3.getIndex().equals(area)){
CASE_NO_COUNT_LW = num;
- }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_4.getIndex().equals(area)){
CASE_NO_COUNT_YX = num;
- }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_5.getIndex().equals(area)){
CASE_NO_COUNT_PY = num;
- }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_6.getIndex().equals(area)){
CASE_NO_COUNT_HD = num;
- }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_7.getIndex().equals(area)){
CASE_NO_COUNT_BY = num;
- }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_8.getIndex().equals(area)){
CASE_NO_COUNT_NS = num;
- }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_9.getIndex().equals(area)){
CASE_NO_COUNT_HP = num;
- }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_10.getIndex().equals(area)){
CASE_NO_COUNT_ZC = num;
- }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_11.getIndex().equals(area)){
CASE_NO_COUNT_CH = num;
}else {
CASE_NO_COUNT = num;
@@ -134,27 +134,27 @@
* @return
*/
public synchronized static void setFlag(String area, boolean flag){
- if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ if (GzRegionEnum.AREA_1.getIndex().equals(area)){
CASE_NO_FLAG_TH = flag;
- }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_2.getIndex().equals(area)){
CASE_NO_FLAG_HZ = flag;
- }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_3.getIndex().equals(area)){
CASE_NO_FLAG_LW = flag;
- }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_4.getIndex().equals(area)){
CASE_NO_FLAG_YX = flag;
- }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_5.getIndex().equals(area)){
CASE_NO_FLAG_PY = flag;
- }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_6.getIndex().equals(area)){
CASE_NO_FLAG_HD = flag;
- }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_7.getIndex().equals(area)){
CASE_NO_FLAG_BY = flag;
- }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_8.getIndex().equals(area)){
CASE_NO_FLAG_NS = flag;
- }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_9.getIndex().equals(area)){
CASE_NO_FLAG_HP = flag;
- }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_10.getIndex().equals(area)){
CASE_NO_FLAG_ZC = flag;
- }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_11.getIndex().equals(area)){
CASE_NO_FLAG_CH = flag;
}else {
CASE_NO_FLAG = flag;
@@ -166,27 +166,27 @@
* @return
*/
public synchronized static void setSign(String area, String logo){
- if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ if (GzRegionEnum.AREA_1.getIndex().equals(area)){
CASE_NO_SIGN_TH = logo;
- }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_2.getIndex().equals(area)){
CASE_NO_SIGN_HZ = logo;
- }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_3.getIndex().equals(area)){
CASE_NO_SIGN_LW = logo;
- }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_4.getIndex().equals(area)){
CASE_NO_SIGN_YX = logo;
- }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_5.getIndex().equals(area)){
CASE_NO_SIGN_PY = logo;
- }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_6.getIndex().equals(area)){
CASE_NO_SIGN_HD = logo;
- }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_7.getIndex().equals(area)){
CASE_NO_SIGN_BY = logo;
- }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_8.getIndex().equals(area)){
CASE_NO_SIGN_NS = logo;
- }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_9.getIndex().equals(area)){
CASE_NO_SIGN_HP = logo;
- }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_10.getIndex().equals(area)){
CASE_NO_SIGN_ZC = logo;
- }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_11.getIndex().equals(area)){
CASE_NO_SIGN_CH = logo;
}
}
@@ -198,37 +198,37 @@
public synchronized static String getCaseNo(String area){
int year = DateUtils.getYear(DateUtils.getNowDate());
String cloudCaseNo = "";
- if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ if (GzRegionEnum.AREA_1.getIndex().equals(area)){
CASE_NO_COUNT_TH += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_TH + (CASE_NO_COUNT_TH) + "号";
- }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_2.getIndex().equals(area)){
CASE_NO_COUNT_HZ += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_HZ + (CASE_NO_COUNT_HZ) + "号";
- }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_3.getIndex().equals(area)){
CASE_NO_COUNT_LW += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_LW + (CASE_NO_COUNT_LW) + "号";
- }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_4.getIndex().equals(area)){
CASE_NO_COUNT_YX += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_YX + (CASE_NO_COUNT_YX) + "号";
- }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_5.getIndex().equals(area)){
CASE_NO_COUNT_PY += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_PY + (CASE_NO_COUNT_PY) + "号";
- }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_6.getIndex().equals(area)){
CASE_NO_COUNT_HD += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_HD + (CASE_NO_COUNT_HD) + "号";
- }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_7.getIndex().equals(area)){
CASE_NO_COUNT_BY += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_BY + (CASE_NO_COUNT_BY) + "号";
- }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_8.getIndex().equals(area)){
CASE_NO_COUNT_NS += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_NS + (CASE_NO_COUNT_NS) + "号";
- }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_9.getIndex().equals(area)){
CASE_NO_COUNT_HP += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_HP + (CASE_NO_COUNT_HP) + "号";
- }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ }else if (GzRegionEnum.AREA_10.getIndex().equals(area)){
CASE_NO_COUNT_ZC += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_ZC + (CASE_NO_COUNT_ZC) + "号";
- }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)) {
+ }else if (GzRegionEnum.AREA_11.getIndex().equals(area)) {
CASE_NO_COUNT_CH += 1;
cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_CH + (CASE_NO_COUNT_CH) + "号";
}else {
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java
index 1920325..c83270b 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java
@@ -1,8 +1,5 @@
package cn.huge.module.mediate.utils;
-import cn.huge.base.common.constant.GzAreaEnum;
-import cn.huge.base.common.utils.DateUtils;
-
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/dyh-service/pom.xml b/dyh-service/pom.xml
index c2a67d1..d06ee1d 100644
--- a/dyh-service/pom.xml
+++ b/dyh-service/pom.xml
@@ -29,8 +29,8 @@
<module>dyh-disp</module>
<module>dyh-mediate</module>
<module>dyh-sys</module>
- <module>dyh-sync</module>
- <module>dyh-ssim</module>
+ <module>dyh-sync-bydyh</module>
+ <module>dyh-sync-ssim</module>
</modules>
<dependencyManagement>
--
Gitblit v1.8.0