合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'

Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!219

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -257,7 +257,7 @@
                     from
                         process_info_detail detail
                     where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId}
-                    <if test="params.queryType == 'todoProcess'">
+                    <if test="params.taskStatus != null and params.taskStatus != ''">
                         and detail.`status` = #{params.taskStatus}
                     </if>
                     order by detail.submit_time desc
@@ -269,7 +269,7 @@
                     from
                         process_info_detail detail
                     where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId}
-                    <if test="params.queryType == 'todoProcess'">
+                    <if test="params.taskStatus != null and params.taskStatus != ''">
                         and detail.`status` = #{params.taskStatus}
                     </if>
                     order by detail.submit_time desc
@@ -287,20 +287,22 @@
                 <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                and (
+                    pi.id IN (
+                        SELECT
+                            pid.process_info_id
+                        FROM
+                            process_info_detail pid
+                        where pid.user_id = #{params.currentUserId}
+                        <if test="params.taskStatus != null and params.taskStatus != ''">
+                            and pid.status = #{params.taskStatus}
+                        </if>
+                    )
+                )
                 <if test="params.queryType == 'issuedProcess'">
                     and pi.create_by = #{params.createBy}
                 </if>
-                <if test="params.queryType != 'issuedProcess'">
-                    and (
-                        pi.id IN (
-                            SELECT
-                                pid.process_info_id
-                            FROM
-                                process_info_detail pid
-                            where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
-                        )
-                    )
-                </if>
+
             </where>
         ) temp
         <include refid="BaseQuerySql"/>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java

@@ -375,6 +375,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 		flowTypeList.add(FlowTypeEnum.FGJSPG.getValue());
 		params.put("flowTypeList",flowTypeList);
 		params.put("currentUserId",currentUser.getId());
+		params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue());
 
 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProcessInfoVO> result = this.baseMapper.queryLawsAssessPageList(page,params);

jero-web/src/views/toDoCenter/taskConfirmation/index.vue

@@ -18,7 +18,7 @@
                 <span>{{$t('standardInformation')}}</span>
               </div>
               <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
-                       v-model="queryParam.serialNumber"></a-input>
+                       v-model="queryParam.standardInfo"></a-input>
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -104,7 +104,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             ellipsis: true,
             scopedSlots: { customRender: 'standardInformation' },
             width: 170