From ee8304be26e7f17ea2c8f5a24256059acfa882cb Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 26 Apr 2023 14:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/ProjectLawsInventoryEOMapper.xml      | 20 ++++++++++++++++++-
 .../ProjectLawsInventoryEOServiceImpl.java    |  9 +++++++++
 .../components/nonConformance.vue             | 14 ++++++-------
 3 files changed, 35 insertions(+), 8 deletions(-)

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 d41eb0ead..f106f4482 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
@@ -156,6 +156,18 @@
                   </foreach>
         ) temp
         <include refid="BaseQuerySql"/>
+        <if test="params.orderByField != null and params.orderByField != ''">
+            order by temp.${params.orderByField}
+            <if test="params.orderBy == '1'">
+                asc
+            </if>
+            <if test="params.orderBy == '2'">
+                desc
+            </if>
+        </if>
+        <if test="params.orderByField == null or params.orderByField == ''">
+            order by temp.serial_number desc
+        </if>
     </select>
 
     <sql id="BaseQuerySql">
@@ -167,7 +179,13 @@
                 and temp.title like CONCAT(CONCAT('%',#{params.title}),'%')
             </if>
             <if test="params.dutyTerritory != null and params.dutyTerritory !=''">
-                and temp.duty_territory = #{params.dutyTerritory}
+                and temp.duty_territory like CONCAT(CONCAT('%',#{params.dutyTerritory}),'%')
+                <!--and (
+                    temp.duty_territory = #{params.dutyTerritory} or
+                    <foreach collection="params.dutyTerritory.split(',')" index="" item="item" open="(" close=")" separator="or">
+                        temp.duty_territory like  CONCAT(CONCAT('%',#{item}),'%')
+                    </foreach>
+                )-->
             </if>
         </where>
     </sql>
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 e8b48096c..1c3fa146c 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
@@ -12598,6 +12598,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					dataMap.put("flowTypeName",FlowTypeEnum.getTextByValue(flowType,cut));
 				}
 
+				// 返回符合性流程的流程实例id
+				QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
+				processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,(String)dataMap.get("id"));
+				processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,flowType);
+				processInfoDetailEOQueryWrapper.orderByDesc("create_time");
+				List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
+				if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){
+					dataMap.put("actiProcInstId",processInfoDetailEOS.get(0).getActiProcInstId());
+				}
 			}
 		}
 		return result;
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 682e17cd1..745fc345f 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -8,8 +8,8 @@
               <div class="title-text" :title="$t('standard')">
                 <span>{{$t('standard')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -17,8 +17,8 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.title"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -168,7 +168,7 @@
         pageNo: 1,
         url: {
           page: '/project/projectLawsInventoryEO/queryNotComplianList',
-          exportData: '/project/ncrTrackController/exportDataInfo'
+          exportData: '/project/projectLawsInventoryEO/exportNotComplianList'
         }
       }
     },
@@ -231,9 +231,9 @@
         let query = {
           ...this.queryParam,
           projectLibraryId: this.$route.query.id,
-          ncrTrackVOList: this.content
+          // ncrTrackVOList: this.content
         }
-        downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
       },
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'