feat: 迁移国内标准法规部分6 详情 下载 标准查询

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java

@@ -3,7 +3,11 @@ package com.adc.da.slrs.sarStandItems.entity;
 import com.adc.da.base.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -48,7 +52,8 @@ public class SarStandItems extends BaseEntity {
 
     @ApiModelProperty(value = "特殊生效时间")
     @TableField("TACK_TIME")
-    private LocalDateTime tackTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date tackTime;
 
     @ApiModelProperty(value = "适用车型")
     @TableField("APPLY_ARCTIC")
@@ -68,18 +73,20 @@ public class SarStandItems extends BaseEntity {
 
     @ApiModelProperty(value = "是否有效")
     @TableField("VALID_FLAG")
-    private Boolean validFlag;
+    private Integer validFlag;
 
     @TableField("CREATION_USER")
     private String creationUser;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATION_TIME")
-    private LocalDateTime creationTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("MODIFY_TIME")
-    private LocalDateTime modifyTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
 
     @ApiModelProperty(value = "条款要求")
     @TableField("TERMS_CONDITIONS")
@@ -113,5 +120,38 @@ public class SarStandItems extends BaseEntity {
     @TableField("FILE_TYPE")
     private String fileType;
 
+    @TableField(exist = false)
+    private String emergyKindShow;
+    @TableField(exist = false)
+    private String applyArcticShow;
+    @TableField(exist = false)
+    private String responsibleUnitShow;
+    @TableField(exist = false)
+    private String mainPointImplementation; //实施要点
+    //新加字段
+    @TableField(exist = false)
+    private String foUser;//FO
+    //新加字段带show
+    @TableField(exist = false)
+    private String foShow;//FO
+    @TableField(exist = false)
+    private String dutyEngineerShow;//责任工程师
+    @TableField(exist = false)
+    private String svppsShow;//SVPPS
+    @TableField(exist = false)
+    private String claimTypeShow;//要求类型
+    @TableField(exist = false)
+    private String busStandCoverShow;//企标覆盖关系
+    @TableField(exist = false)
+    private String fileTypeShow;//文件类型
+    @TableField(exist = false)
+    private String itemState;//条款状态
+    @TableField(exist = false)
+    private List<String> idList;
+    @TableField(exist = false)
+    private String oldId;
+    @TableField(exist = false)
+    private String jspg;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java

@@ -1,8 +1,13 @@
 package com.adc.da.slrs.sarStandItems.service;
 
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
+import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISarStandItemsService extends IService<SarStandItems> {
 
+    List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -2,10 +2,17 @@ package com.adc.da.slrs.sarStandItems.service.impl;
 
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
+import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
+import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
+import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +24,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarStandItems> implements ISarStandItemsService {
 
+    @Autowired
+    private SarStandItemsDao dao;
+
+    @Autowired
+    private SysInfoEOService sysInfoEOService;
+
+
+    public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
+        List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
+        List<ActSarItemsEO> actitemsEOList = new ArrayList<>();
+        if (itemsEOList != null && !itemsEOList.isEmpty()) {
+            for (SarStandItems itemsEO : itemsEOList) {
+                ActSarItemsEO actSarItemsEO = new ActSarItemsEO();
+                actSarItemsEO.setResId(itemsEO.getId());
+                actSarItemsEO.setResNum(itemsEO.getItemsNum());
+                actSarItemsEO.setResType(resType);
+                actSarItemsEO.setResName(itemsEO.getItemsName());
+                actSarItemsEO.setDeptName(itemsEO.getResponsibleUnit());
+                actSarItemsEO.setOrgName(itemsEO.getResponsibleUnitShow());
+                actSarItemsEO.setFoId(itemsEO.getFo());
+                String foShow = sysInfoEOService.getRoleNamesByIds(itemsEO.getFo());
+                actSarItemsEO.setFoName(foShow);
+                actSarItemsEO.setTermsConditions(itemsEO.getTermsConditions());
+                actSarItemsEO.setResState(itemsEO.getItemState());
+                actSarItemsEO.setRoleId(itemsEO.getDutyEngineer());
+                String dutyShow = sysInfoEOService.getRoleNamesByIds(itemsEO.getDutyEngineer());
+                actSarItemsEO.setRoleName(dutyShow);
+                actitemsEOList.add(actSarItemsEO);
+            }
+        }
+        return actitemsEOList;
+    }
 }