首页关键字搜索

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/GxtRepairOrderController.java

@@ -9,7 +9,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ygtx.common.utils.DictUtils;
-import com.ygtx.gxt.domain.GxtEquipment;
 import com.ygtx.gxt.domain.GxtOrderData;
 import com.ygtx.gxt.service.IGxtWorkOrderService;
 import com.ygtx.system.strategy.AutoCodeUtil;
@@ -337,6 +336,7 @@ public class GxtRepairOrderController extends BaseController
         GxtOrderData result = gxtRepairOrderService.selectHomePageData();
         result.setRepairPending(gxtRepairOrderService.getUnfinishedOrder());
         result.setWorkPending(gxtWorkOrderService.getUnfinishedOrder());
+        result.setHasCenter(gxtWorkOrderService.hasCenter());
         return success(result);
     }
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtOrderData.java

@@ -163,6 +163,28 @@ public class GxtOrderData extends BaseEntity
 
     private String dataPermission;
 
+    private String remark;
+
+    private String hasCenter;
+
+    public String getHasCenter() {
+        return hasCenter;
+    }
+
+    public void setHasCenter(String hasCenter) {
+        this.hasCenter = hasCenter;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getDataPermission() {
         return dataPermission;
     }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/IGxtWorkOrderService.java

@@ -211,4 +211,6 @@ public interface IGxtWorkOrderService {
     public List<GxtOrderData> selectHomePageWorkOrderList(GxtOrderData gxtOrderData);
 
     public int getUnfinishedOrder();
+
+    public String hasCenter();
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -1686,10 +1686,14 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         if (result.getWorkOrderNumLast()!=0 && !result.getWorkOrderNumLast().equals(result.getWorkOrderNum())) {
             wjsy =  (double) ((result.getWorkOrderNum() - result.getWorkOrderNumLast()) * 100) / result.getWorkOrderNumLast();
             wjsy = Math.round(wjsy * 10) /10.0;
+        } else if (result.getWorkOrderNumLast()==0 && result.getWorkOrderNum()>0) {
+            wjsy = 100.0;
         }
         if (result.getRepairOrderNumLast()!=0 && !result.getRepairOrderNumLast().equals(result.getRepairOrderNum())) {
             rjsy = (double) ((result.getRepairOrderNum() - result.getRepairOrderNumLast()) * 100) / result.getRepairOrderNumLast();
             rjsy = Math.round(rjsy * 10) /10.0;
+        } else if (result.getRepairOrderNumLast()==0 && result.getRepairOrderNum()>0) {
+            rjsy = 100.0;
         }
         if (wbgsLast.compareTo(BigDecimal.ZERO)!=0) {
             BigDecimal dif = wbgs.subtract(wbgsLast);
@@ -1699,6 +1703,8 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
                         .multiply(new BigDecimal("100"))
                         .setScale(1, RoundingMode.HALF_UP);
             }
+        } else if (wbgs.compareTo(BigDecimal.ZERO)>0) {
+            wbjsy = new BigDecimal(100.0);
         }
         if (wxgsLast.compareTo(BigDecimal.ZERO)!=0) {
             BigDecimal dif = wxgs.subtract(wxgsLast);
@@ -1708,6 +1714,8 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
                         .multiply(new BigDecimal("100"))
                         .setScale(1, RoundingMode.HALF_UP);
             }
+        } else if (wxgs.compareTo(BigDecimal.ZERO)>0) {
+            wxjsy = new BigDecimal(100.0);
         }
         result.setWorkOrderJsy(wjsy);
         result.setRepairOrderJsy(rjsy);

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -1771,4 +1771,12 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         }
         return num;
     }
+
+    public String hasCenter() {
+        SysDept dept = deptMapper.selectDeptById(SecurityUtils.getDeptId());
+        if (dept!=null && dept.getStatus().equals("0") && dept.getLevel().equals("3")) {
+            return "no";
+        }
+        return "yes";
+    }
 }

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -545,6 +545,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="endTime != null "> AND wo.create_time <![CDATA[<]]> #{endTime}</if>
                 <if test="pcsId != null "> AND wo.pcs_station_pid = #{pcsId}</if>
                 <if test="centerId != null "> AND d.parent_id = #{centerId}</if>
+                <if test="remark != null and remark != '' ">
+                    AND (
+                    wo.pcs_device_name LIKE concat('%', #{remark}, '%')
+                    OR wo.brand LIKE concat('%', #{remark}, '%')
+                    OR wo.model LIKE concat('%', #{remark}, '%')
+                    OR wo.mis_no LIKE concat('%', #{remark}, '%')
+                    OR m.nick_name LIKE concat('%', #{remark}, '%')
+                    OR d.dept_name LIKE concat('%', #{remark}, '%')
+                    OR p.dept_name LIKE concat('%', #{remark}, '%')
+                    )
+                </if>
                 <if test="dataPermission != null and dataPermission != ''">${dataPermission}</if>
             </where>
 
@@ -591,6 +602,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="endTime != null "> AND wo.occur_time <![CDATA[<]]> #{endTime}</if>
                 <if test="pcsId != null "> AND wo.pcs_station_pid = #{pcsId}</if>
                 <if test="centerId != null "> AND d.parent_id = #{centerId}</if>
+                <if test="remark != null and remark != '' ">
+                    AND (
+                    wo.pcs_device_name LIKE concat('%', #{remark}, '%')
+                    OR wo.brand LIKE concat('%', #{remark}, '%')
+                    OR wo.model LIKE concat('%', #{remark}, '%')
+                    OR m.nick_name LIKE concat('%', #{remark}, '%')
+                    OR d.dept_name LIKE concat('%', #{remark}, '%')
+                    OR p.dept_name LIKE concat('%', #{remark}, '%')
+                    )
+                </if>
                 <if test="dataPermission != null and dataPermission != ''">${dataPermission}</if>
             </where>
             ) o

ygtx-ui/src/views/index4.vue

@@ -329,10 +329,16 @@
               <i class="fa fa-table blue-color" style="margin-right: 10px;"></i>
               <span>工单数据列表</span>
               <div class="header-buttons">
-                <el-button @click="handleQuery">
-                  <i class="fa fa-search" style="margin-right: 8px;" ></i>搜索</el-button>
+                <el-input
+                  v-model="queryParams.remark"
+                  placeholder="搜索"
+                  @keyup.enter="handleQuery"
+                  style="width: 150px; margin-right: 10px;"
+                  prefix-icon="search"
+                  clearable
+                />
                 <el-button @click="handleExport">
-                  <i class="fa fa-download" style="margin-right: 8px;" ></i>导出</el-button>
+                  <i class="fa fa-download" style="margin-right: 8px;"></i>导出</el-button>
               </div>
             </div>
           </template>
@@ -447,7 +453,7 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         startTime: null,
         endTime: null,
         center: true,
@@ -469,7 +475,8 @@ export default {
         clsc: true,
         qjbwsc: true,
         gqsc: true,
-        score: 1
+        score: 1,
+        remark: null
       },
       orderList: [],
       // 添加首页统计数据
@@ -484,14 +491,15 @@ export default {
         wxjsy: 5,           // 本月工分较上月增长百分比
         repairPending: 0,
         workPending: 0,
-        pendingNum: 0
+        pendingNum: 0,
+        hasCenter: null
       }
     }
   },
   created() {
     this.selectPeriod('本月');
-    this.applyFilter();
     this.loadHomePageData(); // 加载首页统计数据
+    this.applyFilter();
   },
   methods: {
 
@@ -756,6 +764,7 @@ export default {
           this.homePageData.repairPending = response.data.repairPending || 0;
           this.homePageData.workPending = response.data.workPending || 0;
           this.homePageData.pendingNum = this.homePageData.repairPending + this.homePageData.workPending;
+          this.homePageData.hasCenter = response.data.hasCenter;
         }
       });
     },
@@ -784,16 +793,10 @@ export default {
       }
     },
     checkCenter() {
-      console.log(this.orderList);
-      if (this.queryParams.center && this.orderList.length>0) {
-        for(let i=0;i<this.orderList.length;i++) {
-          if(this.orderList[i].center!=null) {
-            return true;
-          }
-        }
-        return false;
+      if (this.homePageData.hasCenter && this.homePageData.hasCenter=='yes') {
+        return true;
       }
-      return true;
+      return false;
     }
   }
 }