From 1e29d341e3b229db31ab209d33a6b6e2c3316129 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Mon, 1 Feb 2021 16:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/.gitignore | 33 -- bin/Dockerfile-gz | 7 - bin/README.md | 10 - bin/config-gz | 17 - bin/deployment-gz.yaml | 83 --- bin/pom.xml | 117 ----- .../BizServiceEbtpExtendApplication.class | Bin 2190 -> 0 bytes .../column/BizBidNoticeField.class | Bin 1319 -> 0 bytes .../controller/BizBidNoticeController.class | Bin 9261 -> 0 bytes .../bizbidnotice/dao/BizBidNoticeMapper.class | Bin 3885 -> 0 bytes .../dao/mapper/BizBidNoticeMapper.xml | 134 ----- .../bizbidnotice/entity/BizBidNotice.class | Bin 8002 -> 0 bytes .../service/IBizBidNoticeService.class | Bin 2113 -> 0 bytes .../impl/BizBidNoticeServiceImpl.class | Bin 6025 -> 0 bytes .../column/BizBidSharedField.class | Bin 1365 -> 0 bytes .../controller/BizBidSharedController.class | Bin 7627 -> 0 bytes .../bizbidshared/dao/BizBidSharedMapper.class | Bin 2275 -> 0 bytes .../dao/mapper/BizBidSharedMapper.xml | 54 -- .../bizbidshared/entity/BizBidShared.class | Bin 8175 -> 0 bytes .../service/IBizBidSharedService.class | Bin 1417 -> 0 bytes .../impl/BizBidSharedServiceImpl.class | Bin 3320 -> 0 bytes .../column/BizBidSharedRecordField.class | Bin 1409 -> 0 bytes .../BizBidSharedRecordController.class | Bin 6426 -> 0 bytes .../dao/BizBidSharedRecordMapper.class | Bin 1761 -> 0 bytes .../dao/mapper/BizBidSharedRecordMapper.xml | 66 --- .../entity/BizBidSharedRecord.class | Bin 8485 -> 0 bytes .../service/IBizBidSharedRecordService.class | Bin 1427 -> 0 bytes .../impl/BizBidSharedRecordServiceImpl.class | Bin 3117 -> 0 bytes bin/src/main/resources/application-dev.yml | 194 ------- bin/src/main/resources/application.yml | 3 - bin/src/main/resources/file.conf | 66 --- bin/src/main/resources/logback.xml | 89 ---- bin/src/main/resources/registry.conf | 79 --- bin/src/main/resources/seata.conf | 21 - .../swagger-configuration.properties | 7 - deployment-gz.yaml | 6 - .../BizServiceEbtpExtendApplication.java | 12 +- .../extend/export/bean/BizBidOpenroom.java | 110 ++++ .../export/bean/BizSupplierRegister.java | 67 +++ .../extend/export/bean/ProjectSection.java | 2 + .../mall/ebtp/extend/export/bean/Tdoc.java | 28 + .../export/controller/ExportController.java | 495 +++++++++++++----- .../ebtp/extend/export/model/开标记录表.docx | Bin 18016 -> 17978 bytes .../ebtp/extend/export/model/打分汇总表.docx | Bin 18987 -> 0 bytes .../ebtp/extend/export/model/打分汇总表.xls | Bin 0 -> 6375 bytes .../extend/export/model/评审专家签到表.docx | Bin 18928 -> 19084 bytes .../ebtp/extend/export/model/评标报告.docx | Bin 22966 -> 24023 bytes .../extend/export/services/ExportService.java | 38 +- .../services/ExportServiceFallback.java | 11 +- .../export/services/ExportServiceOpen.java | 44 ++ .../ExportServiceOpenFallbakFactory.java | 28 + .../export/services/ExportServiceResps.java | 23 + .../ExportServiceRespsFallbakFactory.java | 26 + .../vo/BidEvalDetailJudgesSummaryVO.java | 2 +- .../export/vo/BidEvalDetailSummaryVO.java | 62 ++- 55 files changed, 805 insertions(+), 1129 deletions(-) delete mode 100644 bin/.gitignore delete mode 100644 bin/Dockerfile-gz delete mode 100644 bin/README.md delete mode 100644 bin/config-gz delete mode 100644 bin/deployment-gz.yaml delete mode 100644 bin/pom.xml delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/column/BizBidNoticeField.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/column/BizBidSharedField.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/column/BizBidSharedRecordField.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/BizBidSharedRecordMapper.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/IBizBidSharedRecordService.class delete mode 100644 bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.class delete mode 100644 bin/src/main/resources/application-dev.yml delete mode 100644 bin/src/main/resources/application.yml delete mode 100644 bin/src/main/resources/file.conf delete mode 100644 bin/src/main/resources/logback.xml delete mode 100644 bin/src/main/resources/registry.conf delete mode 100644 bin/src/main/resources/seata.conf delete mode 100644 bin/src/main/resources/swagger-configuration.properties create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/打分汇总表.docx create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/打分汇总表.xls create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpenFallbakFactory.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceResps.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceRespsFallbakFactory.java diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/bin/Dockerfile-gz b/bin/Dockerfile-gz deleted file mode 100644 index 982ea9b..0000000 --- a/bin/Dockerfile-gz +++ /dev/null @@ -1,7 +0,0 @@ -FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0 -ENV LC_ALL=zh_CN.utf8 -ENV LANG=zh_CN.utf8 -ENV LANGUAGE=zh_CN.utf8 -RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 -ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] diff --git a/bin/README.md b/bin/README.md deleted file mode 100644 index 33c31eb..0000000 --- a/bin/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# 扩展功能微服务组件 - - 公告通知功能、共享文档... - -## 组件模块 - - 1. 包名：功能 - 2. 包名：功能 - 3. 包名：功能 - diff --git a/bin/config-gz b/bin/config-gz deleted file mode 100644 index 6fe3b43..0000000 --- a/bin/config-gz +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - server: https://10.125.164.35:48662 - name: demok8s -contexts: -- context: - cluster: demok8s - user: cluster-admin - name: default -current-context: default -kind: Config -users: -- name: cluster-admin - user: - token: df5e4896a4f6d1b1447b2584ca7405f7 diff --git a/bin/deployment-gz.yaml b/bin/deployment-gz.yaml deleted file mode 100644 index ae3756b..0000000 --- a/bin/deployment-gz.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# 接口版本 -apiVersion: apps/v1 -# 接口类型 -kind: Deployment -metadata: - name: biz-service-ebtp-extend - namespace: default - labels: - app: biz-service-ebtp-extend - -# 必选，详细定义 -spec: - # pod 副本数量 - replicas: 1 - - # 滚动升级配置信息 - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 1 - - # 选择器，匹配pod模板 - selector: - matchLabels: - app: biz-service-ebtp-extend - - template: - metadata: - labels: - # 模板名称 - app: biz-service-ebtp-extend - - # 定义容器模板，该模板可以包含多个容器 - spec: - # 挂载日志存储 - volumes: - - name: log - persistentVolumeClaim: - claimName: log-pvc - readOnly: false - - name: storage - persistentVolumeClaim: - claimName: file-pvc - readOnly: false - - # 必选，Pod中容器列表 - containers: - - name: biz-service-ebtp-extend - image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest - # 在容器中挂载日志存储区 - volumeMounts: - - name: log - mountPath: /log - - name: storage - mountPath: /storage - # 需要暴露的端口库号列表 - ports: - - containerPort: 18018 - # 容器运行前需设置的环境变量列表 - env: - # Apollo 配置中心变量设置 - - name: APOLLO_CONFIGSERVICE - value: http://10.242.31.158:6001 ---- -kind: Service -apiVersion: v1 -metadata: - name: biz-service-ebtp-extend - namespace: default - labels: - app: biz-service-ebtp-extend - annotations: - lb.cke.tg.unicom/target-vports: 18018-18018 -spec: - ports: - - port: 18018 - targetPort: 18018 - selector: - app: biz-service-ebtp-extend -status: - loadBalancer: {} - ---- \ No newline at end of file diff --git a/bin/pom.xml b/bin/pom.xml deleted file mode 100644 index f696803..0000000 --- a/bin/pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - 4.0.0 - - - com.chinaunicom.ebtp - mall-ebtp-cloud-parent - 0.0.1-SNAPSHOT - - - com.chinaunicom.mall.ebtp - biz_service_ebtp_extend - 0.0.1 - biz_service_ebtp_extend - - - - - com.chinaunicom.mall.ebtp - uboot-core - 0.0.2-SNAPSHOT - - - com.chinaunicom.ebtp - mall-ebtp-cloud-security-starter - - - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-attachment-sdk - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-eureka-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-feign-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-apollo-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-jpa-starter - - - mysql - mysql-connector-java - - - org.apache.shardingsphere - sharding-jdbc-spring-boot-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-seata-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-swagger-starter - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-redis-starter - - - - - - - maven-snapshot-local - maven-snapshot-local - http://ccp.tianti.tg.unicom.local/artifactory/tianti-maven-snapshot-local/ - - false - - - true - - - - - - - - src/main/resources - true - - - src/main/java - - **/mapper/*Mapper.xml - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.class deleted file mode 100644 index 7a2e252d24ecce69fe7fda4a65c139c76c0fd035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2190 zcmds2OK%e~5T0$5CRqY0ee#st(nHE&_kx5(5mFmcsZv@HDU}c>XV*#G?%Ip(javQ~ z5=e08MJ6|n8p$d(j+K1fwwGMC@!gr!P(SZvOwIBg4xwYbap zK(r#xgwaip{47VIuZgwtcGk39NX|>V8!yKe>kEuhO9S0UVGN92BRot$B2}@?kwF9p^*USA| z$m^B^99U_-FFIfqRvd`0!0p!;H3!_hGIo*A9oU%ieP#6J!2LI=Fg#{^V#GDaz-`+f zB`YY5+iItn&zm+J!+&c)+ZfZ}@R;;rMdJfcyGAdSw%%igNM`o!m& zhY8L1xz@-Uhxi?8SOffJ@rMVP!C4vRu&?0i2}&It-7ipmx8Qz)`nOD{fxXoMZ1dRH zb1k?H3%IJmA}pcAB0QczSS~Q%>s@QTu1fzH z5=e08M6ZM#yaxCKoDD|11`^l`8s zoe1s-bjJJPus@g%-w{|HUHA{2mHPM#Cur6TPPM}z73?H($vqP3zONhPM5C8)Ms zCmy~ZwP6j7bzW{2fvc~jmhKIKE4}Rrfo9*tq6K%5dQsuPT4URAk2K&=Tag)cDq@OX zIF*VyX*5l(iIhmPm(=ToGeKj)6|+c68UM(R1>HinU+axu^u{lG%H;I-fYp> zh>T*+G+~aj9336kk=U|sghhen&qjmSRA&}=G+-e%K_+Z zQ<>3R$Kpt841a_kd}q0Gb+%9U^2`+;WKpJzd`sb)q}M5jhH|Eh>LNjZe^zHGqwZ5G z{!5Yv8}OhD>+q1kTJQ1}6f?9u!qUfi5(yhJ9E)OI3}tSoS4Y`U4u2uw!*Vu^7b zy#te5E_QJx2&`XP^ZB&2;MpI$UbY1{b5CX&Zgq%#$Y2w2J@9X50gGRNtB6{N8qh}U z)$ldMi#5E2c%_D~Bfe3?H&F>wgIjpsM#bkCh2Ycs3L76*?|z2+-{)~Co<&r^-zJ{j Wk_B7v2vGwb&(9~&!)FtHPk#aOM1UUv diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.class deleted file mode 100644 index 070b78193ec6593944a3244083d640fd748b1bf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9261 zcmeHN-BKJy6g~}vWfvldNzlZfNsJ0*-1R3$4M+)?q|hNjAZWBKt9Q1ubex@;%=941 zjZff(cUDYx%)d2 zy+dCVsE^T?QRq|}TzZuoe3Mrkzfo~Eq{m}V>iY(F-HNEHpdz-E@M@K+yj_(w&sWkB zp!QVgyRHZ;^YZq*tX)pV7j}jVG{9&q;p}p+Ub#}eAsof%hy}b@z?Jm9h*8O25s@EYtoiXEd%~YxDbYZI7H)Y?ANPa2yAy# z)GX*LkZv+5D+qnevJsuPO2xGeVbz4=asXHXcfRIzVVweX+0b-ZYr3p8U2bZ+Y-+mP z*7PZ>=8MRJ_*R1}XTwrpFSY{c)npH|f~EAzde(S-pJ2_|%SPab%1T(pO1hTAwf?QD zu(qY|Aly0-B0sEW@p&vsV9+eR{BI=E&zj1IhM(8u@Sh^k;;nVK!jM`UZld<737<(D@Z;ry2A*qk^f= zWk0Xxb)1Ge0%%-h;M)?ay+5wGqhye_{A1p)-O8Zsf@y{{rD7(*er(>eOP1?osy&n7 z5wy#^@4Esq=>AIvt9qG-JZ+0HS9Jd6vd&$J1gRryFu8THr1lf3de+R)e|~FrVX2=KRAkr5i9qiC5-+U?%PstQpXP3zvrsEvx{a@?qja81W2M&q{caCbXiwFU>&hC~Z`Qa z_CV?@MlalJ_BHe%c3FH7-a6;H=qO6mu^~KnD#ICD$$8>`CGCHSE5XNxLimpEPckal zNiGc!dX2Ha9{~^QRUCV?F-pbm>qj_K9MrfHL-aahKlIFRwxIV}Oq#n#N{HQ`nFg-& zYK#MoNn2;_oqN>D)E}@DHS6=%7Gx$_Sn=l=`~Gn=xv7E_>zFowIQ0>hx@ zeIGrCSr8Q%NKWBqn{6NNn`~c9VS6Tp?Mry0NK9jEMsV%_igGaz$}0xSWFpI`R_au1 z8n5EoDbtx0nfM-P6V$I|0>hSQ`l8t~DtBNHGpKYMyA!vPf*b6CJ4SuGaRK-Sy}4t! zw-RA@0MDih`gRK7x48f{KZgI{H~_%!x&VB)Tfp~HB>b@p!0B!QXHo!v=>qV$0XUn- zh99H=-su8x-T++41DGb^pSc11=|i|qA6-a-SqXO+@q7uN&+!>YX#0q4x=hQoLTj{6 GpZyB~`Xl%N diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.class deleted file mode 100644 index 81acf5fddb587aedf29f26a71b204ef6e3aa969c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3885 zcmeHK>2K386o1~vvX+e-EmAuKNJ#t8I?sN7@AoeI`Nz*M-vHnNR4o`FupBGjZBs7X4|IdNzHGbx zIv2DfxcP3=Fmzc{M=smcOayL|Z#Q`$q~<&iCRWk9CMiEmM3=x<}#D!F} z+}F(y%+~})7W|M4t``Xm&R13m3_Xznv!Fy^e3$!~Qc{h;aZ;|l6^g|&++cx?SRx)$ z&84s-C7U5@$B*rDsj<%NfcYU+$P`ikBW*Ez4!ND26^^mOF;+OK6;9p?2d$X11Ic0= z&9d86`|Gwwxok5++X!)neLI6M^>y3J$8o zow>WaTELK{W!39`R6L`gih5UgOHkcW2vYuCZ3|w$iK;H5_KV9MVfxd$*x)fo&m?yf z`a~_6el=;vV|0j@%;Sb*8#L@7)Y<(T8`u`^*>fUuVr{FzwF$xXBI~;TIOv##L$DWE zRz~$pVVH(-a+lbFGqgsV9RicxxO-WhqLIU&Hq*sHEhDt~(`GW3S7b-|>^V2q%;bHU zw#>SBxPy-`W4#6U2#oE?PzxTIMND@K9_@L@r8R_VU-CG{2H8Y49wva#Iebt8 zm?}I5!$@05UG2_(g^_nt<qA`V5@i zq0b>byKmjzw|*Yx5;+&L@nSY!G9wJZkOp{+zf({`%-6wzn{XTM!hOX5 F@E6SK>YV@p diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml deleted file mode 100644 index 8f15396..0000000 --- a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select id,notice_name, notice_title, notice_content, notice_file,notice_release,notice_top, create_by, - create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_notice - - - - - - - - - - - - update biz_bid_notice - set - delete_flag="deleted" - where notice_id=#{notice_id} limit #{pageIndex},#{pageSize} - - - - update biz_bid_notice - set - notice_release="open" - where id=#{id} - - - - update biz_bid_notice - set - notice_release="close" - where id=#{id} - - - - update biz_bid_notice - set - notice_top="0" - where id=#{id} - - - - update biz_bid_notice - set - notice_top="1" - where id=#{id} - - - - - update biz_bid_notice - - notice_name = #{noticeName}, - notice_title = #{noticeTitle}, - notice_content = #{noticeContent}, - notice_file = #{noticeFile}, - notice_release=#{noticeRelease} - notice_top=#{noticeTop} - update_by = #{updatBy}, - update_date = #{updateDate}, - tenant_id = #{tenantId}, - tenant_name = #{tenantName}, - last_update_time = #{lastTpdateTime}, - - where ID=#{id} - - - - - update biz_bid_notice - set - delete_flag="deleted" - where ID=#{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.class deleted file mode 100644 index ca146468486a6e27d4688659626741c629623150..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8002 zcmeHMTXWk)6h2Cw`Vyy?G=|KM*hoL$M1OgE9`xMUcb8QIyRv)}pl?Af!s$AA3w%WnX18E76x z6u9NNdd>+=dIHx(G4W47mOw!fyC z9Wsi<_@AP{2sIQq*k~|&V_JbzD;+dtk-EJ}J=!wKjExjDAE7)2CK@viU1SC^mtE!% z*Wbb}qnjL2fnuYnVTZbbvYfx=pr{nkU(zgWOf+J$tG-Kxy|F-}NqrMl#)B48MHk>$ z!v5E3;^hi4iRN*8VOQoTkk>n|E4maLb?m%BTx3yjv<k0#@t1_(0y2}8DH)yI z91boIXB9XclU;CK<`&?b0@rWbF7cSTNemSy&7r37jOw@yM{ZqFOT}Phs;+UrsV$;L z9ek#0D)&pN1ZUudGF*U*==rPErv5brj#nNhG_{6A8q_9B9jirL;a~1ZrsD)_IL&A^ z6z2Rk#TojfG2}2qH;#L~zAK?G=eqtLLq~Q!UVy3sAEo;!)Zg7nIQwWfvQw@^X1G_z zki&8`yJM&sw?^?@9fP`n)I?Yp;2j0#(|K{_G*Y8zih~y`0X8QS2Ui%Wk;8)aktq10 z;KfxM#$zNZM_NrD(&b1)G!MmZgSB!fejf;8E7AIitwf?@h_fm(#Ac8oI(+>fs7&1~ zz;y-ArFscNmVDjOOboW3kPY(B^wd2CCKHi-3(dIHAQ(rd6XMm5^)9(n1ufa=KDyW(q+i^nEi4OKeGM% zw(G{gHu*uKuN9biHoB*rfvF9iABJaI7GU84W#DmTNC5MipK^jw;Osx|K~3CvdhS96 zJmN3#gAg7xyIZ9=NYzo`vw)8ftQDZC6#nevY$J2buu_u@dnhTl7kFs9NH1)#Mc_$z z&jBLC9aix5V(&SD^uj&a^(SuNPsF)H$==)*2GLE;#jCfY=@0Slr=G_ zGuP+k0?Dmqe^e+-qmr&+GONWNrs4FbC0x9N$r)Y8Ya+uF{;nmJVz)4rq9&>(JR(!{ zX0gPyAc}4&ioso)Zu3%1ifWf)w|17I9#+#*wCV=mnRZm#468(?VtR2S@?oC@gDq}H z)1uV%6f;pQO>xz}`LnNjT(K`LtlF)zj;oWP@^v&>F%YSg*P8hO4C_H-jc9RWYgBJz zy2bucjajHf3l>}BTE}NA#Os*;qJ|~1<8@odx-|88wfF`luIB3Ptvq~%DDeW$gN6m- zkbNF>tWNW_kOwRamy^pk4;wud_3ja_yciS}_(JpG9N?i2OXnpx38QcjTX}4aKmnf; zjA6Sh-j2XHejgU^j>1GJ=lWbe0>>n>Nr~*ZMD~nC_N+v90-h7LPKxgnX!{hL#?R+b z`WB8t!SB+qaOTqq^=CN$yU=|RKRHW)8}Jf-mIE!Qz!bI=xC9sRvx_i-vYincQiPY` zl>|b};Z+HTWhp`pUP~av9ApShDZ=X+INX&Yype&!=Td|>aSmcn#(sEP;)nZEgv;=5 z0wMN;48f2hyq6&!+ERoo8REf|B1~uC;7Ad!X5ipU5#GC3ae$jf_;jex;Yx0rr z9s2^TBt{WT zaPN;o%sMW0t4N_eA`bR=#@~MPvS*Hdeft3bFTr!*5`j;N4!k}S(%WVG%nMZC3wlDb zffV++&!WiV9TR(eXt)f$jyUXyP%0w=?j>CBTiI-g!-fbqQ)_Evbf7?BJ|&Hq?0Q?B zT^<+$rS%{ZQkV?_Q`Oowfx;UVatF!;=1$OWwN|TjFW2FsEc?L#AG+@$t?{IpY_bDLyx+tXCUmF!M}h{Q~QoWtQcp#Fcy*{^f4-kzh>4W%N^=oCS7u-q<_Hwmvmv-t^-soL%V;6HbvqX4d?ESfpx@!T&2Z8YSoBrEqHU&y)iYx` zq zeGNXc zE6n^v>m``SyTt%r3#rAf&_%ckR$hZ8v@fUj>!{y2qpzINZ=TU_!R?giPA2bW@}8AY d0Gcx2&pfQc1JnUryk;?~hp+}!jQkl){RY`+gh2oR diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.class deleted file mode 100644 index 220aa23c3d7a6956dbee034e585d5ba2108fc30d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6025 zcmeHL-E!MR6h50emF<`&4Nal6v}%Cj6p#uO0(Ba&`!je@lbJenh6`p`OB;KOEV-+- zN%}542Qx4O7u@kCyadBpOLk;eGm;aV&Ok1t{X6@ev)`Vxe}De{%WnX%2@f?`An<)4 zY_mhTXFjEUYTACswAx?@4oQ_3w*cF9398op2v9Q->y2EUjq5{23?H_21>FX$M#F#P^ zQ-)&72$?eCOc@bVhGJ@6cYGG;I0C&xrQOygDqsg)q$REZCk8>eXDGXk6Q~PEfSP?F z^#NEj|V_D<44|~0v$&VLo21jZl4Lk9hM?y`CgK%jPW}yV-^o&irV;aQbcEqHihD> z49;}4Q`k2@VrJ@Kr}RuN)$!n(-z2`YusZdg@JJHhqNZI!Gp;=~-**}H(x!S2Yy7E! z>eTsPp5h{u;Cu-Ruu5R9Y#klI8&YtuRZ$1@Ws7@kr`KsRu}AUDjW+|!x2gMt3a-jg zWlpv^p7op7yzeV`g(x`8Ws>dg?_<7fsq;-`qpofzMB?x?NOl-8IOYPij{QBRST~bX~6ti-Lvs| z2PcSm@+-~+6?XejgU@iwn9!-g9Rj7ep&D%AJ`%49EztlUhO~%s4Zg%RJ;@XeYWQ-b zoI`{ADu+7&YIwwh0Jkl*b_Q@A@QDc@(g=Qwa28Vyb1Kbax`b%~iuhl`(ruJfa>ZYv z^zG`opJC;9EG@vR_*Xp?$_4zFLMd2-i-Wq?;C1Xd#Jz-dL$n3VhiGpkpj}EpyMjIP zKv0dsA@C+#MGLNBegX6Z-0KOrR}*jvyajJVE<$=I#o8MQs5cW(C#@}?P{*wdIyO$I zV>5$}nSpO-001xn6!TL@394c@ZzJMy+`v-uS-!lLJ diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/column/BizBidSharedField.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/column/BizBidSharedField.class deleted file mode 100644 index 451a0a00e948d5cc1e10049e0f46fe1a84402f6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1365 zcmdT^OK;Oa5S|U8N!;{7q2*OzTPUP}>#FpR zA%O&UeiUNXj)+ljNE|qL>~FsD%2cpA9zQo+g`O`id=aK&rg@0bGK-YAEiSf2ILLi_g3GW5RRW87Ldn#z zci^A!z!0c(b_pzXr^LW$p^je@nA?d}YM3%3CNo}#1_q0eKx6Q3tKZ%|?CjQ|iLfYq zXsOu=wZGMC*I@x26H>8=PwD&DOItd z5i`M<8cfa46V#!c8r8>iLb-Ou`0HO3avGf|ks=U=rdh%@ZVsi?SzuyK3*}pzRHQUh zAwLod%O4?w-z<}+9PQFxmKw`o6lKb;w@6${=`@O_p#f8NcRr`TkJZGKQS&L`|8I~3 ztFYFD+ptbxxpjF|Y@;o7@qG5P$me>)d9jDL7U~d)Lt6q0&BP%yd|;Tfbg{3`cX(|{a- zAEVH&b}09%59mIv+J2{Mx4B1SkIUx{b=@j!ilE941oNC~lRs{9Cu-A>IVkOk(05%H zR_pw6ojZ-BfBmrAfN25?39?JQR`q`K0kZ{xiyUzdJA8 z&=2!4Pv&0#-V5X&Ntw00%``Kk1U<&wplFfw3+EJ+m%x`18V58JM ziqup^YO2!JR7KTPWuU2L)A3nk;_%H56?WSc2+s}z)Qbv_W2RJ)5j3byFDE0yeI3ul61eEZV5z6jn8G)y zDINu^SXc|VMq-;ij1h5@1_AfdyherF=majexiF(RU?DDDFA`yF3qLfwF{V^Dd1S_( z!}hp`3u_Pm!Dkw~LY1zVn{g!MKPY8VPp-r+umV{u^y7 zt<#=$WH=)a9K*Y`DxAP9V`%*z%b2V*t%;=n7ER1iDBFw@|vrvFV0+&kGVE@#Ou{F8BnzyiU`Y!G? zS-2xzjKHGh+tls5T(5Ilv^nn7ezHz=yNTOBqs4^GIs~qjEY(|UWlME06fHD(%cCL= zanLtM3a?laa^)!AYHbxkE?8>Bz>ahK)Qu5w&Qj_%?7#8!7B)%TOtA3CUUm-mvPm5* zYp7ZtmI!&0VUMZ~LbJ-1VQC~)eQ889Bzn~t8Z<=(8p$z0HM2RDGLpdcr_H{D+o2;C zpW#@ghv=|njSuz`a^iMH>2`?+p=;$sbQzAP6X^a{Qo*6)lu7QlXTWjJsLFUz=O#y9 z$_71C9X@^z(QeN0#4ZjTDp(%gBjnc?E~}o(O;{RgL*4jx#Pd|ltawCQvSgV!oK4?K z{bML+5}36Hg>#ZX)e02@*GGi>eX?FK;L~N3(KXbB*62rS4Y{fYjp+ZrP{&2>Fc*s( z0!zpEMX!{`Y?g;xg#2={CO?%T=lQDs@m{5oT&mpVvaG+VmRf^j-{gJ*?|9@DjB*+* z3t?HJU^^{n3rl|~p&szo4EO?rff}j|Sd%@<&5!}>Skv@s1Ox8i%~4wDGT| z|A5&a7BBn`3xDBT4qom_N|cNEJlmCmOK=(A2wZ_zU>aUcWM6}8*ct@8uj4}>Hiyq$ zSThB-oC3RyUlf2y1_?yq4Ta@K!ZI(X_GVAuZET0xN-1ogAH#M9rX(8z_DE$TVF|o5 z#C={Ww9h@v`)&$v;~3rr$Q|WH!uO$asM2aO*+aq)QYZRh3L(uzDDeo|en9w17Q&k; pgby&JVkV?_!1~M!RO|&^ zAz4of`y8_<@_5@M9zQf(hF)77w?&wCndYGvGUYYIaYKa7OtH(7glh*%1Qs*8h{=xk zx_!U{L!ev_A|Zv@CU9|mW1m3jsS3FR6#@$*^mDD1F2f8deSa%8PgT_CA;nk{5iui_ zq={DTh{x$;TCKFYoQ6DzY&bMw!3WmibQRHVE(_OY;o2>}mCDeV znV?Gz^76w3|!aOVxn63|Z;qtma+J1vd)$Dd$ z@P*{BdU2cU7Q=-{U@1#~pJ`#`p>n>%jUA1~QA-$$+A84lhr?PsdD!r+QH?;QDLRsw zo<`I98BFVb{==+oBh}hoPuhjHBl{v17-Ba3+;IKGF1T!arvw~7)1$#upG7_NyYjnX z3-`#l%`i&>yG1dcDxg0$DWkMc=l}jZ`3j0sZK|FQ_zPisb2VSH!7k0t5&~Xs2nGix z20hxi1;oocGEg$bE^=vJ3a*(Bx - - - - - - - - - - - - - - - - - - - - - - select id,shared_id, shared_name, shared_role, shared_file,shared_remarks, create_by, - create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_shared - - - - - - - - - update biz_bid_shared - set - delete_flag="deleted" - where ID=#{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.class deleted file mode 100644 index 854decc879493087b466102d96c9ca0c95609979..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8175 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 diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.class deleted file mode 100644 index 4fb7070b4b3e14e941b5371d45bbdefbcf172f54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6426 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 X_~$yTk?pX7ZfyZLtiuM}rc9M@>hCPa diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml deleted file mode 100644 index ed9b47a..0000000 --- a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select id,record_id, record_role, record_name, record_staff,record_account, create_by, - create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_shared_record - - - - - - - - - - update biz_bid_shared_record - set - delete_flag="deleted" - where ID=#{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.class deleted file mode 100644 index 285db3456f05d01f244b48465ffa6f59e70d3df1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8485 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 diff --git a/bin/src/main/resources/application-dev.yml b/bin/src/main/resources/application-dev.yml deleted file mode 100644 index 7d976f2..0000000 --- a/bin/src/main/resources/application-dev.yml +++ /dev/null @@ -1,194 +0,0 @@ -server: - port: 18018 - servlet: - context-path: / - -# 对应 apollo 配置中心的应用名 -app: - id: biz-service-ebtp-extend - -# Apollo 配置信息 -apollo: - meta: http://10.242.31.158:6001/ - bootstrap: - namespace: application - enabled: true - eagerLoad: - enabled: true - -spring: - aop: - auto: true #开启spring的aop配置 - proxy-target-class: true - - application: - name: biz-service-ebtp-extend - - shardingsphere: - datasource: - names: ds0 - ds0: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - jdbc-url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - filters: stat,wall,log4j - maxActive: 20 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 - props: - sql: - show: true - - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - serialization: - write-dates-as-timestamps: false - - # 天宫Kafka增加了安全认证，需要配置安全属性 - kafka: - bootstrap-servers: 10.125.164.192:32005,10.125.164.193:32005,10.125.164.194:32005 - template: - default-topic: jl_test - - # 生产者配置参数 - producer: - client-id: core-service-ebtp-crypt - properties: - security.protocol: SASL_PLAINTEXT - sasl.mechanism: SCRAM-SHA-256 - sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; - - # 消费者配置参数 - consumer: - group-id: core-service-ebtp-crypt-consumer - auto-offset-reset: latest - properties: - security.protocol: SASL_PLAINTEXT - sasl.mechanism: SCRAM-SHA-256 - sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; - - # 天宫 redis 需要使用哨兵进行访问 - redis: - sentinel: - master: eshop-redis - nodes: 10.125.164.124:32718, 10.125.164.118:32716, 10.125.164.121:32716 - password: Unicom#135 - - lettuce: - # jedis: - pool: - maxTotal: 50 - minIdle: 1 - maxWaitMillis: 5000 - maxIdle: 5 - testOnBorrow: true - testOnReturn: true - testWhileIdle: true - token: - database: 0 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - uuid: - database: 1 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - cache: - database: 2 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - -# 天宫Eureka配置 -eureka: - client: - service-url: - defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka - instance: - prefer-ip-address: true - hostname: ${spring.cloud.client.ip-address} - instance-ip: ${spring.cloud.client.ip-address}:${server.port} - -mybatis-plus: - configuration: - # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 - map-underscore-to-camel-case: true - auto-mapping-behavior: full - # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml - global-config: - # 逻辑删除配置 - db-config: - # logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic - logic-delete-value: deleted # 逻辑已删除值 - logic-not-delete-value: normal # 逻辑未删除值 - -# --------------feign ------------ -feign: - httpclient: - enabled: false - okhttp: - enabled: true - client: - config: - default: - connect-timeout: 20000 - read-timeout: 20000 - -hystrix: - command: - default: - execution: - timeout: - enabled: true - isolation: - strategy: SEMAPHORE - thread: - timeoutInMilliseconds: 200000 #熔断超时时间 - circuitBreaker: - sleepWindowInMilliseconds: 20000 - forceClosed: true -ribbon: - ReadTimeout: 20000 #请求处理的超时时间 - ConnectTimeout: 20000 #请求连接超时时间 - MaxAutoRetries: 0 #对当前实例的重试次数 - MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 - -mconfig: - workerId: 1 - datacenterId: 1 - remote: - approval: true #是否需要提交公告审批 - media: true #是否需要发送到媒体 - - #中国联通电子商城外网接入平台 相关参数 - token: - userName: zbgg - password: eip_13579 - file-wjpt-storage-path: http://111.198.162.67:8081/enr/api/base/file/cgDownload/ #测试地址 - #获取file地址 - file: - address: http://125.32.114.204:8760/api/core-service-ebtp-updownload/v1/download/oid/ - #提交审批相关字段 - approve: - wfSectionNo: 002 - wfSectionName: 采购审批 diff --git a/bin/src/main/resources/application.yml b/bin/src/main/resources/application.yml deleted file mode 100644 index caf4dfc..0000000 --- a/bin/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/bin/src/main/resources/file.conf b/bin/src/main/resources/file.conf deleted file mode 100644 index d591bab..0000000 --- a/bin/src/main/resources/file.conf +++ /dev/null @@ -1,66 +0,0 @@ -transport { - # tcp udt unix-domain-socket - type = "TCP" - #NIO NATIVE - server = "NIO" - #enable heartbeat - heartbeat = true - # the client batch send request enable - enableClientBatchSendRequest = true - #thread factory for netty - threadFactory { - bossThreadPrefix = "NettyBoss" - workerThreadPrefix = "NettyServerNIOWorker" - serverExecutorThread-prefix = "NettyServerBizHandler" - shareBossWorker = false - clientSelectorThreadPrefix = "NettyClientSelector" - clientSelectorThreadSize = 1 - clientWorkerThreadPrefix = "NettyClientWorkerThread" - # netty boss thread size,will not be used for UDT - bossThreadSize = 1 - #auto default pin or 8 - workerThreadSize = "default" - } - shutdown { - # when destroy server, wait seconds - wait = 3 - } - serialization = "seata" - compressor = "none" -} -service { - #transaction service group mapping - vgroupMapping.biz-service-ebtp-expenses-fescar-service-group = "default" - #only support when registry.type=file, please don't set multiple addresses - default.grouplist = "127.0.0.1:8091" - #degrade, current not support - enableDegrade = false - #disable seata - disableGlobalTransaction = false -} - -client { - rm { - asyncCommitBufferLimit = 10000 - lock { - retryInterval = 10 - retryTimes = 30 - retryPolicyBranchRollbackOnConflict = true - } - reportRetryCount = 5 - tableMetaCheckEnable = false - reportSuccessEnable = false - } - tm { - commitRetryCount = 5 - rollbackRetryCount = 5 - } - undo { - dataValidation = true - logSerialization = "jackson" - logTable = "undo_log" - } - log { - exceptionRate = 100 - } -} \ No newline at end of file diff --git a/bin/src/main/resources/logback.xml b/bin/src/main/resources/logback.xml deleted file mode 100644 index 62285f5..0000000 --- a/bin/src/main/resources/logback.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - ${logback.appname} - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - ERROR - - DENY - - ACCEPT - - - ${logback.logdir}/info.${logback.appname}.log - - - - ${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log - - 3 - - true - - - - - - UTF-8 - %d [%thread] %-5level %logger{64} %line - %msg%n - - - - - - - Error - - - ${logback.logdir}/error.${logback.appname}.log - - - - ${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log - - 3 - - true - - - - - - UTF-8 - %d [%thread] %-5level %logger{128} %line - %msg%n - - - - - - - - - - - - diff --git a/bin/src/main/resources/registry.conf b/bin/src/main/resources/registry.conf deleted file mode 100644 index bd724ed..0000000 --- a/bin/src/main/resources/registry.conf +++ /dev/null @@ -1,79 +0,0 @@ -registry { - # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa - type = "eureka" - - nacos { - application = "seata-server" - serverAddr = "localhost" - namespace = "" - username = "" - password = "" - } - eureka { - serviceUrl = "http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka" - weight = "1" - } - redis { - serverAddr = "localhost:6379" - db = "0" - password = "" - timeout = "0" - } - zk { - serverAddr = "127.0.0.1:2181" - sessionTimeout = 6000 - connectTimeout = 2000 - username = "" - password = "" - } - consul { - serverAddr = "127.0.0.1:8500" - } - etcd3 { - serverAddr = "http://localhost:2379" - } - sofa { - serverAddr = "127.0.0.1:9603" - region = "DEFAULT_ZONE" - datacenter = "DefaultDataCenter" - group = "SEATA_GROUP" - addressWaitTime = "3000" - } - file { - name = "file.conf" - } -} - -config { - # file、nacos 、apollo、zk、consul、etcd3、springCloudConfig - type = "file" - - nacos { - serverAddr = "localhost" - namespace = "" - group = "SEATA_GROUP" - username = "" - password = "" - } - consul { - serverAddr = "127.0.0.1:8500" - } - apollo { - appId = "seata-server" - apolloMeta = "http://192.168.1.204:8801" - namespace = "application" - } - zk { - serverAddr = "127.0.0.1:2181" - sessionTimeout = 6000 - connectTimeout = 2000 - username = "" - password = "" - } - etcd3 { - serverAddr = "http://localhost:2379" - } - file { - name = "file.conf" - } -} diff --git a/bin/src/main/resources/seata.conf b/bin/src/main/resources/seata.conf deleted file mode 100644 index c656a9c..0000000 --- a/bin/src/main/resources/seata.conf +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -client { - application.id = biz-service-ebtp-extend - transaction.service.group = biz-service-ebtp-extend-fescar-service-group -} diff --git a/bin/src/main/resources/swagger-configuration.properties b/bin/src/main/resources/swagger-configuration.properties deleted file mode 100644 index 6624bf1..0000000 --- a/bin/src/main/resources/swagger-configuration.properties +++ /dev/null @@ -1,7 +0,0 @@ -unifast.swagger.basePackage=com.chinaunicom.mall.ebtp.extend -unifast.swagger.title=\u6d4b\u8bd5\u63a5\u53e3\u6587\u6863 -unifast.swagger.contactName=\u5409\u6797\u9879\u76ee\u7ec4 -unifast.swagger.contactUrl=http://chinaunicom.com -unifast.swagger.contactEmail=chinaunicom@chinaunicom.com -unifast.swagger.version=0.0.1 -unifast.swagger.description=\u7840\u540e\u53f0\u529f\u80fd\u6846\u67b6 \ No newline at end of file diff --git a/deployment-gz.yaml b/deployment-gz.yaml index cf47903..4d9e7d4 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -41,10 +41,6 @@ spec: persistentVolumeClaim: claimName: log-pvc readOnly: false - - name: storage - persistentVolumeClaim: - claimName: file-pvc - readOnly: false # 必选，Pod中容器列表 containers: @@ -54,8 +50,6 @@ spec: volumeMounts: - name: log mountPath: /log - - name: storage - mountPath: /storage # 需要暴露的端口库号列表 ports: - containerPort: 18018 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java index 0468653..4cdccbc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java @@ -1,19 +1,14 @@ package com.chinaunicom.mall.ebtp.extend; +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; -import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; - -import io.micrometer.core.instrument.MeterRegistry; - @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class @@ -27,10 +22,5 @@ public class BizServiceEbtpExtendApplication { public static void main(String[] args) { SpringApplication.run(BizServiceEbtpExtendApplication.class, args); } - - @Bean - public MeterRegistryCustomizer configurer() { - return (registry) -> registry.config().commonTags("application", "biz-service-ebtp-extend"); - } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java new file mode 100644 index 0000000..4e66274 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java @@ -0,0 +1,110 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 实体类 BizBidOpenroom + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@TableName(value = "biz_bid_openroom", autoResultMap = true) +public class BizBidOpenroom extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 开标室id + */ + private String id; + /** + * 评审室id + */ + private String assessRoomId; + /** + * 评审室类型 1、资审 2、评审 + */ + private Integer roomType; + + /** + * 评审轮次id + */ + private String turnId; + + /** + * 轮次 + */ + private String turnSort; + + /** + * 项目id + */ + private String projectId; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 项目编号 + */ + private String projectNo; + + /** + * 标段id + */ + private String sectionId; + + /** + * 标段名称 + */ + private String sectionName; + + /** + * 标段编号 + */ + private String sectionNo; + /** + * 开标室状态 0未开标 1、开标 + */ + private String roomState; + /** + * 解封状态(0、为解封 1、解封) + */ + private String unsealState; + + /** + * 开标室备注 + */ + private String remarks; + + /** + * 开标时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime opingTime; + /** + * 开标时限 0 未设置 + */ + private String opingTimeLimit; + /** + * 开标结束时间 通过时限计算 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime opingEndTime; + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java new file mode 100644 index 0000000..5e59ee3 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java @@ -0,0 +1,67 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Map; + +/** + * 实体类 BizSupplierRegister + * + * @auto.generated + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value = "BizSupplierRegister对象", description = "供应商报名登记表") +public class BizSupplierRegister extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + + + /** + * 机构名称 + */ + @ApiModelProperty(value = "机构名称") + private String companyName; + + + /** + * 投标人姓名 + */ + @ApiModelProperty(value = "投标人姓名") + private String bidUserName; + + /** + * 联系人名称 + */ + @ApiModelProperty(value = "联系人名称") + private String contactName; + + + /** + * 签字确认时间 + */ + + @ApiModelProperty(value = "签字确认时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime signTime; + + + private String newPrice; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java index d262698..9667f43 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java @@ -245,4 +245,6 @@ public class ProjectSection extends BaseEntity implements Serializable { public void setId(String id) { this.id = id; } + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java new file mode 100644 index 0000000..264cd16 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java @@ -0,0 +1,28 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import io.swagger.annotations.ApiModelProperty; + +public class Tdoc { + + @ApiModelProperty(value = "") + private String assessRoomId; + + @ApiModelProperty(value = "轮次") + private Integer turnSort; + + public String getAssessRoomId() { + return assessRoomId; + } + + public void setAssessRoomId(String assessRoomId) { + this.assessRoomId = assessRoomId; + } + + public Integer getTurnSort() { + return turnSort; + } + + public void setTurnSort(Integer turnSort) { + this.turnSort = turnSort; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java index 5fc7db5..14227a1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java @@ -34,12 +34,19 @@ import org.springframework.web.bind.annotation.RestController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalInfoDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigCategoryDTO; import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigDetailDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.Tdoc; import com.chinaunicom.mall.ebtp.extend.export.services.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceOpen; import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceProject; +import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceResps; +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailJudgesSummaryVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailSummaryVO; import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalEarlyJudgesSummaryVO; import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; @@ -62,9 +69,10 @@ public class ExportController { private ExportService exportService; @Resource private ExportServiceProject exportServiceProject; - - - + @Resource + private ExportServiceResps exportServiceResps; + @Resource + private ExportServiceOpen exportServiceOpen; /** @@ -74,26 +82,46 @@ public class ExportController { */ @RequestMapping(value = "/kbjl", method = RequestMethod.GET) @ResponseBody - //TODO 暂未完成 - public void exportKbjlMessage(HttpServletRequest request, HttpServletResponse response) throws IOException { + public void exportKbjlMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { + Tdoc tdocPara = new Tdoc(); + tdocPara.setAssessRoomId(parame.getAssessRoomId()); + tdocPara.setTurnSort(Integer.parseInt(parame.getReviewTurnId())); + + BaseResponse> listBaseResponse = exportServiceResps.getTenderQuoteList(tdocPara); + List list = listBaseResponse.getData(); ArrayList> maps = new ArrayList<>(); - for (int i = 0; i < 4; i++) { - Map data = new HashMap<>(); - data.put("num", i); - data.put("tbr", "投标人" + i); - data.put("bj", "10" + i); - data.put("yy", "有争议" + i); - data.put("sign", "签字人" + i + "：2021年"); - maps.add(data); + if (list != null) { + for (int i = 0; i < list.size(); i++) { + Map data = new HashMap<>(); + data.put("num", (i + 1)); + data.put("tbr", list.get(i).getBidUserName()); + data.put("bj", list.get(i).getNewPrice()); + data.put("yy", ""); + data.put("sign", list.get(i).getContactName() + ":" + list.get(i).getSignTime()); + maps.add(data); + } + } + //查询项目名称 + ProjectSectionVO projectSectionVO = new ProjectSectionVO(); + projectSectionVO.setId(parame.getSectionId()); + BaseResponse project = exportServiceProject.selectById(projectSectionVO); + + //查询开标时间 + BizBidOpenroom bizBidOpenroom = new BizBidOpenroom(); + bizBidOpenroom.setAssessRoomId(parame.getAssessRoomId()); + BaseResponse> timeList = exportServiceOpen.list(bizBidOpenroom); + File file = new File("d:/开标记录表.docx"); Map all = new HashMap() {{ put("Record", maps); - put("time", "2020年1月11日"); - put("mc", "测试项目"); - put("yuan", "9999"); + put("time", timeList.getData().get(0).getOpingTime()); + put("mc", project.getData().getProjectName()); + put("bh", project.getData().getSectionNumber()); + put("bao", project.getData().getBidSectBizNum()); + put("yuan", ""); }}; HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); @@ -115,7 +143,7 @@ public class ExportController { */ @RequestMapping(value = "/judges", method = RequestMethod.GET) @ResponseBody - public void exportJudgesMessage(ExportParame parame,HttpServletRequest request, HttpServletResponse response) throws IOException { + public void exportJudgesMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { //项目和招标名称处理 ProjectSectionVO projectSectionVO = new ProjectSectionVO(); @@ -123,7 +151,7 @@ public class ExportController { BaseResponse list = exportServiceProject.selectById(projectSectionVO); //专家人员数据 - BaseResponse> listBaseResponse=exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); + BaseResponse> listBaseResponse = exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); ArrayList> maps = new ArrayList<>(); for (int i = 0; i < listBaseResponse.getData().size(); i++) { Map data = new HashMap<>(); @@ -132,7 +160,7 @@ public class ExportController { maps.add(data); } - //获取模板 + //获取模板 File file = new File("d:/评标委员会签字表.docx"); //当前时间 @@ -142,7 +170,7 @@ public class ExportController { Map all = new HashMap() {{ put("Judges", maps); put("time", sdf.format(date)); - put("bh",list.getData().getBidSectCode()); + put("bh", list.getData().getBidSectCode()); put("mc", list.getData().getProjectName()); }}; @@ -158,7 +186,6 @@ public class ExportController { } - /** * 3 * 导出方法 @@ -175,15 +202,15 @@ public class ExportController { BaseResponse list = exportServiceProject.selectById(projectSectionVO); //专家人员数据 - BaseResponse> listBaseResponse=exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); + BaseResponse> listBaseResponse = exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); ArrayList> maps = new ArrayList<>(); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < listBaseResponse.getData().size(); i++) { Map data = new HashMap<>(); data.put("name", listBaseResponse.getData().get(i).getName()); data.put("phone", listBaseResponse.getData().get(i).getMobile()); data.put("idCard", listBaseResponse.getData().get(i).getCertificate()); - data.put("isTrue", listBaseResponse.getData().get(i).getAttitude()); + data.put("isTrue", listBaseResponse.getData().get(i).getAttitude() == 1 ? "是" : "否"); data.put("time", listBaseResponse.getData().get(i).getLoginTime()); maps.add(data); } @@ -205,7 +232,6 @@ public class ExportController { } - /** * 4 * 导出方法 @@ -214,7 +240,7 @@ public class ExportController { @RequestMapping(value = "/pbbg", method = RequestMethod.GET) @ResponseBody //todo 暂未完成 - public void exportAllMessage( ExportParame parame,HttpServletRequest request, HttpServletResponse response) throws IOException { + public void exportAllMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { //表一假数据 List> list1 = new ArrayList<>(); @@ -235,17 +261,19 @@ public class ExportController { list2.add(map); } - //表三假数据 - List> list3 = new ArrayList<>(); - for (int i = 0; i < 4; i++) { - Map map = new HashMap<>(); - map.put("num", i); - map.put("work", "建设部" + i); - map.put("name", "刘某" + i); - map.put("unit", "全国各地" + i); - list3.add(map); + + //表三数据 + //专家人员数据 + BaseResponse> listBaseResponse = exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); + ArrayList> list3 = new ArrayList<>(); + for (int i = 0; i < listBaseResponse.getData().size(); i++) { + Map data = new HashMap<>(); + data.put("num", (i + 1)); + data.put("name", listBaseResponse.getData().get(i).getName()); + list3.add(data); } + //表四假数据 List> list4 = new ArrayList<>(); for (int i = 0; i < 4; i++) { @@ -267,40 +295,83 @@ public class ExportController { } - //表六假数据 + + BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); + bidEvalDetailDTO.setAssessRoomId(parame.getAssessRoomId()); + bidEvalDetailDTO.setReviewTurnId(parame.getReviewTurnId()); + bidEvalDetailDTO.setReviewType(parame.getReviewType()); + BaseResponse>> list = exportService.findCategoryResultSummary(bidEvalDetailDTO); + //商务数据 + List respondlist1 = list.getData().get("1"); + //服务数据,或技术 + List respondlist2 = list.getData().get("5"); + //价格数据 + List respondlist3 = list.getData().get("0"); + + // 综合汇总 表6和表8一份数据 + List all1 = new ArrayList<>(); + respondlist1.stream().forEach(o -> { + BidEvalDetailSummaryVO object = new BidEvalDetailSummaryVO(); + object.setSupplierRegisterId(o.getSupplierRegisterId()); + object.setSupplierRegisterName(o.getSupplierRegisterName()); + object.setBusinessAllScore(o.getFinalScore()); + all1.add(object); + }); + all1.stream().forEach(x -> { + + respondlist2.stream().forEach(y -> { + if (x.getSupplierRegisterId().equals(y.getSupplierRegisterId())) { + x.setServiceAllScore(y.getFinalScore()); + } + ; + }); + + respondlist3.stream().forEach(z -> { + if (x.getSupplierRegisterId().equals(z.getSupplierRegisterId())) { + x.setPriceAllScore(z.getFinalScore()); + } + ; + }); + + BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); + x.setAllScore(allPrice); + }); + + //表六 详细评审数据 List> list6 = new ArrayList<>(); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < all1.size(); i++) { Map map = new HashMap<>(); - map.put("num", i); - map.put("tbr", "投标人" + i); - map.put("js", "100" + i); - map.put("sw", "99" + i); + map.put("num", (i+1)); + map.put("tbr", all1.get(i).getSupplierRegisterName()); + map.put("js", all1.get(i).getServiceAllScore()); + map.put("sw", all1.get(i).getBusinessAllScore()); list6.add(map); } - //表七假数据 + + //表七 价格评审数据 List> list7 = new ArrayList<>(); for (int i = 0; i < 3; i++) { Map map = new HashMap<>(); map.put("num", i); - map.put("tbr", "投标人" + i); - map.put("bj", "100" + i); - map.put("psjg", "101" + i); - map.put("jgdf", "102" + i); + map.put("tbr", all1.get(i).getSupplierRegisterName()); + map.put("bj", all1.get(i).getPriceAllScore()); + map.put("psjg", ""); + map.put("jgdf", ""); list7.add(map); } - //表八假数据 + //表八 评审总结数据 List> list8 = new ArrayList<>(); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < all1.size(); i++) { Map map = new HashMap<>(); - map.put("num", i); - map.put("tbr", "投标人" + i); - map.put("swdf", "100" + i); - map.put("jsdf", "101" + i); - map.put("jgdf", "102" + i); - map.put("zhdf", "103" + i); - map.put("bj", "104" + i); + map.put("num", (i+1)); + map.put("tbr", all1.get(i).getSupplierRegisterName()); + map.put("sw", all1.get(i).getBusinessAllScore()); + map.put("js", all1.get(i).getServiceAllScore()); + map.put("jg", all1.get(i).getPriceAllScore()); + map.put("zhdf", all1.get(i).getAllScore()); + map.put("bj", ""); list8.add(map); } @@ -342,7 +413,6 @@ public class ExportController { } - /** * 5 * 导出方法 @@ -372,68 +442,260 @@ public class ExportController { */ @RequestMapping(value = "dfhz", method = RequestMethod.GET) @ResponseBody - // TODO: 2021/1/26 暂时未完成 public void exportDfMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { - File file = new File("d:/打分汇总表.docx"); + BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); + bidEvalDetailDTO.setAssessRoomId(parame.getAssessRoomId()); + bidEvalDetailDTO.setReviewTurnId(parame.getReviewTurnId()); + bidEvalDetailDTO.setReviewType(parame.getReviewType()); + BaseResponse>> list = exportService.findCategoryResultSummary(bidEvalDetailDTO); - //表1和表2假数据 - List> list12 = new ArrayList<>(); - for (int i = 0; i < 3; i++) { - Map map = new HashMap<>(); - map.put("name", "投标人" + i); - map.put("num", i); - map.put("z1", 10); - map.put("z2", 15); - map.put("z3", 20); - map.put("avg", 15); - list12.add(map); + //商务数据 + List list1 = list.getData().get("1"); + //服务数据 + List list2 = list.getData().get("5"); + //价格数据 + List list3 = list.getData().get("0"); + + + BidEvalInfoDTO bidEvalInfoDTO = new BidEvalInfoDTO(); + bidEvalInfoDTO.setAssessRoomId(parame.getAssessRoomId()); + bidEvalInfoDTO.setReviewTurnId(parame.getReviewTurnId()); + bidEvalInfoDTO.setReviewType(parame.getReviewType()); + + //所有评委 + List memberall = exportService.findRegisterAndUser(bidEvalInfoDTO).getData().stream().findFirst().get().getMembers(); + + // 综合汇总 + List all = new ArrayList<>(); + list1.stream().forEach(o -> { + BidEvalDetailSummaryVO object = new BidEvalDetailSummaryVO(); + object.setSupplierRegisterId(o.getSupplierRegisterId()); + object.setSupplierRegisterName(o.getSupplierRegisterName()); + object.setBusinessAllScore(o.getFinalScore()); + all.add(object); + }); + all.stream().forEach(x -> { + + list2.stream().forEach(y -> { + if (x.getSupplierRegisterId().equals(y.getSupplierRegisterId())) { + x.setServiceAllScore(y.getFinalScore()); + } + ; + }); + + list3.stream().forEach(z -> { + if (x.getSupplierRegisterId().equals(z.getSupplierRegisterId())) { + x.setPriceAllScore(z.getFinalScore()); + } + ; + }); + + BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); + x.setAllScore(allPrice); + }); + + + //所有专家 + Map members = list1.get(0).getScoreMap(); + //列头 + StringBuffer titles0 = new StringBuffer("投标人名称,投标序号"); + ArrayList strings = new ArrayList<>(); + //专家信息 添加到列头 + members.forEach((k, v) -> { +// titles0.append("," + k); + memberall.forEach(x -> { + if (k.equals(x.getUserId())) { + titles0.append("," + x.getName()); + } + }); + strings.add(v.getCreateBy()); + }); + //添加最后一列 + titles0.append(",平均分"); + //最终的列头 + String titles = titles0.toString(); + + // 创建工作簿 + SXSSFWorkbook wb = new SXSSFWorkbook(); + //表格样式 + CellStyle cellStyle = wb.createCellStyle(); + //水平居中 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //垂直居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + //边框 + cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 + cellStyle.setBorderTop(BorderStyle.THIN);//上边框 + cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + + //渲染所有数据表格 + List createList = null; + /** + * 一共4个表，固定循环4次 + */ + for (int k = 0; k < 4; k++) { + // 创建表格 + Sheet sheet = null; + if (k == 0) { + sheet = wb.createSheet("商务得分"); + } else if (k == 1) { + sheet = wb.createSheet("服务得分"); + } else if (k == 2) { + sheet = wb.createSheet("价格得分"); + titles = "投标人名称,投标序号,价格得分"; + + } else { + sheet = wb.createSheet("评分汇总表"); + titles = "投标人名称,投标序号,商务得分,服务得分,价格得分,综合得分"; + + } + sheet.createFreezePane(1, 1); + + //最右侧列值 + Integer index = (titles.split(",").length) - 1; + //行 + int rowIndex = 0; + //列 + int colIndex = 0; + + // 1行 表头 + CellRangeAddress region1 = new CellRangeAddress(0, 0, 0, index); + sheet.addMergedRegion(region1); + Row title1 = sheet.createRow(rowIndex++); + Cell titleCell1 = title1.createCell(0); + title1.setHeightInPoints(35); + titleCell1.setCellValue("打分汇总表"); + titleCell1.setCellStyle(cellStyle); + // 2行 + /* CellRangeAddress region2 = new CellRangeAddress(1, 1, 0, index); + sheet.addMergedRegion(region2); + Row title2 = sheet.createRow(rowIndex++); + Cell titleCell2 = title2.createCell(0); + titleCell2.setCellValue("包名 ：bao123456"); + //3行 + CellRangeAddress region3 = new CellRangeAddress(2, 2, 0, index); + sheet.addMergedRegion(region3); + Row title3 = sheet.createRow(rowIndex++); + Cell titleCell3 = title3.createCell(0); + titleCell3.setCellValue("招标编号 bh123456");*/ + //4行 得分标题 + CellRangeAddress region4 = new CellRangeAddress(1, 1, 0, index); + sheet.addMergedRegion(region4); + Row title4 = sheet.createRow(rowIndex++); + Cell titleCell4 = title4.createCell(0); + if (k == 0) { + titleCell4.setCellValue("商务得分"); + createList = list1; + } else if (k == 1) { + titleCell4.setCellValue("服务得分"); + createList = list2; + } else if (k == 2) { + titleCell4.setCellValue("价格得分"); + createList = list3; + } else { + titleCell4.setCellValue("评分汇总"); + } + + //5行 列头 + Row titleRow5 = sheet.createRow(rowIndex++); + // 设置高度为30 + titleRow5.setHeightInPoints(30); + for (String title : titles.split(",")) { + sheet.setColumnWidth(colIndex, 17 * 256); + Cell titleCell = titleRow5.createCell(colIndex++); + titleCell.setCellValue(title); + //设置样式 + titleCell.setCellStyle(cellStyle); + } + //6行 数据行 + int num = 1; + if (k == 3) { + for (int i = 0; i < all.size(); i++) { + //3为最终汇总表 + Row titleRowN = sheet.createRow(rowIndex++); + colIndex = 0; + //投标人名称 + Cell cell = titleRowN.createCell(colIndex++); + cell.setCellStyle(cellStyle); + cell.setCellValue(all.get(i).getSupplierRegisterName()); + //序号 + Cell cell1 = titleRowN.createCell(colIndex++); + cell1.setCellStyle(cellStyle); + cell1.setCellValue(num++); + //商务汇总 + Cell cell2 = titleRowN.createCell(colIndex++); + cell2.setCellStyle(cellStyle); + cell2.setCellValue(all.get(i).getBusinessAllScore().toString()); + //服务汇总 + Cell cell3 = titleRowN.createCell(colIndex++); + cell3.setCellStyle(cellStyle); + cell3.setCellValue(all.get(i).getServiceAllScore().toString()); + //价格汇总 + Cell cell4 = titleRowN.createCell(colIndex++); + cell4.setCellStyle(cellStyle); + cell4.setCellValue(all.get(i).getPriceAllScore().toString()); + //综合得分 + Cell cell5 = titleRowN.createCell(colIndex++); + cell5.setCellStyle(cellStyle); + cell5.setCellValue(all.get(i).getAllScore().toString()); + } + } else { + for (int i = 0; i < createList.size(); i++) { + colIndex = 0; + Row titleRowN = sheet.createRow(rowIndex++); + //投标人名称 + Cell cell = titleRowN.createCell(colIndex++); + cell.setCellStyle(cellStyle); + cell.setCellValue(createList.get(i).getSupplierRegisterName()); + //序号 + Cell cell1 = titleRowN.createCell(colIndex++); + cell1.setCellStyle(cellStyle); + cell1.setCellValue(num++); + if (k == 2) { + //价格得分 2时无专家评分，有最终评分 + Cell cellN1 = titleRowN.createCell(colIndex++); + cellN1.setCellStyle(cellStyle); + cellN1.setCellValue(createList.get(i).getFinalScore().toString()); + } else { + //所有专家 + for (int j = 0; j < createList.get(i).getScoreMap().size(); j++) { + Map scoreMap = createList.get(i).getScoreMap(); + //获取专家的顺序 + if (scoreMap != null) { + String score = null; + for (String string : strings) { + if (scoreMap.get(string) != null) { + score = (scoreMap.get(string).getScore()).toString(); + } else { + score = "无"; + } + Cell cellN = titleRowN.createCell(colIndex++); + cellN.setCellStyle(cellStyle); + cellN.setCellValue(score); + } + + } + + + } + //平均分 + Cell cellN1 = titleRowN.createCell(colIndex++); + cellN1.setCellStyle(cellStyle); + cellN1.setCellValue(createList.get(i).getFinalScore().toString()); + } + } + } } + String filename = "打分汇总表.xls"; + filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); + response.reset(); + response.setContentType("application/octet-stream;charset=utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes("UTF-8"), "ISO8859-1"))); + wb.write(response.getOutputStream()); - //表3假数据 - List> list3 = new ArrayList<>(); - for (int i = 0; i < 4; i++) { - Map map = new HashMap<>(); - map.put("name", "投标人" + i); - map.put("num", i); - map.put("jg", i); - list3.add(map); - } - - //表4假数据 - List> list4 = new ArrayList<>(); - for (int i = 0; i < 3; i++) { - Map map = new HashMap<>(); - map.put("name", "投标人" + i); - map.put("num", i); - map.put("sw", i); - map.put("fw", i); - map.put("jg", i); - map.put("zh", i); - list4.add(map); - } - - Map all = new HashMap() {{ - put("table1", list12); - put("table2", list12); - put("table3", list3); - put("table4", list4); - - }}; - HackLoopTableRenderPolicy policy1 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy2 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy3 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy4 = new HackLoopTableRenderPolicy(); - - Configure config = Configure.builder().bind("table1", policy1).bind("table2", policy2).bind("table3", policy3).bind("table4", policy4).build(); - XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); - - - String fileName = new String("打分汇总表.docx".getBytes("UTF-8"), "iso-8859-1"); - OutputStream os = response.getOutputStream(); - response.setHeader("Content-disposition", "attachment; filename=" + fileName); - template.write(os); } @@ -502,7 +764,6 @@ public class ExportController { } - // 创建工作簿 SXSSFWorkbook wb = new SXSSFWorkbook(); //表格样式 @@ -610,7 +871,7 @@ public class ExportController { Row titleLast1 = sheet.createRow(rowIndex++); Cell titleCellLast1 = titleLast1.createCell(0); titleCellLast1.setCellValue("全体委员签字 ："); - CellRangeAddress region6 = new CellRangeAddress((4 + maps.size()+1), (4 + maps.size()+1), 0, 6); + CellRangeAddress region6 = new CellRangeAddress((4 + maps.size() + 1), (4 + maps.size() + 1), 0, 6); sheet.addMergedRegion(region6); //时间行 CellStyle cellStyle1 = wb.createCellStyle(); @@ -657,10 +918,8 @@ public class ExportController { bidEvalInfoDTO.setReviewType(parame.getReviewType()); //供应商 List listBaseResponse = exportService.findRegisterAndUser(bidEvalInfoDTO).getData(); - //列头 StringBuffer titles0 = new StringBuffer("序号,评审因素,评审标准"); - //供应商 顺序 ArrayList strings = new ArrayList<>(); for (int i = 0; i < listBaseResponse.size(); i++) { @@ -719,7 +978,6 @@ public class ExportController { Row title3 = sheet.createRow(rowIndex++); Cell titleCell3 = title3.createCell(0); titleCell3.setCellValue("招标编号 : " + list.getData().getBidSectName()); - //4行 列头 Row titleRow5 = sheet.createRow(rowIndex++); // 设置高度为30 @@ -731,7 +989,6 @@ public class ExportController { //设置样式 titleCell.setCellStyle(cellStyle); } - // 5行开始渲染 for (ReviewConfigCategoryDTO object : dataList) { List detailList = object.getDetailList(); @@ -753,6 +1010,7 @@ public class ExportController { Cell cell2 = titleRowN.createCell(colIndex++); cell2.setCellValue(""); cell2.setCellStyle(cellStyle); + if (scoreMap != null) { for (String string : strings) { Boolean actualValue; @@ -1052,6 +1310,7 @@ public class ExportController { sheet.addMergedRegion(region6); } + String filename = "评标打分表.xls"; filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); response.reset(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx index c94be665ab5faf32678fb5b6e45331b018a7c730..cf4db72bf385571288c399d53933ef44c3460284 100644 GIT binary patch delta 6470 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 delta 6521 zcmZ8mWl$RolTLsZcXufir?^vs7cK7E;_gnvOQE<1mqKv}Zoykhad!#s7Q9%HdvCs( zySe+bv-{`S-PxI)XP<4418&3tlZ0MD@7s>7lEpc|%d!gmP14XpGN6@pvk4+km&2f#X{e&DpoGP+y9*w2mUWs~shi3a3Z}Pt{ zj5RoUz-rN_ZZa>74U6y`Y5lv#h2c@y_q{`Kkb@1~CFm5j33n>;D@p6rR*}-Kvc@59 z&%4A*aKAX8UGLpa>)rK>P<1oKWgG0sUe@w8=}qZ2-O?37nW_^ah{2AmrBi0Wlc5ag zyF8zu&d*SW8Ix|p6KqH_QVIhpQhYDQ%IIC1AsFRy;}SvOi^*y_OmwK+h)VhZHL=#L z2#Fd|&uCEE2)-gaf`ro6aPGl>f9|lYYCN>q3Yy~l^SnpHUME}%2}5d%!(B!WcFQtD z(n~hciz&yh?w|RBGIwCN3MuO=q(k2PP>7H42(dV)t&Vt^;JbNHzXm}zw^p#>VPYH# zWpCY**UuAbO;uDh5&!^z0f^Mt0ws@fGeU-d^kB1(y$mGZ&eR|Aac^ns=Gu~KRA*0y zSyc6lE)sq%DLOl#w&H`kQolGWZnNxn?u(sa7su)t$)oe?>jfqpL=|8(l^0KUhy@O1 zT;M3odvFJ6Ib;?I7&Z;Mx@l_(Xi*yGRKDIOSsa8k*%W>+>hcomU5t@RT}kMaMeeom zvw;1c?R{JKw!WSL5;3#3h-flaJXQePfeeLs?0unC(&~f&ZA-QSGz3@ao0xaT=%r0y zyzud~2HjIrq*~spQwxcUmu7wyRrtWRhj%U-^_p~_8+2biii&e}B@K{Tq8;v|MzMis zy#uT=TktbyP5gLIWb;`Tl9`gJ;pI8O2DSEyw3!Qrvr9bxbm$j+D_E+mQR*za$lRtf zgDOi?W(r(t*RJQ3&25=96m-`d%NR{DBKm|A;r?)c)!_Dj=KzV4BWUzN6(PWc<(qRk z;{pJckY?hKSd{93_-D~od+%om9*G5b;^Ns89!GzhSZmOGQ=ioicb!qU;7KDm-D(|m z52>d|Lbr)(VXKZbzP+o0AKR!-Puul^9`^-5KlgO_~EZ^ zpEfPuymU|{+_@X?%vjKF&G>pfoGQose7N*qDYG&K=UtrDiG1{@iPY(#qaH5nZg)FLN>%G01NVYq0et!P$bvrDDq=AXU8ome%hLjdirhZ& z3d5)=<{*OP(!GVxG~W==GU$M>sf_Xhxs0jl_%_TE`e6EX-2CO$hLHz*nlmLe!?ADw%)#mAI~?tb?%PM&yPR%v z4&}Up1aK2s$>PNM>*;b>qn_wL!=7y@I;11NI0}m-j$wT*ODw62EDE{00K>LttIfYS zu3pTz-nKe)OV(!Pi&Sp>w&>=0UcD`|c}c8AZa#Hes3ZH{JTE0Y!N4nYWTsMrNfhA$ zl4`$)`mMZ{eQyp4-`m%dlqw z_C7w`EGH{Ja)Adss+K#!9DMOT`U@jk*Mli?T$4|&EVZ2f-V;XoTurX3|7<4Su)c3G zdYSkl(uH`q$!O^SXM)$RCpY$T9CjCl>0c;v1_pe)k~DmQulF|b5&MUUu7QSlccbvL zjuuB>ofRMTpIjI4FJ6KbPc_w0*jR>@H0|PQ^Urb1*0!u}XIq(0gfIH=ZxQ{#nOZAH zkK5xfLGT2E(WzmLnQhw#yM?oFiO72fY3BuJ;oh05+#3r&5%5@xnQwr{XwK7iVOg(! zYup5o z?Jf35y~WQ+?k+iA|FuBj+1A5TWI&tIxJcr}ADd+nQyE|A8@CDi5Hq0Nb1*W15%j8l z-A5_*%X;XQ4LEp?;Y0OI9Xr0FKZPmR-#vmw%LS=$|Bwr_x56j(C^`b`q$BQH9@6!VH7%RwscS_hK==g?xzS*IS(y5zN5&w zrgA-XgBgtv-Pyit^vQ<^C&%Vuy8LtR2vQipNS7VKMderZ1`D^%l}RQma;B-!J*Zs<(Wk!~D4Bn_6F4N~EWe5$3hw zJ+AwDSQT75uGtiqe5s#l=!u6#!Cof+19vVrrh%eU3k3R^Nl~kdwD?J!$!KYO0T+xk<-jsVc zUDoVC9p0%P!IuY%%gvmMRw>uGBs248k>VGS*CycnhOx5{8T2!;ZwJ~Yu5RLox;oxd zOS&w7UCh{_Y;>VSD9z?(S-++%7R|`IjMQ^b6-r4Z8@h&}g*%pHY*3wmcm@erDNlw>U24RLxYe6Rcc6KLtHGo@QGii% z!qZ%D1&=07ZRq3CQ`Sl!Y3V45oT*jwPAXf&9zUCley~PLUzV71gnaUZ&Awm;o@Z#- zaso8?hr=KDX7BG;`frqr_Ag{rT=m@BEOD-MG=HI%uyOU@P64ovSk_SP%iWMsxw(bl zhD07Jbul&@#`3BVBC$&`%vQPGJ*PXGIaz{+joTCk-5#%((7KHSWf_kZqWzJ`ABLo< z!;i%>_k&ZfPLIXt(42H-YzR7IO~n~ShZ;i(2>IAjBBKQ3mu1*WqGs1*ryB~yag9Wk z_?UmGP7I2}vj-wHksF8aBQz@tT68eL))>03?%JCb2of@wgPbX#+;1IW8Zkopm`%!|kqY%gXIBK#(hf$St%ta=dFP zfl`)8rO9AQ5RjOutl;9#eZ&mk_csgFQ*@LlS-{Xp6{#JO_b9_@s3}L!=z(VE3;HjT zuA*m+P`Z$lHFJrxGX321j1^A@=fa$m&?o0Oa#Y5tJ$GZ66r$lIwNfk~CRkFj85T)j zicCnvmPSLvPCZ|MO@Pq50G-PRds)DaZ&H{KX>+CS2G2OVmK7PqKBjWx-b5u-{>X?O z=+}zFUztSGr`mR$s{tll&NDVq0P(f-QWn-WvixoQV{>JO$>;PC4X zyPaW#zPg=>+o-C@us(LGnK=ossi+bdCW$tdWV^p6d3ZwbZa?={bD*2HvK!kjM()zc z|6?6xq?ds8N=1XOz1TiWHH$wVl~JAtrlQnq0FA?)B@*Bbw_9tw3|nUg@kxpsXxk|? zYdYkKarADGCLW}Dkk*20bje7ak9yLCzA1TY65T!wOH4R9%;i2_U7?}rj>}9&uOCAX zRLt|L0Ns+$x*)9YxcZdj22?=ku()>z*F^lfNw8kgk^26uwv!w;nvJEFHs!2Jjv9CU zyu0ENcJn-+4s~@i=3_+NHA~N@jS_es@^Jl@a2ltK<&650^4Q3v} z&^PX>XT*74riCot!@KFadxm;;q@-gg=YaIPc%pL-+W3Ql@R%(VGlxDmMIW2-S(GCx z_JFtP<;CdEo?YKLw7Bx`$&QcXwhkIQp_+s0N+^v$6r zH8dk-NkgS|PZJIvD$ls6Doyv#wDXPkIMh}SHmO9*EswTS?gU~R=clt_tQbxy~rs`pitzvnwE7toXS@ljW)mVbTtwcpb zqBf>!nM}QMpVEwdU}x`^(JE1`uZ-S_59P!r-5II8tN5!(kvCy_;y>6*vgCbQMA>@@ z^5lpxTEdTWwccAAmDMy1G`^L=dQs3z^_?oW~T#V82!goFcQL1IdPBNQmSli)cWU`hZ!CNb}6+P4$~Vf=RU76 zO&0aK+ud-KF(>CJh|wvqf9e8};aa{muG3=N|7=ti-vhK*3>e0NeqyuL`Lm4mNx!CVL zzCP|0Hf9jn9($yJwd{A$D&&GWnPX01@5e1^2^*<5ld8P#*P!w9|2 zm?PP%?)T4`(xQ)l3KCi;b%{kH3pEf(GtNtaRO_{nE2scEeb| zkil#yit(G9sG5MinnPD_`|q;(;;IoM;WJLmEEywPYM8E8WuZ#JbUHbTHndRI9{kpK zBiiCX%*#mPVtFwqiK;zdu*S}AJU7cL&kJm8d)D2UkY_CX^sCTSd8SOjc-R})xPHZ0 zS>k?bvqFrUly^%%O5LonxOo%=7kN3A2+HZh5~4~tY#<4B|N3c0K*czZuQpQyU2)a> z124kx+ecJmo0-=>(@n9D38!l9 z12o40XMBhp;SJDgfos63)t`vha#ftE>5;gfmg@DoO3U_<57?2CSh#o(#hAqhC?}}o ze3Yb9gY|uq3?Uu5t5_Z+p*f6ft$5)26@q$yR74hslz_7~iyZ^gDi3x@D}ElFYya#! zj}$=#0%MRcU$~Qic4C>XN#Rxv1DhoXXOv$cL=L+jWs()C>a&%_C~jUii9z9mN2Dm* zI%ezDe)wwU8z-r9;`L#hVDORfw044)X;s@Ss||Jk{OnalsriQ=q4rk=9mC+J>EC4o zFSNH8R&8mzjfTySp|p+eiVXsknvqfp*gjjmAZ*RtezG#$yLPpc6#Y_$>dsN}Uyr@B zHo)K-6CO?n(nb|3VPd^7uSz3Es0vvf4|>Tkh`sTtMbB$4k{?rznt)i{d24=_d?ru4 zEj%-u*%FD0{T5*w;gIr*U6%6zvTbl`N^6BYW2E*=iEfA;9y`*7E=D)D54q;QyeouD|0$=c

Wyu<;aza-@qA92L~M!D%FZS`Ll%fd%fD%C}ZdOyxa<1vr;nh?7pL%zrJT;Lk}B&xA91A5^85t_^AU zhe%?sdzjV!G1(yd}g3LAy*i6&yLta+U5! zLdBKNkr&|=-@zWYwefH$f_g#tOAv{bf|wZEUnYml5o>Hha3!J8NQ#o|K={NHU^-#n zuDoI~;t&|Tjg;$%VokYt3>Yvpik1Pn;u10LBm^uRubCZLNfuFHe4M-*`*oe6?$Yh` zSGcv6+G!nDE3KiR>3cP8y;XuyqU=vTO(lOsd>X-gBKptCor5rB#w%z|SVO*uIe6vI zOd7|B8oakIV7*)E3-2P*`_O|)p5+RWA!?$jALG^17Ap^LetQ;<;tR+|>u`PzX9_&G zXj9mjKn*pUN}JLeI3S`mr130*mWW zL9X&vsbVQ>l2xEK?Uo(IpA3z+SBcqO(e!2$SN7&l@?cc2!f;x-zeNowm0I3{exOrl zCuZJJJ{;Ujsyc^1*AYlU1OaQH2Ui!H2}!hk@GpwX%h~yrn5+|%X(`1J{fKq8l){WYB|PK!?d|{HVU}gKvo`qEvlq9#O(px_!N#mYOr1q`ynAI}-TW?Cvh_-t=L= zTj*XB)C+@XJ$+s7S0XxzSq@0{C*7n3QR2z6^92tXC})k*(T(8dO^a8tpB%!SDLbA^#{7| zX(QF(7812~P z)x7ny+7~a_)oyQ(t8*bMk<`W8gXn{jtsQ%`q@q(XPIlcpf(*teGj2ZFhu%{^a8%G# zIEeI;uCxbD#Ru|B2#a;J^01dy&USbone^DFa@LH~MQ*c!2~Kko+<1>W;xeho(2!*A zf>}HD%j@dF^dE~A&B)uVC9#00HE53zfTE&=E_MH^6APws?xnGE!iab8C%s()Sgl1_ zPZ2hl3#4hb!P_28R z7_e?q2A3z22hzYYfvx)+!&q#58!3dMX4K|1z^n370`tB;mh(bai|iNjB&x;?{&-xV zD})6ELQ56{03h`8WDqcj3fK(E28jZTATuBl6u3BKN}L43Aj5`&DFJyAXMi}$aG(Gs z|8>bAxRO}^h6Ip)87kliWK#wNtb#Dff`G}8&$0?AzCsXZAu7lpS*8DcFCYYRV$}aF zu6qChfPR$!P?&#N3;+mV_}8{TtmWPV^&v%aAdCpK|BxHVI*1m6A&&=qfRM|JqP&rU zXvyb P8U#m??KK1Fzw!PH5~z|y diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/打分汇总表.docx b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/打分汇总表.docx deleted file mode 100644 index 28c3f075943d693e921797c2e0a184cd22b88987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18987 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 Vh)Z7URm=PHqER$T*LyDo`T?i`42=K) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/打分汇总表.xls b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/打分汇总表.xls new file mode 100644 index 0000000000000000000000000000000000000000..7dd771e2acb2d0be5baf2cf991dcbdb807192c84 GIT binary patch literal 6375 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 Ck>czC delta 6911 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 F003E2Z@vHk diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标报告.docx b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/评标报告.docx index be5e25b043e44258594082cea46d6749d2c762e0..371b8446ad32e9e85ed5c44704a4f1a8ea93b438 100644 GIT binary patch delta 16076 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 I{-g4L0PhLsY5)KL delta 15041 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 findRegisterAndUser(BidEvalInfoDTO bidEvalInfoDTO); +// @PostMapping("/v1/bid/archive/findRegister") + @GetMapping("/v1/bid/eval/detail/findRegister") + BaseResponse> findRegisterAndUser(@SpringQueryMap BidEvalInfoDTO bidEvalInfoDTO); /** * 初审汇总 + * * @param bidEvalDetailDTO * @return */ @PostMapping("/v1/bid/eval/summary/findScoreEarlySummary") - BaseResponse> findScoreEarlySummary(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); + BaseResponse> findScoreEarlySummary(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); - - @PostMapping("/v1/bid/archive/findPriceScoreRecord") - BaseResponse> findPriceScoreRecord( @RequestBody BidEvalDetailDTO bidEvalDetailDTO); + /** + * 价格打分 + * + * @param bidEvalDetailDTO + * @return + */ +// @PostMapping("/v1/bid/archive/findPriceScoreRecord") + @PostMapping("/v1/bid/eval/record/findPriceScoreRecord") + BaseResponse> findPriceScoreRecord(@SpringQueryMap BidEvalDetailDTO bidEvalDetailDTO); @ApiOperation("报表打印-通过评审室Id查询评委会成员数据及签到数据") @GetMapping("v1/jury/report/print/{roomId}") - BaseResponse> queryReportPrintByRoomId(@ApiParam(value = "roomId", required = true) @PathVariable String roomId); -} \ No newline at end of file + /** + * 打分汇总 + * + * @param bidEvalDetailDTO + * @return + */ + @PostMapping("v1/bid/archive/findCategoryResultSummary") + BaseResponse>> findCategoryResultSummary(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); + +} + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceFallback.java index de6eb20..836229c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceFallback.java @@ -1,18 +1,16 @@ package com.chinaunicom.mall.ebtp.extend.export.services; import java.util.List; +import java.util.Map; import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalInfoDTO; import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigCategoryDTO; -import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterPriceScoreVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.*; import org.springframework.stereotype.Component; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; @Component public class ExportServiceFallback implements ExportService{ @@ -42,5 +40,10 @@ public class ExportServiceFallback implements ExportService{ return null; } + @Override + public BaseResponse>> findCategoryResultSummary(BidEvalDetailDTO bidEvalDetailDTO) { + return null; + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java new file mode 100644 index 0000000..94930e1 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java @@ -0,0 +1,44 @@ +package com.chinaunicom.mall.ebtp.extend.export.services; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; +import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalInfoDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; +import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigCategoryDTO; +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailSummaryVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterPriceScoreVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +/** + * 调用 OPEN_SERVICE + */ +@FeignClient(value = ServiceNameConstants.OPEN_SERVICE,fallbackFactory = ExportServiceOpenFallbakFactory.class) +public interface ExportServiceOpen { + + + /** + * 查询数据 + * + * @param + * @return + */ + @ApiOperation("查询数据") +// @GetMapping("/v1/bizbidopenroom/list") + @PostMapping ("/v1/bizbidopenroom/getPostlist") + BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) BizBidOpenroom bizBidOpenroom); + +} + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpenFallbakFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpenFallbakFactory.java new file mode 100644 index 0000000..5958f34 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpenFallbakFactory.java @@ -0,0 +1,28 @@ +package com.chinaunicom.mall.ebtp.extend.export.services; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.export.bean.Tdoc; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@Slf4j +public class ExportServiceOpenFallbakFactory implements FallbackFactory { + @Override + public ExportServiceOpen create(Throwable throwable) { + ExportServiceOpen resps = new ExportServiceOpen() { + @Override + public BaseResponse> list(BizBidOpenroom bizBidOpenroom) { + return null; + } + }; + log.error(ExceptionUtil.stacktraceToString(throwable)); + return null; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceResps.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceResps.java new file mode 100644 index 0000000..d865868 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceResps.java @@ -0,0 +1,23 @@ +package com.chinaunicom.mall.ebtp.extend.export.services; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; +import com.chinaunicom.mall.ebtp.extend.export.bean.*; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * 调用 RESPS_SERVICE + */ +@FeignClient(value = ServiceNameConstants.RESPS_SERVICE , fallbackFactory = ExportServiceRespsFallbakFactory.class) +public interface ExportServiceResps { + + @PostMapping("/v1/tfile/getTenderQuoteList") + BaseResponse> getTenderQuoteList(@ApiParam(value = "assessRoomId,turnSort", required = true) @RequestBody Tdoc tdocPara); + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceRespsFallbakFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceRespsFallbakFactory.java new file mode 100644 index 0000000..13434e0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceRespsFallbakFactory.java @@ -0,0 +1,26 @@ +package com.chinaunicom.mall.ebtp.extend.export.services; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.export.bean.Tdoc; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; +@Component +@Slf4j +public class ExportServiceRespsFallbakFactory implements FallbackFactory { + @Override + public ExportServiceResps create(Throwable throwable) { + ExportServiceResps resps = new ExportServiceResps() { + @Override + public BaseResponse> getTenderQuoteList(Tdoc tdocPara) { + return null; + } + }; + log.error(ExceptionUtil.stacktraceToString(throwable)); + return null; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java index ff1e5d8..b8d3c2f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java @@ -24,7 +24,7 @@ import java.math.BigDecimal; @ApiModel(value="BidEvalDetailJudgesSummaryVO对象", description="详审专家汇总VO对象") public class BidEvalDetailJudgesSummaryVO implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; @ApiModelProperty(value = "专家ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java index 637d40d..4cadb00 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java @@ -26,7 +26,7 @@ import java.util.Map; @ApiModel(value="BidEvalDetailSummaryVO对象", description="详审汇总VO对象") public class BidEvalDetailSummaryVO implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; @ApiModelProperty(value = "报名表id(biz_bid_register)") @JsonSerialize(using = ToStringSerializer.class) @@ -50,4 +50,64 @@ public class BidEvalDetailSummaryVO implements Serializable { private Map scoreMap; + @ApiModelProperty(value = "供应商商务汇总") + private BigDecimal businessAllScore; + + @ApiModelProperty(value = "供应商服务汇总") + private BigDecimal serviceAllScore; + + @ApiModelProperty(value = "供应商价格汇总") + private BigDecimal priceAllScore; + + @ApiModelProperty(value = "供应商综合汇总") + private BigDecimal allScore; + + + public String getSupplierRegisterId() { + return supplierRegisterId; + } + + public void setSupplierRegisterId(String supplierRegisterId) { + this.supplierRegisterId = supplierRegisterId; + } + + public String getSupplierRegisterName() { + return supplierRegisterName; + } + + public void setSupplierRegisterName(String supplierRegisterName) { + this.supplierRegisterName = supplierRegisterName; + } + + public BigDecimal getBusinessAllScore() { + return businessAllScore; + } + + public void setBusinessAllScore(BigDecimal businessAllScore) { + this.businessAllScore = businessAllScore; + } + + public BigDecimal getServiceAllScore() { + return serviceAllScore; + } + + public void setServiceAllScore(BigDecimal serviceAllScore) { + this.serviceAllScore = serviceAllScore; + } + + public BigDecimal getPriceAllScore() { + return priceAllScore; + } + + public void setPriceAllScore(BigDecimal priceAllScore) { + this.priceAllScore = priceAllScore; + } + + public BigDecimal getAllScore() { + return allScore; + } + + public void setAllScore(BigDecimal allScore) { + this.allScore = allScore; + } }