1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerCompInfoController.java

@@ -63,7 +63,7 @@ public class CargoOwnerCompInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine( CargoOwnerCompInfo cargoOwnerCompInfo){
+    public String examine(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
         return cargoOwnerCompInfoService.examine(cargoOwnerCompInfo);
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java

@@ -66,7 +66,7 @@ public class CargoOwnerInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine( CargoOwnerInfo cargoOwnerInfo){
+    public String examine(@RequestBody CargoOwnerInfo cargoOwnerInfo){
         return cargoOwnerInfoService.examine(cargoOwnerInfo);
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CompanyInfoController.java

@@ -90,7 +90,7 @@ public class CompanyInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(CompanyInfo companyInfo){
+    public String examine(@RequestBody CompanyInfo companyInfo){
         return companyInfoService.examine(companyInfo);
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java

@@ -74,7 +74,7 @@ public class DriverCarInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine( DriverCarInfo driverCarInfo){
+    public String examine(@RequestBody DriverCarInfo driverCarInfo){
         return driverCarInfoService.examine(driverCarInfo);
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -67,7 +67,7 @@ public class DriverInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine( DriverInfo driverInfo){
+    public String examine(@RequestBody DriverInfo driverInfo){
         return driverInfoService.examine(driverInfo);
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/NewsInfoController.java

@@ -39,7 +39,7 @@ public class NewsInfoController {
      * @return
      */
     @PostMapping("/api/addNewsInfo")
-    public String addNewsInfo ( NewsInfo newsInfo){
+    public String addNewsInfo (@RequestBody NewsInfo newsInfo){
         return newsInfoService.addNewsInfo(newsInfo);
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/OrderInfoController.java

@@ -75,7 +75,7 @@ public class OrderInfoController {
      * @return
      */
     @PostMapping("/api/end")
-    public String end( OrderInfo orderInfo){
+    public String end(@RequestBody OrderInfo orderInfo){
         return orderInfoService.end(orderInfo);
     }
 
@@ -85,7 +85,7 @@ public class OrderInfoController {
      * @return
      */
     @PostMapping("/api/editEnd")
-    public String editEnd( OrderInfo orderInfo){
+    public String editEnd(@RequestBody OrderInfo orderInfo){
         return orderInfoService.editEnd(orderInfo);
     }
 
@@ -116,7 +116,7 @@ public class OrderInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(OrderInfo orderInfo){
+    public String examine(@RequestBody OrderInfo orderInfo){
         return orderInfoService.examine(orderInfo);
     }
 
@@ -136,11 +136,11 @@ public class OrderInfoController {
             orderInfoService.updateById(orderInfo);
         }
 
-        for(int i=0;i<orderInfoList.size();i++){
-            OrderInfo temp = orderInfoList.get(i);
-
-            str.add(xmlUtil.readXml(temp));
-        }
+//        for(int i=0;i<orderInfoList.size();i++){
+//            OrderInfo temp = orderInfoList.get(i);
+//
+//            str.add(xmlUtil.readXml(temp));
+//        }
         return str;
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PatformAnagementEgulationsController.java

@@ -40,7 +40,7 @@ public class PatformAnagementEgulationsController {
      * @return
      */
     @PostMapping("/api/add")
-    public String add( PatformAnagementEgulations patformAnagementEgulations){
+    public String add(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.add(patformAnagementEgulations);
     }
 
@@ -50,7 +50,7 @@ public class PatformAnagementEgulationsController {
      * @return
      */
     @PostMapping("/api/edit")
-    public String edit( PatformAnagementEgulations patformAnagementEgulations){
+    public String edit(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.edit(patformAnagementEgulations);
     }
 
@@ -59,7 +59,7 @@ public class PatformAnagementEgulationsController {
      * @param patformAnagementEgulations
      */
     @PostMapping("/api/delete")
-    public void delete( PatformAnagementEgulations patformAnagementEgulations){
+    public void delete(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
         patformAnagementEgulationsService.delete(patformAnagementEgulations.getId());
     }
 
@@ -78,7 +78,7 @@ public class PatformAnagementEgulationsController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(PatformAnagementEgulations patformAnagementEgulations){
+    public String examine(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.examine(patformAnagementEgulations);
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PublishTaskInfoController.java

@@ -142,7 +142,7 @@ public class PublishTaskInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine( PublishTaskInfo publishTaskInfo){
+    public String examine(@RequestBody PublishTaskInfo publishTaskInfo){
         return publishTaskInfoService.examine(publishTaskInfo);
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AgentCargoOwnerInfoServiceImpl.java

@@ -39,7 +39,7 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
      */
     @Override
     public Page<AgentCargoOwnerInfo> selectAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(7);
         pageView.put("startRecord", (agentCargoOwnerInfo.getCurrentPage() - 1)
                 * agentCargoOwnerInfo.getPageSize());
         //用户id

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerAddressInfoServiceImpl.java

@@ -36,7 +36,7 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
      */
     @Override
     public Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (cargoOwnerAddressInfo.getCurrentPage() - 1)
                 * cargoOwnerAddressInfo.getPageSize());
         //用户id

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerCompInfoServiceImpl.java

@@ -113,7 +113,7 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
      */
     @Override
     public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (cargoOwnerCompInfo.getCurrentPage() - 1)
                 * cargoOwnerCompInfo.getPageSize());
         //公司id

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java

@@ -48,12 +48,10 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
      */
     @Override
     public Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (cargoOwnerInfo.getCurrentPage() - 1)
                 * cargoOwnerInfo.getPageSize());
         //公司id
-//        pageView.put("compId", cargoOwnerInfo.getCompId());
-//        pageView.put("commonId", cargoOwnerInfo.getCommonId());
         pageView.put("searchType", cargoOwnerInfo.getSearchType());
         pageView.put("searchKeyWord", cargoOwnerInfo.getSearchKeyWord());
         pageView.put("pageSize", cargoOwnerInfo.getPageSize());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -837,7 +837,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
      */
     @Override
     public Page<NoticeTaskInfo> findHisPageNoticeTasks(NoticeTaskInfo noticeTask) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (noticeTask.getCurrentPage() - 1)
                 * noticeTask.getPageSize());
         //  公司ID

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CompanyInfoServiceImpl.java

@@ -119,7 +119,7 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      */
     @Override
     public Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(3);
         //模糊查询
         pageView.put("searchKeyWord", companyInfo.getSearchKeyWord());
         // 查询公司总数
@@ -138,7 +138,7 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      */
     @Override
     public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (companyInfo.getCurrentPage() - 1)
                 * companyInfo.getPageSize());
         //模糊查询

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -39,7 +39,7 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
      */
     @Override
     public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (driverCarInfo.getCurrentPage() - 1)
                 * driverCarInfo.getPageSize());
         //公司id

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -52,7 +52,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      */
     @Override
     public Page<DriverInfo> selectDriverInfoPage(DriverInfo driverViewInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(11);
         pageView.put("startRecord", (driverViewInfo.getCurrentPage() - 1)
                 * driverViewInfo.getPageSize());
         //公司id

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NewsInfoServiceImpl.java

@@ -37,13 +37,11 @@ public class NewsInfoServiceImpl extends ServiceImpl<NewsInfoMapper, NewsInfo> i
      */
     @Override
     public Page<NewsInfo> selectNewsInfo(NewsInfo newsInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(7);
         pageView.put("startRecord", (newsInfo.getCurrentPage() - 1)
                 * newsInfo.getPageSize());
         //用户id
         pageView.put("commonId", newsInfo.getReCommonId());
-//        pageView.put("searchKeyWord", orderInfo.getSearchKeyWord());
-//        pageView.put("searchType", orderInfo.getSearchType());
         pageView.put("pageSize", newsInfo.getPageSize());
         pageView.put("currentPage", newsInfo.getCurrentPage());
         // 查询总数

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -51,7 +51,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     @Override
     public Page<OrderInfo> selectOrderInfo(OrderInfo orderInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(9);
         pageView.put("startRecord", (orderInfo.getCurrentPage() - 1)
                 * orderInfo.getPageSize());
         //用户id
@@ -78,7 +78,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     @Override
     public Page<OrderInfo> selectCargoOwnerOrder(OrderInfo orderInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(9);
         pageView.put("startRecord", (orderInfo.getCurrentPage() - 1)
                 * orderInfo.getPageSize());
         //用户id
@@ -108,7 +108,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     public List<OrderInfo> selectOrderInfoList() {
         SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
         String date = f.format(new Date(System.currentTimeMillis()));
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(3);
         pageView.put("date", date);
         List<OrderInfo> dataList = baseMapper.getListByConditions(pageView);
         return dataList;
@@ -312,7 +312,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     @Override
     public Page<OrderInfo> selectOrderInfoPage(OrderInfo orderInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(11);
         pageView.put("startRecord", (orderInfo.getCurrentPage() - 1)
                 * orderInfo.getPageSize());
         //模糊查询

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PatformAnagementEgulationsServiceImpl.java

@@ -98,7 +98,7 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
      */
     @Override
     public Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (patformAnagementEgulations.getCurrentPage() - 1)
                 * patformAnagementEgulations.getPageSize());
         //模糊查询

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -83,10 +83,11 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         if (!CollectionUtils.isEmpty(publishTaskInfos)) {
             publishTaskInfos.forEach(publishTaskInfo -> {
                 publishTaskInfo.setRefreshTimes("0");
-                if (!"长期有效".equals(publishTaskInfo.getTaskValidity())) {
+                boolean task = "长期有效".equals(publishTaskInfo.getTaskValidity());
+                if (!task) {
                     //任务有效期与日期比较
                     int result = publishTaskInfo.getTaskValidity().compareTo(date);
-                    if(result > 0){
+                    if(result < 0){
                         publishTaskInfo.setStatus(StatusEnum.TASK_ADOPT.getName());
                         publishTaskInfo.setStatusKey(StatusEnum.TASK_ADOPT.getFlag());
                     }
@@ -102,7 +103,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                 cargoOwnerInfo.setRefreshTimes(0L);
                 if(!"长期".equals(cargoOwnerInfo.getCardValidityDate())){
                     int result = cargoOwnerInfo.getCardValidityDate().compareTo(date);
-                    if(result > 0){
+                    if(result < 0){
                         cargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_OVERDUE.getName());
                         cargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
                     }
@@ -118,7 +119,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             companyInfos.forEach(companyInfo -> {
                 //企业营业期限截止日期与日期比较
                 int result = companyInfo.getBusinessTermDate().compareTo(date);
-                if(result > 0){
+                if(result < 0){
                     companyInfo.setStatus(StatusEnum.TASK_ADOPT.getName());
                     companyInfo.setStatusKey(StatusEnum.TASK_ADOPT.getFlag());
                     companyInfoService.updateById(companyInfo);
@@ -133,7 +134,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             cargoOwnerCompInfos.forEach(cargoOwnerCompInfo -> {
                 //授权截止日期与日期比较
                 int result = cargoOwnerCompInfo.getAuthorizationDeadline().compareTo(date);
-                if(result > 0){
+                if(result < 0){
                     cargoOwnerCompInfo.setStatus(StatusEnum.CAUTHORIZATION_OVERDUE.getName());
                     cargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_OVERDUE.getFlag());
                     cargoOwnerCompInfoService.updateById(cargoOwnerCompInfo);
@@ -149,38 +150,38 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                 if(!"长期".equals(driverInfo.getCardValidityDate())){
                     //身份证截止日期与日期比较
                     int result1 = driverInfo.getCardValidityDate().compareTo(date);
-                    if(result1 > 0){
+                    if(result1 < 0){
                         driverInfo.setOverdueFlag("1");
                     }
                 }
                 //驾驶证
                 int result2 = driverInfo.getDriverLicenseValidityDate().compareTo(date1);
-                if(result2 > 0){
+                if(result2 < 0){
                     driverInfo.setOverdueFlag("2");
                 }
                 //行驶证
                 int result3 = driverInfo.getDrivingLicenseValidityDate().compareTo(date1);
-                if(result3 > 0){
+                if(result3 < 0){
                     driverInfo.setOverdueFlag("3");
                 }
                 //挂车行驶证
                 int result4 = driverInfo.getTrailerLicenseValidityDate().compareTo(date1);
-                if(result4 > 0){
+                if(result4 < 0){
                     driverInfo.setOverdueFlag("4");
                 }
                 //从业资格证
                 int result5 = driverInfo.getQualificationCertificateValidityDate().compareTo(date1);
-                if(result5 > 0){
+                if(result5 < 0){
                     driverInfo.setOverdueFlag("5");
                 }
                 //道路运输证
                 int result6 = driverInfo.getOperationCertificateValidityDate().compareTo(date1);
-                if(result6 > 0){
+                if(result6 < 0){
                     driverInfo.setOverdueFlag("6");
                 }
                 //挂车运输证
                 int result7 = driverInfo.getTrailerOperationCertificateValidityDate().compareTo(date1);
-                if(result7 > 0){
+                if(result7 < 0){
                     driverInfo.setOverdueFlag("7");
                 }
                 driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_OVERDUE.getName());
@@ -188,8 +189,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                 driverInfoService.updateById(driverInfo);
             });
         }
-
-
     }
 
     /**
@@ -200,7 +199,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
      */
     @Override
     public Page<PublishTaskInfo> selectTask(PublishTaskInfo publishTaskInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(9);
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
         //用户id
@@ -228,7 +227,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
      */
     @Override
     public Page<PublishTaskInfo> selectGoodsSource(PublishTaskInfo publishTaskInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(16);
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
         //自定义装货区
@@ -579,7 +578,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
      */
     @Override
     public Page<PublishTaskInfo> selectPeripheralInfo(PublishTaskInfo publishTaskInfo) {
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(8);
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
         //用户id
@@ -677,7 +676,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     public List<PublishTaskInfo> selectPublishTaskInfoList() {
         SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
         String date = f.format(new Date(System.currentTimeMillis()));
-        Map<String, Object> pageView = new HashMap<>();
+        Map<String, Object> pageView = new HashMap<>(3);
         pageView.put("date", date);
         List<PublishTaskInfo> dataList = baseMapper.getListsByDateCondition(pageView);
         return dataList;