后勤日报表调整

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -434,9 +434,6 @@
                     #{popedom}
                 </foreach>
             </if>
-            <if test="searchParams.jobNumber != null">
-                and a.job_number = #{searchParams.jobNumber}
-            </if>
             <if test="searchParams.carNum != null">
                 and a.car_num like #{searchParams.carNum}
             </if>

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -1507,14 +1507,14 @@ public class WorkScheduleAttendanceController {
             if (StringUtils.isNotEmpty(companyId)) {
                 if ("hq1".equals(companyId)) {
                     //外勤1
-                    List<CompanyInfo> list1 = companyInfoService.findByClassify("1");
-                    searchParams.put("companyInfos", list1);
+//                    List<CompanyInfo> list1 = companyInfoService.findByClassify("1");
+//                    searchParams.put("companyInfos", list1);
 
                     searchParams.put("hqStatus", "1");
                 } else if ("hq2".equals(companyId)) {
                     //外勤2
-                    List<CompanyInfo> list2 = companyInfoService.findByClassify("2");
-                    searchParams.put("companyInfos", list2);
+//                    List<CompanyInfo> list2 = companyInfoService.findByClassify("2");
+//                    searchParams.put("companyInfos", list2);
 
                     searchParams.put("hqStatus", "2");
                 } else {