From 71e31d5337f77874fdc644457313fd1a6c1ca3af Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 1 Sep 2023 16:09:08 +0800 Subject: [PATCH 01/55] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=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 | 9 + jero-web/src/common/lang/zh-cn.js | 9 + .../projectNonConformance/index.vue | 305 ++++--- .../moudles/addModel.vue | 757 ++++++++++++++++++ .../moudles/detilModel.vue | 751 +++++++++++++++++ 5 files changed, 1704 insertions(+), 127 deletions(-) create mode 100644 jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue create mode 100644 jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f46b83a73..8bab38230 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1955,4 +1955,13 @@ module.exports = { Reasonforreturn:'Reason for return', maintenanceTemplate:'Maintenance template', UserFeedback:'User Feedback', + Relevantlawsregulations:'Relevant laws and regulations', + Problemstate:'Problem state', + descriptions:'Descriptions', + documents:'Documents', + examineapproveevidence:'Examine and approve evidence', + conculsion:'Conculsion', + progresstracking:'Progress Tracking', + Fileupload:'File upload', + Addresslink:'Address link', } \ 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 0292fa24a..e50d526ce 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3911,4 +3911,13 @@ module.exports = { Modifyremarks:'修改备注', Reasonforreturn:'退回原因', UserFeedback:'用户反馈', + Relevantlawsregulations:'相关法规', + Problemstate:'问题状态', + descriptions:'描述和分析', + documents:'相关文件', + examineapproveevidence:'审批证据', + conculsion:'结论', + progresstracking:'进度追踪', + Fileupload:'文件上传', + Addresslink:'地址链接', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 26225f031..d9e3294cd 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -3,15 +3,6 @@
- -
-
- {{$t('standard')}} -
- -
-
@@ -23,110 +14,84 @@
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('Relevantlawsregulations')}}
- + +
+ + +
+
+ {{$t('RelatedItems')}} +
+ + + + {{ item.projectName}} + + +
@@ -142,6 +107,10 @@
+
+ + {{$t('newlyAdded')}} +
{{ $t('export') }} @@ -161,10 +130,33 @@ :data-source="dataSource" :columns="columns" > - - - {{text}} - + + + + + +
+ + {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} + +
+ + + {{ $t('See') }} + + + {{ $t('edit') }} + + + {{ $t('deleteLib') }} +
@@ -181,6 +173,8 @@ />
+ + @@ -189,12 +183,16 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance' import store from '@/store/' + import addModel from './moudles/addModel' + import detilModel from './moudles/detilModel' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'projectNonConformance', components: { PersonnelSelection, + addModel, + detilModel, designCompliance }, mixins:[ResizeHeader, ResizeColumnProvide], @@ -205,10 +203,16 @@ dataSource: [], selectedRowKeys: [], projectNameList: [], + ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], + CertificationColor: { + 'red': 'nonConformityColor', + 'green': 'accordColor', + 'yellow': 'TrackedColor', + }, toggleSearchStatus: false, columns: [ { - title: this.$t('standard'), + title: this.$t('title'), align: 'left', dataIndex: 'serialNumber', width: 170, @@ -216,33 +220,18 @@ scopedSlots: { customRender: 'standard' } }, { - title: this.$t('title'), + title: this.$t('Relevantlawsregulations'), align: 'left', dataIndex: 'title', width: 170, - scopedSlots: { customRender: 'standard' } - }, - { - title: this.$t('ProcessType'), - align: 'left', - dataIndex: 'flowType', - width: 150, - sorter:true, - ellipsis: true - }, - { - title: this.$t('areaOfResponsibility'), - align: 'left', - dataIndex: 'dutyTerritory', - width: 100, sorter:true, ellipsis: true }, { title: this.$t('RelatedItems'), align: 'left', - dataIndex: 'projectName', - width: 180, + dataIndex: 'RelatedItems', + width: 170, sorter:true, ellipsis: true }, @@ -250,23 +239,55 @@ title: this.$t('problemType'), align: 'left', dataIndex: 'problemType', + width: 170, + sorter:true, + ellipsis: true, + scopedSlots: { customRender: 'CertificationProgress' } + }, + { + title: this.$t('statisticalNodes'), + align: 'left', + dataIndex: 'dutyTerritory', + width: 100, + sorter:true, + ellipsis: true + }, + { + title: this.$t('creator'), + align: 'left', + dataIndex: 'creator', + width: 100, + sorter:true, + ellipsis: true + }, + { + title: this.$t('Problemstate'), + align: 'left', + dataIndex: 'Problemstate', width: 120, sorter:true, ellipsis: true }, { - title: this.$t('Sponsor'), + title: this.$t('createTime'), align: 'left', - dataIndex: 'initiator', + dataIndex: 'createTime', sorter:true, - width: 100 + width: 180 }, { - title: this.$t('personLiable'), + title: this.$t('updateTime'), align: 'left', - dataIndex: 'duty', + dataIndex: 'updateTime', sorter:true, - width: 100 + width: 180 + }, + { + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180, + scopedSlots: { customRender: 'operation' } } ], total: 0, @@ -274,6 +295,7 @@ pageNo: 1, orderBy: '1', orderByField: '', + long: '', isPersonnelSelection:true, url: { page: '/project/ncrTrackController/queryPage', @@ -288,6 +310,7 @@ } }, mounted() { + this.long = localStorage.getItem('language') || 'zh-cn' this.getList() this.getNameList() }, @@ -320,6 +343,9 @@ this.pageNo = 1 this.getList() }, + addModelForm(){ + this.getList() + }, onSelectChange(value) { this.content = [] this.selectedRowKeys = value @@ -384,6 +410,31 @@ } }) }, + handleAdd(){ + this.$refs.addModelRef.add() + }, + edit(record){ + this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record))) + }, + detil(record){ + this.designFlowStatusClick(record) + }, + deleteLib(record){ + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + deleteAction(_this.url.deleteBatch, { id: record.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + }) + }, handleExport() { let query = { ...this.queryParam, diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue new file mode 100644 index 000000000..de8ad4ea5 --- /dev/null +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -0,0 +1,757 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue new file mode 100644 index 000000000..7d06b0f9d --- /dev/null +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -0,0 +1,751 @@ + + + + + \ No newline at end of file From 866761beae1a458644962d6a6fda5dd94699ed59 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 09:10:09 +0800 Subject: [PATCH 02/55] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 757 ++++++++++++++++++ .../components/detilModel.vue | 751 +++++++++++++++++ .../components/nonConformance.vue | 331 ++++++-- 3 files changed, 1753 insertions(+), 86 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/addModelconformance.vue create mode 100644 jero-web/src/views/projectManagement/components/detilModel.vue diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue new file mode 100644 index 000000000..de8ad4ea5 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -0,0 +1,757 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/detilModel.vue b/jero-web/src/views/projectManagement/components/detilModel.vue new file mode 100644 index 000000000..7d06b0f9d --- /dev/null +++ b/jero-web/src/views/projectManagement/components/detilModel.vue @@ -0,0 +1,751 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 46b5b74a5..2124d0419 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -3,38 +3,103 @@
- -
-
- {{$t('standard')}} -
- -
-
{{$t('title')}}
- +
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('Relevantlawsregulations')}}
- +
+ +
+
+ {{$t('RelatedItems')}} +
+ + + + {{ item.projectName}} + + + +
+ + - {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} {{$t('query')}} @@ -42,6 +107,10 @@
+
+ + {{$t('newlyAdded')}} +
{{ $t('export') }} @@ -61,31 +130,46 @@ :data-source="dataSource" :columns="columns" > - - - {{text}} - - - - - {{text}} - +
+ + {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} + +
+ + + {{ $t('See') }} + + + {{ $t('edit') }} + + + {{ $t('deleteLib') }} +
- - - - - - - - - - - - +
+ +
+ + @@ -93,13 +177,17 @@ import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage' import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance' import store from '@/store/' + import addModel from './addModelconformance' + import detilModel from './detilModel' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'nonConformance', mixins:[ResizeHeader, ResizeColumnProvide], components:{ - designCompliance + designCompliance, + addModel, + detilModel, }, data() { return { @@ -109,76 +197,112 @@ orderByField: '', dataSource: [], selectedRowKeys: [], + projectNameList: [], + ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], + CertificationColor: { + 'red': 'nonConformityColor', + 'green': 'accordColor', + 'yellow': 'TrackedColor', + }, + toggleSearchStatus: false, columns: [ - { - title: this.$t('standard'), - align: 'left', - dataIndex: 'serialNumber', - scopedSlots: { customRender: 'standard' }, - ellipsis: true, - sorter:true, - width: 180 - }, { title: this.$t('title'), align: 'left', + dataIndex: 'serialNumber', + width: 170, + sorter:true, + scopedSlots: { customRender: 'standard' } + }, + { + title: this.$t('Relevantlawsregulations'), + align: 'left', dataIndex: 'title', - ellipsis: true, - width: 180 + width: 170, + sorter:true, + ellipsis: true }, { - title: this.$t('ProcessType'), + title: this.$t('RelatedItems'), align: 'left', - dataIndex: 'flowTypeName', - ellipsis: true, + dataIndex: 'RelatedItems', + width: 170, sorter:true, - width: 150 - }, - { - title: this.$t('areaOfResponsibility'), - align: 'left', - dataIndex: 'dutyTerritory_dictText', - ellipsis: true, - sorter:true, - width: 100 + ellipsis: true }, { title: this.$t('problemType'), align: 'left', - dataIndex: 'flowStatusName', - ellipsis: true, + dataIndex: 'problemType', + width: 170, sorter:true, - width: 150, - scopedSlots: { customRender: 'problemType' }, + ellipsis: true, + scopedSlots: { customRender: 'CertificationProgress' } }, { - title: this.$t('Sponsor'), + title: this.$t('statisticalNodes'), align: 'left', - dataIndex: 'regulationOwnerIdName', - ellipsis: true, + dataIndex: 'dutyTerritory', + width: 100, sorter:true, - width: 100 + ellipsis: true }, { - title: this.$t('personLiable'), + title: this.$t('creator'), align: 'left', - dataIndex: 'dutyIdName', - ellipsis: true, + dataIndex: 'creator', + width: 100, sorter:true, - width: 100 + ellipsis: true + }, + { + title: this.$t('Problemstate'), + align: 'left', + dataIndex: 'Problemstate', + width: 120, + sorter:true, + ellipsis: true + }, + { + title: this.$t('createTime'), + align: 'left', + dataIndex: 'createTime', + sorter:true, + width: 180 + }, + { + title: this.$t('updateTime'), + align: 'left', + dataIndex: 'updateTime', + sorter:true, + width: 180 + }, + { + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180, + scopedSlots: { customRender: 'operation' } } ], total: 0, pageSize: 10, pageNo: 1, + orderBy: '1', + orderByField: '', + long: '', + isPersonnelSelection:true, url: { page: '/project/projectLawsInventoryEO/queryNotComplianList', exportData: '/project/projectLawsInventoryEO/exportNotComplianList' - } + }, + content: [] } }, mounted() { + this.long = localStorage.getItem('language') || 'zh-cn' this.getList() + this.getNameList() }, created() { if (store.getters.userInfo) { @@ -198,6 +322,18 @@ } }, methods: { + getNameList() { + getAction('project/projectNameInfoEO/list', {}).then((res) => { + if (res.success) { + this.projectNameList = res.result || [] + } else { + this.projectNameList = [] + } + }) + }, + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, searchQuery() { this.pageNo = 1 this.getList() @@ -232,6 +368,9 @@ }) } }, + addModelForm(){ + this.getList() + }, handleExport() { let query = { ...this.queryParam, @@ -262,8 +401,8 @@ }, getList() { let query = { - // pageNo: this.pageNo, - // pageSize: this.pageSize, + pageNo: this.pageNo, + pageSize: this.pageSize, projectLibraryId: this.$route.query.id, orderBy: this.orderBy, orderByField: this.orderByField, @@ -272,8 +411,12 @@ this.loading = true getAction(this.url.page, query).then((res) => { if (res.success) { - this.dataSource = res.result || [] - // this.total = res.result.total + if (res.result.current > 1 && res.result.length == 0) { + this.pageNo = 1 + this.getList() + return + } + this.total = res.result.total this.loading = false } else { this.dataSource = [] @@ -281,14 +424,30 @@ } }) }, - standardhdClick(row) { - let newUrl = this.$router.resolve({ - path: '/docManage/library/detail', - query: { - id: row.standId + handleAdd(){ + this.$refs.addModelRef.add() + }, + edit(record){ + this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record))) + }, + detil(record){ + this.problemTypeClick(record) + }, + deleteLib(record){ + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + deleteAction(_this.url.deleteBatch, { id: record.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) } }) - window.open(newUrl.href, '_blank') }, problemTypeClick(row, name){ let query = {} From eb12ae499f433b988f92d241d9a4804b3714ce36 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 10:02:37 +0800 Subject: [PATCH 03/55] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemManagementEOController.java | 170 ++++++++++++++++++ .../project/entity/ProblemManagementEO.java | 134 ++++++++++++++ .../mapper/ProblemManagementEOMapper.java | 17 ++ .../mapper/xml/ProblemManagementEOMapper.xml | 26 +++ .../service/IProblemManagementEOService.java | 61 +++++++ .../impl/ProblemManagementEOServiceImpl.java | 89 +++++++++ 6 files changed, 497 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java new file mode 100644 index 000000000..c34dc0e45 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.project.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.project.entity.ProblemManagementEO; +import com.jero.modules.project.service.IProblemManagementEOService; +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: 2023-09-05 + * @Version: V1.0 + */ +@Api(tags="问题管理") +@RestController +@RequestMapping("/project/problemManagementEO") +@Slf4j +public class ProblemManagementEOController extends JeroController { + @Autowired + private IProblemManagementEOService problemManagementEOService; + + /** + * 分页列表查询 + * + * @param problemManagementEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "问题管理-分页列表查询") + @ApiOperation(value="问题管理-分页列表查询", notes="问题管理-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProblemManagementEO problemManagementEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemManagementEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = problemManagementEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "问题管理-列表查询") + @ApiOperation(value="问题管理-列表查询", notes="问题管理-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = problemManagementEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param problemManagementEO + * @return + */ + @AutoLog(value = "问题管理-添加") + @ApiOperation(value="问题管理-添加", notes="问题管理-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProblemManagementEO problemManagementEO) { + problemManagementEOService.add(problemManagementEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param problemManagementEO + * @return + */ + @AutoLog(value = "问题管理-编辑") + @ApiOperation(value="问题管理-编辑", notes="问题管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProblemManagementEO problemManagementEO) { + problemManagementEOService.editById(problemManagementEO); + 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) { + problemManagementEOService.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.problemManagementEOService.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) { + ProblemManagementEO problemManagementEO = problemManagementEOService.queryById(id); + if(problemManagementEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(problemManagementEO); + } + + /** + * 导出excel + * + * @param request + * @param problemManagementEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProblemManagementEO problemManagementEO) { + return super.exportXls(request, problemManagementEO, ProblemManagementEO.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, ProblemManagementEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java new file mode 100644 index 000000000..3094ac4b3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -0,0 +1,134 @@ +package com.jero.modules.project.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: 2023-09-05 + * @Version: V1.0 + */ +@Data +@TableName("problem_management") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="problem_management对象", description="问题管理") +public class ProblemManagementEO 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; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + + /**问题类型*/ + @Excel(name = "问题类型", width = 15) + @ApiModelProperty(value = "问题类型") + private java.lang.String problemType; + + /**ps_issue*/ + @Excel(name = "ps_issue", width = 15) + @ApiModelProperty(value = "ps_issue") + private java.lang.String psIssue; + + /**相关法规*/ + @Excel(name = "相关法规", width = 15) + @ApiModelProperty(value = "相关法规") + private java.lang.String lawsId; + + /**相关项目*/ + @Excel(name = "相关项目", width = 15) + @ApiModelProperty(value = "相关项目") + private java.lang.String projectId; + + /**责任部门*/ + @Excel(name = "责任部门", width = 15) + @ApiModelProperty(value = "责任部门") + private java.lang.String dutyTerritory; + + /**问题状态*/ + @Excel(name = "问题状态", width = 15) + @ApiModelProperty(value = "问题状态") + private java.lang.String problemState; + + /**描述和分析*/ + @Excel(name = "描述和分析", width = 15) + @ApiModelProperty(value = "描述和分析") + private java.lang.String description; + + /**相关文件链接*/ + @Excel(name = "相关文件链接", width = 15) + @ApiModelProperty(value = "相关文件链接") + private java.lang.String fileLink; + + /**相关文件*/ + @Excel(name = "相关文件", width = 15) + @ApiModelProperty(value = "相关文件") + private java.lang.String file; + + /**进度追踪*/ + @Excel(name = "进度追踪", width = 15) + @ApiModelProperty(value = "进度追踪") + private java.lang.String progressTracking; + + /**结论*/ + @Excel(name = "结论", width = 15) + @ApiModelProperty(value = "结论") + private java.lang.String conclusion; + + /**审批证据*/ + @Excel(name = "审批证据", width = 15) + @ApiModelProperty(value = "审批证据") + private java.lang.String approvalEvidence; + + /**审批证据链接*/ + @Excel(name = "审批证据链接", width = 15) + @ApiModelProperty(value = "审批证据链接") + private java.lang.String approvalEvidenceLink; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java new file mode 100644 index 000000000..db2efa141 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProblemManagementEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 问题管理 + * @Author: jero-boot + * @Date: 2023-09-05 + * @Version: V1.0 + */ +public interface ProblemManagementEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml new file mode 100644 index 000000000..a4ac620b8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java new file mode 100644 index 000000000..253d00f78 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProblemManagementEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 问题管理 + * @Author: jero-boot + * @Date: 2023-09-05 + * @Version: V1.0 + */ +public interface IProblemManagementEOService extends IService { + + /** + * 保存 + * + * @param problemManagementEO + * @return + */ + void add(ProblemManagementEO problemManagementEO); + + /** + * 更新 + * + * @param problemManagementEO + * @return + */ + void editById(ProblemManagementEO problemManagementEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProblemManagementEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java new file mode 100644 index 000000000..065e7af6a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.project.service.impl; + +import com.jero.modules.project.entity.ProblemManagementEO; +import com.jero.modules.project.mapper.ProblemManagementEOMapper; +import com.jero.modules.project.service.IProblemManagementEOService; +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: 2023-09-05 + * @Version: V1.0 + */ +@Service +public class ProblemManagementEOServiceImpl extends ServiceImpl implements IProblemManagementEOService { + + /** + * 保存 + * + * @param problemManagementEO + * @return + */ + @Override + public void add(ProblemManagementEO problemManagementEO) { + Date now = new Date(); + problemManagementEO.setCreateTime(now); + problemManagementEO.setUpdateTime(now); + save(problemManagementEO); + } + + /** + * 更新 + * + * @param problemManagementEO + * @return + */ + @Override + public void editById(ProblemManagementEO problemManagementEO) { + Date now = new Date(); + problemManagementEO.setUpdateTime(now); + saveOrUpdate(problemManagementEO); + } + + /** + * 通过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 ProblemManagementEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From dea8ddb228c9e1c191590808b51ae6e2620069b7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 10:12:13 +0800 Subject: [PATCH 04/55] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProblemManagementEO.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index 3094ac4b3..a71279c6a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -1,21 +1,20 @@ package com.jero.modules.project.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; 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.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; /** @@ -131,4 +130,17 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "审批证据链接") private java.lang.String approvalEvidenceLink; + + @TableField(exist = false) + @ApiModelProperty(value = "相关文件地址链接（前端传参）") + private List fileLinkList; + + @TableField(exist = false) + @ApiModelProperty(value = "进度追踪（前端传参）") + private List progressTrackingList; + + @TableField(exist = false) + @ApiModelProperty(value = "审批证据链接（前端传参）") + private List approvalEvidenceLinkList; + } From 6117c26979b0df82ffa45d9ad43f67a11e2aeaae Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 10:36:18 +0800 Subject: [PATCH 05/55] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProblemManagementEO.java | 8 ++++++++ .../impl/ProblemManagementEOServiceImpl.java | 19 ++++++++++++++++++- .../jero/modules/project/vo/NcrTrackVO.java | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index a71279c6a..409882869 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -143,4 +143,12 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "审批证据链接（前端传参）") private List approvalEvidenceLinkList; + @TableField(exist = false) + @ApiModelProperty(value = "相关法规中文名") + private String lawsName; + + @TableField(exist = false) + @ApiModelProperty(value = "相关项目中文名") + private String projectName; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java index 065e7af6a..dba2367c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.service.IProblemManagementEOService; +import com.jero.modules.system.util.StringUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -25,12 +26,26 @@ public class ProblemManagementEOServiceImpl extends ServiceImplold,新数据->new） + private String flag; + From 37c4e61c123b4d0ff51bd3cb6c39e296e0305630 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 10:56:14 +0800 Subject: [PATCH 06/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91-=E5=A4=84=E7=90=86=E7=9B=B8=E5=85=B3=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=AE=A1=E6=89=B9=E8=AF=81=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProblemManagementEOServiceImpl.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java index dba2367c3..41d4dc12c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -1,12 +1,19 @@ package com.jero.modules.project.service.impl; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.system.util.StringUtils; +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 java.util.UUID; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -18,6 +25,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ProblemManagementEOServiceImpl extends ServiceImpl implements IProblemManagementEOService { + + @Autowired + private IOSSFileService iOSSFileService; + /** * 保存 * @@ -28,12 +39,45 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); + updateFileInfo(fileIds, oSSFileList,connectId); + problemManagementEO.setFile(connectId); + } + //处理审批证据 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ + String connectId = UUID.randomUUID().toString().replace("-", ""); + String fileIds = problemManagementEO.getApprovalEvidence(); + List oSSFileList = new ArrayList<>(); + updateFileInfo(fileIds, oSSFileList,connectId); + problemManagementEO.setApprovalEvidence(connectId); + } + } + + private void updateFileInfo(String fileIds, List oSSFileList,String connectId) { + for (String fileId : fileIds.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + iOSSFileService.updateFileInfo(oSSFileList); + } + private void setParam(ProblemManagementEO problemManagementEO) { if(!problemManagementEO.getFileLinkList().isEmpty()){ problemManagementEO.setFileLink(StringUtils.join(problemManagementEO.getFileLinkList(),",")); @@ -56,6 +100,10 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl Date: Tue, 5 Sep 2023 11:18:11 +0800 Subject: [PATCH 07/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 181 +++++++----------- .../components/nonConformance.vue | 27 ++- .../moudles/addModel.vue | 64 +++---- 3 files changed, 112 insertions(+), 160 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index de8ad4ea5..978ba4b47 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -53,7 +53,7 @@
@@ -64,49 +64,17 @@
- - {{$t('creator')}} -
- - - -
- - -
-
- - {{$t('createTime')}} -
- - - -
- - - - -
-
{{$t('Relevantlawsregulations')}}
+ v-model="formInline.lawsId"/>
@@ -120,7 +88,7 @@ + :value="item.id"> {{ item.projectName}} @@ -156,7 +124,7 @@ class="box-input-search" optionFilterProp="label" :getPopupContainer="triggerNode=> triggerNode.parentNode" - v-model="formInline.firstLevelDutyTerritory"> + v-model="formInline.dutyTerritory"> @@ -223,24 +191,24 @@ {{$t('documents')}}
- -
+ +
-
- {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('file')"> + {{ (formInline.file === 'null' || formInline.file === '' || + formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} @@ -256,15 +224,15 @@ :title="$t('progresstracking')">{{$t('progresstracking')}}
- @@ -278,9 +246,9 @@ {{$t('conculsion')}}
- + @@ -295,24 +263,24 @@ {{$t('examineapproveevidence')}}
- -
+ +
-
- {{ (formInline.examineapproveevidence === 'null' || formInline.examineapproveevidence === '' || - formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('approvalEvidence')"> + {{ (formInline.approvalEvidence === 'null' || formInline.approvalEvidence === '' || + formInline.approvalEvidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} @@ -346,9 +314,9 @@ {{$t('progresstracking')}}
- + @@ -370,7 +338,7 @@ // import addModel from './a/ddModel' import Standardselection from '@/components/Standardselection/index' import uploadFile from '@/components/uploadFile/file' -import { getAction, postAction, downloadFile } from '@/api/manage' +import { getAction, postAction,putAction, downloadFile } from '@/api/manage' import moment from 'moment' import { mapGetters } from 'vuex' @@ -406,7 +374,7 @@ export default { visible: false, visibletrack: false, rulestracking:{ - text: [ + progressTracking: [ { required: true, message: this.$t('text') + this.$t('cannotEmpty'), @@ -415,9 +383,9 @@ export default { ] }, formInline: { - list:[{}], - examineapproveevidencelist:[{}], - progresstrackinglist:[{}] + fileLinkList:[{}], + progressTrackingList:[{}], + approvalEvidenceLink:[{}] }, formInlinetracking:{}, confirmLoading: false, @@ -449,8 +417,8 @@ export default { ], index:'', url: { - add: '/report/lawsMonthlyReportWriteEO/add', - edit: '/report/lawsMonthlyReportWriteEO/edit', + add: '/project/problemManagementEO/add', + edit: '/project/problemManagementEO/edit', queryById: '/report/lawsMonthlyReportWriteEO/queryById' } } @@ -514,17 +482,16 @@ export default { }, ...mapGetters(['userInfo']), add() { - console.log(this.userInfo()) this.templateDisabled = false this.getNameList() this.getFirstLevelDutyTerritory() - this.title = this.$t('newlyAdded') + this.title = this.$t('newlyAdded1') this.visible = true this.disabled = false this.formInline = { - list:[{}], - examineapproveevidencelist:[{}], - progresstrackinglist:[{}] + fileLinkList:[{}], + progressTrackingList:[{}], + approvalEvidenceLink:[{}] } this.$nextTick(() => { this.formInline = { ...this.formInline } @@ -544,19 +511,19 @@ export default { }) }, addClick(index){ - this.formInline.list.splice(index + 1, 0, {}) + this.formInline.fileLinkList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, deleteClick(index) { - this.formInline.list.splice(index, 1) + this.formInline.fileLinkList.splice(index, 1) this.formInline = { ...this.formInline } }, addvidenceClick(index){ - this.formInline.examineapproveevidencelist.splice(index + 1, 0, {}) + this.formInline.approvalEvidenceLinkList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, deletevidenceClick(index) { - this.formInline.examineapproveevidencelist.splice(index, 1) + this.formInline.approvalEvidenceLinkList.splice(index, 1) this.formInline = { ...this.formInline } }, addprogresstrackingClick(index){ @@ -570,11 +537,11 @@ export default { }) }, deleteprogresstrackingClick(index,item) { - if(item.text && item.text != ''){ + if(item.progressTracking && item.progressTracking != ''){ if(index == 0){ - item.text = '' + item.progressTracking = '' }else{ - this.formInline.progresstrackinglist.splice(index, 1) + this.formInline.progressTrackingList.splice(index, 1) } } this.formInline = { ...this.formInline } @@ -592,14 +559,14 @@ export default { let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') this.$refs.ruleFormtracking.validate(valid => { if (valid) { - let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.text - this.formInline.progresstrackinglist.forEach((item,index) => { - console.log(item.text) - if(!item.text){ - this.formInline.progresstrackinglist.splice(0,1) + let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.progressTracking + this.formInline.progressTrackingList.forEach((item,index) => { + console.log(item.progressTracking) + if(!item.progressTracking){ + this.formInline.progressTrackingList.splice(0,1) } }) - this.formInline.progresstrackinglist.splice(this.index+1, 1, {text:text}) + this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:progressTracking}) this.visibletrack = false } }) @@ -608,37 +575,26 @@ export default { console.log(this.formInline) this.$refs.ruleForm.validate(valid => { if (valid) { - let text = '' - if (this.$refs.defaultTemplateRef) { - text = 'defaultTemplateRef' - } else if (this.$refs.solicitOpinionsRef) { - text = 'solicitOpinionsRef' - } else if (this.$refs.releaseStandardRef) { - text = 'releaseStandardRef' - } else if (this.$refs.industryTemplateRef) { - text = 'industryTemplateRef' - } - this.$refs[text].getData((val) => { this.confirmLoading = true let url = '' + let action = '' if (this.formInline.id) { url = this.url.edit + action = putAction } else { url = this.url.add + action = postAction } let formInline = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(formInline).forEach(res => { - if (formInline[res] && formInline[res] instanceof Array) { - formInline[res] = formInline[res].join(',') - } - }) - let query = Object.assign(val, { - month: formInline.month, - memoriesChapter: formInline.memoriesChapter, - contentTemplate: formInline.contentTemplate, - memoriesChapterOne:formInline.memoriesChapterOne - }) - postAction(url, query).then((res) => { + // Object.keys(formInline).forEach(res => { + // if (formInline[res] && formInline[res] instanceof Array) { + // formInline[res] = formInline[res].join(',') + // } + // }) + let query = { + problemManagementEO:formInline + } + action(url, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false @@ -649,7 +605,6 @@ export default { this.$message.warning(this.$t('operationFailed')) } }) - }) } }) } diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 2124d0419..16dff372d 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -8,8 +8,8 @@
{{$t('title')}}
- +
@@ -17,8 +17,8 @@
{{$t('Relevantlawsregulations')}}
- + @@ -28,7 +28,7 @@ + :value="item.id"> {{ item.projectName}} @@ -75,7 +75,7 @@ - - -
-
- - {{$t('creator')}} -
- - - -
- - -
-
- - {{$t('createTime')}} -
- - - -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From 5f2beaf67cd6f2bec8996115b3ece480fdc0ef44 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 11:53:27 +0800 Subject: [PATCH 08/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 128 ++++----- .../components/nonConformance.vue | 3 +- .../projectNonConformance/index.vue | 24 +- .../moudles/addModel.vue | 259 ++++++++---------- 4 files changed, 185 insertions(+), 229 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 978ba4b47..597eef7a0 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -47,7 +47,7 @@
- + {{'PS-issue'}}
@@ -170,7 +170,7 @@
- + {{$t('descriptions')}}
@@ -184,36 +184,36 @@ - -
-
- - {{$t('documents')}} -
- -
- - - -
- - {{ (formInline.file === 'null' || formInline.file === '' || - formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles') - }} - - + +
+
+ + {{$t('documents')}}
- + +
+ + + +
+ + {{ (formInline.file === 'null' || formInline.file === '' || + formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles') + }} + + +
+ @@ -225,7 +225,7 @@
- +
- + { if (valid) { - this.confirmLoading = true - let url = '' - let action = '' - if (this.formInline.id) { - url = this.url.edit - action = putAction + this.confirmLoading = true + let url = '' + let action = '' + if (this.formInline.id) { + url = this.url.edit + action = putAction + } else { + url = this.url.add + action = postAction + } + let formInline = JSON.parse(JSON.stringify(this.formInline)) + // Object.keys(formInline).forEach(res => { + // if (formInline[res] && formInline[res] instanceof Array) { + // formInline[res] = formInline[res].join(',') + // } + // }) + let query = { + problemManagementEO:formInline + } + action(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('fillAddForm') } else { - url = this.url.add - action = postAction + this.confirmLoading = false + this.$message.warning(this.$t('operationFailed')) } - let formInline = JSON.parse(JSON.stringify(this.formInline)) - // Object.keys(formInline).forEach(res => { - // if (formInline[res] && formInline[res] instanceof Array) { - // formInline[res] = formInline[res].join(',') - // } - // }) - let query = { - problemManagementEO:formInline - } - action(url, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('fillAddForm') - } else { - this.confirmLoading = false - this.$message.warning(this.$t('operationFailed')) - } - }) + }) } }) } diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 16dff372d..1add5aba1 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -211,7 +211,8 @@ align: 'left', dataIndex: 'title', width: 170, - sorter:true + sorter:true, + ellipsis: true }, { title: this.$t('Relevantlawsregulations'), diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index d9e3294cd..e8e4583b9 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -8,8 +8,8 @@
{{$t('title')}}
- +
@@ -17,8 +17,8 @@
{{$t('Relevantlawsregulations')}}
- +
@@ -28,7 +28,7 @@
+ :value="item.id"> {{ item.projectName}} @@ -75,7 +75,7 @@
- + {{'PS-issue'}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -102,11 +70,11 @@
+ v-model="formInline.lawsId"/> @@ -120,7 +88,7 @@ + :value="item.id"> {{ item.projectName}} @@ -156,7 +124,7 @@ class="box-input-search" optionFilterProp="label" :getPopupContainer="triggerNode=> triggerNode.parentNode" - v-model="formInline.firstLevelDutyTerritory"> + v-model="formInline.dutyTerritory">
- + {{$t('descriptions')}}
@@ -216,36 +184,36 @@ - -
-
- - {{$t('documents')}} -
- -
- - - -
- - {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles') - }} - - + +
+
+ + {{$t('documents')}}
- + +
+ + + +
+ + {{ (formInline.file === 'null' || formInline.file === '' || + formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles') + }} + + +
+ @@ -256,15 +224,15 @@ :title="$t('progresstracking')">{{$t('progresstracking')}}
- @@ -278,9 +246,9 @@ {{$t('conculsion')}}
- + @@ -295,24 +263,24 @@ {{$t('examineapproveevidence')}} - -
+ +
-
- {{ (formInline.examineapproveevidence === 'null' || formInline.examineapproveevidence === '' || - formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('approvalEvidence')"> + {{ (formInline.approvalEvidence === 'null' || formInline.approvalEvidence === '' || + formInline.approvalEvidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} @@ -327,7 +295,7 @@
- + {{$t('progresstracking')}} - + @@ -370,7 +338,7 @@ // import addModel from './a/ddModel' import Standardselection from '@/components/Standardselection/index' import uploadFile from '@/components/uploadFile/file' -import { getAction, postAction, downloadFile } from '@/api/manage' +import { getAction, postAction,putAction, downloadFile } from '@/api/manage' import moment from 'moment' import { mapGetters } from 'vuex' @@ -406,7 +374,7 @@ export default { visible: false, visibletrack: false, rulestracking:{ - text: [ + progressTracking: [ { required: true, message: this.$t('text') + this.$t('cannotEmpty'), @@ -415,9 +383,9 @@ export default { ] }, formInline: { - list:[{}], - examineapproveevidencelist:[{}], - progresstrackinglist:[{}] + fileLinkList:[{}], + progressTrackingList:[{}], + approvalEvidenceLink:[{}] }, formInlinetracking:{}, confirmLoading: false, @@ -449,8 +417,8 @@ export default { ], index:'', url: { - add: '/report/lawsMonthlyReportWriteEO/add', - edit: '/report/lawsMonthlyReportWriteEO/edit', + add: '/project/problemManagementEO/add', + edit: '/project/problemManagementEO/edit', queryById: '/report/lawsMonthlyReportWriteEO/queryById' } } @@ -485,7 +453,7 @@ export default { }, StandardselectionChange(value, id) { console.log(id) - this.formInline.documentId = id + this.formInline.lawsId = id this.formInline = { ...this.formInline } }, clickButtonToUpload(item) { @@ -514,7 +482,6 @@ export default { }, ...mapGetters(['userInfo']), add() { - console.log(this.userInfo()) this.templateDisabled = false this.getNameList() this.getFirstLevelDutyTerritory() @@ -522,9 +489,9 @@ export default { this.visible = true this.disabled = false this.formInline = { - list:[{}], - examineapproveevidencelist:[{}], - progresstrackinglist:[{}] + fileLinkList:[{}], + progressTrackingList:[{}], + approvalEvidenceLink:[{}] } this.$nextTick(() => { this.formInline = { ...this.formInline } @@ -544,19 +511,19 @@ export default { }) }, addClick(index){ - this.formInline.list.splice(index + 1, 0, {}) + this.formInline.fileLinkList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, deleteClick(index) { - this.formInline.list.splice(index, 1) + this.formInline.fileLinkList.splice(index, 1) this.formInline = { ...this.formInline } }, addvidenceClick(index){ - this.formInline.examineapproveevidencelist.splice(index + 1, 0, {}) + this.formInline.approvalEvidenceLinkList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, deletevidenceClick(index) { - this.formInline.examineapproveevidencelist.splice(index, 1) + this.formInline.approvalEvidenceLinkList.splice(index, 1) this.formInline = { ...this.formInline } }, addprogresstrackingClick(index){ @@ -570,11 +537,11 @@ export default { }) }, deleteprogresstrackingClick(index,item) { - if(item.text && item.text != ''){ + if(item.progressTracking && item.progressTracking != ''){ if(index == 0){ - item.text = '' + item.progressTracking = '' }else{ - this.formInline.progresstrackinglist.splice(index, 1) + this.formInline.progressTrackingList.splice(index, 1) } } this.formInline = { ...this.formInline } @@ -592,14 +559,14 @@ export default { let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') this.$refs.ruleFormtracking.validate(valid => { if (valid) { - let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.text - this.formInline.progresstrackinglist.forEach((item,index) => { - console.log(item.text) - if(!item.text){ - this.formInline.progresstrackinglist.splice(0,1) + let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.progressTracking + this.formInline.progressTrackingList.forEach((item,index) => { + console.log(item.progressTracking) + if(!item.progressTracking){ + this.formInline.progressTrackingList.splice(0,1) } }) - this.formInline.progresstrackinglist.splice(this.index+1, 1, {text:text}) + this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:text}) this.visibletrack = false } }) @@ -608,47 +575,35 @@ export default { console.log(this.formInline) this.$refs.ruleForm.validate(valid => { if (valid) { - let text = '' - if (this.$refs.defaultTemplateRef) { - text = 'defaultTemplateRef' - } else if (this.$refs.solicitOpinionsRef) { - text = 'solicitOpinionsRef' - } else if (this.$refs.releaseStandardRef) { - text = 'releaseStandardRef' - } else if (this.$refs.industryTemplateRef) { - text = 'industryTemplateRef' + this.confirmLoading = true + let url = '' + let action = '' + if (this.formInline.id) { + url = this.url.edit + action = putAction + } else { + url = this.url.add + action = postAction } - this.$refs[text].getData((val) => { - this.confirmLoading = true - let url = '' - if (this.formInline.id) { - url = this.url.edit + let formInline = JSON.parse(JSON.stringify(this.formInline)) + // Object.keys(formInline).forEach(res => { + // if (formInline[res] && formInline[res] instanceof Array) { + // formInline[res] = formInline[res].join(',') + // } + // }) + let query = { + problemManagementEO:formInline + } + action(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('fillAddForm') } else { - url = this.url.add + this.confirmLoading = false + this.$message.warning(this.$t('operationFailed')) } - let formInline = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(formInline).forEach(res => { - if (formInline[res] && formInline[res] instanceof Array) { - formInline[res] = formInline[res].join(',') - } - }) - let query = Object.assign(val, { - month: formInline.month, - memoriesChapter: formInline.memoriesChapter, - contentTemplate: formInline.contentTemplate, - memoriesChapterOne:formInline.memoriesChapterOne - }) - postAction(url, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('fillAddForm') - } else { - this.confirmLoading = false - this.$message.warning(this.$t('operationFailed')) - } - }) }) } }) From 47a7fb2fdfee0cc705d15393ec5094d36d58c251 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 13:52:11 +0800 Subject: [PATCH 09/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 7 +++++-- .../projectNonConformance/moudles/addModel.vue | 14 +++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 597eef7a0..4504ec55c 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -73,8 +73,9 @@ :query="{'db_field_txt':$t('Relevantlawsregulations')}" :standard="formInline" :disabled="false" + @input="Standardselectioninput" @change="StandardselectionChange" - v-model="formInline.lawsId"/> + v-model="formInline.lawsName"/> @@ -452,10 +453,12 @@ export default { }) }, StandardselectionChange(value, id) { - console.log(id) this.formInline.lawsId = id this.formInline = { ...this.formInline } }, + Standardselectioninput(val){ + this.formInline.lawsName = val + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 597eef7a0..22fc0b35a 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -73,8 +73,9 @@ :query="{'db_field_txt':$t('Relevantlawsregulations')}" :standard="formInline" :disabled="false" + @input="Standardselectioninput" @change="StandardselectionChange" - v-model="formInline.lawsId"/> + v-model="formInline.lawsName"/> @@ -385,7 +386,7 @@ export default { formInline: { fileLinkList:[{}], progressTrackingList:[{}], - approvalEvidenceLink:[{}] + approvalEvidenceLinkList:[{}] }, formInlinetracking:{}, confirmLoading: false, @@ -452,10 +453,12 @@ export default { }) }, StandardselectionChange(value, id) { - console.log(id) this.formInline.lawsId = id this.formInline = { ...this.formInline } }, + Standardselectioninput(val){ + this.formInline.lawsName = val + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -491,7 +494,7 @@ export default { this.formInline = { fileLinkList:[{}], progressTrackingList:[{}], - approvalEvidenceLink:[{}] + approvalEvidenceLinkList:[{}] } this.$nextTick(() => { this.formInline = { ...this.formInline } @@ -592,7 +595,8 @@ export default { // } // }) let query = { - problemManagementEO:formInline + // problemManagementEO:formInline + ...this.formInline } action(url, query).then((res) => { if (res.success) { From 4c5d0679263e10157c0c241a9d44c2ff8aa2aff1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 14:11:00 +0800 Subject: [PATCH 10/55] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemManagementEOController.java | 7 +- .../project/entity/ProblemManagementEO.java | 13 +- .../mapper/ProblemManagementEOMapper.java | 3 + .../mapper/xml/ProblemManagementEOMapper.xml | 36 ++++- .../service/IProblemManagementEOService.java | 2 +- .../impl/ProblemManagementEOServiceImpl.java | 123 +++++++++++++++++- 6 files changed, 172 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java index c34dc0e45..dc442d6ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class ProblemManagementEOController extends JeroController { @Autowired private IProblemManagementEOService problemManagementEOService; - + /** * 分页列表查询 * @@ -136,8 +136,9 @@ public class ProblemManagementEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ProblemManagementEO problemManagementEO = problemManagementEOService.queryById(id); + public Result queryById(@RequestParam(name="id",required=true) String id, + @RequestParam(name="cut",required=true) String cut) { + ProblemManagementEO problemManagementEO = problemManagementEOService.queryById(id,cut); if(problemManagementEO==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index 409882869..2fd45cc77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.oss.entity.OSSFile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -86,12 +87,12 @@ public class ProblemManagementEO implements Serializable { private java.lang.String projectId; /**责任部门*/ - @Excel(name = "责任部门", width = 15) @ApiModelProperty(value = "责任部门") + @Excel(name = "*责任领域", width = 15,dicCode ="duty_territory") private java.lang.String dutyTerritory; /**问题状态*/ - @Excel(name = "问题状态", width = 15) + @Excel(name = "*问题状态", width = 15,dicCode ="wen4_ti2_lei4_xing2") @ApiModelProperty(value = "问题状态") private java.lang.String problemState; @@ -151,4 +152,12 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "相关项目中文名") private String projectName; + @TableField(exist = false) + @ApiModelProperty(value = "详情文件回显") + private List fileList; + + @TableField(exist = false) + @ApiModelProperty(value = "详情文件回显") + private List approvalEvidenceFileList; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java index db2efa141..2ce1e634d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java @@ -2,6 +2,7 @@ package com.jero.modules.project.mapper; import java.util.List; +import com.jero.modules.project.entity.ProjectLibraryBase; import org.apache.ibatis.annotations.Param; import com.jero.modules.project.entity.ProblemManagementEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProblemManagementEOMapper extends BaseMapper { + List queryByIds(@Param("ids") String ids); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml index a4ac620b8..d0cf6982a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml @@ -23,4 +23,38 @@ - \ No newline at end of file + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java index 253d00f78..29b406652 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java @@ -50,7 +50,7 @@ public interface IProblemManagementEOService extends IService wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(problemManagementEO.getLawsId().split(","))); + List documentLibraryEOList = bussDocumentLibraryEOService.list(wrapper); + if(!documentLibraryEOList.isEmpty()){ + List serialNumberList = documentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + problemManagementEO.setLawsName(StringUtils.join(serialNumberList,",")); + } + } + + //相关项目 + if(StringUtils.isNotBlank(problemManagementEO.getProjectId())){ + List projectLibraryBaseList = problemManagementEOMapper.queryByIds(problemManagementEO.getProjectId()); + //目标市场数据字典 + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List projectNameList = new ArrayList<>(); + for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) { + //目标市场 + String targetMarket = getMarket(cut, targetMarketList, projectLibraryBase); + //主项目的版本号 + String projectVersion = ""; + if(StringUtils.isBlank(projectLibraryBase.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = projectLibraryBase.getProjectVersion(); + } + if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket); + } + projectNameList.add(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket + +"-"+projectVersion); + } + } + + + //责任部门 + if(StringUtils.isNotBlank(problemManagementEO.getDutyTerritory())){ + + } + + + //相关文件 + if(StringUtils.isNotBlank(problemManagementEO.getFile())){ + List fileInfos = iOSSFileService.getFileInfosByConnectId(problemManagementEO.getFile()); + problemManagementEO.setFileList(fileInfos); + } + + + //审批证据 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ + List fileInfos = iOSSFileService.getFileInfosByConnectId(problemManagementEO.getApprovalEvidence()); + problemManagementEO.setApprovalEvidenceFileList(fileInfos); + } + + + //相关文件连接 + if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ + problemManagementEO.setFileLinkList(Arrays.asList(problemManagementEO.getFileLink().split(","))); + } + + //审批证据连接 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){ + problemManagementEO.setApprovalEvidenceLinkList(Arrays.asList(problemManagementEO.getApprovalEvidenceLink().split(","))); + } + + return problemManagementEO; } + public String getMarket(String cut, List targetMarketList, ProjectLibraryBase projectLibraryBase) { + List dictModelList = new ArrayList<>(); + for (String s : projectLibraryBase.getTargetMarket().split(",")) { + List dictModelListTemp = targetMarketList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + String targetMarket = ""; + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + targetMarket = sb.substring(0,sb.length()-1); + } + } + return targetMarket; + } + /** * 列表查询 * From 7f2371684f509de748706cbeca061bdee79fcf74 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 14:18:21 +0800 Subject: [PATCH 11/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 4 +- .../moudles/addModel.vue | 44 ++++++++++++++++++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 4504ec55c..cb346c2fa 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -386,7 +386,7 @@ export default { formInline: { fileLinkList:[{}], progressTrackingList:[{}], - approvalEvidenceLink:[{}] + approvalEvidenceLinkList:[{}] }, formInlinetracking:{}, confirmLoading: false, @@ -494,7 +494,7 @@ export default { this.formInline = { fileLinkList:[{}], progressTrackingList:[{}], - approvalEvidenceLink:[{}] + approvalEvidenceLinkList:[{}] } this.$nextTick(() => { this.formInline = { ...this.formInline } diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 22fc0b35a..d19ac4093 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -509,6 +509,12 @@ export default { this.disabled = false this.templateDisabled = true this.$nextTick(() => { + if(row.dutyTerritory){ + this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') + } + if(row.projectId){ + this.formInline.projectId = this.formInline.projectId.split(',') + } this.formInline = row this.$refs.ruleForm.clearValidate() }) @@ -588,12 +594,46 @@ export default { url = this.url.add action = postAction } - let formInline = JSON.parse(JSON.stringify(this.formInline)) // Object.keys(formInline).forEach(res => { // if (formInline[res] && formInline[res] instanceof Array) { // formInline[res] = formInline[res].join(',') // } // }) + let formInline = JSON.parse(JSON.stringify(this.formInline)) + if(this.formInline.dutyTerritory && this.formInline.dutyTerritory instanceof Array){ + this.formInline.dutyTerritory = this.formInline.dutyTerritory.join(',') + } + if(this.formInline.projectId && this.formInline.projectId instanceof Array){ + this.formInline.projectId = this.formInline.projectId.join(',') + } + let fileLinkList = [] + let approvalEvidenceLinkList = [] + let progressTrackingList = [] + if(this.formInline.fileLinkList){ + this.formInline.fileLinkList.forEach(item => { + if(item.fileLink){ + fileLinkList.push(item.fileLink) + } + }) + this.formInline.fileLinkList = fileLinkList + } + if(this.formInline.approvalEvidenceLinkList){ + this.formInline.approvalEvidenceLinkList.forEach(item => { + if(item.approvalEvidenceLink){ + approvalEvidenceLinkList.push(item.approvalEvidenceLink) + } + }) + this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList + } + if(this.formInline.progressTrackingList){ + this.formInline.progressTrackingList.forEach(item => { + if(item.progressTracking){ + progressTrackingList.push(item.progressTracking) + } + }) + this.formInline.progressTrackingList = progressTrackingList + } + delete this.formInline.lawsName let query = { // problemManagementEO:formInline ...this.formInline @@ -603,7 +643,7 @@ export default { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('fillAddForm') + this.$emit('addModelForm') } else { this.confirmLoading = false this.$message.warning(this.$t('operationFailed')) From 3e1e44f5a020a70731e06efcff2c99447d95a635 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 14:34:12 +0800 Subject: [PATCH 12/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProblemManagementEO.java | 5 + .../jero/modules/project/enums/DataEnum.java | 46 ++++++++ .../service/impl/NcrTrackServiceImpl.java | 27 +++-- .../jero/modules/project/vo/NcrTrackVO.java | 100 ++++++++++++++++++ 4 files changed, 169 insertions(+), 9 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DataEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index 2fd45cc77..10ba0f03b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -160,4 +160,9 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "详情文件回显") private List approvalEvidenceFileList; + //用于区分旧数据和新数据（旧数据->old,新数据->new） + @TableField(exist = false) + @ApiModelProperty(value = "旧数据->old,新数据->new") + private String flag; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DataEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DataEnum.java new file mode 100644 index 000000000..fe437a5ea --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DataEnum.java @@ -0,0 +1,46 @@ +package com.jero.modules.project.enums; + +/** + * 当前状态枚举类 + */ +public enum DataEnum { + + OLD("老数据","OLD"), // 老数据 + NEW("新数据","NEW") // 新数据 + ; + + + String name; + String value; + + private DataEnum(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) { + DataEnum[] values = values(); + for (DataEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + return taskStatusEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 2dd1e5608..e10f960ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -8,10 +8,13 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; +import com.jero.modules.project.enums.DataEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.mapper.NcrTrackMapper; import com.jero.modules.project.service.INcrTrackService; +import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.project.vo.NcrTrackInfoVO; import com.jero.modules.project.vo.NcrTrackVO; import com.jero.modules.system.entity.SysDictItem; @@ -66,6 +69,8 @@ public class NcrTrackServiceImpl extends ServiceImpl private ISysDictService sysDictService; @Autowired private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; + @Autowired + private IProblemManagementEOService problemManagementEOService; @Override public List getPageInfo(NcrTrackVO ncrTrackVO) { @@ -121,15 +126,6 @@ public class NcrTrackServiceImpl extends ServiceImpl List dictItemList = sysDictItemServiceImpl.selectItemsAll(); Set userIdSet = new HashSet<>(); for (NcrTrackVO trackVO : infoList) { - /*if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){ - userIdSet.add(trackVO.getDesignInitiatorId()); - } - if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){ - userIdSet.add(trackVO.getPrehomoInitiatorId()); - } - if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){ - userIdSet.add(trackVO.getVerifyInitiatorId()); - }*/ if(StringUtils.isNotBlank(trackVO.getDesignDutyId())){ userIdSet.add(trackVO.getDesignDutyId()); } @@ -305,10 +301,23 @@ public class NcrTrackServiceImpl extends ServiceImpl } } } + List managementEOList = problemManagementEOService.list(); + List ncrTrackVOList = new ArrayList<>(); + for (ProblemManagementEO problemManagementEO : managementEOList) { + NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); + BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); + ncrTrackVOList.add(ncrTrackVOTemp); + } if(trackVOListTemp.size() != 0){ + if(!ncrTrackVOList.isEmpty()){ + trackVOListTemp.addAll(ncrTrackVOList); + } return trackVOListTemp; }else{ + if(!ncrTrackVOList.isEmpty()){ + trackVOList.addAll(ncrTrackVOList); + } return trackVOList; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index 04e5b6298..703dd02e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -1,6 +1,8 @@ package com.jero.modules.project.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.oss.entity.OSSFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -158,10 +160,108 @@ public class NcrTrackVO implements Serializable { private String flowStatus; + + + /**标题*/ +// @Excel(name = "标题", width = 15) +// @ApiModelProperty(value = "标题") +// private java.lang.String title; +// +// /**问题类型*/ +// @Excel(name = "问题类型", width = 15) +// @ApiModelProperty(value = "问题类型") +// private java.lang.String problemType; + + /**ps_issue*/ + @Excel(name = "ps_issue", width = 15) + @ApiModelProperty(value = "ps_issue") + private java.lang.String psIssue; + + /**相关法规*/ + @Excel(name = "相关法规", width = 15) + @ApiModelProperty(value = "相关法规") + private java.lang.String lawsId; + + /**相关项目*/ + @Excel(name = "相关项目", width = 15) + @ApiModelProperty(value = "相关项目") + private java.lang.String projectId; + +// /**责任部门*/ +// @ApiModelProperty(value = "责任部门") +// @Excel(name = "*责任领域", width = 15,dicCode ="duty_territory") +// private java.lang.String dutyTerritory; + + /**问题状态*/ + @Excel(name = "*问题状态", width = 15,dicCode ="wen4_ti2_lei4_xing2") + @ApiModelProperty(value = "问题状态") + private java.lang.String problemState; + + /**描述和分析*/ + @Excel(name = "描述和分析", width = 15) + @ApiModelProperty(value = "描述和分析") + private java.lang.String description; + + /**相关文件链接*/ + @Excel(name = "相关文件链接", width = 15) + @ApiModelProperty(value = "相关文件链接") + private java.lang.String fileLink; + + /**相关文件*/ + @Excel(name = "相关文件", width = 15) + @ApiModelProperty(value = "相关文件") + private java.lang.String file; + + /**进度追踪*/ + @Excel(name = "进度追踪", width = 15) + @ApiModelProperty(value = "进度追踪") + private java.lang.String progressTracking; + + /**结论*/ + @Excel(name = "结论", width = 15) + @ApiModelProperty(value = "结论") + private java.lang.String conclusion; + + /**审批证据*/ + @Excel(name = "审批证据", width = 15) + @ApiModelProperty(value = "审批证据") + private java.lang.String approvalEvidence; + + /**审批证据链接*/ + @Excel(name = "审批证据链接", width = 15) + @ApiModelProperty(value = "审批证据链接") + private java.lang.String approvalEvidenceLink; + + + @ApiModelProperty(value = "相关文件地址链接（前端传参）") + private List fileLinkList; + + @ApiModelProperty(value = "进度追踪（前端传参）") + private List progressTrackingList; + + @ApiModelProperty(value = "审批证据链接（前端传参）") + private List approvalEvidenceLinkList; + + @ApiModelProperty(value = "相关法规中文名") + private String lawsName; + +// @TableField(exist = false) +// @ApiModelProperty(value = "相关项目中文名") +// private String projectName; + + @ApiModelProperty(value = "详情文件回显") + private List fileList; + + @ApiModelProperty(value = "详情文件回显") + private List approvalEvidenceFileList; + //用于区分旧数据和新数据（旧数据->old,新数据->new） + @ApiModelProperty(value = "旧数据->old,新数据->new") private String flag; + + } From b611d0f61d21f27c6ff53aa0ee32884fb1bec29c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 15:00:22 +0800 Subject: [PATCH 13/55] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/NcrTrackServiceImpl.java | 44 ++++++++++++++++--- .../jero/modules/project/vo/NcrTrackVO.java | 5 ++- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index e10f960ef..71e759ba1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.project.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -33,6 +34,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -301,15 +303,17 @@ public class NcrTrackServiceImpl extends ServiceImpl } } } - List managementEOList = problemManagementEOService.list(); - List ncrTrackVOList = new ArrayList<>(); - for (ProblemManagementEO problemManagementEO : managementEOList) { - NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); - BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); - ncrTrackVOList.add(ncrTrackVOTemp); - } + List ncrTrackVOList = getProblemManagementData(ncrTrackVOListTemp); if(trackVOListTemp.size() != 0){ + //旧数据处理 + for (NcrTrackVO trackVO : trackVOListTemp) { + String problemType = trackVO.getProblemType(); + trackVO.setTitle(trackVO.getFlowType()+problemType); + + } + + if(!ncrTrackVOList.isEmpty()){ trackVOListTemp.addAll(ncrTrackVOList); } @@ -322,6 +326,32 @@ public class NcrTrackServiceImpl extends ServiceImpl } } + @NotNull + private List getProblemManagementData(List ncrTrackVOListTemp) { + List idList = new ArrayList<>(); + if(!ncrTrackVOListTemp.isEmpty()){ + //处理导出时勾选数据 + idList = ncrTrackVOListTemp.stream().filter(e -> StringUtils.isNotBlank(e.getFlowType())).map(NcrTrackVO::getId).collect(Collectors.toList()); + } + List managementEOList = new ArrayList<>(); + if(!idList.isEmpty()){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProblemManagementEO::getId,idList); + managementEOList = problemManagementEOService.list(wrapper); + }else{ + managementEOList = problemManagementEOService.list(); + } + List ncrTrackVOList = new ArrayList<>(); + for (ProblemManagementEO problemManagementEO : managementEOList) { + NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); + BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); + ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId()); + ncrTrackVOTemp.setFlag(DataEnum.NEW.getValue()); + ncrTrackVOList.add(ncrTrackVOTemp); + } + return ncrTrackVOList; + } + private String getMarket(List targetMarketList, NcrTrackVO trackVO,String cut) { //目标市场 List dictModelList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index 703dd02e0..f737c7640 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -1,7 +1,7 @@ package com.jero.modules.project.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import com.jero.modules.oss.entity.OSSFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -59,7 +59,7 @@ public class NcrTrackVO implements Serializable { private String flowType; //责任领域 duty_territory -// @Dict(dicCode ="duty_territory") + @Dict(dicCode ="duty_territory") @Excel(name = "责任领域", width = 20,dicCode ="duty_territory") private String dutyTerritory; @@ -80,6 +80,7 @@ public class NcrTrackVO implements Serializable { private String projectVersion; //问题类型 + @Dict(dicCode ="wen4_ti2_lei4_xing2") @Excel(name = "问题类型", width = 20) private String problemType; From b12a210df437d1fef8d3b4d5dea66d996f0bda94 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 15:41:36 +0800 Subject: [PATCH 14/55] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProblemManagementEO.java | 7 ++-- .../impl/ProblemManagementEOServiceImpl.java | 39 ++++++++++++++++--- .../project/vo/ProblemManagementVO.java | 34 ++++++++++++++++ 3 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProblemManagementVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index 10ba0f03b..20a71fb61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.project.vo.ProblemManagementVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -134,15 +135,15 @@ public class ProblemManagementEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "相关文件地址链接（前端传参）") - private List fileLinkList; + private List fileLinkList; @TableField(exist = false) @ApiModelProperty(value = "进度追踪（前端传参）") - private List progressTrackingList; + private List progressTrackingList; @TableField(exist = false) @ApiModelProperty(value = "审批证据链接（前端传参）") - private List approvalEvidenceLinkList; + private List approvalEvidenceLinkList; @TableField(exist = false) @ApiModelProperty(value = "相关法规中文名") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java index a2eacfd63..e5c48f5bd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -13,6 +13,7 @@ import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.project.vo.ProblemManagementVO; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; @@ -98,13 +99,19 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl fileLinkList = problemManagementEO.getFileLinkList(); + List collect = fileLinkList.stream().map(ProblemManagementVO::getFileLink).collect(Collectors.toList()); + problemManagementEO.setFileLink(StringUtils.join(collect,",")); } if(!problemManagementEO.getProgressTrackingList().isEmpty()){ - problemManagementEO.setProgressTracking(StringUtils.join(problemManagementEO.getProgressTrackingList(),",")); + List progressTrackingList = problemManagementEO.getProgressTrackingList(); + List collect = progressTrackingList.stream().map(ProblemManagementVO::getProgressTracking).collect(Collectors.toList()); + problemManagementEO.setProgressTracking(StringUtils.join(collect,",")); } if(!problemManagementEO.getApprovalEvidenceLinkList().isEmpty()){ - problemManagementEO.setApprovalEvidenceLink(StringUtils.join(problemManagementEO.getApprovalEvidenceLinkList(),",")); + List approvalEvidenceLinkList = problemManagementEO.getApprovalEvidenceLinkList(); + List collect = approvalEvidenceLinkList.stream().map(ProblemManagementVO::getApprovalEvidenceLink).collect(Collectors.toList()); + problemManagementEO.setApprovalEvidenceLink(StringUtils.join(collect,",")); } } @@ -220,12 +227,34 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl list = new ArrayList<>(); + for (String fileLink : problemManagementEO.getFileLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setFileLink(fileLink); + list.add(problemManagementVO); + } + problemManagementEO.setFileLinkList(list); } //审批证据连接 if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){ - problemManagementEO.setApprovalEvidenceLinkList(Arrays.asList(problemManagementEO.getApprovalEvidenceLink().split(","))); + List list = new ArrayList<>(); + for (String approvalEvidenceLink : problemManagementEO.getApprovalEvidenceLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setApprovalEvidenceLink(approvalEvidenceLink); + list.add(problemManagementVO); + } + problemManagementEO.setApprovalEvidenceLinkList(list); + } + //进度追踪 + if(StringUtils.isNotBlank(problemManagementEO.getProgressTracking())){ + List list = new ArrayList<>(); + for (String progressTracking : problemManagementEO.getProgressTracking().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setProgressTracking(progressTracking); + list.add(problemManagementVO); + } + problemManagementEO.setProgressTrackingList(list); } return problemManagementEO; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProblemManagementVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProblemManagementVO.java new file mode 100644 index 000000000..c758f5236 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProblemManagementVO.java @@ -0,0 +1,34 @@ +package com.jero.modules.project.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.oss.entity.OSSFile; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; + + +/** + * @Description: 问题管理 + * @Author: jero-boot + * @Date: 2023-09-05 + * @Version: V1.0 + */ +@Data +public class ProblemManagementVO implements Serializable { + + private String fileLink; + private String progressTracking; + private String approvalEvidenceLink; + +} From ffb5b4ff0a67931968480fafefb08956d062e6f3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 16:07:07 +0800 Subject: [PATCH 15/55] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ComplianceFlowStatusEnum.java | 2 + .../service/impl/NcrTrackServiceImpl.java | 56 ++++++++++++++++++- .../jero/modules/project/vo/NcrTrackVO.java | 19 ++----- 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java index 1eb7e76cf..6949a4ebb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -19,6 +19,8 @@ public enum ComplianceFlowStatusEnum { TO_TRACK("待追踪","To be tracked","To be tracked"), UNINVOLVED("不涉及","NA","NA"), TERMINATION_OF_TASK("任务终止","Termination of task","Termination of task"), + LAWS_INCONFORMITY("法规未符合项","Non-compliance of regulations","Non-compliance of regulations"), + LAWS_TO_TRACK("法规待追踪项","Regulations to track items","Regulations to track items"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 71e759ba1..3d55b978d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -11,6 +11,8 @@ import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; +import com.jero.modules.project.enums.ColourEnum; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.DataEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.mapper.NcrTrackMapper; @@ -18,6 +20,7 @@ import com.jero.modules.project.service.INcrTrackService; import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.project.vo.NcrTrackInfoVO; import com.jero.modules.project.vo.NcrTrackVO; +import com.jero.modules.project.vo.ProblemManagementVO; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; @@ -310,10 +313,27 @@ public class NcrTrackServiceImpl extends ServiceImpl for (NcrTrackVO trackVO : trackVOListTemp) { String problemType = trackVO.getProblemType(); trackVO.setTitle(trackVO.getFlowType()+problemType); - + trackVO.setCreateBy(trackVO.getDuty()); + if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) + || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + }else{ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + } + trackVO.setProblemType(ColourEnum.RED.getName()); + } + if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) + ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + }else{ + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + } + trackVO.setProblemType(ColourEnum.YELLOW.getName()); + } } - if(!ncrTrackVOList.isEmpty()){ trackVOListTemp.addAll(ncrTrackVOList); } @@ -343,6 +363,38 @@ public class NcrTrackServiceImpl extends ServiceImpl } List ncrTrackVOList = new ArrayList<>(); for (ProblemManagementEO problemManagementEO : managementEOList) { + //相关文件连接 + if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ + List list = new ArrayList<>(); + for (String fileLink : problemManagementEO.getFileLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setFileLink(fileLink); + list.add(problemManagementVO); + } + problemManagementEO.setFileLinkList(list); + } + + //审批证据连接 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){ + List list = new ArrayList<>(); + for (String approvalEvidenceLink : problemManagementEO.getApprovalEvidenceLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setApprovalEvidenceLink(approvalEvidenceLink); + list.add(problemManagementVO); + } + problemManagementEO.setApprovalEvidenceLinkList(list); + } + //进度追踪 + if(StringUtils.isNotBlank(problemManagementEO.getProgressTracking())){ + List list = new ArrayList<>(); + for (String progressTracking : problemManagementEO.getProgressTracking().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setProgressTracking(progressTracking); + list.add(problemManagementVO); + } + problemManagementEO.setProgressTrackingList(list); + } + NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index f737c7640..e52292cde 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -173,13 +173,14 @@ public class NcrTrackVO implements Serializable { // @ApiModelProperty(value = "问题类型") // private java.lang.String problemType; + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**ps_issue*/ - @Excel(name = "ps_issue", width = 15) @ApiModelProperty(value = "ps_issue") private java.lang.String psIssue; /**相关法规*/ - @Excel(name = "相关法规", width = 15) @ApiModelProperty(value = "相关法规") private java.lang.String lawsId; @@ -194,54 +195,46 @@ public class NcrTrackVO implements Serializable { // private java.lang.String dutyTerritory; /**问题状态*/ - @Excel(name = "*问题状态", width = 15,dicCode ="wen4_ti2_lei4_xing2") @ApiModelProperty(value = "问题状态") private java.lang.String problemState; /**描述和分析*/ - @Excel(name = "描述和分析", width = 15) @ApiModelProperty(value = "描述和分析") private java.lang.String description; /**相关文件链接*/ - @Excel(name = "相关文件链接", width = 15) @ApiModelProperty(value = "相关文件链接") private java.lang.String fileLink; /**相关文件*/ - @Excel(name = "相关文件", width = 15) @ApiModelProperty(value = "相关文件") private java.lang.String file; /**进度追踪*/ - @Excel(name = "进度追踪", width = 15) @ApiModelProperty(value = "进度追踪") private java.lang.String progressTracking; /**结论*/ - @Excel(name = "结论", width = 15) @ApiModelProperty(value = "结论") private java.lang.String conclusion; /**审批证据*/ - @Excel(name = "审批证据", width = 15) @ApiModelProperty(value = "审批证据") private java.lang.String approvalEvidence; /**审批证据链接*/ - @Excel(name = "审批证据链接", width = 15) @ApiModelProperty(value = "审批证据链接") private java.lang.String approvalEvidenceLink; @ApiModelProperty(value = "相关文件地址链接（前端传参）") - private List fileLinkList; + private List fileLinkList; @ApiModelProperty(value = "进度追踪（前端传参）") - private List progressTrackingList; + private List progressTrackingList; @ApiModelProperty(value = "审批证据链接（前端传参）") - private List approvalEvidenceLinkList; + private List approvalEvidenceLinkList; @ApiModelProperty(value = "相关法规中文名") private String lawsName; From 19420218083a8a41d9d5af2263fc2e109208121e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 16:09:01 +0800 Subject: [PATCH 16/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectNonConformance/index.vue | 73 +++++++++++++---- .../moudles/addModel.vue | 80 +++++++++++-------- 2 files changed, 102 insertions(+), 51 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index e8e4583b9..086c6f36d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -136,12 +136,20 @@
- - {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} + {{result.problemState ? result.problemState : ''}} + + + {{result.problemState ? result.problemState : ''}} + + + {{result.problemState ? result.problemState : ''}}
@@ -149,11 +157,11 @@ @click="detil(record)"> {{ $t('See') }} - {{ $t('edit') }} - {{ $t('deleteLib') }} @@ -204,11 +212,11 @@ selectedRowKeys: [], projectNameList: [], ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], - CertificationColor: { - 'red': 'nonConformityColor', - 'green': 'accordColor', - 'yellow': 'TrackedColor', - }, + // CertificationColor: { + // $t('red'): 'nonConformityColor', + // $t('green'): 'accordColor', + // $t('yellow'): 'TrackedColor', + // }, toggleSearchStatus: false, columns: [ { @@ -238,11 +246,10 @@ { title: this.$t('problemType'), align: 'left', - dataIndex: 'problemType', + dataIndex: 'problemType_dictText', width: 170, sorter:true, - ellipsis: true, - scopedSlots: { customRender: 'CertificationProgress' } + ellipsis: true }, { title: this.$t('statisticalNodes'), @@ -266,7 +273,8 @@ dataIndex: 'problemState', width: 120, sorter:true, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'CertificationProgress' } }, { title: this.$t('createTime'), @@ -424,7 +432,7 @@ this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - deleteAction(_this.url.deleteBatch, { id: record.id }).then((res) => { + deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -601,7 +609,40 @@ text-align: right; margin-top: 20px; } + .box-content-Progress { + width: 88px; + height: 32px; + display: inline-block; + text-align: center; + line-height: 32px; + border-radius: 4px; + background: #f1f3f5; + color: #919399; + } + .accordColor { + background: #dbf6e2; + color: #26BD4B; + } + .nonConformityColor { + background: #f3dddd; + color: #E83030; + } + + .TrackedColor { + background: #f6ebdb; + color: #FDA71C; + } + + .notInvolvedColor { + background: #eef1f4; + color: #707486; + } + + .submittedColor { + color: #00B3BE; + background: #ddf3f4; + } .textName { width: 100%; overflow: hidden; diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index d19ac4093..20c408f2f 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -386,7 +386,10 @@ export default { formInline: { fileLinkList:[{}], progressTrackingList:[{}], - approvalEvidenceLinkList:[{}] + approvalEvidenceLinkList:[{}], + dutyTerritory:undefined, + projectId:undefined, + problemState:undefined, }, formInlinetracking:{}, confirmLoading: false, @@ -502,20 +505,27 @@ export default { }) }, edit(row) { + console.log(row) this.getNameList() this.getFirstLevelDutyTerritory() this.title = this.$t('edit') + if(row.dutyTerritory != null){ + this.formInline.dutyTerritory = row.dutyTerritory.split(',') + }else{ + this.formInline.dutyTerritory = undefined + console.log(this.formInline.dutyTerritory) + } + if(row.projectId != null){ + this.formInline.projectId = row.projectId.split(',') + }else{ + this.formInline.dutyTerritory = undefined + } + this.formInline = row + console.log(this.formInline) this.visible = true this.disabled = false this.templateDisabled = true this.$nextTick(() => { - if(row.dutyTerritory){ - this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') - } - if(row.projectId){ - this.formInline.projectId = this.formInline.projectId.split(',') - } - this.formInline = row this.$refs.ruleForm.clearValidate() }) }, @@ -606,33 +616,33 @@ export default { if(this.formInline.projectId && this.formInline.projectId instanceof Array){ this.formInline.projectId = this.formInline.projectId.join(',') } - let fileLinkList = [] - let approvalEvidenceLinkList = [] - let progressTrackingList = [] - if(this.formInline.fileLinkList){ - this.formInline.fileLinkList.forEach(item => { - if(item.fileLink){ - fileLinkList.push(item.fileLink) - } - }) - this.formInline.fileLinkList = fileLinkList - } - if(this.formInline.approvalEvidenceLinkList){ - this.formInline.approvalEvidenceLinkList.forEach(item => { - if(item.approvalEvidenceLink){ - approvalEvidenceLinkList.push(item.approvalEvidenceLink) - } - }) - this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList - } - if(this.formInline.progressTrackingList){ - this.formInline.progressTrackingList.forEach(item => { - if(item.progressTracking){ - progressTrackingList.push(item.progressTracking) - } - }) - this.formInline.progressTrackingList = progressTrackingList - } + // let fileLinkList = [] + // let approvalEvidenceLinkList = [] + // let progressTrackingList = [] + // if(this.formInline.fileLinkList){ + // this.formInline.fileLinkList.forEach(item => { + // if(item.fileLink){ + // fileLinkList.push(item.fileLink) + // } + // }) + // this.formInline.fileLinkList = fileLinkList + // } + // if(this.formInline.approvalEvidenceLinkList){ + // this.formInline.approvalEvidenceLinkList.forEach(item => { + // if(item.approvalEvidenceLink){ + // approvalEvidenceLinkList.push(item.approvalEvidenceLink) + // } + // }) + // this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList + // } + // if(this.formInline.progressTrackingList){ + // this.formInline.progressTrackingList.forEach(item => { + // if(item.progressTracking){ + // progressTrackingList.push(item.progressTracking) + // } + // }) + // this.formInline.progressTrackingList = progressTrackingList + // } delete this.formInline.lawsName let query = { // problemManagementEO:formInline From 6feb61c256b6a44905ba892867a988b594e6e67c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 16:40:29 +0800 Subject: [PATCH 17/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=20?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectNonConformance/index.vue | 6 +- .../moudles/addModel.vue | 24 +- .../moudles/detilModel.vue | 439 ++---------------- 3 files changed, 53 insertions(+), 416 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 086c6f36d..5a0367166 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -425,7 +425,11 @@ this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record))) }, detil(record){ - this.designFlowStatusClick(record) + if(record.flag == 'NEW'){ + this.$refs.detilModelRef.check(JSON.parse(JSON.stringify(record))) + }else{ + this.designFlowStatusClick(record) + } }, deleteLib(record){ let _this = this diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 20c408f2f..f9e8da0c5 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -509,18 +509,20 @@ export default { this.getNameList() this.getFirstLevelDutyTerritory() this.title = this.$t('edit') - if(row.dutyTerritory != null){ - this.formInline.dutyTerritory = row.dutyTerritory.split(',') - }else{ - this.formInline.dutyTerritory = undefined - console.log(this.formInline.dutyTerritory) - } - if(row.projectId != null){ - this.formInline.projectId = row.projectId.split(',') - }else{ - this.formInline.dutyTerritory = undefined - } this.formInline = row + if(this.formInline.dutyTerritory != null){ + this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') + }else{ + this.formInline.dutyTerritory = undefined + } + if(this.formInline.problemState == null){ + this.formInline.problemState = undefined + } + if(this.formInline.projectId != null){ + this.formInline.projectId = this.formInline.projectId.split(',') + }else{ + this.formInline.projectId = undefined + } console.log(this.formInline) this.visible = true this.disabled = false diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 7d06b0f9d..2272baf87 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -10,21 +10,14 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> -
- * {{$t('title')}}
- - - + {{formInline.title}}
@@ -32,31 +25,26 @@
- * + {{$t('problemType')}}
- - - + {{formInline.problemType}} + + + + + +
- {{'PS-issue'}}
- - - + {{formInline.psIssue}}
@@ -68,12 +56,7 @@ {{$t('creator')}} - - - + {{formInline.creator}} @@ -83,12 +66,7 @@ {{$t('createTime')}} - - - + {{formInline.createTime}} @@ -100,14 +78,7 @@ {{$t('Relevantlawsregulations')}} - - - + {{formInline.lawsName}} @@ -117,26 +88,7 @@ {{$t('RelatedItems')}} - - - - - {{ item.projectName}} - - - - + {{formInline.projectId}} @@ -148,25 +100,7 @@ {{$t('statisticalNodes')}} - - - - - {{ item.key }} - - - - + {{formInline.dutyTerritory}} @@ -176,25 +110,7 @@ {{$t('Problemstate')}} - - - - - {{ item }} - - - - + {{formInline.problemState}} @@ -206,12 +122,7 @@ {{$t('descriptions')}} - - - + {{formInline.descriptions}} @@ -223,27 +134,16 @@ {{$t('documents')}} - -
- - - +
+ {{item.fileLink}}
+ {{formInline.fileLink}} {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} -
@@ -255,18 +155,9 @@ {{$t('progresstracking')}} - -
- - - {{$t('newlyAdded')}} - {{$t('delete')}} +
+ {{item.progressTracking}}
-
@@ -278,12 +169,7 @@ {{$t('conculsion')}} - - - + {{formInline.conclusion}} @@ -295,19 +181,8 @@ {{$t('examineapproveevidence')}} - -
- - - +
+ {{item.approvalEvidenceLink}}
@@ -315,60 +190,21 @@ formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} -
-
{{$t('cancel')}} - {{$t('submit')}} - + +
- - - - - -
-
- * - - {{$t('progresstracking')}} -
- - - -
- - - - From bad7c2e6184f02916eadc9c3daae5d8c8a2bf882 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 17:12:01 +0800 Subject: [PATCH 18/55] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProblemManagementEOMapper.xml | 2 +- .../service/impl/NcrTrackServiceImpl.java | 67 ++++++++++++++++++- .../impl/ProblemManagementEOServiceImpl.java | 3 + 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml index d0cf6982a..1a14817c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml @@ -52,7 +52,7 @@ left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id - where id in + where plb.id in #{item} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 3d55b978d..5bda203a7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -9,13 +9,17 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.project.entity.ProblemManagementEO; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; import com.jero.modules.project.enums.ColourEnum; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.DataEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.mapper.NcrTrackMapper; +import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.service.INcrTrackService; import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.project.vo.NcrTrackInfoVO; @@ -47,6 +51,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashSet; import java.util.List; @@ -75,7 +80,11 @@ public class NcrTrackServiceImpl extends ServiceImpl @Autowired private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; @Autowired - private IProblemManagementEOService problemManagementEOService; + private ProblemManagementEOServiceImpl problemManagementEOService; + @Autowired + private ProblemManagementEOMapper problemManagementEOMapper; + @Autowired + private IBussDocumentLibraryEOService bussDocumentLibraryEOService; @Override public List getPageInfo(NcrTrackVO ncrTrackVO) { @@ -306,7 +315,7 @@ public class NcrTrackServiceImpl extends ServiceImpl } } } - List ncrTrackVOList = getProblemManagementData(ncrTrackVOListTemp); + List ncrTrackVOList = getProblemManagementData(ncrTrackVOListTemp,ncrTrackVO.getCut()); if(trackVOListTemp.size() != 0){ //旧数据处理 @@ -347,7 +356,7 @@ public class NcrTrackServiceImpl extends ServiceImpl } @NotNull - private List getProblemManagementData(List ncrTrackVOListTemp) { + private List getProblemManagementData(List ncrTrackVOListTemp,String cut) { List idList = new ArrayList<>(); if(!ncrTrackVOListTemp.isEmpty()){ //处理导出时勾选数据 @@ -361,8 +370,60 @@ public class NcrTrackServiceImpl extends ServiceImpl }else{ managementEOList = problemManagementEOService.list(); } + List collect = managementEOList.stream().map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); + List documentLibraryEOList = new ArrayList<>(); + if(!collect.isEmpty()){ + Set lawIdSet = new HashSet<>(); + for (String lawIds : collect) { + lawIdSet.addAll(Arrays.asList(lawIds.split(","))); + } + if(!lawIdSet.isEmpty()){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, lawIdSet); + documentLibraryEOList = bussDocumentLibraryEOService.list(wrapper); + } + } List ncrTrackVOList = new ArrayList<>(); for (ProblemManagementEO problemManagementEO : managementEOList) { + //相关法规 + if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ + if(!documentLibraryEOList.isEmpty()){ + documentLibraryEOList = documentLibraryEOList.stream().filter(e->problemManagementEO.getLawsId().contains(e.getId())).collect(Collectors.toList()); + List serialNumberList = documentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + problemManagementEO.setLawsName(com.jero.modules.system.util.StringUtils.join(serialNumberList,",")); + } + } + //相关项目 + if(com.jero.modules.system.util.StringUtils.isNotBlank(problemManagementEO.getProjectId())){ + List projectLibraryBaseList = problemManagementEOMapper.queryByIds(problemManagementEO.getProjectId()); + //目标市场数据字典 + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List projectNameList = new ArrayList<>(); + for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) { + //目标市场 + String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase); + //主项目的版本号 + String projectVersion = ""; + if(com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = projectLibraryBase.getProjectVersion(); + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket); + } + projectNameList.add(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket + +"-"+projectVersion); + } + if(!projectNameList.isEmpty()){ + problemManagementEO.setProjectName(com.jero.modules.system.util.StringUtils.join(projectNameList,",")); + } + } + //相关文件连接 if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ List list = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java index e5c48f5bd..5751478fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -202,6 +202,9 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl Date: Wed, 6 Sep 2023 09:38:48 +0800 Subject: [PATCH 19/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectNonConformance/index.vue | 10 +- .../moudles/detilModel.vue | 329 ++++++++++++------ 2 files changed, 229 insertions(+), 110 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 5a0367166..97fd7682f 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -137,17 +137,17 @@
{{result.problemState ? result.problemState : ''}} {{result.problemState ? result.problemState : ''}} {{result.problemState ? result.problemState : ''}} @@ -426,7 +426,7 @@ }, detil(record){ if(record.flag == 'NEW'){ - this.$refs.detilModelRef.check(JSON.parse(JSON.stringify(record))) + this.$refs.detilModelRef.edit(JSON.parse(JSON.stringify(record))) }else{ this.designFlowStatusClick(record) } @@ -614,7 +614,7 @@ margin-top: 20px; } .box-content-Progress { - width: 88px; + width: 78px; height: 32px; display: inline-block; text-align: center; diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 2272baf87..ab46a8f98 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -10,6 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> +
@@ -17,7 +18,11 @@ {{$t('title')}}
- {{formInline.title}} + + +
@@ -25,38 +30,15 @@
- {{$t('problemType')}}
- {{formInline.problemType}} - - - - - - -
- - -
-
- {{'PS-issue'}} -
- {{formInline.psIssue}} -
- - - - -
-
- - {{$t('creator')}} -
- {{formInline.creator}} + + +
@@ -64,9 +46,13 @@
{{$t('createTime')}} + :title="'PS-issue'">{{'PS-issue'}}
- {{formInline.createTime}} + + + @@ -78,7 +64,11 @@ {{$t('Relevantlawsregulations')}} - {{formInline.lawsName}} + + + @@ -88,7 +78,26 @@ {{$t('RelatedItems')}} - {{formInline.projectId}} + + + + + {{ item.projectName}} + + + + @@ -100,7 +109,26 @@ {{$t('statisticalNodes')}} - {{formInline.dutyTerritory}} + + + + + {{ item.key }} + + + + @@ -110,7 +138,25 @@ {{$t('Problemstate')}} - {{formInline.problemState}} + + + + + {{ item }} + + + + @@ -118,46 +164,50 @@
- {{$t('descriptions')}}
- {{formInline.descriptions}} + + + +
+ + + + +
+
+ {{$t('documents')}} +
+ + + +
- - -
-
- - {{$t('documents')}} -
-
- {{item.fileLink}} -
- {{formInline.fileLink}} - - {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles') - }} - -
- -
- {{$t('progresstracking')}}
+
- {{item.progressTracking}} +
+
@@ -165,11 +215,14 @@
- {{$t('conculsion')}}
- {{formInline.conclusion}} + + +
@@ -181,48 +234,72 @@ {{$t('examineapproveevidence')}} +
- {{item.approvalEvidenceLink}} + {{item.approvalEvidenceLink}}
- - {{ (formInline.examineapproveevidence === 'null' || formInline.examineapproveevidence === '' || - formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') - }} - + + +
- {{$t('cancel')}} - - + {{$t('close')}}
- diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 1add5aba1..712660277 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -111,7 +111,7 @@ {{$t('newlyAdded')}} -
+
{{ $t('export') }}
@@ -120,23 +120,36 @@ + + + + +
- - {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} + {{result.problemState ? result.problemState : ''}} + + + {{result.problemState ? result.problemState : ''}} + + + {{result.problemState ? result.problemState : ''}}
@@ -144,11 +157,11 @@ @click="detil(record)"> {{ $t('See') }} - {{ $t('edit') }} - {{ $t('deleteLib') }} @@ -174,394 +187,476 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 97fd7682f..fc0db405a 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -336,7 +336,7 @@ }, methods: { getNameList() { - getAction('project/projectNameInfoEO/list', {}).then((res) => { + getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => { if (res.success) { this.projectNameList = res.result || [] } else { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index f9e8da0c5..a3ce7b1ee 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -231,6 +231,7 @@ style='width: 89%' v-model='item.progressTracking' :disabled="true" + :title='item.progressTracking' :placeholder="$t('PleaseEnter')+$t('progresstracking')"/> {{$t('newlyAdded')}} {{$t('delete')}} @@ -435,7 +436,7 @@ export default { // this.$refs.addModelRef.addModel() // }, getNameList() { - getAction('project/projectNameInfoEO/list', {}).then((res) => { + getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => { if (res.success) { this.projectNameList = res.result || [] } else { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 465ac6547..7bbdc3fcd 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -66,6 +66,7 @@
@@ -205,6 +206,7 @@ @@ -342,7 +344,7 @@ export default { }, methods: { getNameList() { - getAction('project/projectNameInfoEO/list', {}).then((res) => { + getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => { if (res.success) { this.projectNameList = res.result || [] } else { From f83c03c2da69eecab95eea63b916a134c191dfcd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 6 Sep 2023 10:30:30 +0800 Subject: [PATCH 23/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=20PS?= =?UTF-8?q?-issue=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 6 +++--- .../views/projectManagement/components/detilModel.vue | 10 +++++----- .../projectNonConformance/moudles/addModel.vue | 6 +++--- .../projectNonConformance/moudles/detilModel.vue | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index a3ce7b1ee..395162929 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -195,7 +195,7 @@
@@ -228,7 +228,7 @@
diff --git a/jero-web/src/views/projectManagement/components/detilModel.vue b/jero-web/src/views/projectManagement/components/detilModel.vue index 922449839..23e0d70f7 100644 --- a/jero-web/src/views/projectManagement/components/detilModel.vue +++ b/jero-web/src/views/projectManagement/components/detilModel.vue @@ -48,11 +48,11 @@ {{'PS-issue'}}
- - - +
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index a3ce7b1ee..395162929 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -195,7 +195,7 @@
@@ -228,7 +228,7 @@
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 7bbdc3fcd..284d6c5ee 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -48,11 +48,11 @@ {{'PS-issue'}}
- - - +
From 7d9315967cf26bf3dbf4a410dfc24f5b5ad79c57 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 10:34:34 +0800 Subject: [PATCH 24/55] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/NcrTrackServiceImpl.java | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 860beccf3..96d04a51d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -11,6 +11,8 @@ import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; @@ -85,6 +87,8 @@ public class NcrTrackServiceImpl extends ServiceImpl private ProblemManagementEOMapper problemManagementEOMapper; @Autowired private IBussDocumentLibraryEOService bussDocumentLibraryEOService; + @Autowired + private IOSSFileService iOSSFileService; @Override public List getPageInfo(NcrTrackVO ncrTrackVO) { @@ -370,9 +374,30 @@ public class NcrTrackServiceImpl extends ServiceImpl }else{ managementEOList = problemManagementEOService.list(); } + //法规 List lawsIdList = managementEOList.stream() .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); - List projectIdList = managementEOList.stream().filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); + //项目 + List projectIdList = managementEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); + //相关文件 + List fileList = managementEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getFile())).map(ProblemManagementEO::getFile).collect(Collectors.toList()); + //审批证据 + List approvalEvidenceList = managementEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getApprovalEvidence())).map(ProblemManagementEO::getApprovalEvidence).collect(Collectors.toList()); + List connectList = new ArrayList<>(); + if(!fileList.isEmpty()){ + connectList.addAll(fileList); + } + if(!approvalEvidenceList.isEmpty()){ + connectList.addAll(approvalEvidenceList); + } + List fileInfoList = new ArrayList<>(); + if(!connectList.isEmpty()){ + fileInfoList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectList,",")); + } + List documentLibraryEOList = new ArrayList<>(); if(!lawsIdList.isEmpty()){ Set lawIdSet = new HashSet<>(); @@ -472,7 +497,18 @@ public class NcrTrackServiceImpl extends ServiceImpl } problemManagementEO.setProgressTrackingList(list); } - + //相关文件 + if(StringUtils.isNotBlank(problemManagementEO.getFile())){ + List collect = fileInfoList.stream() + .filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList()); + problemManagementEO.setFileList(collect); + } + //审批证据 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ + List collect = fileInfoList.stream() + .filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList()); + problemManagementEO.setApprovalEvidenceFileList(collect); + } NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId()); From c5c1d3cf4e095acdbb1496d0794c91bb310ee72a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 11:16:47 +0800 Subject: [PATCH 25/55] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/ColourEnum.java | 4 +- .../service/impl/NcrTrackServiceImpl.java | 61 ++++++++++--------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java index 3261a49a9..952af50dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java @@ -5,8 +5,8 @@ package com.jero.modules.project.enums; */ public enum ColourEnum { - RED("红色","1"), // 未完成 - YELLOW("黄色","2"), // 已完成 + RED("红","1"), // 未完成 + YELLOW("黄","2"), // 已完成 GREEN("绿色","3"), // 展示数据 BLUE("蓝色","4") // 展示数据 ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 96d04a51d..77018c99f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -323,35 +323,14 @@ public class NcrTrackServiceImpl extends ServiceImpl if(trackVOListTemp.size() != 0){ //旧数据处理 - for (NcrTrackVO trackVO : trackVOListTemp) { - String problemType = trackVO.getProblemType(); - trackVO.setTitle(trackVO.getFlowType()+problemType); - trackVO.setCreateBy(trackVO.getDuty()); - if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) - || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ - if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); - }else{ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); - } - trackVO.setProblemType(ColourEnum.RED.getName()); - } - if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) - ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ - if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); - }else{ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); - } - trackVO.setProblemType(ColourEnum.YELLOW.getName()); - } - } - + oldData(ncrTrackVO, trackVOListTemp); if(!ncrTrackVOList.isEmpty()){ trackVOListTemp.addAll(ncrTrackVOList); } return trackVOListTemp; }else{ + //旧数据处理 + oldData(ncrTrackVO, trackVOList); if(!ncrTrackVOList.isEmpty()){ trackVOList.addAll(ncrTrackVOList); } @@ -359,6 +338,33 @@ public class NcrTrackServiceImpl extends ServiceImpl } } + private void oldData(NcrTrackVO ncrTrackVO, List trackVOListTemp) { + for (NcrTrackVO trackVO : trackVOListTemp) { + String problemType = trackVO.getProblemType(); + trackVO.setTitle(trackVO.getTitle()+problemType); + trackVO.setCreateBy(trackVO.getDuty()); + trackVO.setLawsName(trackVO.getSerialNumber()); + if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) + || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + }else{ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + } + trackVO.setProblemState(ColourEnum.RED.getName()); + } + if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) + ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + }else{ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + } + trackVO.setProblemState(ColourEnum.YELLOW.getName()); + } + } + } + @NotNull private List getProblemManagementData(List ncrTrackVOListTemp,String cut) { List idList = new ArrayList<>(); @@ -451,18 +457,13 @@ public class NcrTrackServiceImpl extends ServiceImpl }else{ projectVersion = projectLibraryBase.getProjectVersion(); } - if(com.jero.modules.system.util.StringUtils.isNotBlank(projectLibraryBase.getYearName())){ - projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() - + "-" + projectLibraryBase.getYearName() - + "-" + targetMarket); - } projectNameList.add(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName() + "-" + targetMarket +"-"+projectVersion); } if(!projectNameList.isEmpty()){ - problemManagementEO.setProjectName(com.jero.modules.system.util.StringUtils.join(projectNameList,",")); + problemManagementEO.setProjectName(StringUtils.join(projectNameList,",")); } } From 33acabdb773232f1ec1c094e32c66c32fa86ac2b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 11:20:50 +0800 Subject: [PATCH 26/55] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/service/impl/NcrTrackServiceImpl.java | 8 ++++---- .../main/java/com/jero/modules/project/vo/NcrTrackVO.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 77018c99f..1d696f64a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -347,18 +347,18 @@ public class NcrTrackServiceImpl extends ServiceImpl if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); }else{ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); } trackVO.setProblemState(ColourEnum.RED.getName()); } if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); }else{ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); } trackVO.setProblemState(ColourEnum.YELLOW.getName()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index e52292cde..c2ccb89f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -40,6 +40,11 @@ public class NcrTrackVO implements Serializable { @ApiModelProperty(value = "创建日期") private java.util.Date createTime; + @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; + //中英文切换 private String cut; From bfaa8387cd45621202b80ebab17b79651805f33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 6 Sep 2023 11:28:46 +0800 Subject: [PATCH 27/55] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/addModelconformance.vue | 9 +++++++++ .../projectManagement/projectNonConformance/index.vue | 8 ++++++-- .../projectNonConformance/moudles/addModel.vue | 9 +++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 395162929..5aeaa814d 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -519,6 +519,15 @@ export default { if(this.formInline.problemState == null){ this.formInline.problemState = undefined } + if(this.formInline.progressTrackingList == null){ + this.formInline.progressTrackingList = [{}] + } + if(this.formInline.approvalEvidenceLinkList == null){ + this.formInline.approvalEvidenceLinkList = [{}] + } + if(this.formInline.fileLinkList == null){ + this.formInline.fileLinkList = [{}] + } if(this.formInline.projectId != null){ this.formInline.projectId = this.formInline.projectId.split(',') }else{ diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index fc0db405a..6d27e7639 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -152,6 +152,9 @@ {{result.problemState ? result.problemState : ''}}
+ + {{result.flag== 'NEW'?result.problemType_dictText:result.problemType}} + @@ -249,7 +252,8 @@ dataIndex: 'problemType_dictText', width: 170, sorter:true, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'problemType' } }, { title: this.$t('statisticalNodes'), @@ -262,7 +266,7 @@ { title: this.$t('creator'), align: 'left', - dataIndex: 'creator', + dataIndex: 'createBy', width: 100, sorter:true, ellipsis: true diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 395162929..5aeaa814d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -519,6 +519,15 @@ export default { if(this.formInline.problemState == null){ this.formInline.problemState = undefined } + if(this.formInline.progressTrackingList == null){ + this.formInline.progressTrackingList = [{}] + } + if(this.formInline.approvalEvidenceLinkList == null){ + this.formInline.approvalEvidenceLinkList = [{}] + } + if(this.formInline.fileLinkList == null){ + this.formInline.fileLinkList = [{}] + } if(this.formInline.projectId != null){ this.formInline.projectId = this.formInline.projectId.split(',') }else{ From 78b370fac57609d6f88c1bcb9917cd8e7c3a6bd8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 6 Sep 2023 11:46:23 +0800 Subject: [PATCH 28/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/nonConformance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 712660277..6e76bb8a8 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -306,7 +306,7 @@ export default { long: '', isPersonnelSelection:true, url: { - page: '/project/ncrTrackController/queryPage', + page: '/project/projectLawsInventoryEO/queryNotComplianList', exportData: '/project/ncrTrackController/exportData' }, content: [] From 5eadc8da211b0e7ea817c1e85ea2568450aa4f35 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 6 Sep 2023 14:02:12 +0800 Subject: [PATCH 29/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/nonConformance.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 6e76bb8a8..160950d4e 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -152,6 +152,9 @@ {{result.problemState ? result.problemState : ''}}
+ + {{result.flag== 'NEW'?result.problemType_dictText:result.problemType}} + @@ -249,7 +252,8 @@ export default { dataIndex: 'problemType_dictText', width: 170, sorter:true, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'problemType' } }, { title: this.$t('statisticalNodes'), @@ -399,6 +403,7 @@ export default { pageSize: this.pageSize, orderBy: this.orderBy, orderByField: this.orderByField, + projectLibraryId: this.$route.query.id, ...this.queryParam } this.loading = true From 0fb70d077e4d27baad374e16b4a42aaae94833b1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 15:10:08 +0800 Subject: [PATCH 30/55] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9-=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/xml/NcrTrackMapper.xml | 6 +- .../ProjectLawsInventoryEOServiceImpl.java | 175 ++++++++++++++++++ 2 files changed, 180 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml index 637345b40..e5545435d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml @@ -113,9 +113,13 @@ and ( + design_flow_status =#{ncrTrackVO.inconformity} + or verify_flow_status =#{ncrTrackVO.inconformity} + ) + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 848c2ccb8..55704bc95 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -58,6 +58,8 @@ import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.*; import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl; import com.jero.modules.project.util.WordUtil; +import com.jero.modules.project.vo.NcrTrackVO; +import com.jero.modules.project.vo.ProblemManagementVO; import com.jero.modules.project.vo.ProjectTaskUrgVo; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysAnnouncement; @@ -73,6 +75,7 @@ import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -272,6 +275,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> queryNotComplianList(Map params) { + //problemManagementEOService String cut = (String) params.get("cut"); List complianceFlowStatusList = new ArrayList<>(); @@ -10348,6 +10358,171 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); + List managementEOList = problemManagementEOService.list(wrapper); + //法规 + List lawsIdList = managementEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); + //项目 + List projectIdList = managementEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); + //相关文件 + List fileList = managementEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getFile())).map(ProblemManagementEO::getFile).collect(Collectors.toList()); + //审批证据 + List approvalEvidenceList = managementEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getApprovalEvidence())).map(ProblemManagementEO::getApprovalEvidence).collect(Collectors.toList()); + List connectList = new ArrayList<>(); + if(!fileList.isEmpty()){ + connectList.addAll(fileList); + } + if(!approvalEvidenceList.isEmpty()){ + connectList.addAll(approvalEvidenceList); + } + List fileInfoList = new ArrayList<>(); + if(!connectList.isEmpty()){ + fileInfoList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectList,",")); + } + + List documentLibraryEOList = new ArrayList<>(); + if(!lawsIdList.isEmpty()){ + Set lawIdSet = new HashSet<>(); + for (String lawIds : lawsIdList) { + lawIdSet.addAll(Arrays.asList(lawIds.split(","))); + } + if(!lawIdSet.isEmpty()){ + LambdaQueryWrapper wrapperDocument = new LambdaQueryWrapper<>(); + wrapperDocument.in(BussDocumentLibraryEO::getId, lawIdSet); + documentLibraryEOList = bussDocumentLibraryEOService.list(wrapperDocument); + } + } + + List projectLibraryBaseList = new ArrayList<>(); + if(!projectIdList.isEmpty()){ + Set projectIdSet = new HashSet<>(); + for (String projectIds : projectIdList) { + projectIdSet.addAll(Arrays.asList(projectIds.split(","))); + } + if(!projectIdSet.isEmpty()){ + projectLibraryBaseList = problemManagementEOMapper.queryByIds(StringUtils.join(projectIdSet,",")); + } + } + List ncrTrackVOList = new ArrayList<>(); + List> mapList = new ArrayList<>(); + for (ProblemManagementEO problemManagementEO : managementEOList) { + Map map = new HashMap<>(); + map.put("title",problemManagementEO.getTitle()); + map.put("psIssue",problemManagementEO.getPsIssue()); + map.put("dutyTerritory",problemManagementEO.getDutyTerritory()); + map.put("problemState",problemManagementEO.getProblemState()); + map.put("description",problemManagementEO.getDescription()); + map.put("conclusion",problemManagementEO.getConclusion()); + //相关法规 + if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ + if(!documentLibraryEOList.isEmpty()){ + List documentLibraryEOListTemp = documentLibraryEOList.stream() + .filter(e->StringUtils.isNotBlank(problemManagementEO.getLawsId()) + && problemManagementEO.getLawsId().contains(e.getId())).collect(Collectors.toList()); + List serialNumberList = documentLibraryEOListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + problemManagementEO.setLawsName(StringUtils.join(serialNumberList,",")); + map.put("lawsName",StringUtils.join(serialNumberList,",")); + map.put("lawsId",problemManagementEO.getLawsId()); + } + } + //相关项目 + if(StringUtils.isNotBlank(problemManagementEO.getProjectId())){ + List projectLibraryBaseListTemp = projectLibraryBaseList.stream() + .filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId()) + && problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList()); + //目标市场数据字典 + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List projectNameList = new ArrayList<>(); + for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseListTemp) { + //目标市场 + String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase); + //主项目的版本号 + String projectVersion = ""; + if(com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = projectLibraryBase.getProjectVersion(); + } + projectNameList.add(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket + +"-"+projectVersion); + } + if(!projectNameList.isEmpty()){ + problemManagementEO.setProjectName(StringUtils.join(projectNameList,",")); + map.put("projectName",StringUtils.join(projectNameList,",")); + map.put("projectId",problemManagementEO.getProjectId()); + } + } + + //相关文件连接 + if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ + List list = new ArrayList<>(); + for (String fileLink : problemManagementEO.getFileLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setFileLink(fileLink); + list.add(problemManagementVO); + } + problemManagementEO.setFileLinkList(list); + map.put("fileLinkList",list); + } + + //审批证据连接 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){ + List list = new ArrayList<>(); + for (String approvalEvidenceLink : problemManagementEO.getApprovalEvidenceLink().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setApprovalEvidenceLink(approvalEvidenceLink); + list.add(problemManagementVO); + } + problemManagementEO.setApprovalEvidenceLinkList(list); + map.put("approvalEvidenceLinkList",list); + } + //进度追踪 + if(StringUtils.isNotBlank(problemManagementEO.getProgressTracking())){ + List list = new ArrayList<>(); + for (String progressTracking : problemManagementEO.getProgressTracking().split(",")) { + ProblemManagementVO problemManagementVO = new ProblemManagementVO(); + problemManagementVO.setProgressTracking(progressTracking); + list.add(problemManagementVO); + } + problemManagementEO.setProgressTrackingList(list); + map.put("progressTrackingList",list); + } + //相关文件 + if(StringUtils.isNotBlank(problemManagementEO.getFile())){ + List collect = fileInfoList.stream() + .filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList()); + problemManagementEO.setFileList(collect); + map.put("fileList",collect); + } + //审批证据 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ + List collect = fileInfoList.stream() + .filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList()); + problemManagementEO.setApprovalEvidenceFileList(collect); + map.put("approvalEvidenceFileList",collect); + + } + map.put("uuid",problemManagementEO.getId()); + map.put("flag",DataEnum.NEW.getValue()); + mapList.add(map); + NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); + BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); + ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId()); + ncrTrackVOTemp.setFlag(DataEnum.NEW.getValue()); + ncrTrackVOList.add(ncrTrackVOTemp); + } + if(ObjectUtils.isNotEmpty(mapList)){ + result.addAll(mapList); + } + return result; } From b24547128ca26f1fda63fdc5632d8f0c13668e7d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 6 Sep 2023 15:49:41 +0800 Subject: [PATCH 31/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/nonConformance.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 160950d4e..103d035f9 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -398,12 +398,14 @@ export default { this.getList() }, getList() { + console.log(this.$route.query) let query = { pageNo: this.pageNo, pageSize: this.pageSize, orderBy: this.orderBy, orderByField: this.orderByField, projectLibraryId: this.$route.query.id, + projectName:this.$route.query.projectName, ...this.queryParam } this.loading = true From fb145199400bfdc523ea10d4409bd783f0bb7fcf Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 6 Sep 2023 15:58:36 +0800 Subject: [PATCH 32/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/nonConformance.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 103d035f9..f2fbcb51b 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -266,7 +266,7 @@ export default { { title: this.$t('creator'), align: 'left', - dataIndex: 'creator', + dataIndex: 'createBy', width: 100, sorter:true, ellipsis: true @@ -411,12 +411,12 @@ export default { this.loading = true getAction(this.url.page, query).then((res) => { if (res.success) { - if (res.result.current > 1 && res.result.records.length == 0) { + if (res.result.current > 1 && res.result.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result.records || [] + this.dataSource = res.result || [] this.total = res.result.total this.loading = false } else { From 77d8e6caf820c1f5ed0bd741a83186395603611b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 16:45:13 +0800 Subject: [PATCH 33/55] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/NcrTrackServiceImpl.java | 1 + .../ProjectLawsInventoryEOServiceImpl.java | 46 ++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 1d696f64a..5e30fbba8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -344,6 +344,7 @@ public class NcrTrackServiceImpl extends ServiceImpl trackVO.setTitle(trackVO.getTitle()+problemType); trackVO.setCreateBy(trackVO.getDuty()); trackVO.setLawsName(trackVO.getSerialNumber()); + trackVO.setFlag(DataEnum.OLD.getValue()); if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 55704bc95..518232535 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10285,7 +10285,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> queryNotComplianList(Map params) { - //problemManagementEOService String cut = (String) params.get("cut"); List complianceFlowStatusList = new ArrayList<>(); @@ -10316,16 +10315,51 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataMap : result) { + + //相关法规 + dataMap.put("lawsName",dataMap.get("serialNumber")); + //相关项目(旧数据的未符合项，都是属于这一个项目的) + dataMap.put("projectName",params.get("projectName")); + //创建时间 + dataMap.put("createTime",dataMap.get("createTime")); + //更新时间 + dataMap.put("updateTime",dataMap.get("updateTime")); + String dutyTerritory = (String) dataMap.get("dutyTerritory"); if(StringUtils.isNotEmpty(dutyTerritory)){ if(StringUtils.isNotEmpty(dutyTerritory)){ String dutyTerritory_dictText = this.disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); dataMap.put("dutyTerritory_dictText",dutyTerritory_dictText); + //责任部门 + dataMap.put("dutyTerritory",dutyTerritory_dictText); } } String flowStatus = (String) dataMap.get("flowStatus"); if(StringUtils.isNotEmpty(flowStatus)){ + String textByValue = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut); + if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(textByValue) + || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(flowStatus)){ + //问题类型 + if(CutEnum.CN.getValue().equals(cut)){ + dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + }else{ + dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + } + //问题状态 + dataMap.put("problemState",ColourEnum.RED.getName()); + } + if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(flowStatus) + ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(flowStatus)){ + //问题类型 + if(CutEnum.CN.getValue().equals(cut)){ + dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + }else{ + dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + } + //问题状态 + dataMap.put("problemState",ColourEnum.YELLOW.getName()); + } dataMap.put("flowStatusName",ComplianceFlowStatusEnum.getTextByValue(flowStatus,cut)); } @@ -10339,6 +10373,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOQueryWrapper = new QueryWrapper<>(); @@ -10417,8 +10456,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 6 Sep 2023 16:49:13 +0800 Subject: [PATCH 34/55] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/addModelconformance.vue | 8 ++++---- .../projectNonConformance/moudles/addModel.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 5aeaa814d..0bdd14ac0 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -609,12 +609,12 @@ export default { this.confirmLoading = true let url = '' let action = '' - if (this.formInline.id) { - url = this.url.edit - action = putAction - } else { + if (this.title == this.$t('newlyAdded')) { url = this.url.add action = postAction + } else { + url = this.url.edit + action = putAction } // Object.keys(formInline).forEach(res => { // if (formInline[res] && formInline[res] instanceof Array) { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 5aeaa814d..0bdd14ac0 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -609,12 +609,12 @@ export default { this.confirmLoading = true let url = '' let action = '' - if (this.formInline.id) { - url = this.url.edit - action = putAction - } else { + if (this.title == this.$t('newlyAdded')) { url = this.url.add action = postAction + } else { + url = this.url.edit + action = putAction } // Object.keys(formInline).forEach(res => { // if (formInline[res] && formInline[res] instanceof Array) { From b5235a34280eb7024029e7bd668ce9d2a596e043 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 6 Sep 2023 16:59:29 +0800 Subject: [PATCH 35/55] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/nonConformance.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index f2fbcb51b..58308d5a9 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -411,12 +411,12 @@ export default { this.loading = true getAction(this.url.page, query).then((res) => { if (res.success) { - if (res.result.current > 1 && res.result.length == 0) { + if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result || [] + this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false } else { From d59f95f920e2edfbcbed6df512a099e6d8d548f1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 17:01:24 +0800 Subject: [PATCH 36/55] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9-=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectLawsInventoryEOController.java | 4 +++- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index d3a21eb4f..19c45539b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -10,6 +10,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.PageUtil; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; @@ -550,7 +551,8 @@ public class ProjectLawsInventoryEOController extends JeroController queryNotComplianList(@RequestParam Map params) { List> result = this.projectLawsInventoryEOService.queryNotComplianList(params); - return Result.OK(result); + Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result); + return Result.OK(pages); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 518232535..77394f233 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -30,6 +30,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; +import com.jero.common.util.PageUtil; import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; @@ -10545,6 +10546,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList()); problemManagementEO.setFileList(collect); map.put("fileList",collect); + map.put("file",problemManagementEO.getFile()); } //审批证据 if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ @@ -10552,6 +10554,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList()); problemManagementEO.setApprovalEvidenceFileList(collect); map.put("approvalEvidenceFileList",collect); + map.put("approvalEvidence",problemManagementEO.getApprovalEvidence()); } map.put("uuid",problemManagementEO.getId()); @@ -10566,7 +10569,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 6 Sep 2023 17:08:16 +0800 Subject: [PATCH 37/55] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 77394f233..6c00a1e74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10451,6 +10451,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl ncrTrackVOList = new ArrayList<>(); List> mapList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for (ProblemManagementEO problemManagementEO : managementEOList) { Map map = new HashMap<>(); map.put("title",problemManagementEO.getTitle()); @@ -10461,8 +10462,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 6 Sep 2023 17:50:45 +0800 Subject: [PATCH 38/55] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/nonConformance.vue | 36 +++++++++++++++---- .../projectNonConformance/index.vue | 36 +++++++++++++++---- 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 58308d5a9..94c67f20e 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -59,13 +59,26 @@
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('statisticalNodes')}}
- + + + + {{ item.key }} + + +
@@ -214,6 +227,7 @@ export default { dataSource: [], selectedRowKeys: [], projectNameList: [], + firstLevelDutyTerritoryList:[], ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], // CertificationColor: { // $t('red'): 'nonConformityColor', @@ -325,6 +339,7 @@ export default { this.long = localStorage.getItem('language') || 'zh-cn' this.getList() this.getNameList() + this.getFirstLevelDutyTerritory() }, watch: { '$socketPublic.state.msg': { @@ -339,6 +354,15 @@ export default { } }, methods: { + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, getNameList() { getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 6d27e7639..c9ca09da6 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -59,13 +59,26 @@
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('statisticalNodes')}}
- + + + + {{ item.key }} + + +
@@ -213,6 +226,7 @@ loading: false, dataSource: [], selectedRowKeys: [], + firstLevelDutyTerritoryList:[], projectNameList: [], ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], // CertificationColor: { @@ -325,6 +339,7 @@ this.long = localStorage.getItem('language') || 'zh-cn' this.getList() this.getNameList() + this.getFirstLevelDutyTerritory() }, watch: { '$socketPublic.state.msg': { @@ -339,6 +354,15 @@ } }, methods: { + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, getNameList() { getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => { if (res.success) { From dd58c342905f1e3aa75d0dd211311b3d8ed9b79f Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 18:35:54 +0800 Subject: [PATCH 39/55] =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/DicCodeEnum.java | 1 + .../xml/ProjectLawsInventoryEOMapper.xml | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 66 +++++++++++++++++-- 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index c1f571268..313ad591e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -6,6 +6,7 @@ package com.jero.modules.system.enums; public enum DicCodeEnum { REGION("适用地区","1493782108399820801","region"), DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"), + PROBLEM_TYPE("问题类型","1697066042058821634","wen4_ti2_lei4_xing2"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml index 6d2dc3451..b24afb028 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml @@ -158,7 +158,7 @@ #{item} ) temp - + order by temp.${params.orderByField} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 6c00a1e74..140906d37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10321,6 +10321,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> mapList = getNewData(params, cut); + if(ObjectUtils.isNotEmpty(mapList)){ + result.addAll(mapList); + } + return result; + } + + @NotNull + private List> getNewData(Map params, String cut) { //新数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); List managementEOList = problemManagementEOService.list(wrapper); //法规 List lawsIdList = managementEOList.stream() - .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); + .filter(e-> StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); //项目 List projectIdList = managementEOList.stream() .filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); @@ -10449,6 +10462,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl problemTypeList = sysDictService.queryDictItemsByCode(DicCodeEnum.PROBLEM_TYPE.getCode()); + List ncrTrackVOList = new ArrayList<>(); List> mapList = new ArrayList<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -10464,7 +10479,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList()); + + if(!dictModelList.isEmpty()){ + if(CutEnum.CN.getValue().equals(cut)){ + map.put("problemType_dictText",dictModelList.get(0).getText()); + }else{ + map.put("problemType_dictText",dictModelList.get(0).getTextEn()); + } + } //相关法规 if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ if(!documentLibraryEOList.isEmpty()){ @@ -10558,8 +10585,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> dataParameter(Map params, List> mapList) { + if(ObjectUtils.isNotEmpty(params.get("title"))){//标题 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("title")) + && e.get("title").toString().contains(params.get("title").toString())).collect(Collectors.toList()); } - return result; + if(ObjectUtils.isNotEmpty(params.get("lawsName"))){//相关法规 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("lawsName")) + && e.get("lawsName").toString().contains(params.get("lawsName").toString())).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("projectId"))){//相关项目 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("projectId")) + && String.valueOf(e.get("projectId")).equals(String.valueOf(params.get("projectId")))).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("problemType"))){//问题类型 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("problemType")) + && e.get("problemType").toString().equals(params.get("problemType").toString())).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("dutyTerritory"))){//责任领域 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("dutyTerritory")) + && e.get("dutyTerritory").toString().contains(params.get("dutyTerritory").toString())).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(params.get("problemState"))){//问题状态 + mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("problemState")) + && e.get("problemState").toString().contains(params.get("problemState").toString())).collect(Collectors.toList()); + } + return mapList; } @Override From ffc648105e671e85ebd9fd3cb22d874060a7c078 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 7 Sep 2023 09:07:25 +0800 Subject: [PATCH 40/55] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/nonConformance.vue | 1 - .../src/views/projectManagement/projectNonConformance/index.vue | 1 - 2 files changed, 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 94c67f20e..e97c31338 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -65,7 +65,6 @@ Date: Thu, 7 Sep 2023 09:10:41 +0800 Subject: [PATCH 41/55] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/nonConformance.vue | 2 +- .../src/views/projectManagement/projectNonConformance/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index e97c31338..003231922 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -65,7 +65,7 @@ diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index e414d37c3..bb9997475 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -65,7 +65,7 @@ From 81ed6ef9dcdbc14d39a865f6323be1cd1ea66dac Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 7 Sep 2023 10:58:01 +0800 Subject: [PATCH 42/55] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=A9=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProblemManagementEO.java | 2 + .../project/mapper/xml/NcrTrackMapper.xml | 34 ++------ .../service/impl/NcrTrackServiceImpl.java | 83 +++++++++++++++---- .../ProjectLawsInventoryEOServiceImpl.java | 22 +++-- .../jero/modules/project/vo/NcrTrackVO.java | 3 +- .../components/nonConformance.vue | 15 +++- .../projectNonConformance/index.vue | 14 +++- 7 files changed, 108 insertions(+), 65 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index 20a71fb61..cb741c931 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -71,6 +71,8 @@ public class ProblemManagementEO implements Serializable { @Excel(name = "问题类型", width = 15) @ApiModelProperty(value = "问题类型") private java.lang.String problemType; + @TableField(exist = false) + private String problemType_dictText; /**ps_issue*/ @Excel(name = "ps_issue", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml index e5545435d..2615ca8cf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml @@ -27,20 +27,6 @@