优化BUG

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java

@@ -90,6 +90,8 @@ public class TrafficSafetyMeetingController extends BaseController {
             String status = meetingEnd.before(now) ? "2" : (meetingStart.after(now) ? "0" : "1");
             pd.put("MEETING_STATUS", status);
         }
+        /*pd.put("MEETING_DATE_START", pd.getString("MEETING_DATE_START") + " 00:00:00");
+        pd.put("MEETING_DATE_END", pd.getString("MEETING_DATE_END") + " 23:59:59");*/
         trafficSafetyMeetingService.save(pd);
 
         String[] personIds = pd.getString("PERSON_ID").split(",");
@@ -140,6 +142,9 @@ public class TrafficSafetyMeetingController extends BaseController {
                 else if (date.after(endDate)) {
                     item.put("MEETING_STATUS", "2");
                 }
+                else if (date.equals(startDate) && date.equals(endDate)){
+                    item.put("MEETING_STATUS", "1");
+                }
                 String meetingDate = start + "至" + end;
                 item.put("MEETING_DATE", meetingDate);
             }

src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java

@@ -247,6 +247,33 @@ public class FreighttTrailerController extends BaseController {
         return map;
     }
 
+
+    @RequestMapping(value = "/getAllVehicleList")
+    // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR)
+    @ResponseBody
+    @LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "列表")
+    public Object getAllVehicleList() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
+        List<PageData> trailerList = freightTrailerService.getAllVehicle(pd);
+        List<PageData> operatingList = operatingVehiclesService.getAllVehicle(pd);
+        List<PageData> vehicleAll = new ArrayList<>();
+        trailerList.stream().forEach(data -> {
+            data.put("ID", data.getString("FREIGHTTRAILER_ID"));
+            vehicleAll.add(data);
+        });
+        operatingList.stream().forEach(data -> {
+            data.put("ID", data.getString("OPERATING_ID"));
+            vehicleAll.add(data);
+        });
+        map.put("varList", vehicleAll);
+        map.put("result", errInfo);
+        return map;
+    }
+
     /**从EXCEL导入到数据库
      * @param file
      * @return
@@ -679,7 +706,14 @@ public class FreighttTrailerController extends BaseController {
         pd = this.getPageData();
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         pd.put("PLATE_NUMBER", pd.getString("vehicleNumber"));
-        PageData resData = freightTrailerService.findTrailerByPlateNumber(pd);
+        PageData resData = null;
+        resData = freightTrailerService.findTrailerByPlateNumber(pd);
+        if(ObjectUtil.isEmpty(resData)) {
+            PageData data = new PageData();
+            data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+            data.put("PLATE_NUMBER", pd.getString("vehicleNumber"));
+            resData = operatingVehiclesService.findByfindByPlateNumber(data);
+        }
         map.put("pd", resData);
         map.put("result", errInfo);
         return map;

src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java

@@ -6,6 +6,7 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.logs.LogAnno;
 import com.zcloud.service.assignedManage.AssignedManageService;
+import com.zcloud.service.freighttrailer.FreightTrailerService;
 import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
 import com.zcloud.service.scrapManage.ScrapManageService;
 import com.zcloud.service.system.DepartmentService;
@@ -53,6 +54,9 @@ public class OperatingVehiclesController extends BaseController {
     @Autowired
     private AssignedManageService assignedManageService;
 
+    @Autowired
+    private FreightTrailerService freightTrailerService;
+
     /**
      * 新增
      *
@@ -301,7 +305,14 @@ public class OperatingVehiclesController extends BaseController {
         pd = this.getPageData();
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         pd.put("PLATE_NUMBER", pd.getString("vehicleNumber"));
-        PageData resData = operatingVehiclesService.findByfindByPlateNumber(pd);
+        PageData resData = null;
+        resData = operatingVehiclesService.findByfindByPlateNumber(pd);
+        if(ObjectUtils.isEmpty(resData)) {
+            PageData data = new PageData();
+            data.put("PLATE_NUMBER", pd.getString("vehicleNumber"));
+            data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+            resData = freightTrailerService.findByPlateNumber(data);
+        }
         map.put("pd", resData);
         map.put("result", errInfo);
         return map;

src/main/java/com/zcloud/controller/system/AppUsersController.java

@@ -135,6 +135,22 @@ public class AppUsersController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+
+    @RequestMapping(value = "/getUserStatus")
+    @ResponseBody
+    @LogAnno(menuType = "手机", menuServer = "用户处理", instructionsOperate = "用户处理", instructionsType = "用户头像")
+    public Object getUserStatus() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String errInfo = "success";
+        pd.put("CORPINFO_ID", "13cf0f4ec77e4d98ae8cdd9c3386ae0c");
+        List<PageData> byUserId = userCorpService.findByUserId(pd);
+        map.put("pd", byUserId.get(0));
+        map.put("result", errInfo);
+        return map;
+    }
+
 //
 //    /**
 //     * 用户人脸

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -33,6 +33,8 @@ import org.springframework.web.multipart.MultipartRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -2561,7 +2563,12 @@ public class UsersController extends BaseController {
         dataInfoList = dataInfoList.stream()
                         .filter(userCorpData -> StringUtils.equals(userCorpData.getString("ISDELETE"), "0"))
                 .collect(Collectors.toList());
-        System.out.println("dataInfoList = " + dataInfoList);
+        /*dataInfoList.sort((t1,t2) -> t2.getString("OPERATTIME").compareTo(t1.getString("OPERATTIME")));
+        dataInfoList.forEach(info -> {
+            if(StringUtils.equals(info.getString("APPLY_TYPE"), "0") && StringUtils.equals(info.getString("APPLY_STATUS"),"0")) {
+                info.put("flag", "0");
+            }
+        });*/
         map.put("pd", pd);
         map.put("statusInfo", dataInfoList.get(0));
         map.put("userCerList", userCerList);

src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java

@@ -96,5 +96,6 @@ public interface FreightTrailerMapper {
     PageData findTrailerByPlateNumber(PageData pd);
 
 
+    List<PageData> getAllVehicle(PageData pd);
 }
 

src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java

@@ -53,4 +53,6 @@ public interface OperatingVehiclesMapper {
     List<PageData> getScrapPulldownVehicleList(PageData pd);
 
     void editInspectVehicleowner(PageData pd);
+
+    List<PageData> getAllVehicle(PageData pd);
 }

src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java

@@ -94,5 +94,7 @@ public interface FreightTrailerService {
     void editInspectTreight(PageData data);
 
     PageData findTrailerByPlateNumber(PageData pd);
+
+    List<PageData> getAllVehicle(PageData pd);
 }
 

src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java

@@ -153,5 +153,9 @@ public class FreightTrailerServiceImpl implements FreightTrailerService {
         return freightTrailerMapper.findTrailerByPlateNumber(pd);
     }
 
+    @Override
+    public List<PageData> getAllVehicle(PageData pd) {
+        return freightTrailerMapper.getAllVehicle(pd);
+    }
 }
 

src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java

@@ -52,5 +52,6 @@ public interface OperatingVehiclesService {
 
     List<PageData> getScrapPulldownVehicleList(PageData pd);
 
-    void editInspectVehicleowner(PageData operation);
+
+    List<PageData> getAllVehicle(PageData pd);
 }

src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java

@@ -88,7 +88,7 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
     }
 
     @Override
-    public void editInspectVehicleowner(PageData pd) {
+    public List<PageData> getAllVehicle(PageData pd) {
-        operatingVehiclesMapper.editInspectVehicleowner(pd);
+        return operatingVehiclesMapper.getAllVehicle(pd);
     }
 }

src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml

@@ -444,4 +444,13 @@
 	</select>
 
 
+	<select id="getAllVehicle" resultType="com.zcloud.entity.PageData">
+		select
+		<include refid="Field"/>
+		from
+		<include refid="tableName"/> f
+		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+	</select>
+
+
 </mapper>

src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml

@@ -658,4 +658,13 @@
 	</select>
 
 
+	<select id="getAllVehicle" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"/>
+		from
+		<include refid="tableName"/> f
+		where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
+	</select>
+
+
 </mapper>

src/main/resources/mybatis/datasource/system/UserCorpMapper.xml

@@ -279,6 +279,6 @@
 		<include refid="tableName"/> f
 		LEFT JOIN sys_user_corp_review ucr on ucr.USER_CORP_ID = f.USER_CORP_ID
 		WHERE f.USER_ID = #{USER_ID} AND f.CORPINFO_ID = #{CORPINFO_ID}
-		ORDER BY ucr.CREATTIME DESC
+		ORDER BY f.CREATTIME DESC
 	</select>
 </mapper>

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -1880,7 +1880,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and u.ISSTUDENT = #{pd.IS_STUDENT}
 		</if>
 		<if test="pd.PERSONNEL_TYPE != null and pd.PERSONNEL_TYPE != ''">
-			and info.PERSONNEL_TYPE = #{pd.PERSONNEL_TYPE}
+			and info.PERSONNEL_TYPE LIKE CONCAT(CONCAT('%', #{pd.PERSONNEL_TYPE}),'%')
 		</if>
 		<if test="pd.IS_RECORDER != null and pd.IS_RECORDER != '' and pd.IS_RECORDER == 1 ">
 			and info.IS_RECORDER =  #{pd.IS_RECORDER}