From b14a80c7a49808f6a7d06ac5d0f414bfebfccf41 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 11 Aug 2021 13:33:42 +0800 Subject: [PATCH 01/10] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=EF=BC=8C=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 8 ++++ .../SarStandProjectTeamController.java | 43 +++++++++++++++++++ .../dao/SarStandProjectTeamDao.java | 16 +++++++ .../entity/SarStandProjectTeam.java | 24 +++++++++++ .../service/ISarStandProjectTeamService.java | 16 +++++++ .../impl/SarStandProjectTeamServiceImpl.java | 20 +++++++++ .../mapper/slrs/SarStandProjectTeamMapper.xml | 5 +++ 7 files changed, 132 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/dao/SarStandProjectTeamDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/entity/SarStandProjectTeam.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/ISarStandProjectTeamService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/slrs/SarStandProjectTeamMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 6af63af1..f8a09d75 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -196,4 +196,12 @@ public class SarStandProjectLibraryController extends BaseController list){ + sarStandProjectLibraryService.saveBatch(list); + return Result.success("200","新增成功",list); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java new file mode 100644 index 00000000..3727f519 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.sarStandProjectTeam.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author wangxiahui +* @since 2021-08-10 +*/ +@RestController +@Api(description = "|SarStandProjectTeam|") +@RequestMapping("/slrs/sar-stand-project-team") +public class SarStandProjectTeamController extends BaseController { + + @Autowired + private ISarStandProjectTeamService sarStandProjectTeamService; + + @PostMapping("/save") + @ApiOperation("同步PCMS组织信息") + public ResponseMessage save(@RequestBody List list){ + sarStandProjectTeamService.saveBatch(list); + return Result.success("200","新增成功",list); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/dao/SarStandProjectTeamDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/dao/SarStandProjectTeamDao.java new file mode 100644 index 00000000..20c65e86 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/dao/SarStandProjectTeamDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandProjectTeam.dao; + +import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangxiahui + * @since 2021-08-10 + */ +public interface SarStandProjectTeamDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/entity/SarStandProjectTeam.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/entity/SarStandProjectTeam.java new file mode 100644 index 00000000..96cb201b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/entity/SarStandProjectTeam.java @@ -0,0 +1,24 @@ +package com.adc.da.slrs.sarStandProjectTeam.entity; + +import com.adc.da.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarStandProjectTeam对象", description="") +public class SarStandProjectTeam extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String id; + + private String name; + + private String person; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/ISarStandProjectTeamService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/ISarStandProjectTeamService.java new file mode 100644 index 00000000..d2444c3f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/ISarStandProjectTeamService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandProjectTeam.service; + +import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author wangxiahui + * @since 2021-08-10 + */ +public interface ISarStandProjectTeamService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java new file mode 100644 index 00000000..69dfb385 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarStandProjectTeam.service.impl; + +import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam; +import com.adc.da.slrs.sarStandProjectTeam.dao.SarStandProjectTeamDao; +import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangxiahui + * @since 2021-08-10 + */ +@Service +public class SarStandProjectTeamServiceImpl extends ServiceImpl implements ISarStandProjectTeamService { + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/slrs/SarStandProjectTeamMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/slrs/SarStandProjectTeamMapper.xml new file mode 100644 index 00000000..1ccf3f8b --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/slrs/SarStandProjectTeamMapper.xml @@ -0,0 +1,5 @@ + + + + + From 530a6febf6f8d64a9834e4a2c9fe816ca4ad6460 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 11 Aug 2021 13:36:50 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandItems/entity/SarItemVO.java | 8 +++++--- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java index ac471308..6de98409 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -18,7 +18,6 @@ public class SarItemVO extends BaseEntity { @ApiModelProperty(value = "主键") private String id; - @ApiModelProperty(value = "标准ID") private String standId; @@ -28,10 +27,10 @@ public class SarItemVO extends BaseEntity { @ApiModelProperty(value = "条款名称") private String itemsName; - @ApiModelProperty(value = "条款内容") + @ApiModelProperty(value = "条款内容(未使用)") private String itemsTitle; - @ApiModelProperty(value = "解读内容--条款要求") + @ApiModelProperty(value = "条款内容--条款要求") private String termsConditions; @ApiModelProperty(value = "新车实施日期") @@ -64,4 +63,7 @@ public class SarItemVO extends BaseEntity { @ApiModelProperty(value = "文件类型") private String fileType; + + @ApiModelProperty(value = "解读内容") + private String interpretationContent; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index f66c5ee1..2f4b9196 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -67,6 +67,7 @@ + From adb039fa98045cdeefc27994c6f339f4af98ccb1 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 17:52:01 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 1 - .../SarLawsAttrDetailedListMapper.xml | 30 ++----------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 2ff5fc7c..47444721 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -31,7 +31,6 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); - List selectLawsByIdCount(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 70378358..994ffcb3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -110,34 +110,6 @@ group by a.ID limit #{start},#{end} - - - + + + - select from From f43ac650e009a89057934b1e24a1809e036c511e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 09:29:24 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandProjectLibraryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3fb2b859..6097ac73 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 @@ -106,8 +106,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName"); - wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager"); + wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName"); + wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal());