From 963365cbdc78d42657fd564650dd93e06738a743 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 11 Jul 2022 09:21:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BAword?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ParamsReportDetailEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 60754ba17..ae409e6dc 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -902,6 +902,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl queryForExportCustom(ParamsReportDetailVO paramsReportDetailVO) { + paramsReportDetailVO.setSeparator("&"); // 设置分隔符 + List idList = new ArrayList<>(); if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) { idList = Arrays.asList(paramsReportDetailVO.getIds().split(",")); From 8868cf0829acc2e58eadd98cbf0affabd51c34ba Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 11:02:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/initiatingProcess.vue | 447 ++++++++++++++++++ .../technologyAssessment/index.vue | 351 ++++++++++++++ 6 files changed, 806 insertions(+) create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9c72de433..2db63ba8e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1106,4 +1106,5 @@ module.exports = { PreHomoNotification:'Pre-Homo Notification', ValidationComplianceNotification:'Validation Compliance Notification', RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification', + evaluationMethod:'Evaluation method', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 36383260f..82611fe55 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1110,4 +1110,5 @@ module.exports = { PreHomoNotification:'Pre-Homo通知', ValidationComplianceNotification:'验证符合性通知', RegulationTaskConfirmationNotification:'任务确认通知', + evaluationMethod:'评估方式', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index bd131a3ca..63efafd77 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -97,6 +97,7 @@ this.$route.path == '/handshakeProcess' || this.$route.path == '/projectStatusAndProgress' || this.$route.path == '/TaskPlanList' || + this.$route.path == '/evaluationInitiationProcess' || this.$route.path == '/historicalVersion' || this.$route.path == '/dashboard/analysis' || this.$route.path == '/processDetails') { diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index bbe11e197..6c5c7f1d2 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -342,6 +342,11 @@ export const constantRouterMap = [ name: 'initiatingProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess') }, + { + path: '/evaluationInitiationProcess', + name: 'evaluationInitiationProcess', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/initiatingProcess') + }, // { // path: '/ParameterItemCollection', // name: 'ParameterItemCollection', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue new file mode 100644 index 000000000..66b030e9c --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -0,0 +1,447 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue new file mode 100644 index 000000000..7f8b97246 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -0,0 +1,351 @@ + + + + + + \ No newline at end of file From 66d2c12d3d8edb669131b4847c90bacef5df3d80 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 15:29:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 + jero-web/src/common/lang/zh-cn.js | 5 + .../components/TermInformation.vue | 70 +++++ .../components/initiatingProcess.vue | 204 ++++++++++++--- .../components/standardDecompositionSheet.vue | 247 ++++++++++++++++++ .../technologyAssessment/index.vue | 94 ++++++- 6 files changed, 578 insertions(+), 47 deletions(-) create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2db63ba8e..9b08f22c0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1107,4 +1107,9 @@ module.exports = { ValidationComplianceNotification:'Validation Compliance Notification', RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification', evaluationMethod:'Evaluation method', + uploadRelevantMaterials:'Upload relevant materials', + processBackground:'Process background', + selectedStandard:'Selected standard', + standardDecompositionDocument:'Standard decomposition document', + pleaseSelectStandardFirst:'Please select a standard first', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 82611fe55..d1d642381 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1111,4 +1111,9 @@ module.exports = { ValidationComplianceNotification:'验证符合性通知', RegulationTaskConfirmationNotification:'任务确认通知', evaluationMethod:'评估方式', + uploadRelevantMaterials:'相关资料上传', + processBackground:'流程背景', + selectedStandard:'所选标准', + standardDecompositionDocument:'带入标准分解单', + pleaseSelectStandardFirst:'请先选择标准', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue new file mode 100644 index 000000000..1ccae18b1 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 66b030e9c..1cf238d6c 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -34,6 +34,24 @@ /> + + +
+
+ {{$t('selectedStandard')}} +
+
+ 件大事发的科技示范和的空间是否和是科技示范的空间是多少 +
+
+ + {{$t('standardDecompositionDocument')}} + +
+
+ +
@@ -52,6 +70,74 @@
+ +
+
+ {{$t('enclosure')}} +
+ + + {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || + formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + + + +
+
+ {{$t('processBackground')}} +
+ + + +
+ + + + +
+
+ {{$t('remarks')}} +
+ + + +
+ + + + +
+
+ * + {{$t('evaluationMethod')}} +
+ + + + + {{ item.name }} + + + + +
+
@@ -69,38 +155,8 @@
- - -
-
- {{$t('taskDescription')}} -
- - - -
- - - - -
-
- {{$t('enclosure')}} -
- - - {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - + {{this.$t('pleaseWaitWhileRunning')}} +
@@ -118,6 +176,8 @@ import uploadFile from '@/components/uploadFile/file' import PersonnelSelection from '@/components/PersonnelSelection/index' import footerProcess from '../../../processCenter/components/footerProcess' + import standardDecompositionSheet from './standardDecompositionSheet' + import TermInformation from './TermInformation' import { getAction, postAction } from '@/api/manage' import moment from 'moment' import eventBUs from '../../../../common/event' @@ -130,7 +190,9 @@ search, uploadFile, footerProcess, - PersonnelSelection + PersonnelSelection, + standardDecompositionSheet, + TermInformation }, data() { return { @@ -141,13 +203,24 @@ addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' }, loading: false, - JLoading:false, + JLoading: false, + isTrue: false, dataSource: [], selectedRowKeys: [], total: 0, pageSize: 10, pageNo: 1, formInline: {}, + gatherResultList: [ + { + value: 'Underway', + name: this.$t('inProgress') + }, + { + value: 'Completed', + name: this.$t('Finished') + } + ], rules: { endTime: [ { @@ -215,6 +288,11 @@ mounted() { document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess') this.getList() + if (this.$route.query.whetherTobring == '1') { + this.isTrue = true + } else { + this.isTrue = false + } eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { if (search[res] instanceof Array) { @@ -263,6 +341,16 @@ record.shift() } this.selectedRowKeysRecord = record + }, + standardDecompositionDocumentClick() { + if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) { + this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0]))) + } else { + this.$message.warning(this.$t('pleaseSelectStandardFirst')) + } + }, + standardDecompositionSheetForm(value) { + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() @@ -295,14 +383,14 @@ dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, - getUUID(){ - var str=[]; - var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; - for(var i=0;i<36;i++){ - str[i]=Chars.substr(Math.floor(Math.random()*16),1) + getUUID() { + var str = [] + var Chars = '0123456789abcdefghijklmnopqrstuvwxyz' + for (var i = 0; i < 36; i++) { + str[i] = Chars.substr(Math.floor(Math.random() * 16), 1) } - str[0]=str[8]=str[13]=str[18]=str[23]='-'; - return str.join("") + str[0] = str[8] = str[13] = str[18] = str[23] = '-' + return str.join('') }, submit() { this.$refs.ruleForm.validate(valid => { @@ -336,7 +424,7 @@ postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { this.completeTask(value, res.result) - }else{ + } else { this.JLoading = false } }) @@ -444,4 +532,38 @@ text-align: right; margin-top: 20px; } + + .title-text-content { + display: inline-block; + width: calc(100% - 334px); + text-align: center; + border: 1px solid #d9d9d9; + line-height: 38px; + border-bottom-left-radius: 5px; + border-top-left-radius: 5px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .title-text-right { + width: 200px; + text-align: center; + border: 1px solid #d9d9d9; + line-height: 38px; + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-left: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #21c9cc; + cursor: pointer; + } + + .title-text-content-one { + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + width: calc(100% - 128px); + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue new file mode 100644 index 000000000..511c36717 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -0,0 +1,247 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 7f8b97246..ca3a8db38 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -111,6 +111,43 @@ /> + + + + +
+
+ * + {{$t('standardDecompositionDocument')}} +
+ + + + + {{ item.name }} + + + + +
+ + + + @@ -126,6 +163,7 @@ list: '', getSysCategoryTree: '/sys/category/getSysCategoryTree' }, + visible: false, loading: false, toggleSearchStatus: false, dataSource: [], @@ -135,6 +173,26 @@ pageNo: 1, CategoryTreeList: [], queryParam: {}, + formInline: {}, + rules: { + whetherTobring: [ + { + required: true, + message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + whetherTobringList: [ + { + value: '1', + name: '是' + }, + { + value: '2', + name: '否' + } + ], gatherResultList: [ { value: 'Underway', @@ -271,14 +329,27 @@ onSelectChange(value) { this.selectedRowKeys = value }, + handleOk() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.visible = false + let newUrl = this.$router.resolve({ + path: '/evaluationInitiationProcess', + query: this.formInline + }) + // let newUrl = this.$router.resolve({ + // path: '/regulatoryProcessReview' + // }) + window.open(newUrl.href, '_blank') + } + }) + }, initiatingProcessClick() { - let newUrl = this.$router.resolve({ - path: '/evaluationInitiationProcess' + this.visible = true + this.formInline = {} + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() }) - // let newUrl = this.$router.resolve({ - // path: '/regulatoryProcessReview' - // }) - window.open(newUrl.href, '_blank') }, viewProcessClick(row) { let newUrl = this.$router.resolve({ @@ -348,4 +419,15 @@ .text-operation { margin-right: 8px; } + + .itemModel { + width: calc(100% - 130px); + display: inline-block; + margin-top: 2px; + } + + .Required { + color: red; + margin-right: 4px; + } \ No newline at end of file From bf4bd9e8d46c42cbbe25f68f4059ef02a76ddcb0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 16:44:33 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onthlyReportTitleTemplateEOController.java | 14 ++++- .../components/modules/fillTable.vue | 54 ++++++++++++++++--- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index db6a7d163..4ccc7a42f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -1,5 +1,7 @@ package com.jero.modules.report.controller; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -23,6 +25,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -186,13 +189,20 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController move(@RequestBody List lawsMonthlyReportTitleTemplateEOS) { + public Result move(@RequestBody JSONObject jsonObject) { + JSONArray lawsMonthlyReportTitleTemplateJson = jsonObject.getJSONArray("lawsMonthlyReportTitleTemplateEOS"); + LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = null; + List lawsMonthlyReportTitleTemplateEOS = new ArrayList<>(); + for (Object o : lawsMonthlyReportTitleTemplateJson) { + lawsMonthlyReportTitleTemplateEO=JSONObject.parseObject(JSONObject.toJSONString(o),LawsMonthlyReportTitleTemplateEO.class); + lawsMonthlyReportTitleTemplateEOS.add(lawsMonthlyReportTitleTemplateEO); + } lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS); return Result.OK("操作成功！"); } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index f738e0f96..7d2abf4fb 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -28,9 +28,9 @@ :data-source="dataSource" :columns="columns" > - - {{$t('moveUp')}} - {{$t('moveDown')}} + + {{$t('moveUp')}} + {{$t('moveDown')}} {{$t('edit')}} {{$t('deleteLib')}} @@ -69,6 +69,7 @@ dataSource: [], pageNo: 1, pageSize: 10, + sortList: [], total: 0, columns: [ { @@ -146,11 +147,49 @@ } }) }, - moveUpClick() { - + moveUpClick(row, index) { + this.sortList = [] + this.sortList.push(row) + if (row.parentId) { + let content = this.dataSource.filter(res => { + return row.parentId == res.id + }) + if (index != 0) { + this.sortList.push(content[0].children[index - 1]) + } + } else { + if (index != 0) { + this.sortList.push(this.dataSource[index - 1]) + } + } + this.move() }, - moveDownClick() { - + moveDownClick(row, index) { + this.sortList = [] + this.sortList.push(row) + if (row.parentId) { + let content = this.dataSource.filter(res => { + return row.parentId == res.id + }) + if (index != (content[0].children.length - 1)) { + this.sortList.push(content[0].children[index + 1]) + } + } else { + if (index != (this.dataSource.length - 1)) { + this.sortList.push(this.dataSource[index + 1]) + } + } + this.move() + }, + move() { + postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) }, deleteLib(val) { let _this = this @@ -185,6 +224,7 @@ text-align: right; margin-bottom: 16px; } + .text-operation { margin-right: 8px; } From a4ef7232f314ed4d93528642cbaf9a7f77f51a70 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 17:22:08 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationReport/components/modules/addModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue index 8e792dd8a..b5543536a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue @@ -207,7 +207,7 @@ queryConditionVOList: JSON.stringify(queryConditionVOList) } this.loading = true - postAction('/dummy/dummyInventoryInfoEO/queryPageDummy', query).then((res) => { + postAction('/report/lawsMonthlyReportWriteEO/queryPageDocument', query).then((res) => { if (res.success) { this.dataList = res.result.records || [] this.total = res.result.total From e6270bf4f864b2247254f129a8531deafa12c308 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 11 Jul 2022 17:30:48 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99--=E5=B8=A6=E5=85=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOController.java | 15 ++- .../ILawsMonthlyReportWriteEOService.java | 3 + .../LawsMonthlyReportWriteEOServiceImpl.java | 91 ++++++++++++++++++- 3 files changed, 105 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java index 8c873e5d6..9f965309c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java @@ -9,6 +9,7 @@ import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; @@ -27,9 +29,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; - /** +/** * @Description: 月报填写 * @Author: jero-boot * @Date: 2022-07-02 @@ -184,4 +187,14 @@ public class LawsMonthlyReportWriteEOController extends JeroController parameter) { + IPage infoPage = lawsMonthlyReportWriteEOService.queryPageDocument(parameter); + Result ok = Result.OK(infoPage); + JSONObject jsonResult = JSONObject.fromObject(ok); + return jsonResult; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java index 503feabb0..9f4e58fec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java @@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * @Description: 月报填写 @@ -77,4 +78,6 @@ public interface ILawsMonthlyReportWriteEOService extends IService exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); + + IPage queryPageDocument(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 60deb8c14..1739939b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -6,7 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.entity.NewOpinionTemplateEO; @@ -20,7 +26,9 @@ import com.jero.modules.report.service.INewOpinionTemplateEOService; import com.jero.modules.report.service.INewStandardTemplateEOService; import com.jero.modules.report.util.WordUtil; import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.XWPFDocument; @@ -37,6 +45,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -58,6 +67,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + //文档库字段 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //需要查询的字段 + List fieldListQuery = new ArrayList<>(); + fieldListQuery.add("serial_number"); + fieldListQuery.add("title"); + fieldListQuery.add("title_en"); + fieldListQuery.add("state"); + fieldListQuery.add("region"); + fieldListQuery.add("technology_territory"); + fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1"); + fieldListQuery.add("implement_time"); + fieldListQuery.add("corresponding_standard"); + fieldListQuery.add("shi4_yong4_che1_xing2"); + fieldListQuery.add("shi4_yong4_fan4_wei2"); + + List fieldListNew = new ArrayList<>(); + fieldListNew.add("id"); + + //转时间格式 + for (String field : fieldListQuery) { + String fieldTemp = null; + if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) { + String fieldNew = "date_format(" + field + ", '%Y-%m-%d')"; + fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field; + fieldListNew.add(fieldTemp); + } else { + fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field; + fieldListNew.add(fieldTemp); + } + } + //封装查询条件 + String condition = bussDocumentLibraryEOService.getConditionStr(parameter); + int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); + int pageSize = Integer.parseInt(parameter.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + + IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition); + + //树形数据字典 + List categoryList = sysCategoryService.list(); + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + + List records = infoPage.getRecords(); + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //下拉选处理数据字典 + for (Map record : records) { + Map record1 = (Map) record; + record1.put("state_dict",record1.get("state"));//状态 + record1.put("technology_territory_dict",record1.get("technology_territory"));//相关领域 + record1.put("shi4_yong4_fan4_wei2_dict",record1.get("shi4_yong4_fan4_wei2"));//适用范围 + record1.put("shi4_yong4_che1_xing2_dict",record1.get("shi4_yong4_che1_xing2"));//适用车型 + for (Map.Entry entry : record1.entrySet()) { + //下拉选处理数据字典 + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null); + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + } + return infoPage; + } + } From 348ef3667682aefca19e4b0fee174139db0686a4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 17:41:56 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../technologyAssessment/index.vue | 10 +- .../processForm/evaluationProcess/index.vue | 209 ++++++++++++++++++ 4 files changed, 220 insertions(+), 5 deletions(-) create mode 100644 jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 63efafd77..d2b7479b0 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -97,6 +97,7 @@ this.$route.path == '/handshakeProcess' || this.$route.path == '/projectStatusAndProgress' || this.$route.path == '/TaskPlanList' || + this.$route.path == '/evaluationProcess' || this.$route.path == '/evaluationInitiationProcess' || this.$route.path == '/historicalVersion' || this.$route.path == '/dashboard/analysis' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 6c5c7f1d2..b544ebd0b 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -367,6 +367,11 @@ export const constantRouterMap = [ name: 'taskListProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index') }, + { + path: '/evaluationProcess', + name: 'evaluationProcess', + component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index') + }, { path: '/handshakeProcess', name: 'handshakeProcess', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index ca3a8db38..52090af72 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -333,13 +333,13 @@ this.$refs.ruleForm.validate(valid => { if (valid) { this.visible = false - let newUrl = this.$router.resolve({ - path: '/evaluationInitiationProcess', - query: this.formInline - }) // let newUrl = this.$router.resolve({ - // path: '/regulatoryProcessReview' + // path: '/evaluationInitiationProcess', + // query: this.formInline // }) + let newUrl = this.$router.resolve({ + path: '/evaluationProcess' + }) window.open(newUrl.href, '_blank') } }) diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue new file mode 100644 index 000000000..94ec268cf --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -0,0 +1,209 @@ + + + + + \ No newline at end of file From fd165ded018285f10a954281a96481e0c3c51a88 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 11 Jul 2022 17:46:20 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 27 +++ .../com/jero/config/shiro/ShiroConfig.java | 4 + .../LawsTechnologyEvaluationEOController.java | 16 +- ...ologyEvaluationFlowDetailEOController.java | 184 ++++++++++++++++++ .../LawsTechnologyEvaluationFlowDetailEO.java | 89 +++++++++ .../enums/EvaluationTypeEnum.java | 51 +++++ ...echnologyEvaluationFlowDetailEOMapper.java | 17 ++ ...TechnologyEvaluationFlowDetailEOMapper.xml | 17 ++ .../ILawsTechnologyEvaluationEOService.java | 9 + ...chnologyEvaluationFlowDetailEOService.java | 70 +++++++ ...LawsTechnologyEvaluationEOServiceImpl.java | 33 ++++ ...logyEvaluationFlowDetailEOServiceImpl.java | 129 ++++++++++++ .../wkflow/controller/workFlowController.java | 11 ++ .../wkflow/entity/TaskCommonQuery.java | 4 +- .../modules/wkflow/enums/FlowTypeEnum.java | 1 + .../feginClient/WorkFlowFeignClient.java | 8 + .../impl/WorkFlowFeignClientImpl.java | 10 + 17 files changed, 678 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 5af2789e3..12b54b750 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -238,3 +238,30 @@ CREATE TABLE `laws_technology_evaluation` ( `prc_num` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC; + +-- 法规技术评估-流程明细表 +CREATE TABLE `laws_technology_evaluation_flow_detail` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id', + `acti_proc_inst_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', + `prc_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号', + `prc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程名称', + `evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-流程明细表' ROW_FORMAT = Dynamic; + +-- 工作流数据库增加数据。 +INSERT INTO `t_form` ( + `OBJECT_ID`,`CODE`,`CREATE_TIME`,`WIDGET_JSON`,`JSON`,`NAME`,`SHOW_KEY`,`IS_DELETED`, + `MODEL_ID`,`JSON_EVAL`,`HTML`,`RUN_TYPE`,`CATEGORY_ID`,`HTML_READONLY` +) +VALUES +( + 'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL, + 0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL +); diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index c68350d46..d09b3c92b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -145,6 +145,10 @@ public class ShiroConfig { filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除 filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除 filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除 + // 法规技术评估表-流程明细 工作流处理数据接口排除 + filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/processCall", "anon"); + // 法规技术评估表 工作流处理数据接口排除 + filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon"); filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 // 添加自己的过滤器并且取名为jwt diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 2c8380afc..f62943826 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; @@ -35,7 +37,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsTechnologyEvaluationEOController extends JeroController { @Autowired private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService; - + /** * 分页列表查询 * @@ -167,4 +169,16 @@ public class LawsTechnologyEvaluationEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ + return this.lawsTechnologyEvaluationEOService.processCall(jsonObject); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java new file mode 100644 index 000000000..38fa76c5a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java @@ -0,0 +1,184 @@ +package com.jero.modules.lawsTechnologyEvaluation.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规技术评估表-流程明细 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Api(tags="法规技术评估表-流程明细") +@RestController +@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO") +@Slf4j +public class LawsTechnologyEvaluationFlowDetailEOController extends JeroController { + @Autowired + private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService; + + /** + * 分页列表查询 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-分页列表查询") + @ApiOperation(value="法规技术评估表-流程明细-分页列表查询", notes="法规技术评估表-流程明细-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationFlowDetailEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsTechnologyEvaluationFlowDetailEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-列表查询") + @ApiOperation(value="法规技术评估表-流程明细-列表查询", notes="法规技术评估表-流程明细-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsTechnologyEvaluationFlowDetailEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-添加") + @ApiOperation(value="法规技术评估表-流程明细-添加", notes="法规技术评估表-流程明细-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) { + lawsTechnologyEvaluationFlowDetailEOService.add(lawsTechnologyEvaluationFlowDetailEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-编辑") + @ApiOperation(value="法规技术评估表-流程明细-编辑", notes="法规技术评估表-流程明细-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) { + lawsTechnologyEvaluationFlowDetailEOService.editById(lawsTechnologyEvaluationFlowDetailEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-通过id删除") + @ApiOperation(value="法规技术评估表-流程明细-通过id删除", notes="法规技术评估表-流程明细-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsTechnologyEvaluationFlowDetailEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-批量删除") + @ApiOperation(value="法规技术评估表-流程明细-批量删除", notes="法规技术评估表-流程明细-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsTechnologyEvaluationFlowDetailEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估表-流程明细-通过id查询") + @ApiOperation(value="法规技术评估表-流程明细-通过id查询", notes="法规技术评估表-流程明细-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO = lawsTechnologyEvaluationFlowDetailEOService.queryById(id); + if(lawsTechnologyEvaluationFlowDetailEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsTechnologyEvaluationFlowDetailEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsTechnologyEvaluationFlowDetailEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) { + return super.exportXls(request, lawsTechnologyEvaluationFlowDetailEO, LawsTechnologyEvaluationFlowDetailEO.class, "法规技术评估表-流程明细"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsTechnologyEvaluationFlowDetailEO.class); + } + + /** + * 流程调用接口 + * @param jsonObject + * @return + */ + @AutoLog(value = "法规意见收集-流程明细表-流程调用") + @ApiOperation(value="法规意见收集-流程明细表-流程调用", notes="法规意见收集-流程明细表-流程调用") + @PostMapping(value = "/processCall") + public Result processCall(@RequestBody JSONObject jsonObject){ + return this.lawsTechnologyEvaluationFlowDetailEOService.processCall(jsonObject); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java new file mode 100644 index 000000000..8178c3dfb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java @@ -0,0 +1,89 @@ +package com.jero.modules.lawsTechnologyEvaluation.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规技术评估表-流程明细 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Data +@TableName("laws_technology_evaluation_flow_detail") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_technology_evaluation_flow_detail对象", description="法规技术评估表-流程明细") +public class LawsTechnologyEvaluationFlowDetailEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**法规技术评估表id*/ + @Excel(name = "法规技术评估表id", width = 15) + @ApiModelProperty(value = "法规技术评估表id") + private java.lang.String lawsTechnologyEvaluationId; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private java.lang.String actiProcInstId; + + /**流程编号*/ + @Excel(name = "流程编号", width = 15) + @ApiModelProperty(value = "流程编号") + private java.lang.String prcNum; + + /**流程名称*/ + @Excel(name = "流程名称", width = 15) + @ApiModelProperty(value = "流程名称") + private java.lang.String prcName; + + /**评估人id*/ + @Excel(name = "评估人id", width = 15) + @ApiModelProperty(value = "评估人id") + private java.lang.String evaluatorId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java new file mode 100644 index 000000000..06d9043c6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java @@ -0,0 +1,51 @@ +package com.jero.modules.lawsTechnologyEvaluation.enums; + +import com.alibaba.druid.util.StringUtils; +import com.jero.common.constant.enums.CutEnum; + +/** + * 评估类型枚举类 + */ +public enum EvaluationTypeEnum { + FEED_BACK("反馈评估","Feedback evaluation"), + ITEM("条款评估","Item evaluation"), + ; + + String name; + String value; + + private EvaluationTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + EvaluationTypeEnum[] values = values(); + for (EvaluationTypeEnum certificationProgressEnum : values) { + if (certificationProgressEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return certificationProgressEnum.name; + }else { + return certificationProgressEnum.value; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java new file mode 100644 index 000000000..da6be153c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsTechnologyEvaluation.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规技术评估表-流程明细 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml new file mode 100644 index 000000000..72cc2a9f6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index 65a302e4c..ba0402ba0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -1,5 +1,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +60,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java new file mode 100644 index 000000000..89af12bd5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java @@ -0,0 +1,70 @@ +package com.jero.modules.lawsTechnologyEvaluation.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规技术评估表-流程明细 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface ILawsTechnologyEvaluationFlowDetailEOService extends IService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @return + */ + void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO); + + /** + * 更新 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @return + */ + void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsTechnologyEvaluationFlowDetailEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 5d7100f1d..737583f85 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -1,9 +1,20 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import java.util.ArrayList; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -86,4 +97,26 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){ + LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class); + this.save(lawsTechnologyEvaluationEO); + } + + return new Result<>().success("调用成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java new file mode 100644 index 000000000..dbf699f42 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java @@ -0,0 +1,129 @@ +package com.jero.modules.lawsTechnologyEvaluation.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规技术评估表-流程明细 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Service +public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationFlowDetailEOService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @return + */ + @Override + public void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) { + Date now = new Date(); + lawsTechnologyEvaluationFlowDetailEO.setCreateTime(now); + lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now); + save(lawsTechnologyEvaluationFlowDetailEO); + } + + /** + * 更新 + * + * @param lawsTechnologyEvaluationFlowDetailEO + * @return + */ + @Override + public void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) { + Date now = new Date(); + lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now); + saveOrUpdate(lawsTechnologyEvaluationFlowDetailEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsTechnologyEvaluationFlowDetailEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){ + JSONArray lawsTechnologyEvaluationListArray = jsonObject.getJSONArray("lawsTechnologyEvaluationList"); + List detailList = new ArrayList<>(); + LawsTechnologyEvaluationFlowDetailEO detailEO = null; + for (Object lawsTechnologyEvaluation : lawsTechnologyEvaluationListArray) { + detailEO = JSONObject.parseObject(JSONObject.toJSONString(lawsTechnologyEvaluation),LawsTechnologyEvaluationFlowDetailEO.class); + detailList.add(detailEO); + } + if(CollectionUtils.isNotEmpty(detailList)){ + this.saveBatch(detailList); + } + } + + return new Result<>().success("调用成功！"); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index bf3b4ca11..b39663dc2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -71,6 +71,9 @@ public class workFlowController { }else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){ jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey()); return this.activiti_define_start(jsonObject); + }else if(StringUtils.equals(type,FlowTypeEnum.FGJSPG.getValue())){ + jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey()); + return this.startLawsTechnologyEvaluationProcess(jsonObject); }else{ return null; } @@ -192,4 +195,12 @@ public class workFlowController { conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO); } + /** + * 启动流程-法规技术评估流程 + * @param jsonObject + * @return + */ + public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){ + return workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java index 27ed1817a..cbecf5705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java @@ -45,7 +45,9 @@ public class TaskCommonQuery { @ApiModelProperty(value = "流程类型") private String prcType; - private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue(); + private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + + "," + FlowTypeEnum.FGYJSJLC.getValue() + + "," + FlowTypeEnum.FGJSPG.getValue(); @ApiModelProperty(value = "高级搜索字符串") private String advanceSearchVOStr; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 159c3a27b..d41f6e887 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -10,6 +10,7 @@ public enum FlowTypeEnum { PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"), YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"), FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"), + FGJSPG("6","法规技术评估","FGJSPG","法规技术评估流程","fgjspglc"), ; private String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index f6a1f8a0a..59d7da450 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -137,4 +137,12 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/completeTaskByPids",method = RequestMethod.GET) Result completeTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); + + /** + * 启动流程-法规技术评估流程 + * @param jsonObject + * @return + */ + @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result startLawsTechnologyEvaluationProcess(String jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index f41e56c44..78da46005 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -157,4 +157,14 @@ public class WorkFlowFeignClientImpl{ public List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu); } + + /** + * 启动流程-法规技术评估流程 + * @param jsonObject + * @return + */ + public Result startLawsTechnologyEvaluationProcess(@RequestBody net.sf.json.JSONObject jsonObject){ + Result stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString()); + return Result.OK(stringWrapper.getResult()); + } } From 3836acb7ce6f0521cda47ece4ee00221f361dd7d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 11 Jul 2022 19:34:53 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 57 +++++ .../com/jero/config/shiro/ShiroConfig.java | 2 + ...valuationComplianceResultEOController.java | 170 +++++++++++++++ ...ologyEvaluationFlowDetailEOController.java | 4 +- ...ologyEvaluationItemResultEOController.java | 197 ++++++++++++++++++ ...echnologyEvaluationResultEOController.java | 186 +++++++++++++++++ ...echnologyEvaluationComplianceResultEO.java | 79 +++++++ .../LawsTechnologyEvaluationItemResultEO.java | 132 ++++++++++++ .../LawsTechnologyEvaluationResultEO.java | 101 +++++++++ ...ogyEvaluationComplianceResultEOMapper.java | 17 ++ ...echnologyEvaluationItemResultEOMapper.java | 17 ++ ...awsTechnologyEvaluationResultEOMapper.java | 17 ++ ...logyEvaluationComplianceResultEOMapper.xml | 15 ++ ...TechnologyEvaluationItemResultEOMapper.xml | 25 +++ ...LawsTechnologyEvaluationResultEOMapper.xml | 19 ++ ...gyEvaluationComplianceResultEOService.java | 61 ++++++ ...chnologyEvaluationItemResultEOService.java | 76 +++++++ ...wsTechnologyEvaluationResultEOService.java | 68 ++++++ ...aluationComplianceResultEOServiceImpl.java | 89 ++++++++ ...LawsTechnologyEvaluationEOServiceImpl.java | 3 + ...logyEvaluationItemResultEOServiceImpl.java | 150 +++++++++++++ ...chnologyEvaluationResultEOServiceImpl.java | 138 ++++++++++++ 22 files changed, 1621 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 12b54b750..6f67d579a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -265,3 +265,60 @@ VALUES 'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL, 0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL ); + +-- 法规技术评估-条款信息评估结果表 +CREATE TABLE `laws_technology_evaluation_item_result` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `item_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款id', + `item_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款号', + `item_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款名称', + `item_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款内容', + `evaluation_methods` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估方式', + `technical_file_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称', + `section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节', + `opinion` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '意见', + `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件', + `compliance_result` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果', + `evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id', + `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', + `sponsor_feedback` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发起人反馈', + `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-条款信息评估结果表' ROW_FORMAT = Dynamic; + +-- 法规技术评估-评估人反馈-符合性结果表 +CREATE TABLE `laws_technology_evaluation_compliance_result` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id', + `compliance_result` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果', + `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估人反馈-符合性结果表' ROW_FORMAT = Dynamic; + +-- 法规技术评估-评估结果表 +CREATE TABLE `laws_technology_evaluation_result` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id', + `related_section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节', + `issue_or_suggest` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议', + `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由', + `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件', + `submit_time` datetime NULL DEFAULT NULL COMMENT '提出时间', + `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估结果表' ROW_FORMAT = Dynamic; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index d09b3c92b..a57e7db62 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -149,6 +149,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/processCall", "anon"); // 法规技术评估表 工作流处理数据接口排除 filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon"); + // 法规技术评估-条款信息评估结果表 工作流处理数据接口排除 + filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/processCall", "anon"); filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 // 添加自己的过滤器并且取名为jwt diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java new file mode 100644 index 000000000..2cca22297 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.lawsTechnologyEvaluation.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规技术评估-评估人反馈-符合性结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Api(tags="法规技术评估-评估人反馈-符合性结果表") +@RestController +@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO") +@Slf4j +public class LawsTechnologyEvaluationComplianceResultEOController extends JeroController { + @Autowired + private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService; + + /** + * 分页列表查询 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-分页列表查询") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-分页列表查询", notes="法规技术评估-评估人反馈-符合性结果表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsTechnologyEvaluationComplianceResultEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-列表查询") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-列表查询", notes="法规技术评估-评估人反馈-符合性结果表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsTechnologyEvaluationComplianceResultEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-添加") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-添加", notes="法规技术评估-评估人反馈-符合性结果表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) { + lawsTechnologyEvaluationComplianceResultEOService.add(lawsTechnologyEvaluationComplianceResultEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-编辑") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-编辑", notes="法规技术评估-评估人反馈-符合性结果表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) { + lawsTechnologyEvaluationComplianceResultEOService.editById(lawsTechnologyEvaluationComplianceResultEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-通过id删除") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-通过id删除", notes="法规技术评估-评估人反馈-符合性结果表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsTechnologyEvaluationComplianceResultEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-批量删除") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-批量删除", notes="法规技术评估-评估人反馈-符合性结果表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsTechnologyEvaluationComplianceResultEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-通过id查询") + @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-通过id查询", notes="法规技术评估-评估人反馈-符合性结果表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO = lawsTechnologyEvaluationComplianceResultEOService.queryById(id); + if(lawsTechnologyEvaluationComplianceResultEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsTechnologyEvaluationComplianceResultEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsTechnologyEvaluationComplianceResultEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) { + return super.exportXls(request, lawsTechnologyEvaluationComplianceResultEO, LawsTechnologyEvaluationComplianceResultEO.class, "法规技术评估-评估人反馈-符合性结果表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsTechnologyEvaluationComplianceResultEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java index 38fa76c5a..499b50d43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java @@ -174,8 +174,8 @@ public class LawsTechnologyEvaluationFlowDetailEOController extends JeroControll * @param jsonObject * @return */ - @AutoLog(value = "法规意见收集-流程明细表-流程调用") - @ApiOperation(value="法规意见收集-流程明细表-流程调用", notes="法规意见收集-流程明细表-流程调用") + @AutoLog(value = "法规技术评估-流程明细表-流程调用") + @ApiOperation(value="法规技术评估-流程明细表-流程调用", notes="法规技术评估-流程明细表-流程调用") @PostMapping(value = "/processCall") public Result processCall(@RequestBody JSONObject jsonObject){ return this.lawsTechnologyEvaluationFlowDetailEOService.processCall(jsonObject); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java new file mode 100644 index 000000000..ccf5dcd61 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java @@ -0,0 +1,197 @@ +package com.jero.modules.lawsTechnologyEvaluation.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规技术评估-条款信息评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Api(tags="法规技术评估-条款信息评估结果表") +@RestController +@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO") +@Slf4j +public class LawsTechnologyEvaluationItemResultEOController extends JeroController { + @Autowired + private ILawsTechnologyEvaluationItemResultEOService lawsTechnologyEvaluationItemResultEOService; + + /** + * 分页列表查询 + * + * @param lawsTechnologyEvaluationItemResultEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-分页列表查询") + @ApiOperation(value="法规技术评估-条款信息评估结果表-分页列表查询", notes="法规技术评估-条款信息评估结果表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationItemResultEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsTechnologyEvaluationItemResultEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-列表查询") + @ApiOperation(value="法规技术评估-条款信息评估结果表-列表查询", notes="法规技术评估-条款信息评估结果表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsTechnologyEvaluationItemResultEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsTechnologyEvaluationItemResultEO + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-添加") + @ApiOperation(value="法规技术评估-条款信息评估结果表-添加", notes="法规技术评估-条款信息评估结果表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) { + lawsTechnologyEvaluationItemResultEOService.add(lawsTechnologyEvaluationItemResultEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsTechnologyEvaluationItemResultEO + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-编辑") + @ApiOperation(value="法规技术评估-条款信息评估结果表-编辑", notes="法规技术评估-条款信息评估结果表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) { + lawsTechnologyEvaluationItemResultEOService.editById(lawsTechnologyEvaluationItemResultEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-通过id删除") + @ApiOperation(value="法规技术评估-条款信息评估结果表-通过id删除", notes="法规技术评估-条款信息评估结果表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsTechnologyEvaluationItemResultEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-批量删除") + @ApiOperation(value="法规技术评估-条款信息评估结果表-批量删除", notes="法规技术评估-条款信息评估结果表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsTechnologyEvaluationItemResultEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-通过id查询") + @ApiOperation(value="法规技术评估-条款信息评估结果表-通过id查询", notes="法规技术评估-条款信息评估结果表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO = lawsTechnologyEvaluationItemResultEOService.queryById(id); + if(lawsTechnologyEvaluationItemResultEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsTechnologyEvaluationItemResultEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsTechnologyEvaluationItemResultEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) { + return super.exportXls(request, lawsTechnologyEvaluationItemResultEO, LawsTechnologyEvaluationItemResultEO.class, "法规技术评估-条款信息评估结果表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsTechnologyEvaluationItemResultEO.class); + } + + /** + * 流程调用接口 + * @param jsonObject + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-流程调用") + @ApiOperation(value="法规技术评估-条款信息评估结果表-流程调用", notes="法规技术评估-条款信息评估结果表-流程调用") + @PostMapping(value = "/processCall") + public Result processCall(@RequestBody JSONObject jsonObject){ + return this.lawsTechnologyEvaluationItemResultEOService.processCall(jsonObject); + } + + /** + * 编辑 + * + * @param jsonObject + * @return + */ + @AutoLog(value = "法规技术评估-条款信息评估结果表-批量更新") + @ApiOperation(value="法规技术评估-条款信息评估结果表-批量更新", notes="法规技术评估-条款信息评估结果表-批量更新") + @PostMapping(value = "/batchUpdate") + public Result batchUpdate(@RequestBody JSONObject jsonObject) { + this.lawsTechnologyEvaluationItemResultEOService.batchUpdate(jsonObject); + return Result.OK("编辑成功!"); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java new file mode 100644 index 000000000..7dc83916c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java @@ -0,0 +1,186 @@ +package com.jero.modules.lawsTechnologyEvaluation.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规技术评估-评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Api(tags="法规技术评估-评估结果表") +@RestController +@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO") +@Slf4j +public class LawsTechnologyEvaluationResultEOController extends JeroController { + @Autowired + private ILawsTechnologyEvaluationResultEOService lawsTechnologyEvaluationResultEOService; + + /** + * 分页列表查询 + * + * @param lawsTechnologyEvaluationResultEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-分页列表查询") + @ApiOperation(value="法规技术评估-评估结果表-分页列表查询", notes="法规技术评估-评估结果表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationResultEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsTechnologyEvaluationResultEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-列表查询") + @ApiOperation(value="法规技术评估-评估结果表-列表查询", notes="法规技术评估-评估结果表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsTechnologyEvaluationResultEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsTechnologyEvaluationResultEO + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-添加") + @ApiOperation(value="法规技术评估-评估结果表-添加", notes="法规技术评估-评估结果表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) { + lawsTechnologyEvaluationResultEOService.add(lawsTechnologyEvaluationResultEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsTechnologyEvaluationResultEO + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-编辑") + @ApiOperation(value="法规技术评估-评估结果表-编辑", notes="法规技术评估-评估结果表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) { + lawsTechnologyEvaluationResultEOService.editById(lawsTechnologyEvaluationResultEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-通过id删除") + @ApiOperation(value="法规技术评估-评估结果表-通过id删除", notes="法规技术评估-评估结果表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsTechnologyEvaluationResultEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-批量删除") + @ApiOperation(value="法规技术评估-评估结果表-批量删除", notes="法规技术评估-评估结果表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsTechnologyEvaluationResultEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-通过id查询") + @ApiOperation(value="法规技术评估-评估结果表-通过id查询", notes="法规技术评估-评估结果表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO = lawsTechnologyEvaluationResultEOService.queryById(id); + if(lawsTechnologyEvaluationResultEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsTechnologyEvaluationResultEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsTechnologyEvaluationResultEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) { + return super.exportXls(request, lawsTechnologyEvaluationResultEO, LawsTechnologyEvaluationResultEO.class, "法规技术评估-评估结果表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsTechnologyEvaluationResultEO.class); + } + + + /** + * 添加 + * + * @param json + * @return + */ + @AutoLog(value = "法规技术评估-评估结果表-批量添加") + @ApiOperation(value="法规技术评估-评估结果表-批量添加", notes="法规技术评估-评估结果表-批量添加") + @PostMapping(value = "/evaluatorSaveResult") + public Result evaluatorSaveResult(@RequestBody JSONObject json) { + lawsTechnologyEvaluationResultEOService.evaluatorSaveResult(json); + return Result.OK("添加成功！"); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java new file mode 100644 index 000000000..d642d1c95 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.lawsTechnologyEvaluation.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规技术评估-评估人反馈-符合性结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Data +@TableName("laws_technology_evaluation_compliance_result") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_technology_evaluation_compliance_result对象", description="法规技术评估-评估人反馈-符合性结果表") +public class LawsTechnologyEvaluationComplianceResultEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**法规技术评估表id*/ + @Excel(name = "法规技术评估表id", width = 15) + @ApiModelProperty(value = "法规技术评估表id") + private java.lang.String lawsTechnologyEvaluationId; + + /**符合性结果*/ + @Excel(name = "符合性结果", width = 15) + @ApiModelProperty(value = "符合性结果") + private java.lang.String complianceResult; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private java.lang.String actiProcInstId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java new file mode 100644 index 000000000..0ef568162 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java @@ -0,0 +1,132 @@ +package com.jero.modules.lawsTechnologyEvaluation.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规技术评估-条款信息评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Data +@TableName("laws_technology_evaluation_item_result") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_technology_evaluation_item_result对象", description="法规技术评估-条款信息评估结果表") +public class LawsTechnologyEvaluationItemResultEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**条款id*/ + @Excel(name = "条款id", width = 15) + @ApiModelProperty(value = "条款id") + private java.lang.String itemId; + + /**条款号*/ + @Excel(name = "条款号", width = 15) + @ApiModelProperty(value = "条款号") + private java.lang.String itemNum; + + /**条款名称*/ + @Excel(name = "条款名称", width = 15) + @ApiModelProperty(value = "条款名称") + private java.lang.String itemName; + + /**条款内容*/ + @Excel(name = "条款内容", width = 15) + @ApiModelProperty(value = "条款内容") + private java.lang.String itemContent; + + /**评估方式*/ + @Excel(name = "评估方式", width = 15) + @ApiModelProperty(value = "评估方式") + private java.lang.String evaluationMethods; + + /**技术文件名称*/ + @Excel(name = "技术文件名称", width = 15) + @ApiModelProperty(value = "技术文件名称") + private java.lang.String technicalFileName; + + /**章节*/ + @Excel(name = "章节", width = 15) + @ApiModelProperty(value = "章节") + private java.lang.String section; + + /**意见*/ + @Excel(name = "意见", width = 15) + @ApiModelProperty(value = "意见") + private java.lang.String opinion; + + /**附件*/ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private java.lang.String accessoryFile; + + /**符合性结果*/ + @Excel(name = "符合性结果", width = 15) + @ApiModelProperty(value = "符合性结果") + private java.lang.String complianceResult; + + /**评估人id*/ + @Excel(name = "评估人id", width = 15) + @ApiModelProperty(value = "评估人id") + private java.lang.String evaluatorId; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private java.lang.String actiProcInstId; + + /**发起人反馈*/ + @Excel(name = "发起人反馈", width = 15) + @ApiModelProperty(value = "发起人反馈") + private java.lang.String sponsorFeedback; + + /**法规技术评估表id*/ + @ApiModelProperty(value = "法规技术评估表id") + private java.lang.String lawsTechnologyEvaluationId; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java new file mode 100644 index 000000000..1777b8396 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java @@ -0,0 +1,101 @@ +package com.jero.modules.lawsTechnologyEvaluation.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规技术评估-评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Data +@TableName("laws_technology_evaluation_result") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_technology_evaluation_result对象", description="法规技术评估-评估结果表") +public class LawsTechnologyEvaluationResultEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**法规技术评估表id*/ + @Excel(name = "法规技术评估表id", width = 15) + @ApiModelProperty(value = "法规技术评估表id") + private java.lang.String lawsTechnologyEvaluationId; + + /**相关章节*/ + @Excel(name = "相关章节", width = 15) + @ApiModelProperty(value = "相关章节") + private java.lang.String relatedSection; + + /**问题/建议*/ + @Excel(name = "问题/建议", width = 15) + @ApiModelProperty(value = "问题/建议") + private java.lang.String issueOrSuggest; + + /**理由*/ + @Excel(name = "理由", width = 15) + @ApiModelProperty(value = "理由") + private java.lang.String reason; + + /**附件*/ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private java.lang.String accessoryFile; + + /**提出时间*/ + @Excel(name = "提出时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "提出时间") + private java.util.Date submitTime; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private java.lang.String actiProcInstId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java new file mode 100644 index 000000000..4306057ae --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsTechnologyEvaluation.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规技术评估-评估人反馈-符合性结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface LawsTechnologyEvaluationComplianceResultEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java new file mode 100644 index 000000000..9e46327ff --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsTechnologyEvaluation.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规技术评估-条款信息评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface LawsTechnologyEvaluationItemResultEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java new file mode 100644 index 000000000..871666f41 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsTechnologyEvaluation.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规技术评估-评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface LawsTechnologyEvaluationResultEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml new file mode 100644 index 000000000..bb7b021b5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml new file mode 100644 index 000000000..36a1ce561 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml new file mode 100644 index 000000000..f25dba1c3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java new file mode 100644 index 000000000..f93d11f0c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.lawsTechnologyEvaluation.service; + +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规技术评估-评估人反馈-符合性结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface ILawsTechnologyEvaluationComplianceResultEOService extends IService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @return + */ + void add(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO); + + /** + * 更新 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @return + */ + void editById(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsTechnologyEvaluationComplianceResultEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java new file mode 100644 index 000000000..bdc60abf2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java @@ -0,0 +1,76 @@ +package com.jero.modules.lawsTechnologyEvaluation.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规技术评估-条款信息评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface ILawsTechnologyEvaluationItemResultEOService extends IService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationItemResultEO + * @return + */ + void add(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO); + + /** + * 更新 + * + * @param lawsTechnologyEvaluationItemResultEO + * @return + */ + void editById(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsTechnologyEvaluationItemResultEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); + + /** + * 批量更新 + * @param jsonObject + */ + void batchUpdate(JSONObject jsonObject); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java new file mode 100644 index 000000000..a1ab5e08c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java @@ -0,0 +1,68 @@ +package com.jero.modules.lawsTechnologyEvaluation.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规技术评估-评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +public interface ILawsTechnologyEvaluationResultEOService extends IService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationResultEO + * @return + */ + void add(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO); + + /** + * 更新 + * + * @param lawsTechnologyEvaluationResultEO + * @return + */ + void editById(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsTechnologyEvaluationResultEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 评估人保存/提交 + * @param json + */ + void evaluatorSaveResult(JSONObject json); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java new file mode 100644 index 000000000..8f8397d0c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.lawsTechnologyEvaluation.service.impl; + +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; +import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规技术评估-评估人反馈-符合性结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Service +public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationComplianceResultEOService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @return + */ + @Override + public void add(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) { + Date now = new Date(); + lawsTechnologyEvaluationComplianceResultEO.setCreateTime(now); + lawsTechnologyEvaluationComplianceResultEO.setUpdateTime(now); + save(lawsTechnologyEvaluationComplianceResultEO); + } + + /** + * 更新 + * + * @param lawsTechnologyEvaluationComplianceResultEO + * @return + */ + @Override + public void editById(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) { + Date now = new Date(); + lawsTechnologyEvaluationComplianceResultEO.setUpdateTime(now); + saveOrUpdate(lawsTechnologyEvaluationComplianceResultEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsTechnologyEvaluationComplianceResultEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 737583f85..ef74f3786 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -115,6 +115,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl().success("调用成功！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java new file mode 100644 index 000000000..9f2fdc9f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -0,0 +1,150 @@ +package com.jero.modules.lawsTechnologyEvaluation.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO; +import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规技术评估-条款信息评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Service +public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationItemResultEOService { + + /** + * 保存 + * + * @param lawsTechnologyEvaluationItemResultEO + * @return + */ + @Override + public void add(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) { + Date now = new Date(); + lawsTechnologyEvaluationItemResultEO.setCreateTime(now); + lawsTechnologyEvaluationItemResultEO.setUpdateTime(now); + save(lawsTechnologyEvaluationItemResultEO); + } + + /** + * 更新 + * + * @param lawsTechnologyEvaluationItemResultEO + * @return + */ + @Override + public void editById(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) { + Date now = new Date(); + lawsTechnologyEvaluationItemResultEO.setUpdateTime(now); + saveOrUpdate(lawsTechnologyEvaluationItemResultEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsTechnologyEvaluationItemResultEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + /** + * 流程调用 + * @param jsonObject + * @return + */ + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){ + JSONArray itemResultEOList = jsonObject.getJSONArray("itemResultEOList"); + List itemResultList = new ArrayList<>(); + LawsTechnologyEvaluationItemResultEO itemResultEO = null; + for (Object itemResult : itemResultEOList) { + itemResultEO = JSONObject.parseObject(JSONObject.toJSONString(itemResult),LawsTechnologyEvaluationItemResultEO.class); + itemResultList.add(itemResultEO); + } + if(CollectionUtils.isNotEmpty(itemResultList)){ + this.saveBatch(itemResultList); + } + } + + return new Result<>().success("调用成功！"); + } + + @Override + public void batchUpdate(JSONObject jsonObject) { + JSONArray itemResultArray = jsonObject.getJSONArray("itemResultList"); + List itemResultEOList = new ArrayList<>(); + LawsTechnologyEvaluationItemResultEO itemResultEO = null; + for (Object itemResult : itemResultArray) { + itemResultEO = JSONObject.parseObject(JSONObject.toJSONString(itemResult),LawsTechnologyEvaluationItemResultEO.class); + itemResultEOList.add(itemResultEO); + } + + if(CollectionUtils.isNotEmpty(itemResultEOList)){ + this.updateBatchById(itemResultEOList); + } + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java new file mode 100644 index 000000000..21a4f9974 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java @@ -0,0 +1,138 @@ +package com.jero.modules.lawsTechnologyEvaluation.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; +import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规技术评估-评估结果表 + * @Author: jero-boot + * @Date: 2022-07-11 + * @Version: V1.0 + */ +@Service +public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationResultEOService { + + @Autowired + private ILawsTechnologyEvaluationComplianceResultEOService complianceResultEOService; + + /** + * 保存 + * + * @param lawsTechnologyEvaluationResultEO + * @return + */ + @Override + public void add(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) { + Date now = new Date(); + lawsTechnologyEvaluationResultEO.setCreateTime(now); + lawsTechnologyEvaluationResultEO.setUpdateTime(now); + save(lawsTechnologyEvaluationResultEO); + } + + /** + * 更新 + * + * @param lawsTechnologyEvaluationResultEO + * @return + */ + @Override + public void editById(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) { + Date now = new Date(); + lawsTechnologyEvaluationResultEO.setUpdateTime(now); + saveOrUpdate(lawsTechnologyEvaluationResultEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsTechnologyEvaluationResultEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public void evaluatorSaveResult(JSONObject json) { + String actiProcInstId = json.getString("actiProcInstId"); + String lawsTechnologyEvaluationId = json.getString("lawsTechnologyEvaluationId"); + + String complianceResult = json.getString("complianceResult"); + + //删除符合性结果信息 + QueryWrapper removeComplianceResultWrapper = new QueryWrapper<>(); + removeComplianceResultWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getActiProcInstId,actiProcInstId); + removeComplianceResultWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId); + complianceResultEOService.remove(removeComplianceResultWrapper); + + LawsTechnologyEvaluationComplianceResultEO complianceResultEO = new LawsTechnologyEvaluationComplianceResultEO(); + complianceResultEO.setActiProcInstId(actiProcInstId); + complianceResultEO.setLawsTechnologyEvaluationId(lawsTechnologyEvaluationId); + complianceResultEO.setComplianceResult(complianceResult); + complianceResultEOService.save(complianceResultEO); + + //删除之前提交的评估信息 + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(LawsTechnologyEvaluationResultEO::getActiProcInstId,actiProcInstId); + deleteWrapper.lambda().eq(LawsTechnologyEvaluationResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId); + this.baseMapper.delete(deleteWrapper); + + JSONArray evaluationResultList = json.getJSONArray("evaluationResultList"); + List evaluationResultEOList = new ArrayList<>(); + LawsTechnologyEvaluationResultEO evaluationResultEO = null; + for (Object evaluationResult : evaluationResultList) { + evaluationResultEO = JSONObject.parseObject(JSONObject.toJSONString(evaluationResult),LawsTechnologyEvaluationResultEO.class); + evaluationResultEOList.add(evaluationResultEO); + } + if(CollectionUtils.isNotEmpty(evaluationResultEOList)){ + this.saveBatch(evaluationResultEOList); + } + } +}