WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_20230508' 到 'master'

Browse Source 
Fix 20230508

查看合并请求 laws-nio/laws-weilai!317
This commit is contained in:
高嵩
2023-05-08 18:05:55 +08:00
parent 7c6251d1ab 756a71aace
commit bd2ae3610b
6 changed files with 169 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+77 -8
View File
@@ -22,10 +22,12 @@
<result column="prehomo_flow_task_status" property="prehomoFlowTaskStatus" />
<result column="verify_flow_task_status" property="verifyFlowTaskStatus" />
<result column="create_time" property="createTime" />
<result column="project_laws_inventory_id" property="projectLawsInventoryId" />
</resultMap>
<select id="getInfoList" resultMap="NcrTrackVOResultMap">
<!--
SELECT
pni.project_name,plb.target_market,plb.project_version,pyni.year_name,
pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,pli.stand_id,
@@ -38,7 +40,41 @@
left join project_name_info pni on pni.id = plb.project_name_id
left join project_task_inventory_detail ptid on ptid.project_task_inventory_id = pti.project_laws_inventory_id
left join project_year_name_info pyni on pyni.id = plb.year_name_id
-->
SELECT
pni.project_name,
plb.target_market,
plb.project_version,
pyni.year_name,
pli.serial_number,
pli.title,
pli.duty_territory,
pli.create_time,
pli.project_library_id,
pli.stand_id,
pli.regulation_owner_id as design_initiator_id,
pli.design_duty_id,
pli.regulation_owner_id as verify_initiator_id,
pli.verify_duty_id,
pli.design_flow_status as design_flow_task_status,
pli.verify_flow_status as verify_flow_task_status,
pli.id as project_laws_inventory_id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '2' order by pi.create_time desc limit 0,1
) as design_p_id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '4' order by pi.create_time desc limit 0,1
) as verify_p_id
FROM project_laws_inventory pli
LEFT JOIN project_library_base plb ON plb.id = pli.project_library_id
LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
where
<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
plb.id =#{ncrTrackVO.projectLibraryId}
@@ -77,9 +113,8 @@
and
</if>
(
design_flow_task_status =#{ncrTrackVO.inconformity} or design_flow_task_status =#{ncrTrackVO.track}
or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track}
or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track}
design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
)
<!--如果当前操作人不是系统管理员角色，查询跟自己相关的数据，如果是系统管理员，查询所有的-->
<if test="ncrTrackVO.administrator == 'false'">
@@ -96,6 +131,7 @@
</select>
<select id="getViewerInfoList" resultMap="NcrTrackVOResultMap">
<!--
SELECT
pni.project_name,plb.target_market,
pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,
@@ -107,7 +143,41 @@
left join project_library_base plb on plb.id = pli.project_library_id
left join project_name_info pni on pni.id = plb.project_name_id
left join project_task_inventory_detail ptid on ptid.project_task_inventory_id = pti.project_laws_inventory_id
-->
SELECT
pni.project_name,
plb.target_market,
plb.project_version,
pyni.year_name,
pli.serial_number,
pli.title,
pli.duty_territory,
pli.create_time,
pli.project_library_id,
pli.stand_id,
pli.regulation_owner_id as design_initiator_id,
pli.design_duty_id,
pli.regulation_owner_id as verify_initiator_id,
pli.verify_duty_id,
pli.design_flow_status as design_flow_task_status,
pli.verify_flow_status as verify_flow_task_status,
pli.id as project_laws_inventory_id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '2' order by pi.create_time desc limit 0,1
) as design_p_id,
(
select
pi.acti_proc_inst_id
from process_info pi
where pi.project_laws_inventory_id = pli.id and pi.flow_type = '4' order by pi.create_time desc limit 0,1
) as verify_p_id
FROM project_laws_inventory pli
LEFT JOIN project_library_base plb ON plb.id = pli.project_library_id
LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
where
<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
plb.id =#{ncrTrackVO.projectLibraryId}
@@ -134,9 +204,8 @@
and
</if>
(
design_flow_task_status =#{ncrTrackVO.inconformity} or design_flow_task_status =#{ncrTrackVO.track}
or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track}
or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track}
design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
)
and pli.duty_territory in
<foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+19 -5
View File
@@ -110,23 +110,35 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
String prehomoName = "";
String verifyName = "";
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
designName = "设计符合性确认";
designName = "设计符合性流程";
prehomoName = "PreHomo确认";
verifyName = "验证符合性确认";
verifyName = "验证符合性流程";
}else{
designName = "Confirm design conformance";
designName = "Design Compliance Process";
prehomoName = "PreHomo confirmation";
verifyName = "Verify conformance validation";
verifyName = "Verification of compliance process";
}
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
Set<String> userIdSet = new HashSet<>();
for (NcrTrackVO trackVO : infoList) {
if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
/*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());
}
if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
userIdSet.add(trackVO.getDesignInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyDutyId())){
userIdSet.add(trackVO.getVerifyDutyId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
userIdSet.add(trackVO.getVerifyInitiatorId());
}
@@ -202,6 +214,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
trackVO.getProjectLibraryId(),
trackVO.getProjectLawsInventoryId(),
FlowTypeEnum.SJFHXSHLC.getValue());
ncrTrackVOTemp.setFlowStatus(designFlowTaskStatus);
trackVOList.add(ncrTrackVOTemp);
}
//PreHomo确认
@@ -242,6 +255,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
trackVO.getProjectLibraryId(),
trackVO.getProjectLawsInventoryId(),
FlowTypeEnum.YZFHXSCLC.getValue());
ncrTrackVOTemp.setFlowStatus(verifyFlowTaskStatus);
trackVOList.add(ncrTrackVOTemp);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+2
View File
@@ -156,6 +156,8 @@ public class NcrTrackVO implements Serializable {
//排序字段
private String orderByField;
private String flowStatus;
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+68 -2
View File
@@ -162,7 +162,7 @@
:columns="columns"
>
<span slot="standard" slot-scope="text,result">
<a @click="standardClick(result)" class="textName" :title="text">
<a @click="designFlowStatusClick(result)" class="textName" :title="text">
{{text}}
</a>
</span>
@@ -180,19 +180,22 @@
@showSizeChange="SizeChange"
/>
</div>
<designCompliance ref="designComplianceRef"/>
</a-card>
</template>
<script>
import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
import store from '@/store/'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'projectNonConformance',
components: {
PersonnelSelection
PersonnelSelection,
designCompliance
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
@@ -390,6 +393,69 @@
this.queryParam[value] = id
this.queryParam = { ...this.queryParam }
},
//流程状态点击事件
designFlowStatusClick(row, name) {
let query = {}
let TaskKey = ''
let flowTypeName = ''
if (row.prcType == '2') {
if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
TaskKey = 'zrrqr'
} else if (row.flowStatus == 'Results to be submitted') {
TaskKey = 'zrrtjjfw'
} else if (row.flowStatus == 'Results to be reviewed' ||
row.flowStatus == 'Compliance' ||
row.flowStatus == 'Non-Compliance' ||
row.flowStatus == 'To be tracked' ||
row.flowStatus == 'NA') {
TaskKey = 'fggcssh'
}
query = {
actiProcInstId: row.prcId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId:row.projectLibraryId,
TaskKey: TaskKey,
isDisplay: false,
flowType: row.prcType,
Sponsor: 'regulationOwnerName',
personLiable: 'designDutyIdName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
remarks: 'designRemark',
}
flowTypeName = this.$t('designComplianceProcess')
} else if(row.prcType == '4'){
if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
TaskKey = 'zrrqr'
} else if (row.flowStatus == 'Results to be submitted') {
TaskKey = 'zrrtjjfw'
} else if (row.flowStatus == 'Results to be reviewed' ||
row.flowStatus == 'Compliance' ||
row.flowStatus == 'Non-Compliance' ||
row.flowStatus == 'To be tracked' ||
row.flowStatus == 'NA') {
TaskKey = 'fggcssh'
}
query = {
actiProcInstId: row.prcId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId: row.projectLibraryId,
TaskKey: TaskKey,
flowType: row.prcType,
isDisplay: false,
Sponsor: 'regulationOwnerName',
personLiable: 'verifyDutyIdName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
remarks: 'verifyRemark',
}
flowTypeName = this.$t('validationComplianceProcess')
}
this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), flowTypeName)
},
standardClick(val) {
let num = val.prcType
let query = {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+1 -1
View File
@@ -319,7 +319,7 @@
@import '~@assets/less/common.less';
.box {
padding: 0 0 24px 0;
padding: 0 0 38px 0;
box-sizing: border-box;
}
jero-web/vue.config.js
+2 -2
View File
@@ -93,15 +93,15 @@ module.exports = {
}
}, */
'/jero-boot': {
// target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
target: 'http://localhost:8080', //请求本地 jero-boot后台项目
// target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
// target: 'http://10.0.1.25:8080',
// target: 'http://10.0.1.5:8080',
target: 'http://127.0.0.1:8080',
ws: false,
changeOrigin: true
}
}
},
lintOnSave: undefined
}