Merge remote-tracking branch 'origin/main'

2026-03-19 15:56:45 +08:00
parent 63b19faba8 2d6bd2107c
commit fd224f6167
10 changed files with 51 additions and 16 deletions
--- a/outbridge/src/main/resources/common-dev-100.yml
+++ b/outbridge/src/main/resources/common-dev-100.yml
@@ -49,6 +49,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控工种）,激光光学工种,激光工艺工种,激光程序工种,激光装调工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
  account: lyric
  password: Lyric#$12389..@
--- a/outbridge/src/main/resources/common-dev-190.yml
+++ b/outbridge/src/main/resources/common-dev-190.yml
@@ -50,6 +50,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控工种）,激光光学工种,激光工艺工种,激光程序工种,激光装调工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
  account: lyric
  password: Lyric#$12389..@
--- a/outbridge/src/main/resources/common-dev-65.yml
+++ b/outbridge/src/main/resources/common-dev-65.yml
@@ -49,6 +49,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控工种）,激光光学工种,激光工艺工种,激光程序工种,激光装调工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
  account: lyric
  password: Lyric#$12389..@
--- a/outbridge/src/main/resources/common-local.yml
+++ b/outbridge/src/main/resources/common-local.yml
@@ -50,6 +50,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控工种）,激光光学工种,激光工艺工种,激光程序工种,激光装调工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
  account: lyric
  password: Lyric#$12389..@
--- a/outbridge/src/main/resources/common-lyric.yml
+++ b/outbridge/src/main/resources/common-lyric.yml
@@ -63,6 +63,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控工种）,激光光学工种,激光工艺工种,激光程序工种,激光装调工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
  account: lyric
  password: Lyric#$12389..@
--- a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
@@ -61,7 +61,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {

    List<SpdmTaskVo> getTaskListByDemandId(@Param("demandId") String demandId);

-    List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeId") String taskNodeId,@Param("ownDisciplineName") String ownDisciplineName);
+    List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeId") String taskNodeId,@Param("disciplineList") List<String> disciplineList);

    List<SpdmTaskVo> getTaskListByIdList(@Param("taskIdList") List<String> taskIdList);

--- a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java
@@ -151,6 +151,8 @@ public class SpdmAnalysisTaskListReq extends BaseEntity {

    private String discipline;

+    private List<String> disciplineList;
+
    private String ownDisciplineName;

    private String reportTemplate;
--- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
@@ -155,6 +155,8 @@ public class SpdmTaskListReq {
    // 二次查询过滤学科
    private String discipline;

+    private List<String> disciplineList;
+
    private String taskId;

    /**
--- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
@@ -1209,7 +1209,8 @@ public class TaskServiceImpl implements ITaskService {
        stopWatch.start("查所有任务");
        // 二次查询过滤学科
        if (StringUtils.isNotBlank(req.getDiscipline())) {
-            req.setFilterDiscipline(Collections.singletonList(req.getDiscipline()));
+            req.setFilterDiscipline(new ArrayList<>());
+            req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList());
        }
        List<SpdmTaskVo> allTaskList = mapper.optimisedGtTaskList(tenantId, req);
        stopWatch.stop();
@@ -2162,8 +2163,11 @@ public class TaskServiceImpl implements ITaskService {
        String taskNodeId = tagReq.getTaskId();
        List<SpdmAnalysisTaskVo> taskVoList;
        List<SpdmAnalysisTaskVo> allTaskVoList = new ArrayList<>();
+        if (StringUtils.isNotBlank(req.getDiscipline())) {
+            req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList());
+        }
        if (StringUtils.isNotBlank(taskNodeId)) {
-            allTaskVoList = mapper.getAnalysisTask(taskNodeId,req.getDiscipline());
+            allTaskVoList = mapper.getAnalysisTask(taskNodeId,req.getDisciplineList());
        } else {
            taskVoList = mapper.taskListByTag(req, tenantId, new ArrayList<>(), pos, limit,userId,
                    tag1KeyList,tag2KeyList,tag3KeyList,tag4KeyList,tag5KeyList,tag6KeyList,tag7KeyList
--- a/project/src/main/resources/mapper/SimulationTaskMapper.xml
+++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml
@@ -745,8 +745,12 @@

    <select id="getAnalysisTask" resultType="com.sdm.project.model.vo.SpdmAnalysisTaskVo">
        select * from simulation_task where uuid = #{taskNodeId}
-        <if test="ownDisciplineName != null and ownDisciplineName != ''">
-            and discipline = #{ownDisciplineName}
+        <if test="disciplineList != null and disciplineList.size > 0">
+            and (discipline in (
+            <foreach collection='disciplineList' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            ))
        </if>
        order by create_time desc
    </select>
@@ -883,6 +887,14 @@
            or discipline = '' or discipline is null)
        </if>

+        <if test="req.disciplineList != null and req.disciplineList.size > 0">
+            and (discipline in (
+            <foreach collection='req.disciplineList' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            ))
+        </if>
+
 <!--        <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
 <!--            order by create_time-->
 <!--        </if>-->
@@ -1014,6 +1026,14 @@
            or discipline = '' or discipline is null)
        </if>

+        <if test="req.disciplineList != null and req.disciplineList.size > 0">
+            and (discipline in (
+            <foreach collection='req.disciplineList' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            ))
+        </if>
+
 <!--        <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
 <!--            order by create_time-->
 <!--        </if>-->
@@ -1169,9 +1189,13 @@
        <if test="req.expStatus != null and req.expStatus != ''">
            and st.expStatus = #{req.expStatus}
        </if>
-        <if test="req.discipline != null and req.discipline != ''">
-            <bind name="searchKey17" value="'%' + req.discipline + '%'"/>
-            and st.discipline like #{searchKey17}
+
+        <if test="req.disciplineList != null and req.disciplineList.size > 0">
+            and (discipline in (
+            <foreach collection='req.disciplineList' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            ))
        </if>
        <if test="req.reportTemplate != null and req.reportTemplate != ''">
            <bind name="searchKey18" value="'%' + req.reportTemplate + '%'"/>
@@ -1373,9 +1397,12 @@
        <if test="req.expStatus != null and req.expStatus != ''">
            and st.expStatus = #{req.expStatus}
        </if>
-        <if test="req.ownDisciplineName != null and req.ownDisciplineName != ''">
-            <bind name="searchKey17" value="'%' + req.ownDisciplineName + '%'"/>
-            and st.discipline like #{searchKey17}
+        <if test="req.disciplineList != null and req.disciplineList.size > 0">
+            and (discipline in (
+            <foreach collection='req.disciplineList' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            ))
        </if>
        <if test="req.reportTemplate != null and req.reportTemplate != ''">
            <bind name="searchKey18" value="'%' + req.reportTemplate + '%'"/>