专家详情增加专家码base64

hz-pm-api/.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

hz-pm-api/.idea/checkstyle-idea.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.5.0</checkstyleVersion>
-    <scanScope>JavaOnly</scanScope>
-    <copyLibs>true</copyLibs>
-    <option name="locations">
-      <list>
-        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-      </list>
-    </option>
-  </component>
-</project>

hz-pm-api/.idea/compiler.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="pmapi" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

hz-pm-api/.idea/eclipseCodeFormatter.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EclipseCodeFormatterProjectSettings">
-    <option name="projectSpecificProfile">
-      <ProjectSpecificProfile>
-        <option name="formatter" value="ECLIPSE" />
-        <option name="pathToConfigFileJava" value="D:/soft/formatter/eclipse-codestyle.xml" />
-        <option name="selectedJavaProfile" value="P3C-CodeStyle" />
-      </ProjectSpecificProfile>
-    </option>
-  </component>
-</project>

hz-pm-api/.idea/encodings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/lib" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

hz-pm-api/.idea/inspectionProfiles/Project_Default.xml

@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <Languages>
-        <language minSize="189" name="Java" />
-      </Languages>
-    </inspection_tool>
-  </profile>
-</component>

hz-pm-api/.idea/jarRepositories.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="aliyun" />
-      <option name="name" value="aliyun" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-  </component>
-</project>

hz-pm-api/.idea/misc.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>

hz-pm-api/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3

@@ -1,3 +0,0 @@
-
-U
-java:S1118":Add a private constructor to hide the implicit public one.(áÛ«îýÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084

@@ -1,3 +0,0 @@
-
-U
-java:S1118":Add a private constructor to hide the implicit public one.(±ÎÞèýÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5

@@ -1,95 +0,0 @@
-
-o
-java:S1192„"SDefine a constant instead of duplicating this literal "Unexpected value: " 3 times.(¡þé£üÿÿÿÿ

-n
-java:S1192Ä"WDefine a constant instead of duplicating this literal "状æ€�机执行失败!" 3 times.(¨¾¦ø
-e
-java:S1192—"IDefine a constant instead of duplicating this literal "approve_" 5 times.(¢¡öñüÿÿÿÿ

-t	java:S135È"YReduce the total number of break and continue statements in this loop to use at most one.(ÃŽÍÎþÿÿÿÿ

-A
-java:S5411Å"*Use the primitive boolean expression here.(•„¹¾
-Z
-java:S2583Å"CChange this condition so that it does not always evaluate to "true"(•„¹¾
-W	java:S125ƒ
"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125ª
"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125Ù
"<This block of commented-out lines of code should be removed.(­“¸»ûÿÿÿÿ

-R	java:S125Û
"<This block of commented-out lines of code should be removed.(�³Ÿˆ
-Q
-java:S6213–":Rename this variable to not match a restricted identifier.(˜Š¡©

-b
-java:S3252œ"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-N
-java:S1135¢"2Complete the task associated to this TODO comment.(©†î¿ÿÿÿÿÿ

-[
-java:S1854ë"?Remove this useless assignment to local variable "projectName".(Ϥõ…ûÿÿÿÿ

-\
-java:S1854ç"ERemove this useless assignment to local variable "processInstanceId".(ËŽÿð
-M
-java:S1481ç"6Remove this unused "processInstanceId" local variable.(ËŽÿð
-L
-java:S1481ë"0Remove this unused "projectName" local variable.(Ϥõ…ûÿÿÿÿ

-Q
-java:S6213í":Rename this variable to not match a restricted identifier.(˜Š¡©

-b
-java:S3252ó"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-N
-java:S1135õ"2Complete the task associated to this TODO comment.(Ü™´æúÿÿÿÿ

-N
-java:S1135÷"2Complete the task associated to this TODO comment.(üʸßüÿÿÿÿ

-Q
-java:S6213‰":Rename this variable to not match a restricted identifier.(˜Š¡©

-b
-java:S3252�"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-N
-java:S1135©"2Complete the task associated to this TODO comment.(Ä‹µëûÿÿÿÿ

-N
-java:S1135Ò"2Complete the task associated to this TODO comment.(‘¢Èýÿÿÿÿ

-I
-java:S1135¬"2Complete the task associated to this TODO comment.(•Øþ�
-I
-java:S1135Ï"2Complete the task associated to this TODO comment.(•Øþ�
-k
-java:S3252ç"OUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isNotBlank".(¥‚°€ýÿÿÿÿ

-[
-java:S1854€"?Remove this useless assignment to local variable "projectName".(Ϥõ…ûÿÿÿÿ

-]
-java:S1854¸"ARemove this useless assignment to local variable "currentUserId".(þÅøÜùÿÿÿÿ

-\
-java:S1854¶"@Remove this useless assignment to local variable "beforeUserId".(©ï¿‹ýÿÿÿÿ

-L
-java:S1481€"0Remove this unused "projectName" local variable.(Ϥõ…ûÿÿÿÿ

-I
-java:S1135Œ"2Complete the task associated to this TODO comment.(¥ÿ¬¾
-M
-java:S1481¶"1Remove this unused "beforeUserId" local variable.(©ï¿‹ýÿÿÿÿ

-N
-java:S1481¸"2Remove this unused "currentUserId" local variable.(þÅøÜùÿÿÿÿ

-W	java:S125¹"<This block of commented-out lines of code should be removed.(ï–õ‡þÿÿÿÿ

-I
-java:S1135Ã"2Complete the task associated to this TODO comment.(®–˜ˆ
-b
-java:S3252�"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-I
-java:S1135¢"2Complete the task associated to this TODO comment.(æ·â®

-W	java:S125Ð"<This block of commented-out lines of code should be removed.(åÔÙÍýÿÿÿÿ

-N
-java:S1135Ù"2Complete the task associated to this TODO comment.(«­¾Òýÿÿÿÿ

-W	java:S125õ"<This block of commented-out lines of code should be removed.(˜€ÔÑýÿÿÿÿ

-I
-java:S2201‘"+The return value of "collect" must be used.(Ú¿±ì8œß²úæ0
-?
-java:S3864‘"!Remove this use of "Stream.peek".(Ú¿±ì8�ß²úæ0
-\
-java:S3252µ"EUse static access with "com.alibaba.fastjson.JSON" for "parseObject".(ÿ�€Ú
-N
-java:S2201Ù"+The return value of "collect" must be used.(ÔûÙøúÿÿÿÿ
8²ß²úæ0
-D
-java:S3864Ù"!Remove this use of "Stream.peek".(ÔûÙøúÿÿÿÿ
8³ß²úæ0
-M
-java:S1172Þ"1Remove this unused method parameter "instanceId".(™ÃÉþÿÿÿÿ

-W	java:S125ì"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125”"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-R	java:S125É"<This block of commented-out lines of code should be removed.(ÝÎÞÁ
-W	java:S125ð"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125£	"<This block of commented-out lines of code should be removed.(­“¸»ûÿÿÿÿ

-W	java:S125Ë	"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/8/c/8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7

@@ -1,3 +0,0 @@
-
-\
-java:S1128"ARemove this unused import 'javax.validation.constraints.NotNull'.(áç¥ãüÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/9/2/92bb80058f98a2589a95655e976c4c3b31905e3f

@@ -1,5 +0,0 @@
-
-B
-java:S1602s",Remove useless curly braces around statement(Ƙ¸ƒ
-O
-java:S1128"-Remove this unused import 'java.util.Arrays'.(î–˜Éüÿÿÿÿ
8¼�¨ùæ0

hz-pm-api/.idea/sonarlint/issuestore/a/9/a90097c62f2d5eef81300bceaa14afa9559ec829

@@ -1,5 +0,0 @@
-
-f
-java:S1128"IRemove this unused import 'com.wflow.workflow.bean.vo.ProcessInstanceVo'.(†å˜¯
8¬ûøæ0
-b
-java:S1128"ERemove this unused import 'com.wflow.workflow.bean.vo.ProcessTaskVo'.(�ÑÇù8¬ûøæ0

hz-pm-api/.idea/sonarlint/issuestore/d/3/d39b8ec842398247637f12ea4caf897c9a0a8463

@@ -1,15 +0,0 @@
-
-\
-java:S1118(":Add a private constructor to hide the implicit public one.(¬º‹×ûÿÿÿÿ
8Ý´ûãæ0
-h
-java:S3776R"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(§°¯î
-^
-java:S3252\"HUse static access with "com.alibaba.excel.EasyExcelFactory" for "write".( òŸ€
-c
-java:S3252^"HUse static access with "com.alibaba.excel.EasyExcelFactory" for "write".(µû•Ðÿÿÿÿÿ

-d
-java:S3252n"NUse static access with "com.alibaba.excel.EasyExcelFactory" for "writerSheet".(ìç±Ú

-”

-java:S1130…
"}Remove the declaration of thrown exception 'java.io.UnsupportedEncodingException', as it cannot be thrown from method's body.(±®ðÚ
-]
-java:S6213”
":Rename this variable to not match a restricted identifier.(ÿ‚Î×þÿÿÿÿ
8�õøãæ0

hz-pm-api/.idea/sonarlint/issuestore/d/7/d7146276b7a0a780dc7631a29b70c58f9c37fac3

@@ -1,72 +0,0 @@
-
-\	java:S112•
"FDefine and throw a dedicated exception instead of using a generic one.( ÐÇï
-a	java:S112§
"FDefine and throw a dedicated exception instead of using a generic one.(ˆòóµùÿÿÿÿ

-a	java:S112Æ"FDefine and throw a dedicated exception instead of using a generic one.(ËÿÜÎÿÿÿÿÿ

-a
-java:S1192c"KDefine a constant instead of duplicating this literal "HmacSHA256" 4 times.(öüõî
-a
-java:S1192n"FDefine a constant instead of duplicating this literal "UTF-8" 5 times.(»”ýªüÿÿÿÿ

-k	java:S117?"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(³×ߢúÿÿÿÿ

-K
-java:S1191"5Use classes from the Java API instead of Sun classes.(—øÛÖ
-]
-java:S2259ý
"AA "NullPointerException" could be thrown; "fin" is nullable here.(µö¹šúÿÿÿÿ

-m
-java:S2095ê
"QUse try-with-resources or close this "BufferedInputStream" in a "finally" clause.(ˆ£Þðþÿÿÿÿ

-j
-java:S2095ž"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.(ÖŽ“¯úÿÿÿÿ

-n
-java:S2095Ÿ"RUse try-with-resources or close this "BufferedOutputStream" in a "finally" clause.(㨿®þÿÿÿÿ

-j
-java:S3008("TRename this field "ProjectID" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Šõö·
-n
-java:S3008)"XRename this field "ProjectSecret" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ôØÚ¬
-Q	java:S125""<This block of commented-out lines of code should be removed.(¹ä¶¢
-‡

-java:S1130/"lRemove the declaration of thrown exception 'java.lang.Exception', as it cannot be thrown from method's body.(ÙؤÞýÿÿÿÿ

-\
-java:S1075@"ARefactor your code to get this URI from a customizable parameter.(«é¥™øÿÿÿÿ

-Q	java:S125H"<This block of commented-out lines of code should be removed.(ÅøúÈ
-P	java:S125h"<This block of commented-out lines of code should be removed.(…‘ïs
-N	java:S106m"9Replace this use of System.out or System.err by a logger.(àÙø¼
-T
-java:S4719n"9Replace charset name argument with StandardCharsets.UTF_8(»”ýªüÿÿÿÿ

-Q	java:S125q"<This block of commented-out lines of code should be removed.(իз
-O	java:S106‡
"9Replace this use of System.out or System.err by a logger.(…¢üÔ
-O	java:S106‰
"9Replace this use of System.out or System.err by a logger.(…¢üÔ
-P
-java:S4719�
"9Replace charset name argument with StandardCharsets.UTF_8(ÄÌ ¯
-O	java:S106�
"9Replace this use of System.out or System.err by a logger.(µ³õ’

-P
-java:S4719š
"9Replace charset name argument with StandardCharsets.UTF_8(Å¡Ö°
-U
-java:S4719¬
"9Replace charset name argument with StandardCharsets.UTF_8(÷�‚ßþÿÿÿÿ

-A
-java:S1197º
"*Move the array designators [] to the type.(ˆö�ì
-i	java:S100â
"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(åñÜ­ýÿÿÿÿ

-H
-java:S1481ã
",Remove this unused "encoder" local variable.(Ã�‰˜üÿÿÿÿ

-W	java:S125÷
"<This block of commented-out lines of code should be removed.(óºõŒýÿÿÿÿ

-F
-java:S2093è
"*Change this "try" to a try-with-resources.(¡»¢üùÿÿÿÿ

-R	java:S125«"<This block of commented-out lines of code should be removed.(›�ÎŒ
-F
-java:S2093•"*Change this "try" to a try-with-resources.(¡»¢üùÿÿÿÿ

-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-F
-java:S1144§
"*Remove this unused private "sign1" method.(ˆòóµùÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/e/c/ecd8157d3ccb289d327361f90fcef4d14eddb335

@@ -1,5 +0,0 @@
-
-t
-java:S1488u"^Immediately return this expression instead of assigning it to the temporary variable "result".(뙩Ý
-z
-java:S1488�
"^Immediately return this expression instead of assigning it to the temporary variable "result".(©¶üÈúÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/f/1/f1ece2c596126c2753f07e9c33ac1dee153eca7c

@@ -1,3 +0,0 @@
-
-X
-java:S1214"CMove constants defined in this interfaces to another class or enum.(Ôô•

hz-pm-api/.idea/sonarlint/issuestore/index.pb

@@ -1,31 +0,0 @@
-
-{
-Ksrc/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java,4\d\4d181ee0ef35161a71fa355047c13e9ab5aa4793
-…

-Usrc/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ReqProcessHandlerDTO.java,3\a\3a29a241dcf97a75f4de88a48dacd988a7193f67
-€

-Psrc/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java,0\3\032c44040c9d507864de35d7170661addf623095
-v
-Fsrc/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java,0\2\02999ca52b20720a6dba73a2ea57a018dba90084
-q
-Asrc/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java,d\3\d39b8ec842398247637f12ea4caf897c9a0a8463
-v
-Fsrc/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java,f\1\f1ece2c596126c2753f07e9c33ac1dee153eca7c
-}
-Msrc/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java,b\7\b7eec6c95fd743ceb0853f62f1870e78ac47fa1d
-u
-Esrc/main/java/com/ningdatech/pmapi/user/service/IUserInfoService.java,e\4\e427e2fbf9cff46a15e651e8759e4487828aaa90
-w
-Gsrc/main/java/com/ningdatech/pmapi/projectlib/helper/ProjectHelper.java,0\0\002597a7f172f343a6cffcd273be74aa895d74b3
-z
-Jsrc/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java,9\2\92bb80058f98a2589a95655e976c4c3b31905e3f
-‚

-Rsrc/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java,e\c\ecd8157d3ccb289d327361f90fcef4d14eddb335
-�

-Qsrc/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ToBeProcessedReq.java,8\c\8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7
-z
-Jsrc/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java,7\a\7a4df0ff8172ed96c29e54029f6ecac024700aa5
-‚

-Rsrc/main/java/com/ningdatech/pmapi/todocenter/model/dto/vo/ResToBeProcessedVO.java,a\9\a90097c62f2d5eef81300bceaa14afa9559ec829
-n
->src/main/java/com/ningdatech/pmapi/irs/sign/IRSAPIRequest.java,d\7\d7146276b7a0a780dc7631a29b70c58f9c37fac3

hz-pm-api/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BaseFieldFillHandler.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 
-import static com.hz.pm.api.common.constant.BaseFieldConst.*;
+import static com.hz.pm.api.common.model.constant.BaseFieldConst.*;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/basic/AbstractRegionLimitHelper.java

@@ -2,15 +2,11 @@ package com.hz.pm.api.common.helper.basic;
 
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.RegionLimitHelper;
-import com.hz.pm.api.expert.entity.ExpertUserFullInfo;
 import com.hz.pm.api.expert.service.IExpertUserFullInfoService;
-import com.hz.pm.api.meta.model.ExpertRegionInfo;
 import com.hz.pm.api.sys.service.IRegionService;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.AllArgsConstructor;
 
-import java.util.Objects;
-
 /**
  * <p>
  * AbstractRegionLimitHelper
@@ -27,22 +23,4 @@ public abstract class AbstractRegionLimitHelper implements RegionLimitHelper {
     protected final IUserInfoService iUserInfoService;
     protected final IRegionService regionService;
 
-
-    /**
-     * 根据 专家用户id 获取专家层级
-     *
-     * @param expertUserId /
-     * @return /
-     */
-    protected ExpertRegionInfo getExpertRegionInfo(Long expertUserId) {
-        ExpertUserFullInfo userFullInfo = expertUserFullInfoService.getByUserId(expertUserId);
-        if (Objects.isNull(userFullInfo)) {
-            return new ExpertRegionInfo();
-        }
-        ExpertRegionInfo regionInfo = new ExpertRegionInfo();
-        regionInfo.setRegionCode(userFullInfo.getRegionCode());
-        regionInfo.setRegionLevel(userFullInfo.getRegionLevel());
-        return regionInfo;
-    }
-
 }

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/RegionsCacheHelperImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.text.StrPool;
 import com.hz.pm.api.sys.service.IRegionService;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.util.CollUtils;
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.basic.AbstractRegionCacheHelper;
 import com.hz.pm.api.common.model.RegionMapKey;

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.organization.model.entity.DingEmployeeInfo;
 import com.hz.pm.api.organization.model.entity.DingOrganization;
@@ -15,9 +15,9 @@ import com.hz.pm.api.sys.mapper.RoleMapper;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IUserRoleService;
-import com.hz.pm.api.user.constant.UserAvailableEnum;
+import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
 import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BaseFieldConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 import com.ningdatech.basic.model.ApiResponse;
 

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * @description: 常量

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 
 import com.ningdatech.basic.util.StrPool;

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * 浙政钉常量

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 import java.math.BigDecimal;
 

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 import com.google.common.collect.Lists;
 

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * @author CMM

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareChoiceAction.java

@@ -1,12 +1,12 @@
 package com.hz.pm.api.common.statemachine.action;
 
 import cn.hutool.core.collection.CollUtil;
-import com.hz.pm.api.common.constant.ProjectDeclareConst;
-import com.hz.pm.api.common.constant.StateMachineConst;
+import com.hz.pm.api.common.model.constant.ProjectDeclareConst;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.statemachine.util.StateMachineUtils;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,7 @@ import org.springframework.statemachine.action.Action;
 
 import java.util.List;
 
-import static com.hz.pm.api.common.constant.StateMachineConst.APPLICATION_DECLARE;
+import static com.hz.pm.api.common.model.constant.StateMachineConst.APPLICATION_DECLARE;
 
 /**
  * 项目申报状态机选择分支action类

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJNAction.java

@@ -1,10 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.builder.ProjectDeclareStateMachineBuilder;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJYAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareKFBAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLDAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLQAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQTAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQYAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSBJAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSCAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSYAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareYHAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.statemachine.StateMachine;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java → hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.statemachine.contants;
+package com.hz.pm.api.common.statemachine.contant;
 
 /**
  * @Classname RegionContant

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStatusChangeEvent.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.common.statemachine.event;
 
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/factory/ProjectDeclareGuardFactory.java

@@ -1,12 +1,12 @@
 package com.hz.pm.api.common.statemachine.factory;
 
 import cn.hutool.core.collection.CollUtil;
-import com.hz.pm.api.common.constant.ProjectDeclareConst;
-import com.hz.pm.api.common.constant.StateMachineConst;
+import com.hz.pm.api.common.model.constant.ProjectDeclareConst;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.statemachine.util.StateMachineUtils;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
 import org.springframework.statemachine.StateContext;
@@ -14,7 +14,7 @@ import org.springframework.statemachine.guard.Guard;
 
 import java.util.List;
 
-import static com.hz.pm.api.common.constant.StateMachineConst.APPLICATION_DECLARE;
+import static com.hz.pm.api.common.model.constant.StateMachineConst.APPLICATION_DECLARE;
 
 /**
  * 项目申报状态机guard集合类

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/MachineBuilderFounder.java

@@ -2,7 +2,7 @@ package com.hz.pm.api.common.statemachine.util;
 
 import com.google.common.collect.Maps;
 import com.hz.pm.api.common.statemachine.builder.*;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java

@@ -2,14 +2,11 @@ package com.hz.pm.api.common.statemachine.util;
 
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;
-import com.hz.pm.api.common.constant.ProjectDeclareConst;
-import com.hz.pm.api.common.constant.RegionConst;
-import com.hz.pm.api.common.constant.StateMachineConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
 import com.hz.pm.api.common.statemachine.builder.ProjectDeclareStateMachineBuilder;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.ProjectStatusChange;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.INdProjectStatusChangeService;
@@ -23,7 +20,6 @@ import org.springframework.statemachine.StateMachine;
 import org.springframework.statemachine.persist.StateMachinePersister;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Objects;

hz-pm-api/src/main/java/com/hz/pm/api/common/util/BizUtils.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.common.util;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.basic.util.StrPool;
 import com.ningdatech.file.entity.vo.result.FileResultVO;
 import org.apache.commons.lang3.StringUtils;

hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExcelDownUtil.java

@@ -13,7 +13,7 @@ import com.ningdatech.basic.model.ApiResponse;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.basic.util.StrPool;
-import com.hz.pm.api.common.constant.CommonConst;
+import com.hz.pm.api.common.model.constant.CommonConst;
 import com.hz.pm.api.common.enumeration.ExportOptionEnum;
 import com.hz.pm.api.common.model.entity.ExcelExportWriter;
 import com.hz.pm.api.projectlib.model.entity.Project;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/controller/DashboardController.java

@@ -2,7 +2,6 @@ package com.hz.pm.api.dashboard.controller;
 
 import com.ningdatech.log.annotation.WebLog;
 import com.hz.pm.api.dashboard.manage.CockpitStatsManage;
-import com.hz.pm.api.dashboard.manage.DashboardExpertManage;
 import com.hz.pm.api.dashboard.manage.DashboardProjectManage;
 import com.hz.pm.api.dashboard.model.dto.CockpitStatsSaveDTO;
 import com.hz.pm.api.dashboard.model.po.QueryYearPO;
@@ -29,20 +28,12 @@ import java.util.List;
 @Api(value = "DashboardController", tags = "驾驶舱相关接口")
 public class DashboardController {
 
-    private final DashboardExpertManage dashboardExpertManage;
     private final DashboardProjectManage dashboardProjectManage;
 
     private final CockpitStatsManage cockpitStatsManage;
 
     private final CockpitStatsStatisticsTask cockpitStatsStatisticsTask;
 
-    @PostMapping("/expert-summary")
-    @ApiOperation("专家驾驶舱统计数据")
-    @WebLog("专家驾驶舱统计数据")
-    public ExpertDashboardSummaryVO getExpertDashboardSummary(@Valid @RequestBody QueryYearPO queryYearPO) {
-        return dashboardExpertManage.getExpertDashboardSummary(queryYearPO);
-    }
-
     @PostMapping("project-summary")
     @ApiOperation("驾驶舱项目总览")
     @WebLog("驾驶舱项目总览")

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.dashboard.constant.DashboardConstant;
 import com.hz.pm.api.dashboard.enums.CockpitAppcationTypeEnum;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/ProjectStatusHandler.java

@@ -2,7 +2,7 @@ package com.hz.pm.api.dashboard.handle;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.common.util.BizUtils;
 import com.hz.pm.api.dashboard.constant.DashboardConstant;
 import com.hz.pm.api.dashboard.model.vo.ProtraitProjectStatusSituationVO;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/helper/DashboardChartAssembler.java

@@ -5,7 +5,7 @@ import com.hz.pm.api.dashboard.constant.ChartTypeEnum;
 import com.hz.pm.api.dashboard.model.basic.AnalysisChart;
 import com.hz.pm.api.dashboard.model.basic.AnalysisData;
 import com.hz.pm.api.meta.helper.DictionaryCache;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/CockpitStatsManage.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.dashboard.constant.DashboardConstant;
 import com.hz.pm.api.dashboard.handle.CockpitStatsHandler;
 import com.hz.pm.api.dashboard.model.dto.CockpitApplicationDTO;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardExpertManage.java

@@ -1,163 +0,0 @@
-package com.hz.pm.api.dashboard.manage;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.dashboard.constant.ChartTypeEnum;
-import com.hz.pm.api.dashboard.helper.DashboardChartAssembler;
-import com.hz.pm.api.dashboard.helper.DashboardHelper;
-import com.hz.pm.api.dashboard.model.basic.AnalysisChart;
-import com.hz.pm.api.dashboard.model.basic.AnalysisData;
-import com.hz.pm.api.dashboard.model.basic.StarExpertBO;
-import com.hz.pm.api.dashboard.model.po.QueryYearPO;
-import com.hz.pm.api.dashboard.model.vo.ExpertDashboardSummaryVO;
-import com.hz.pm.api.expert.entity.ExpertUserFullInfo;
-import com.hz.pm.api.expert.service.IExpertUserFullInfoService;
-import com.hz.pm.api.meeting.entity.domain.Meeting;
-import com.hz.pm.api.meeting.entity.domain.MeetingExpertJudge;
-import com.hz.pm.api.meeting.entity.enumeration.MeetingStatusEnum;
-import com.hz.pm.api.meeting.service.IMeetingExpertJudgeService;
-import com.hz.pm.api.meeting.service.IMeetingService;
-import com.hz.pm.api.meta.constant.ExpertDictTypeEnum;
-import com.hz.pm.api.meta.model.entity.ExpertDictionary;
-import com.hz.pm.api.meta.service.IExpertDictionaryService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author liuxinxin
- * @date 2023/8/2 上午10:39
- */
-
-@Component
-@RequiredArgsConstructor
-public class DashboardExpertManage {
-
-    private final DashboardHelper dashboardHelper;
-    private final IExpertUserFullInfoService iExpertUserFullInfoService;
-    private final IMeetingService iMeetingService;
-    private final IMeetingExpertJudgeService iMeetingExpertJudgeService;
-    private final IExpertDictionaryService iExpertDictionaryService;
-    private final DashboardChartAssembler dashboardChartAssembler;
-
-
-    public ExpertDashboardSummaryVO getExpertDashboardSummary(QueryYearPO req) {
-        String queryRegionCode = req.getRegionCode();
-        List<AnalysisChart> analysisChartList = new ArrayList<>();
-
-        // 获取丽水区域 code name Map
-        Map<String, String> liShuiRegionCodeNameMap = dashboardHelper.getLiShuiRegionCodeNameMap();
-        // 获取库内所有的专家列表
-        List<ExpertUserFullInfo> evidenceHasBeenSubmittedExpertInfoList = iExpertUserFullInfoService.list();
-        // 专家regionCode分组map列表
-        Map<String, List<ExpertUserFullInfo>> regionCodeExpertMap = evidenceHasBeenSubmittedExpertInfoList.stream()
-                .collect(Collectors.groupingBy(ExpertUserFullInfo::getRegionCode));
-
-        // 各区域专家数量
-        AnalysisChart regionExpertNumberChartAnalysisChart = new AnalysisChart();
-        List<AnalysisData> regionExpertNumberChartDataList = new ArrayList<>();
-        regionExpertNumberChartAnalysisChart.setChartType(ChartTypeEnum.REGION_EXPERT_NUMBER_CHART);
-        regionExpertNumberChartAnalysisChart.setDataList(regionExpertNumberChartDataList);
-        for (String regionCode : liShuiRegionCodeNameMap.keySet()) {
-            AnalysisData analysisData = new AnalysisData();
-            String regionName = liShuiRegionCodeNameMap.get(regionCode);
-            List<ExpertUserFullInfo> expertUserFullInfoList = regionCodeExpertMap.get(regionCode);
-            int expertCnt = 0;
-            if (CollectionUtil.isNotEmpty(expertUserFullInfoList)) {
-                expertCnt = expertUserFullInfoList.size();
-            }
-            analysisData.setKey(regionName);
-            analysisData.setValue(expertCnt);
-            regionExpertNumberChartDataList.add(analysisData);
-        }
-        analysisChartList.add(regionExpertNumberChartAnalysisChart);
-
-        // 查询区域的专家id 列表
-        List<Long> regionDegreeExpertIdList = new ArrayList<>();
-        if (StringUtils.isNotBlank(queryRegionCode)) {
-            List<ExpertUserFullInfo> expertUserFullInfoList = regionCodeExpertMap.get(queryRegionCode);
-            if (CollectionUtil.isNotEmpty(expertUserFullInfoList)) {
-                regionDegreeExpertIdList = expertUserFullInfoList.stream()
-                        .map(ExpertUserFullInfo::getUserId)
-                        .collect(Collectors.toList());
-            }
-        } else {
-            regionDegreeExpertIdList = evidenceHasBeenSubmittedExpertInfoList.stream()
-                    .map(ExpertUserFullInfo::getUserId)
-                    .collect(Collectors.toList());
-        }
-
-        if (CollectionUtil.isNotEmpty(regionDegreeExpertIdList)) {
-            // 区域学历分布
-            List<ExpertDictionary> degreeExpertDictionaryList = iExpertDictionaryService
-                    .listByUserId(regionDegreeExpertIdList, ExpertDictTypeEnum.DEGREE);
-            Map<String, List<String>> degreeCodeMap = degreeExpertDictionaryList.stream()
-                    .map(ExpertDictionary::getDictionaryCode)
-                    .collect(Collectors.groupingBy(Function.identity()));
-            AnalysisChart regionExpertEducationChartAnalysisChart =
-                    dashboardChartAssembler.assemblerAnalysisChart(degreeCodeMap, ChartTypeEnum.REGION_EXPERT_EDUCATION_CHART);
-            analysisChartList.add(regionExpertEducationChartAnalysisChart);
-
-            // 区域职称级别分布
-            List<ExpertDictionary> titleLevelExpertDictionaryList = iExpertDictionaryService
-                    .listByUserId(regionDegreeExpertIdList, ExpertDictTypeEnum.TITLE_LEVEL);
-            Map<String, List<ExpertDictionary>> titleLevelCodeMap = titleLevelExpertDictionaryList.stream()
-                    .collect(Collectors.groupingBy(ExpertDictionary::getDictionaryCode));
-            AnalysisChart regionExpertTitleLevelChartAnalysisChart =
-                    dashboardChartAssembler.assemblerAnalysisChart(titleLevelCodeMap, ChartTypeEnum.REGION_EXPERT_TITLE_LEVEL_CHART);
-            analysisChartList.add(regionExpertTitleLevelChartAnalysisChart);
-        }
-
-        // 评审次数
-        List<Meeting> normalMeetingList = iMeetingService.list(Wrappers.lambdaQuery(Meeting.class)
-                .ne(Meeting::getStatus, MeetingStatusEnum.CANCELED.getCode()));
-        Integer meetingCnt = normalMeetingList.size();
-
-        // 各类型评审次数
-        Map<String, List<Meeting>> meetingTypeMap = normalMeetingList.stream().collect(Collectors.groupingBy(Meeting::getType));
-        AnalysisChart meetingTypeCntChartAnalysisChart =
-                dashboardChartAssembler.assemblerAnalysisChart(meetingTypeMap, ChartTypeEnum.MEETING_TYPE_CNT_CHART);
-        analysisChartList.add(meetingTypeCntChartAnalysisChart);
-
-        // 明星专家列表
-        List<StarExpertBO> starExpertList = new ArrayList<>();
-        List<MeetingExpertJudge> meetingExpertJudgeList = iMeetingExpertJudgeService.list();
-        Map<Long, List<MeetingExpertJudge>> expertIdMeetingExpertJudgeMap = meetingExpertJudgeList.stream()
-                .collect(Collectors.groupingBy(MeetingExpertJudge::getExpertId));
-        Map<Long, String> expertIdExpertNameMap = evidenceHasBeenSubmittedExpertInfoList.stream()
-                .collect(Collectors.toMap(ExpertUserFullInfo::getUserId, ExpertUserFullInfo::getExpertName));
-
-        for (Long expertId : expertIdMeetingExpertJudgeMap.keySet()) {
-            String expertName = expertIdExpertNameMap.get(expertId);
-            List<MeetingExpertJudge> expertMeetingExpertJudgeList = expertIdMeetingExpertJudgeMap.get(expertId);
-            DoubleSummaryStatistics statistics = expertMeetingExpertJudgeList
-                    .stream().map(MeetingExpertJudge::getScore)
-                    .filter(Objects::nonNull).mapToDouble(Number::doubleValue).summaryStatistics();
-            double average = statistics.getAverage();
-            StarExpertBO starExpertBO = new StarExpertBO();
-            starExpertBO.setAveragePerformanceScore(average);
-            starExpertBO.setExpertId(expertId);
-            starExpertBO.setExpertName(expertName);
-            starExpertList.add(starExpertBO);
-        }
-        starExpertList = starExpertList.stream()
-                .sorted(Comparator.comparing(StarExpertBO::getAveragePerformanceScore)
-                        .reversed()).collect(Collectors.toList());
-        if (starExpertList.size() > 5) {
-            starExpertList = starExpertList.subList(0, 5);
-        }
-
-        // 装配返回类
-        ExpertDashboardSummaryVO expertDashboardSummaryVO = new ExpertDashboardSummaryVO();
-        expertDashboardSummaryVO.setMeetingCnt(meetingCnt);
-        expertDashboardSummaryVO.setStarExpertList(starExpertList);
-        expertDashboardSummaryVO.setAnalysisChartList(analysisChartList);
-        return expertDashboardSummaryVO;
-    }
-
-}
-

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardProjectManage.java

@@ -7,8 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
-import com.ningdatech.basic.util.StrPool;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.dashboard.constant.ChartTypeEnum;
 import com.hz.pm.api.dashboard.constant.DashboardConstant;
 import com.hz.pm.api.dashboard.handle.ApplicationHandler;
@@ -29,16 +28,12 @@ import com.hz.pm.api.gov.service.IGovOperationProjectBaseinfoService;
 import com.hz.pm.api.portrait.service.IProjectTagService;
 import com.hz.pm.api.projectdeclared.model.entity.Purchase;
 import com.hz.pm.api.projectdeclared.service.IPurchaseService;
-import com.hz.pm.api.projectlib.enumeration.InstTypeEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.InstTypeEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectDelayApply;
 import com.hz.pm.api.projectlib.service.INdProjectDelayApplyService;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.sys.model.req.NoticeListReq;
-import com.hz.pm.api.todocenter.model.req.ToBeProcessedReq;
-import com.hz.pm.api.todocenter.model.vo.TodoCenterStatisticsVO;
-import com.hz.pm.api.workbench.converter.WorkbenchConverter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/EarlyWarningStatisticsManage.java

@@ -7,9 +7,9 @@ import com.google.common.collect.Lists;
 import com.hz.pm.api.common.enumeration.ProjectProcessStageEnum;
 import com.hz.pm.api.common.model.entity.DataDTO;
 import com.hz.pm.api.dashboard.model.vo.EarlyWarningStatisticsVO;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.WarningFlowTypeEnum;
-import com.hz.pm.api.projectlib.enumeration.WarningOperationTypeEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.WarningFlowTypeEnum;
+import com.hz.pm.api.projectlib.model.enumeration.WarningOperationTypeEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectInst;
 import com.hz.pm.api.projectlib.service.IProjectInstService;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/FundStatisticsManage.java

@@ -12,7 +12,7 @@ import com.hz.pm.api.gov.service.IGovBizProjectApplyService;
 import com.hz.pm.api.gov.service.IGovBizProjectApproveService;
 import com.hz.pm.api.gov.service.IGovBizProjectBaseinfoService;
 import com.hz.pm.api.gov.service.IGovBizProjectProcureService;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/model/DataScopeDTO.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.datascope.model;
 
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import lombok.Data;
 
 import java.util.List;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/DashboardUserDataScopeProviderImpl.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertAdminDataScopeProviderImpl.java

@@ -6,7 +6,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.sys.model.dto.RegionDTO;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java

@@ -1,11 +1,11 @@
 package com.hz.pm.api.datascope.provider.impl;
 
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/HigherUserDataScopeProviderImpl.java

@@ -2,12 +2,12 @@ package com.hz.pm.api.datascope.provider.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.datascope.provider.impl;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java

@@ -2,12 +2,12 @@ package com.hz.pm.api.datascope.provider.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java

@@ -1,11 +1,11 @@
 package com.hz.pm.api.datascope.provider.impl;
 
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/VisitoyDataScopeProviderImpl.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.datascope.provider.impl;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/ding/task/EmployeeBatchGetTask.java

@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.GenericResult;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.ding.constants.DingOrganizationContant;
 import com.hz.pm.api.organization.model.entity.DingEmployeeInfo;
 import com.hz.pm.api.organization.model.entity.DingOrganization;
 import com.hz.pm.api.organization.service.IDingEmployeeInfoService;
 import com.hz.pm.api.organization.service.IDingOrganizationService;
-import com.hz.pm.api.user.constant.UserAvailableEnum;
+import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
 import com.hz.pm.api.user.entity.UserInfo;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.ningdatech.zwdd.ZwddIntegrationProperties;

hz-pm-api/src/main/java/com/hz/pm/api/ding/task/OrganizationBatchGetTask.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.model.GenericResult;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.ding.model.DingOrgInfoTreeDTO;
 import com.hz.pm.api.organization.model.entity.DingOrganization;
 import com.hz.pm.api.organization.service.IDingOrganizationService;
@@ -18,7 +18,6 @@ import com.ningdatech.zwdd.model.dto.DingScopesV2DTO;
 import com.ningdatech.zwdd.model.dto.PageSubOrganizationCodeDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertUserInfoAssembler.java

@@ -363,8 +363,6 @@ public class ExpertUserInfoAssembler {
         expert.setAddress(expertFullInfo.getAddress());
         expert.setExperience(expertFullInfo.getExperience());
         expert.setAcademicTitle(expertFullInfo.getAcademicTitle());
-        expert.setRegionCode(expertFullInfo.getRegionCode());
-        expert.setRegionLevel(expertFullInfo.getRegionLevel());
         expert.setRecommendFile(expertFullInfo.getRecommendFile());
         return expert;
     }

hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java

@@ -43,6 +43,8 @@ public class ExpertUserFullInfo implements Serializable {
      */
     private String mhUserId;
 
+    private String mhExpertId;
+
     /**
      * 专家编号
      */
@@ -92,10 +94,6 @@ public class ExpertUserFullInfo implements Serializable {
 
     private String email;
 
-    private String regionCode;
-
-    private Integer regionLevel;
-
     /**
      * 企业ID
      */
@@ -236,16 +234,10 @@ public class ExpertUserFullInfo implements Serializable {
     @ApiModelProperty("工作简历")
     private String resume;
 
-    /**
-     * TODO：重新处理单位
-     */
-    @TableField(exist = false)
+    //==================================================================================================================
+
     private String companyUniqCode;
 
-    /**
-     * TODO：重新处理单位
-     */
-    @TableField(exist = false)
     private String company;
 
 }

hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/PermissionCheckHelper.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.expert.helper;
 
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertAdminManage.java

@@ -25,7 +25,6 @@ import com.hz.pm.api.expert.model.cmd.ExpertAdminExpertManageQueryCmd;
 import com.hz.pm.api.expert.model.cmd.ExpertInfoModifyCmd;
 import com.hz.pm.api.expert.model.dto.ExpertAdminExpertListDTO;
 import com.hz.pm.api.expert.model.query.ExpertDictionaryQuery;
-import com.hz.pm.api.expert.model.query.ExpertTagQuery;
 import com.hz.pm.api.expert.model.req.AdminExpertBasicInfoModifyRequest;
 import com.hz.pm.api.expert.model.req.GetZzdInfoRequest;
 import com.hz.pm.api.expert.model.req.MetaApplyResultRequest;
@@ -36,9 +35,6 @@ import com.hz.pm.api.expert.service.ExpertAdminManageService;
 import com.hz.pm.api.expert.service.ExpertInfoService;
 import com.hz.pm.api.expert.service.IExpertMetaApplyService;
 import com.hz.pm.api.meta.constant.ExpertDictTypeEnum;
-import com.hz.pm.api.meta.constant.ExpertTagEnum;
-import com.hz.pm.api.meta.model.ExpertRegionInfo;
-import com.hz.pm.api.meta.model.bo.RegionContainsBO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.zwdd.client.ZwddClient;
 import com.ningdatech.zwdd.model.dto.DingInfoByMobileDTO;
@@ -74,25 +70,24 @@ public class ExpertAdminManage {
     /**
      * 专家管理员使用 专家库列表查询
      *
-     * @param query
-     * @return
+     * @param query \
+     * @return \
      */
     public PageVo<ExpertLibraryListItemVO> getExpertLibraryList(ExpertLibraryReq query) {
-        Long userId = LoginUserUtil.getUserId();
-        ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(query, userId);
+        ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(query);
         if (queryCmd.isHasNonData()) {
             return PageVo.empty();
         }
-        CommonPage<ExpertAdminExpertListDTO> pageResult = expertAdminManageService.getExpertLibraryList(queryCmd);
+        CommonPage<ExpertAdminExpertListDTO> page = expertAdminManageService.getExpertLibraryList(queryCmd);
 
         PageVo<ExpertLibraryListItemVO> pageVo = new PageVo<>();
-        pageVo.setTotal(pageResult.getItemsTotal());
-        pageVo.setRecords(expertAdminExpertManageAssembler.toViews(pageResult.getItems()));
+        pageVo.setTotal(page.getItemsTotal());
+        pageVo.setRecords(expertAdminExpertManageAssembler.toViews(page.getItems()));
         return pageVo;
     }
 
 
-    private ExpertAdminExpertManageQueryCmd buildExpertAdminExpertManageQueryCmd(ExpertLibraryReq query, Long userId) {
+    private ExpertAdminExpertManageQueryCmd buildExpertAdminExpertManageQueryCmd(ExpertLibraryReq query) {
         ExpertAdminExpertManageQueryCmd queryCmd = new ExpertAdminExpertManageQueryCmd();
         queryCmd.setPageNumber(query.getPageNumber());
         queryCmd.setPageSize(query.getPageSize());
@@ -102,39 +97,26 @@ public class ExpertAdminManage {
         if (StrUtils.isNotBlank(query.getCompany())) {
             queryCmd.setCompany(query.getCompany());
         }
-        List<ExpertDictionaryQuery> expertDictQueryList = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getTitleLevelDictionaryCode())) {
+        List<ExpertDictionaryQuery> dictQuery = new ArrayList<>();
+        if (StrUtils.isNotBlank(query.getTitleLevelDictionaryCode())) {
             ExpertDictionaryQuery expertDictQuery = new ExpertDictionaryQuery();
             expertDictQuery.setExpertInfoField(ExpertDictTypeEnum.TITLE_LEVEL.getKey());
             expertDictQuery.setDictionaryCodeList(CollectionUtil.toList(query.getTitleLevelDictionaryCode()));
-            expertDictQueryList.add(expertDictQuery);
+            dictQuery.add(expertDictQuery);
         }
-        if (StringUtils.isNotBlank(query.getCompanyAttributeDictionaryCode())) {
+        if (StrUtils.isNotBlank(query.getCompanyAttributeDictionaryCode())) {
             ExpertDictionaryQuery expertDictQuery = new ExpertDictionaryQuery();
             expertDictQuery.setExpertInfoField(ExpertDictTypeEnum.COMPANY_ATTRIBUTE.getKey());
             expertDictQuery.setDictionaryCodeList(CollectionUtil.toList(query.getCompanyAttributeDictionaryCode()));
-            expertDictQueryList.add(expertDictQuery);
+            dictQuery.add(expertDictQuery);
         }
-        if (StringUtils.isNotBlank(query.getExpertTypeDictionaryCode())) {
+        if (StrUtils.isNotBlank(query.getExpertTypeDictionaryCode())) {
             ExpertDictionaryQuery expertDictQuery = new ExpertDictionaryQuery();
             expertDictQuery.setExpertInfoField(ExpertDictTypeEnum.EXPERT_TYPE.getKey());
             expertDictQuery.setDictionaryCodeList(CollectionUtil.toList(query.getExpertTypeDictionaryCode()));
-            expertDictQueryList.add(expertDictQuery);
-        }
-        List<ExpertTagQuery> expertTagQueryList = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getExpertSourceTagCode())) {
-            ExpertTagQuery expertTagQuery = new ExpertTagQuery();
-            expertTagQuery.setExpertInfoField(ExpertTagEnum.EXPERT_SOURCE.getKey());
-            expertTagQuery.setTagCodeList(CollectionUtil.toList(query.getExpertSourceTagCode()));
-            expertTagQueryList.add(expertTagQuery);
-        }
-        if (StringUtils.isNotBlank(query.getGoodAtTagCode())) {
-            ExpertTagQuery expertTagQuery = new ExpertTagQuery();
-            expertTagQuery.setExpertInfoField(ExpertTagEnum.GOOD_AT.getKey());
-            expertTagQuery.setTagCodeList(CollectionUtil.toList(query.getGoodAtTagCode()));
-            expertTagQueryList.add(expertTagQuery);
+            dictQuery.add(expertDictQuery);
         }
-        if (StringUtils.isNotBlank(query.getExpertAccountStatus())) {
+        if (StrUtils.isNotBlank(query.getExpertAccountStatus())) {
             QueryExpertAccountStatusEnum queryExpertAccountStatus = QueryExpertAccountStatusEnum.of(query.getExpertAccountStatus());
             switch (queryExpertAccountStatus) {
                 case NORMAL:
@@ -150,53 +132,8 @@ public class ExpertAdminManage {
             queryCmd.setExpertAccountStatusList(CollectionUtil.toList(ExpertAccountStatusEnum.AVAILABLE, ExpertAccountStatusEnum.FREEZE));
         }
 
-        List<RegionContainsBO> expertAdminContainsRegionList;
-        // 如果为超级管理员，可以查看所有的专家，包括没有层级的专家
-        boolean isSuperAdmin;
-        if (!(isSuperAdmin = permissionCheckHelper.isSuperAdmin())) {
-            expertAdminContainsRegionList = regionLimitHelper.getExpertAdminContainsRegion(userId);
-        } else {
-            expertAdminContainsRegionList = Collections.emptyList();
-        }
-
-        List<RegionContainsBO> containsRegion = null;
-        if (Objects.nonNull(query.getExpertRegionInfo())) {
-            RegionContainsBO containsRegionBo = regionLimitHelper.getContainsRegionBo(query.getExpertRegionInfo().getRegionLevel()
-                    , query.getExpertRegionInfo().getRegionCode());
-            if (isSuperAdmin) {
-                containsRegion = Collections.singletonList(containsRegionBo);
-            } else {
-                containsRegion = regionLimitHelper.queryContainsRegionAssembler(containsRegionBo, expertAdminContainsRegionList);
-                if (containsRegion.isEmpty()) {
-                    queryCmd.setHasNonData(true);
-                    return queryCmd;
-                }
-            }
-        }
-
-        List<RegionContainsBO> intentionRegions = null;
-        if (query.getIntentionRegionInfo() != null) {
-            ExpertRegionInfo intentionRegionInfo = query.getIntentionRegionInfo();
-            RegionContainsBO containsRegionBo = regionLimitHelper.getContainsRegionBo(intentionRegionInfo.getRegionLevel()
-                    , intentionRegionInfo.getRegionCode());
-            if (isSuperAdmin) {
-                intentionRegions = Collections.singletonList(containsRegionBo);
-            } else {
-                intentionRegions = regionLimitHelper.queryContainsRegionAssembler(containsRegionBo, expertAdminContainsRegionList);
-                if (intentionRegions.isEmpty()) {
-                    queryCmd.setHasNonData(true);
-                    return queryCmd;
-                }
-            }
-        }
-        if (containsRegion == null && intentionRegions == null) {
-            containsRegion = expertAdminContainsRegionList;
-        }
-        queryCmd.setExpertDictionaryQueryList(expertDictQueryList);
-        queryCmd.setExpertTagQueryList(expertTagQueryList);
+        queryCmd.setExpertDictionaryQueryList(dictQuery);
         queryCmd.setIsDingUser(query.getIsDingUser());
-        queryCmd.setRegionContainsList(containsRegion);
-        queryCmd.setIntentionRegionList(intentionRegions);
         queryCmd.setPageSize(query.getPageSize());
         queryCmd.setPageNumber(query.getPageNumber());
         return queryCmd;

hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertManage.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.expert.manage;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.common.model.entity.KeyValDTO;
 import com.hz.pm.api.expert.assembler.ExpertInfoCmdAssembler;
 import com.hz.pm.api.expert.entity.ExpertUserFullInfo;
@@ -17,6 +17,7 @@ import com.hz.pm.api.expert.model.vo.ExpertDetailVO;
 import com.hz.pm.api.expert.model.vo.ExpertPortraitVO;
 import com.hz.pm.api.expert.service.ExpertInfoService;
 import com.hz.pm.api.expert.service.IExpertUserFullInfoService;
+import com.hz.pm.api.external.MhExpertQrCodeGenClient;
 import com.hz.pm.api.meeting.entity.domain.MeetingExpertJudge;
 import com.hz.pm.api.meeting.entity.dto.ExpertInvitedRecordDTO;
 import com.hz.pm.api.meeting.entity.enumeration.ExpertAttendStatusEnum;
@@ -35,9 +36,9 @@ import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.sys.service.IUserRoleService;
-import com.hz.pm.api.user.constant.UserAvailableEnum;
+import com.hz.pm.api.user.model.enumeration.UserAvailableEnum;
 import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.entity.enumeration.RoleEnum;
+import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
@@ -79,6 +80,7 @@ public class ExpertManage {
     private final IMeetingExpertJudgeService expertJudgeService;
     private final IExpertDictionaryService expertDictionaryService;
     private final DictionaryCache dictionaryCache;
+    private final MhExpertQrCodeGenClient expertQrCodeGenClient;
 
 
     @Value("${expert-registration.verify-code.check:true}")
@@ -133,6 +135,8 @@ public class ExpertManage {
         if (expertType != null) {
             isTechExpert = expertType.get(0).getDictionaryName().contains("技术");
         }
+        String expertQrCode = expertQrCodeGenClient.genExpertQrCode(eui.getMhExpertId());
+        expertDetail.setExpertQrCodeBase64(expertQrCode);
         expertDetail.setIsTechExpert(isTechExpert);
         return expertDetail;
     }

hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertMetaApplyManage.java

@@ -383,16 +383,6 @@ public class ExpertMetaApplyManage {
             }
             expertApplyMetaVO.setName(expertUserFullInfo.getExpertName());
 
-            RegionDTO regionDTO = regionCacheHelper.getByCodeAndLevel(expertUserFullInfo.getRegionCode(), expertUserFullInfo.getRegionLevel());
-
-            if (Objects.nonNull(regionDTO)) {
-                ExpertRegionInfo expertRegionInfo = new ExpertRegionInfo();
-                expertRegionInfo.setRegionCode(expertUserFullInfo.getRegionCode());
-                expertRegionInfo.setRegionLevel(expertUserFullInfo.getRegionLevel());
-                expertRegionInfo.setRegionName(regionDTO.getRegionName());
-                expertApplyMetaVO.setExpertRegionInfo(expertRegionInfo);
-            }
-
             List<ExpertDictionary> titleLevelDictionaryList = titleLevelDictMap.get(userId);
             if (CollectionUtils.isNotEmpty(titleLevelDictionaryList)) {
                 expertApplyMetaVO.setTitleLevel(titleLevelDictionaryList.stream().map(r -> {

hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ReviewTemplateSettingsManage.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.util.CollUtils;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.expert.model.dto.ReviewTemplateSettingsDTO;
 import com.hz.pm.api.expert.model.entity.ReviewTemplateSettings;
 import com.hz.pm.api.expert.model.enumeration.ReviewTemplateTypeEnum;

hz-pm-api/src/main/java/com/hz/pm/api/expert/mapper/ExpertAdminManageMapper.xml

@@ -11,39 +11,12 @@
             <if test="query.company != null and query.company !='' ">
                 AND company LIKE CONCAT('%',#{query.company, jdbcType=BIGINT},'%')
             </if>
-            <if test="query.regionCode != null and query.regionCode != '' and query.regionLevel != null and query.regionLevel != '' ">
-                AND region_code = #{query.regionCode} AND region_level = #{query.regionLevel}
-            </if>
             <if test="query.isDingUser != null and query.isDingUser == true ">
                 AND is_ding_user = 'Y'
             </if>
             <if test="query.isDingUser != null and query.isDingUser == false ">
                 AND is_ding_user = 'N'
             </if>
-            <if test="query.regionContainsList != null and query.regionContainsList.size >0 ">
-                AND (
-                <foreach collection="query.regionContainsList" item="regionContains" index="index" separator="OR">
-                    (<![CDATA[ region_level>= #{regionContains.parentRegionTreeLevel} AND region_code IN ]]>
-                    <foreach collection="regionContains.containsRegionCodeList" item="containsRegionCode" index="index"
-                             open="("
-                             close=")"
-                             separator=",">#{containsRegionCode}
-                    </foreach>
-                    )
-                </foreach>
-                )
-            </if>
-            <if test="query.intentionRegionList != null and query.intentionRegionList.size > 0">
-                AND exists(select 1 from expert_intention_work_region eiwr where eiwr.user_id = nd_expert_user_full_info.user_id and
-                <foreach collection="query.intentionRegionList" item="intentionRegions" open="(" close=")" separator="or">
-                    (<![CDATA[ region_level>= #{intentionRegions.parentRegionTreeLevel} AND region_code IN ]]>
-                    <foreach collection="intentionRegions.containsRegionCodeList" item="intentionRegionCode"
-                             index="index" open="(" close=")" separator=",">#{intentionRegionCode}
-                    </foreach>
-                    )
-                </foreach>
-                )
-            </if>
         </where>
         ORDER BY update_on DESC
     </sql>
@@ -106,14 +79,6 @@
     <select id="listExpertUserId" resultType="java.lang.Long"
             parameterType="com.hz.pm.api.expert.model.query.ListExpertQuery">
         <include refid="Expert_Full_Info_Region"/>
-        <!--        <if test="query.expertTagQueryList != null and query.expertTagQueryList.size >0 ">-->
-        <!--            INTERSECT-->
-        <!--            <include refid="Expert_Tag_Relation"/>-->
-        <!--        </if>-->
-        <!--        <if test="query.expertDictionaryQueryList != null and query.expertDictionaryQueryList.size >0 ">-->
-        <!--            INTERSECT-->
-        <!--            <include refid="Expert_Dictionary_Relation"/>-->
-        <!--        </if>-->
     </select>
 
     <select id="listExpertDictionaryUserId" resultType="java.lang.Long"

hz-pm-api/src/main/java/com/hz/pm/api/expert/model/vo/ExpertDetailVO.java

@@ -1,6 +1,7 @@
 package com.hz.pm.api.expert.model.vo;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.hz.pm.api.expert.model.dto.DictionaryVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -69,12 +70,6 @@ public class ExpertDetailVO {
     @ApiModelProperty(value = "电子邮箱")
     private String email;
 
-    @ApiModelProperty(value = "区域代码")
-    private String regionCode;
-
-    @ApiModelProperty(value = "区域级别")
-    private Integer regionLevel;
-
     @ApiModelProperty(value = "企业ID")
     private String mhCompanyId;
 
@@ -127,6 +122,7 @@ public class ExpertDetailVO {
     @ApiModelProperty(value = "政治面貌")
     private String political;
 
+    private String expertQrCodeBase64;
 
     @ApiModelProperty(value = "籍贯")
     private String hometown;
@@ -138,13 +134,14 @@ public class ExpertDetailVO {
     private LocalDate birthday;
 
     @ApiModelProperty(value = "入库时间")
-
+    @JSONField(format = "yyyy-MM-dd")
     private LocalDateTime inPutTime;
 
     @ApiModelProperty(value = "是否入库")
     private String isPut;
 
     @ApiModelProperty(value = "发证日期")
+    @JSONField(format = "yyyy-MM-dd")
     private LocalDateTime awardCertDate;
 
     @ApiModelProperty(value = "信创创建人")