jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-07-01 18:00:07 +08:00
parent e9e2a003aa
commit ca25764569
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-bigscreen/src/views/quality/qualityCheck.vue
View File

@ -374,7 +374,7 @@ export default {
data: it, data: it,
} }
}) })
this.chart2Data = (res[1].data || []).map((it) => { this.chart2Data = (res[1].data.fi || []).map((it) => {
return { return {
id: it.nickedInfo, id: it.nickedInfo,
name: it.dangerType, name: it.dangerType,

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
View File

@ -58,7 +58,7 @@
<if test='activeTags == "users"'>, bus.user_picture as businessImg, bus.card_code as businessMk1, sdd.dict_label as businessMk2, bus.sub_dept_name as businessMk3</if> <if test='activeTags == "users"'>, bus.user_picture as businessImg, bus.card_code as businessMk1, sdd.dict_label as businessMk2, bus.sub_dept_name as businessMk3</if>
from vw_flow_await fa from vw_flow_await fa
<if test='activeTags == "depts"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join pro_project_info_subdepts sud on sud.id = bus.sub_dept_id left join sys_dict_data sdd on sdd.dict_value = bus.sub_dept_type and sdd.dict_type='sub_dept_type' </if> <if test='activeTags == "depts"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join pro_project_info_subdepts sud on sud.id = bus.sub_dept_id left join sys_dict_data sdd on sdd.dict_value = bus.sub_dept_type and sdd.dict_type='sub_dept_type' </if>
<if test='activeTags == "users"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join sys_dict_data sdd on sdd.dict_value = bus.craft_post and sdd.dict_type='pro_craft_post'</if> <if test='activeTags == "users" or (groupIds != null and groupIds.size()>0)'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join sys_dict_data sdd on sdd.dict_value = bus.craft_post and sdd.dict_type='pro_craft_post'</if>
where where
fa.taskName != '申请人提交' fa.taskName != '申请人提交'
<if test="procDefName != null and procDefName != ''"> and fa.procDefName like concat('%', #{procDefName}, '%')</if> <if test="procDefName != null and procDefName != ''"> and fa.procDefName like concat('%', #{procDefName}, '%')</if>

2
yanzhu-ui-vue3/src/views/trouble/problemmodifyDraftQuality/index.vue
View File

@ -350,7 +350,7 @@ function doBatchAdd(datas) {
datas.forEach((it) => { datas.forEach((it) => {
it.projectId = userStore.currentPrjId it.projectId = userStore.currentPrjId
it.comId = userStore.currentComId it.comId = userStore.currentComId
it.infoType = 0 it.infoType = 1
let users = data.users.filter((u) => u.userId == it.lordSent) let users = data.users.filter((u) => u.userId == it.lordSent)
it.lordSent = users.map((u) => u.userId).join(',') it.lordSent = users.map((u) => u.userId).join(',')
it.lordSentUser = users.map((u) => u.userName).join(',') it.lordSentUser = users.map((u) => u.userName).join(',')