Merge branch 'develop_3' into 'develop_master'

Develop 3 See merge request !99
2021-08-09 09:11:47 +00:00
parent 1b8884fe75 4302fed66f
commit d7ed47a58f
6 changed files with 406 additions and 215 deletions
@@ -5,9 +5,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;

 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
-import com.adc.da.slrs.sarStandItems.entity.FindStandDto;
-import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
-import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
+import com.adc.da.slrs.sarStandItems.entity.*;
 import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;

@@ -55,6 +52,17 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
        }
    }

+    @ApiOperation(value = "分解单查询")
+    @GetMapping("/querySarItemAndInterpretation")
+    public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
+        List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
+
+        return Result.success("200",sarItemVOS);
+    }
+
+
+
+
    @ApiOperation(value = "分解单查询(带时间)")
    @GetMapping("/findAllItemsTimes")
    public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
@@ -1,8 +1,6 @@
 package com.adc.da.slrs.sarStandItems.dao;

-import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
-import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
-import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
+import com.adc.da.slrs.sarStandItems.entity.*;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,6 +22,8 @@ import java.util.Set;
@Mapper
 public interface SarStandItemsDao extends BaseMapper<SarStandItems> {

+    List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+
    List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);

    int querySarStandItemsListCount(SarStandItemsEOPage page);
@@ -0,0 +1,36 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import com.adc.da.base.page.BasePage;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+@Data
+public class FindSarItemsPageReqDTO {
+
+    private static final long serialVersionUID = 1L;
+    private Integer page = 1;
+    private Integer pageSize = 20;
+
+
+    @ApiModelProperty(value = "标准id")
+    private String standId;
+
+    @ApiModelProperty(value = "条款名称")
+    private String itemsName;
+
+    @ApiModelProperty(value = "新车型实施日期")
+    @DateTimeFormat(pattern = "yyy-MM-dd")
+    private Date XCXSSRQ;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @DateTimeFormat(pattern = "yyy-MM-dd")
+    private Date ZCCSSRQ;
+
+    @ApiModelProperty(value = "文件类型")
+    private String fileType;
+}
@@ -0,0 +1,67 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value="标准分解单显示对象", description="")
+public class SarItemVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+
+    @ApiModelProperty(value = "标准ID")
+    private String standId;
+
+    @ApiModelProperty(value = "条款号")
+    private String itemsNum;
+
+    @ApiModelProperty(value = "条款名称")
+    private String itemsName;
+
+    @ApiModelProperty(value = "条款内容")
+    private String itemsTitle;
+
+    @ApiModelProperty(value = "解读内容--条款要求")
+    private String termsConditions;
+
+    @ApiModelProperty(value = "新车实施日期")
+    @DateTimeFormat
+    private Date XCXSSRQ;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @DateTimeFormat
+    private Date ZCCSSRQ;
+
+    @ApiModelProperty(value = "适用车型")
+    private String applyArctic;
+
+
+    @ApiModelProperty(value = "责任部门")
+    private String responsibleUnit;
+
+
+    @ApiModelProperty(value = "责任工程师")
+    private String dutyEngineer;
+
+    @ApiModelProperty(value = "相对于上一版本变化点")
+    private String comparedWithPrevious;
+
+    @ApiModelProperty(value = "合规性分析")
+    private String complianceState;
+
+    @ApiModelProperty(value = "符合性要求-符合性状态")
+    private String complianceRequire;
+
+    @ApiModelProperty(value = "文件类型")
+    private String fileType;
+}
@@ -189,4 +189,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
    public List<SarStandItemsDto> findAllItems(String type,String[] ids){
        return dao.selectAllItemsByIds(type,ids);
    }
+
+
+    public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
+        return dao.querySarItemAndInterpretation(page);
+    }
 }