Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -102,6 +102,13 @@ public class SarBussionessStand extends BaseEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
+    // 新添加字段
+    @ApiModelProperty(value = "文本状态")
+    @TableField("TEXT_STATUS_BUSS")
+    private String textStatusBuss;
+
+
+    // 非表字段
     @TableField(exist = false)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private String firstPutTime;

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;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -196,4 +196,12 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
             response.getWriter().println(JSON.toJSONString(Result.error()));
         }
     }
+
+
+    @PostMapping("/save")
+    @ApiOperation("同步车型项目数据")
+    public ResponseMessage save(@RequestBody List<SarStandProjectLibrary> list){
+        sarStandProjectLibraryService.saveBatch(list);
+        return  Result.success("200","新增成功",list);
+    }
 }

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;
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author wangxiahui
+* @since 2021-08-10
+*/
+@RestController
+@Api(description = "|SarStandProjectTeam|")
+@RequestMapping("/slrs/sar-stand-project-team")
+public class SarStandProjectTeamController extends BaseController<SarStandProjectTeam> {
+
+    @Autowired
+    private ISarStandProjectTeamService sarStandProjectTeamService;
+
+    @PostMapping("/save")
+    @ApiOperation("同步PCMS组织信息")
+    public ResponseMessage save(@RequestBody List<SarStandProjectTeam> list){
+        sarStandProjectTeamService.saveBatch(list);
+        return  Result.success("200","新增成功",list);
+    }
+}

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;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangxiahui
+ * @since 2021-08-10
+ */
+public interface SarStandProjectTeamDao extends BaseMapper<SarStandProjectTeam> {
+
+}

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;
+
+
+}

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;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangxiahui
+ * @since 2021-08-10
+ */
+public interface ISarStandProjectTeamService extends IService<SarStandProjectTeam> {
+
+}

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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangxiahui
+ * @since 2021-08-10
+ */
+@Service
+public class SarStandProjectTeamServiceImpl extends ServiceImpl<SarStandProjectTeamDao, SarStandProjectTeam> implements ISarStandProjectTeamService {
+
+}