From 0e8238267cad0c83f8f28a545607ea54a195d4a1 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 2 Sep 2021 17:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E6=B8=85=E5=8D=95=E7=89=88=E6=9C=AC~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandProjectLibraryDao.java | 1 + .../entity/SarStandProjectLibrary.java | 3 +++ .../entity/SarStandProjectLibraryDto.java | 2 ++ .../impl/SarStandProjectLibraryServiceImpl.java | 15 ++++++++++++--- .../SarStandProjectLibraryMapper.xml | 7 +++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 2b0f1594..11c529bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -26,5 +26,6 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStands(); List getAllStand(); + List updateByProjectId(@Param("id")String id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index d3897c61..ac2a411e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -72,6 +72,9 @@ public class SarStandProjectLibrary extends BaseEntity { @TableField(exist = false) private String uName; + @TableField("detailed_list_version") + private String detailedListVersion; + //标准编号 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java index 1046c618..35653a3a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java @@ -39,4 +39,6 @@ public class SarStandProjectLibraryDto { private String productLine; + private String detailedListVersion; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 6cab703a..ed2f5dd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -19,6 +19,7 @@ import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -40,6 +41,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { @@ -193,8 +197,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandInfo(int current, int pageSize, String standId, String cars) { - System.out.println(cars); List ids =new ArrayList<>(); + //cars传回值为1时判断是从车型项目库中调取 if ("1".equals(cars)){ ids=sarStandProjectLibraryDao.getAllStand(); } @@ -218,6 +222,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); System.out.println("总条数"+userIPage1.getTotal()); System.out.println("总页数"+userIPage1.getPages()); + QueryWrapper wrapper2 = new QueryWrapper<>(); wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); if (ids.isEmpty()){ @@ -270,8 +275,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list) { - sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId()); - sarStandProjectLibraryDao.batchInsert(list); + + sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId()); + sarStandProjectLibraryDao.batchInsert(list); + sarStandProjectLibraryDao.updateByProjectId(list.get(0).getProjectId(), String.valueOf(version)); + + } @Override diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index ccb5c838..e6d90b5e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -32,6 +32,13 @@ project_id= #{projectId} + + update sar_stand_project_library + + set detailed_list_version = #{version} where id = #{id} + + +