bugfix - 进度跟踪搜索列名称模糊问题

rc-buisness/src/main/resources/mapper/rc/TProgressMapper.xml

@@ -46,26 +46,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTProgressList" parameterType="TProgress" resultMap="TProgressResult">
         <include refid="selectTProgressVo"/>
         <where>  
-            <if test="questionnaireId != null "> and questionnaire_id = #{questionnaireId}</if>
-            <if test="chapName != null  and chapName != ''"> and chap_name like concat('%', #{chapName}, '%')</if>
-            <if test="subChapName != null  and subChapName != ''"> and sub_chap_name like concat('%', #{subChapName}, '%')</if>
-            <if test="secSubChapName != null  and secSubChapName != ''"> and sec_sub_chap_name like concat('%', #{secSubChapName}, '%')</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="personInCharge != null "> and person_in_charge = #{personInCharge}</if>
-            <if test="supporter != null "> and supporter = #{supporter}</if>
-            <if test="startDate != null "> and start_date = #{startDate}</if>
-            <if test="targetDate != null "> and target_date = #{targetDate}</if>
-            <if test="finishDate != null "> and finish_date = #{finishDate}</if>
-            <if test="preparation != null  and preparation != ''"> and preparation = #{preparation}</if>
-            <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
-            <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="questionnaireId != null "> and p.questionnaire_id = #{questionnaireId}</if>
+            <if test="chapName != null  and chapName != ''"> and p.chap_name like concat('%', #{chapName}, '%')</if>
+            <if test="subChapName != null  and subChapName != ''"> and p.sub_chap_name like concat('%', #{subChapName}, '%')</if>
+            <if test="secSubChapName != null  and secSubChapName != ''"> and p.sec_sub_chap_name like concat('%', #{secSubChapName}, '%')</if>
+            <if test="content != null  and content != ''"> and p.content = #{content}</if>
+            <if test="personInCharge != null "> and p.person_in_charge = #{personInCharge}</if>
+            <if test="supporter != null "> and p.supporter = #{supporter}</if>
+            <if test="startDate != null "> and p.start_date = #{startDate}</if>
+            <if test="targetDate != null "> and p.target_date = #{targetDate}</if>
+            <if test="finishDate != null "> and p.finish_date = #{finishDate}</if>
+            <if test="preparation != null  and preparation != ''"> and p.preparation = #{preparation}</if>
+            <if test="progress != null  and progress != ''"> and p.progress = #{progress}</if>
+            <if test="applyStatus != null  and applyStatus != ''"> and p.apply_status = #{applyStatus}</if>
+            <if test="remarks != null  and remarks != ''"> and p.remarks = #{remarks}</if>
             <if test="deptId != null  and deptId != ''"> and p.dept_id = #{deptId}</if>
             <if test="auditId != null "> and p.audit_id = #{auditId}</if>
             <if test="apNo != null "> and p.ap_no = #{apNo}</if>
             <if test="processId != null "> and p.process_id = #{processId}</if>
-            <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
-            <if test="taskName != null  and taskName != ''"> and task_name = #{taskName}</if>
+            <if test="taskId != null  and taskId != ''"> and p.task_id = #{taskId}</if>
+            <if test="taskName != null  and taskName != ''"> and p.task_name = #{taskName}</if>
         </where>
     </select>
     

ruoyi-ui/src/views/home1.vue

@@ -45,14 +45,20 @@
       <div class="bot-left">
         <div class="card cardleft1" @click="handleClickPlant(101)">
           <div class="cardword">
-            <div class="cardleft1Title">电厂</div>
+            <div class="cardleft1Title">
+              <svg-icon v-if="hasAudit(101)" icon-class="roundGreen" style="font-size: 10px;"></svg-icon>
+              电厂
+            </div>
             <div class="cardleft1Content">Power<br>Plant</div>
           </div>
         </div>
 
         <div class="card cardleft2" @click="handleClickPlant(102)">
           <div class="cardword">
-            <div class="cardleft1Title">合成气</div>
+            <div class="cardleft1Title">
+              <svg-icon v-if="hasAudit(102)" icon-class="roundGreen" style="font-size: 10px;"></svg-icon>
+              合成气
+            </div>
             <div class="cardleft1Content">Syngas</div>
           </div>
         </div>
@@ -285,6 +291,7 @@
         homeData2: 0,
         homeData3: 0,
         homeData4: 0,
+        auditDeptList: [],
       }
     },
     created() {
@@ -296,8 +303,16 @@
           this.homeData4 = response.data.homeData4;
         }
       });
+      getAuditDeptList().then(response => {
+        this.auditDeptList = response.data;
+      });
     },
     methods: {
+      hasAudit(deptId) {
+        let hasAudit = false;
+
+        return;
+      },
       handleClickTopItem1() {
         this.$router.push("/rc/audit");
       },