From 54315dca0b266993c8f1bc6fbaf071ddfdb86c36 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Mon, 17 Oct 2022 18:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E9=AA=8C=E8=BD=A6=20=E5=8F=91=E5=8A=A8=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehiclePatrolinspectionMapper.java | 8 ++--- .../ScmVehiclePatrolinspectionMapper.xml | 4 +-- .../ScmVehiclePatrolinspectionService.java | 30 ++++++++++++------- ...ScmVehiclePatrolinspectionsheetMapper.java | 8 ++--- ...cmVehiclePatrolinspectionsheetService.java | 11 ++++--- .../AppExamineDetailsVo.java | 3 ++ .../scmvehicleexamine/AppExamineDto.java | 3 ++ .../scmvehicleexamine/AppExamineInfoVo.java | 3 ++ .../scmvehicleexamine/AppSubmitDto.java | 3 ++ 9 files changed, 46 insertions(+), 27 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java index 077cd9af17..f9490cf725 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java @@ -36,10 +36,7 @@ import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPat import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; import java.util.List; @@ -105,7 +102,8 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper selectByMandSid(@Param("sid") String sid, @Param("vin") String vin); - @Update("update scm_vehicle_patrolinspection set isDelete = 1 where vinNo = #{vinNo} and id = #{id} ") +// @Update("update scm_vehicle_patrolinspection set isDelete = 1 where vinNo = #{vinNo} and id = #{id} ") + @Delete("delete from scm_vehicle_patrolinspection where vinNo = #{vinNo} and id = #{id}") void deleteByVinNo(@Param("vinNo") String vinNo, @Param("id") String id); List selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml index 434ef823e3..d75a3e408e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml @@ -46,9 +46,9 @@ resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo"> SELECT count(*), (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber, - (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.pushState = 1 and svp.mainSid = #{mainSid}) AS unHandledNumber, + (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber, - (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber, + (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber FROM scm_vehicle_patrolinspection svp diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index 1af3293b0c..4594275eb4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -264,19 +264,18 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); - qw.eq("svp.isDelete", 0); - if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { - qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); - } - if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { - qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid()); - } - if (StringUtils.isNotBlank(pagerQuery.getParams().getReportSid())) { - qw.eq("svp.mainSid", pagerQuery.getParams().getReportSid()); - } if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) { + if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { + qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); + } + if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { + qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid()); + } + if (StringUtils.isNotBlank(pagerQuery.getParams().getReportSid())) { + qw.eq("svp.mainSid", pagerQuery.getParams().getReportSid()); + } if ("01".equals(pagerQuery.getParams().getState())) { - qw.eq("svp.state", "1"); + qw.eq("svp.state", 1); } if ("02".equals(pagerQuery.getParams().getState())) { qw.ne("svp.patrolInspectionStateKey", "000"); @@ -294,6 +293,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService 0) { String id = list.get(0).getId(); String mainSid = list.get(0).getSid(); - scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id); - int count = baseMapper.selectByMainSidNum(mainSid); - if (count > 0) { - baseMapper.deleteByMainSid(mainSid); + if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())){ + scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id); + int count = baseMapper.selectByMainSidNum(mainSid); + if (count > 0) { + baseMapper.deleteByMainSid(mainSid); + } } } ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); @@ -297,6 +299,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService