From 5c93557bc91d6508b262a70b3a4bbb4b171bc464 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 10 May 2024 17:52:26 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E8=A1=8C=E8=BD=A6?= =?UTF-8?q?=E4=B8=89=E6=A3=80=20=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=89=BF=E8=AF=BA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSecurityNoticeController.java | 2 +- ...SecurityWaybillRegistrationController.java | 13 ++++++++++++ ...SecurityWaybillRegistrationController.java | 21 +++++++++++++------ .../controller/insure/InsureController.java | 1 + .../TrafficDrivingSignMapper.java | 2 ++ .../TrafficDrivingSignService.java | 2 ++ .../impl/TrafficDrivingSignServiceImpl.java | 5 +++++ .../impl/TrafficDrivingTypeServiceImpl.java | 9 +++++++- .../TrafficDrivingCommitmentMapper.xml | 2 +- .../TrafficDrivingSignMapper.xml | 15 +++++++++++++ 10 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java index 6c27ad2..5085afb 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java @@ -47,7 +47,7 @@ public class AppTrafficSecurityNoticeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("DELETOR", Jurisdiction.getUSER_ID()); //删除人id + pd.put("DELETOR", Jurisdiction.getCORPINFO_ID()); //删除人id pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date())); //删除时间 securityNoticeService.delete(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java index d9f8bf9..617d537 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java @@ -4,11 +4,13 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; +import com.zcloud.service.comprehensive.TrafficDrivingSignService; import com.zcloud.service.comprehensive.TrafficDrivingTypeService; import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +32,9 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl @Autowired private TrafficDrivingTypeService trafficDrivingTypeService; + @Autowired + private TrafficDrivingSignService trafficDrivingSignService; + @RequestMapping(value = "/listForSecurityWaybillre") @ResponseBody @@ -69,6 +74,14 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl String errInfo = "success"; PageData pd = this.getPageData(); List commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); + List list = trafficDrivingSignService.findWaybillRegistrationId(pd); + for (PageData pageData : commitmentList) { + for (PageData data : list) { + if(StringUtils.equals(pageData.getString("DRIVINGCOMMITMENT_ID"), data.getString("DRIVINGTYPE_ID"))) { + pageData.put("STATUS", data.getString("STATUS")); + } + } + } try { pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 // if(pd.getString("OPERATOR")) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 0415806..08f12d8 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -1,13 +1,11 @@ package com.zcloud.controller.comprehensive; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; -import com.zcloud.service.comprehensive.TrafficDrivingTypeService; -import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; -import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; +import com.zcloud.service.comprehensive.*; import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.ObjectUtils; @@ -38,6 +36,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController @Autowired private TrafficSecurityCustomerManagementService trafficSecurityCustomerManagementService; + @Autowired + private TrafficDrivingSignService trafficDrivingSignService; + @Autowired private UsersService usersService; @@ -71,7 +72,15 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController String errInfo = "success"; PageData pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); + List varList = trafficDrivingCommitmentService.getDrivingCommitment(pd); + List list = trafficDrivingSignService.findWaybillRegistrationId(pd); + for (PageData pageData : varList) { + for (PageData data : list) { + if(StringUtils.equals(pageData.getString("DRIVINGCOMMITMENT_ID"), data.getString("DRIVINGTYPE_ID"))) { + pageData.put("STATUS", data.getString("STATUS")); + } + } + } try { pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 // if(pd.getString("OPERATOR")) @@ -87,7 +96,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController map.put("result", errInfo); map.put("msg", "数据获取失败"); } - map.put("commitmentList", commitmentList); + map.put("commitmentList", varList); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index 7ef9fa3..f51502a 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -33,6 +33,7 @@ public class InsureController extends BaseController { @Autowired private InsureService insureService; + @Autowired private ImgFilesService imgfilesService; diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java index 5193d96..f3f6c0d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java @@ -45,4 +45,6 @@ public interface TrafficDrivingSignMapper { * @throws Exception */ PageData findById(PageData pd); + + List findWaybillRegistrationId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java index 1aa2704..db3c900 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java @@ -31,4 +31,6 @@ public interface TrafficDrivingSignService { void delete(PageData pd); PageData findById(PageData pd) throws Exception; + + List findWaybillRegistrationId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java index 34fbd85..b7e21ae 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java @@ -62,4 +62,9 @@ public class TrafficDrivingSignServiceImpl implements TrafficDrivingSignService public PageData findById(PageData pd) { return trafficDrivingSignMapper.findById(pd); } + + @Override + public List findWaybillRegistrationId(PageData pd) { + return trafficDrivingSignMapper.findWaybillRegistrationId(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java index 2dbb7fd..e083778 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingSignMapper; import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingTypeMapper; import com.zcloud.service.comprehensive.TrafficDrivingTypeService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,6 +13,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; @Service public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService { @@ -76,6 +79,7 @@ public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService PageData cpd = TrafficSecurityWaybillRegistrationMapper.findById(pd); // 根据ID读取 List varOList = trafficDrivingTypeMapper.findListbyDetail(pd); List vList = trafficDrivingTypeMapper.findCategory(pd); + List varItemList = trafficDrivingTypeMapper.findListbyItem(pd); List pd1Children = new ArrayList<>(); @@ -97,7 +101,10 @@ public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService pd1.put("pd1Children",pd1Children); } - cpd.put("varList", vList); + List list1 = vList.stream().parallel().filter(data -> !StringUtils.equals(data.getString("CHECKTYPE_ID"), "status000")).collect(Collectors.toList()); + List list2 = vList.stream().parallel().filter(data -> StringUtils.equals(data.getString("CHECKTYPE_ID"), "status000")).collect(Collectors.toList()); + cpd.put("varList", list1); + cpd.put("varList2", list2); return cpd; } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml index 097ed9f..6166847 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml @@ -113,7 +113,7 @@ from f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} order by f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml index d49d5c5..1df7cf1 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml @@ -162,4 +162,19 @@ where DRIVING_SIGN_ID = #{DRIVING_SIGN_ID} + +