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

待办中心-法规清单待办，全词模糊搜索相关项目修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-14 15:46:25 +08:00
parent 43302b1eae
commit d9ed6da645
2 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+66 -9
View File
@@ -50,16 +50,35 @@
pi.buss_document_library_id,
pi.acti_proc_inst_id,
<!--pni.project_name,-->
concat( pni.project_name, '-', pyni.year_name ) AS project_name,
<!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
concat(
pni.project_name, '-',
pyni.year_name, '-',
(
SELECT
<if test="params.cut == 'cn'">
CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
</if>
<if test="params.cut == 'en'">
CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
</if>
FROM
sys_dict_item
WHERE
FIND_IN_SET( item_value, plb.target_market ) > 0
AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
) , '-',
plb.project_version
) AS project_name,
pyni.year_name,
pli.serial_number,
pli.title,
bdl.title_en,
<if test="params.cut == 'cn'">
concat(pli.serial_number,'、',pli.title) as standard_info,
concat(pli.serial_number,' ',pli.title) as standard_info,
</if>
<if test="params.cut == 'en'">
concat(pli.serial_number,'、',bdl.title_en) as standard_info,
concat(pli.serial_number,' ',bdl.title_en) as standard_info,
</if>
pi.flow_type,
pi.create_by,
@@ -124,16 +143,35 @@
pi.buss_document_library_id,
pi.acti_proc_inst_id,
<!--pni.project_name,-->
concat( pni.project_name, '-', pyni.year_name ) AS project_name,
<!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
concat(
pni.project_name, '-',
pyni.year_name, '-',
(
SELECT
<if test="params.cut == 'cn'">
CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
</if>
<if test="params.cut == 'en'">
CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
</if>
FROM
sys_dict_item
WHERE
FIND_IN_SET( item_value, plb.target_market ) > 0
AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
) , '-',
plb.project_version
) AS project_name,
pyni.year_name,
pli.serial_number,
pli.title,
bdl.title_en,
<if test="params.cut == 'cn'">
concat(pli.serial_number,'、',pli.title) as standard_info,
concat(pli.serial_number,' ',pli.title) as standard_info,
</if>
<if test="params.cut == 'en'">
concat(pli.serial_number,'、',bdl.title_en) as standard_info,
concat(pli.serial_number,' ',bdl.title_en) as standard_info,
</if>
pi.flow_type,
pi.create_by,
@@ -175,7 +213,26 @@
pi.buss_document_library_id,
pi.acti_proc_inst_id,
<!--pni.project_name,-->
concat( pni.project_name, '-', pyni.year_name ) AS project_name,
<!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
concat(
pni.project_name, '-',
pyni.year_name, '-',
(
SELECT
<if test="params.cut == 'cn'">
CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
</if>
<if test="params.cut == 'en'">
CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
</if>
FROM
sys_dict_item
WHERE
FIND_IN_SET( item_value, plb.target_market ) > 0
AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
) , '-',
plb.project_version
) AS project_name,
pyni.year_name,
'--' as serial_number,
'--' as standard_info,
@@ -267,10 +324,10 @@
bdl.title,
bdl.title_en,
<if test="params.cut == 'cn'">
concat(bdl.serial_number,'、',bdl.title) as standard_info,
concat(bdl.serial_number,' ',bdl.title) as standard_info,
</if>
<if test="params.cut == 'en'">
concat(bdl.serial_number,'、',bdl.title_en) as standard_info,
concat(bdl.serial_number,' ',bdl.title_en) as standard_info,
</if>
pi.flow_type,
pi.end_time,
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+2 -2
View File
@@ -642,7 +642,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
}
}
if (StringUtils.isNotBlank(data.getTargetMarket())) {
/*if (StringUtils.isNotBlank(data.getTargetMarket())) {
//目标市场
List<DictModel> targetMarketList = this.sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -657,7 +657,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
//data.setProjectName(data.getProjectName() + "-" + data.getYearName() + "-" + targetMarket + "-" + projectVersion);
data.setProjectName(data.getProjectName() + "-" + targetMarket + "-" + projectVersion);
}
}*/
//设置任务清单明细表id
if(CollectionUtils.isNotEmpty(finalTaskInventoryDetailList)){