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

This commit is contained in:
zzy
2021-07-20 10:35:00 +08:00
59 changed files with 3502 additions and 19 deletions
@@ -0,0 +1,92 @@
package com.adc.da.common;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import java.util.*;
public class TableToExcel {
public static <T extends Object> Workbook createExcel(Map<String,String> columnMap, List<T> dataList, String sheelName, String fileName) {
if(sheelName==null)sheelName="sheet1";
int sheetRow=500;
sheetRow=sheetRow<0?200:sheetRow;
//第一步,创建一个webbook,对应一个excel文件,内存中sheetRow条记录后提交。
Workbook wb=new SXSSFWorkbook(sheetRow);
if(columnMap!=null&&dataList!=null) {
//获取需要生成的sheet数,以防数据量过大报错
int sheetCount=getSheetCount(sheetRow,dataList.size());
//循环生成sheet
for(int i=0;i<sheetCount;i++) {
//第二步,在webbook中添加一个sheet,对应Excel文件中的sheet
Sheet sheet=wb.createSheet(sheelName);
//第三步,在sheet中添加表头第0行,注意老版本poi对Excel的行数有限制short
Row titleRow=sheet.createRow(0);
Set<String> keys=columnMap.keySet();
//第一行(标题行)合并并设置标题
//创建表头行
Row headRow=sheet.createRow(0);
//生成表头行
int j=0;
for(String key:keys) {
Cell hCell=headRow.createCell(j++);
hCell.setCellValue(columnMap.get(key));
}
//从第三行开始填充数据
int c=2;
for(int k=i*sheetRow;k<dataList.size()&&k<(i+1)*sheetRow;k++) {
T t=dataList.get(k);
Row dataRow=sheet.createRow(c++);
//循环取值进行数据填充
int v=0;
for(String key:keys) {
try {
Object val= BeanUtils.getProperty(t, key);
if(val instanceof Long) {
dataRow.createCell(v++).setCellValue((Long)val);
}else if(val instanceof Double){
dataRow.createCell(v++).setCellValue((Double)val);
}else if(val instanceof Date) {
dataRow.createCell(v++).setCellValue((Date)val);
}else if(val instanceof Calendar) {
dataRow.createCell(v++).setCellValue((Calendar)val);
}else if(val instanceof Boolean) {
dataRow.createCell(v++).setCellValue((Boolean)val);
}else if(val==null) {
dataRow.createCell(v++).setCellValue("");
}else {
dataRow.createCell(v++).setCellValue((String)val);
}
} catch (Exception e) {
System.out.println("导出Excel-表格赋值异常");
}
}
}
//设置列宽
// setColumnWidth(sheet,columnMap);
}
}
return wb;
}
public static void setColumnWidth(Sheet sheet, Map<String,String> columnMap) {
if(sheet!=null&&columnMap!=null) {
List<String> list=new ArrayList<String>(columnMap.keySet());
for(int i=0;i<list.size();i++) {
sheet.autoSizeColumn(i,true);
}
}
}
public static int getSheetCount(int sheelRow,int total) {
if(total==0||total<sheelRow)return 1;
return total%sheelRow>0?total/sheelRow+1:total/sheelRow;
}
}
@@ -3,6 +3,7 @@ package com.adc.da.workFlow.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.hutool.core.lang.UUID;
import com.adc.da.FeignClientImpl.workFlowFeignClientImpl;
import com.adc.da.Timer.ProcessTimer;
import com.adc.da.common.*;
@@ -15,7 +16,11 @@ import com.adc.da.sys.common.EmailUtils;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.IUserEOService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.workFlow.dao.ExportExcelMapper;
import com.adc.da.workFlow.entity.ExportExcel;
import com.adc.da.workFlow.entity.ExportExcelEO;
import com.adc.da.workFlow.entity.ProcessDetailExport;
import com.adc.da.workFlow.service.WorkFlowService;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -42,6 +48,46 @@ public class WorkFlowController {
@Autowired
private workFlowFeignClientImpl workFlowFeignClient;
// @Autowired
// private ExportExcelMapper exportExcelMapper;
@ApiOperation(value = "导出excel")
@PostMapping("/export_excel")
public void exportExcel(@RequestBody ExportExcelEO exportExcelEO, HttpServletResponse response, HttpServletRequest request) throws IOException {
// ExportExcel exportExcel = exportExcelMapper.selectById(id);
// if(exportExcel==null||exportExcel.getJson()==null)return;
// ExportExcelEO exportExcelEO=JSON.parseObject(exportExcel.getJson(),ExportExcelEO.class);
if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){
exportExcelEO.setFileName(UUID.fastUUID().toString(true));
}
Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), exportExcelEO.getDataList(), null, exportExcelEO.getFileName());
response.reset();
response.setContentType("application/vnd.ms-excel");
response.setHeader("Content-disposition", "attachment; filename=" + exportExcelEO.getFileName() + ".xls");
OutputStream outputStream = response.getOutputStream();
excel.write(outputStream);
outputStream.flush();
outputStream.close();
}
// @ApiOperation(value = "导出excel数据暂留")
// @PostMapping("/save_excel")
// public ResponseMessage saveExcel(@RequestBody ExportExcel exportExcel){
//
// exportExcelMapper.insert(exportExcel);
// return Result.success(exportExcel);
//
// }
@ApiOperation(value = "启动流程-以流程定义id")
@GetMapping("/activiti_define_start")
public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){
@@ -0,0 +1,8 @@
package com.adc.da.workFlow.dao;
import com.adc.da.workFlow.entity.ExportExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ExportExcelMapper extends BaseMapper<ExportExcel> {
}
@@ -0,0 +1,20 @@
package com.adc.da.workFlow.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.models.auth.In;
import lombok.*;
@TableName("t_export_excel")
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ExportExcel {
@TableId(value = "id",type = IdType.AUTO)
private Integer id;
@TableField(value = "json")
private String json;
}
@@ -0,0 +1,17 @@
package com.adc.da.workFlow.entity;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class ExportExcelEO {
private Map<String,String> columnName;
private List<Map<String,Object>> dataList;
private String fileName;
}
@@ -88,8 +88,40 @@ public class ActSarItemsEOService {
@Value("${elas.flag}")
private boolean elasflag;
/**
* 标准解读流程入库"
* @param standJson
* @throws Exception
*/
public void createStandardRead(String standJson) throws Exception{
JSONObject object = JSONObject.parseObject(standJson);
String fileName = object.getString("fileName");
String fileType = object.getString("fileType");
String creationTime = object.getString("creationTime");
String creationUser = object.getString("creationUser");
String standId = object.getString("standId");
//数组去重
JSONArray responUserList1 = object.getJSONArray("itemList");
for (Object obj:responUserList1) {
JSONObject object1 = (JSONObject) obj;
JSONArray preResponUserList = object1.getJSONArray("zxUserId");
String oldNumber = object1.getString("oldNumber");
String itemsNum = object1.getString("itemsNum");
String itemsName = object1.getString("itemsName");
String itemsTitle = object1.getString("itemsTitle");
String applyArcticId = object1.getString("applyArcticId");
String applyArctic = object1.getString("applyArctic");
String changePoint = object1.getString("changePoint");
String technicalRequir = object1.getString("technicalRequir");
String onlineData = object1.getString("onlineData");
String newData = object1.getString("newData");
String complianceRequir = object1.getString("complianceRequir");
String complianceState = object1.getString("complianceState");
}
}
/***
* @Description: 标准入库流程数据保存
* @Description: 标准解读流程入库"
* @Author: yangxuenan
* @Date: 2020/12/7 13:48
* @Param: [standJson]
@@ -31,4 +31,5 @@ public class WorkFlowService {
/**
* 后续优化工作流
*/
}
+2
View File
@@ -37,6 +37,8 @@
<artifactId>UserAgentUtils</artifactId>
<version>1.21</version>
</dependency>
</dependencies>
<build>
@@ -39,7 +39,7 @@ eureka.client.fetch-registry=true
#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/
# 请求连接的超时时间 默认的时间为 1 秒
ribbon.ConnectTimeout=500000
@@ -0,0 +1,23 @@
package com.adc.da.slrs.sarBussionessStand.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
/**
* <p>
* 企业标准信息表 前端控制器
* </p>
*
* @author super_liu
* @since 2021-07-13
*/
@RestController
@Api(tags = "福田标准法规--企业标准信息")
@RequestMapping("/${restPath}/lawss/sarBussionessStand")
public class SarBussionessStandController extends BaseController<SarBussionessStand> {
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarBussionessStand.dao;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 企业标准信息表 Mapper 接口
* </p>
*
* @author super_liu
* @since 2021-07-13
*/
public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
}
@@ -0,0 +1,186 @@
package com.adc.da.slrs.sarBussionessStand.entity;
import com.adc.da.att.vo.AttFileVo;
import com.adc.da.base.entity.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDate;
import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.util.*;
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;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 企业标准信息表
* </p>
*
* @author super_liu
* @since 2021-07-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarBussionessStand对象", description="企业标准信息表")
public class SarBussionessStand extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId("ID")
private String id;
@ApiModelProperty(value = "标准编号")
@TableField("STAND_CODE")
private String standCode;
@ApiModelProperty(value = "标准名称")
@TableField("STAND_NAME")
private String standName;
@ApiModelProperty(value = "标准英文名称")
@TableField("STAND_EN_NAME")
private String standEnName;
@ApiModelProperty(value = "发布日期")
@TableField("ISSUE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date issueTime;
@ApiModelProperty(value = "实施日期")
@TableField("PUT_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date putTime;
@ApiModelProperty(value = "代替标准号")
@TableField("REPLACE_STAND_NUM")
private String replaceStandNum;
@ApiModelProperty(value = "被代替标准号")
@TableField("REPLACED_STAND_NUM")
private String replacedStandNum;
@ApiModelProperty(value = "标准状态")
@TableField("STAND_STATUS")
private String standStatus;
@ApiModelProperty(value = "适用国家/地区")
@TableField("APPLY_COUNTRY")
private String applyCountry;
@ApiModelProperty(value = "标准性质")
@TableField("STAND_NATURE")
private String standNature;
@ApiModelProperty(value = "标准类别")
@TableField("STAND_SORT")
private String standSort;
@ApiModelProperty(value = "标准年份")
@TableField("STAND_YEAR")
private String standYear;
@ApiModelProperty(value = "是否有效")
@TableField("VALID_FLAG")
private Integer validFlag;
@ApiModelProperty(value = "创建时间")
@TableField("CREATION_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date creationTime;
@ApiModelProperty(value = "修改时间")
@TableField("MODIFY_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String firstPutTime;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String putTimeShow;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String issueTimeShow;
@TableField(exist = false)
private String issueTimeStr;
@TableField(exist = false)
private String putTimeStr;
//目录ID 非标准信息表中的字段
@TableField(exist = false)
private String menuId;
@TableField(exist = false)
private String menuParentId;
@TableField(exist = false)
private String standStatusShow; // 标准状态下拉框 --单选
@TableField(exist = false)
private String standNatrueShow;
@TableField(exist = false)
private String standSortShow;
@TableField(exist = false)
private String applyCountryShow;
@TableField(exist = false)
private List<AttFileVo> standFileList = new ArrayList<AttFileVo>();
@TableField(exist = false)
private List<AttFileVo> opinionFilesList = new ArrayList<AttFileVo>();
@TableField(exist = false)
private List<AttFileVo> relevanceFileList = new ArrayList<AttFileVo>();
@TableField(exist = false)
private String collectId;
//文件的类型
@TableField(exist = false)
private String standFileClassify;
//文件的下载id
@TableField(exist = false)
private String attId;
//记录是否修改了替代文件号
@TableField(exist = false)
private int upReplaceNumFlag;
//记录是否修改了文件号
@TableField(exist = false)
private int upNumFlag;
// 数据库新加的字段
@TableField(exist = false)
private String remark;//备注
@TableField(exist = false)
private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
@TableField(exist = false)
private String sarStandAttrEOStr; //新增修改时属性表信息
@TableField(exist = false)
private String fileIds; //全部文件ID
@TableField(exist = false)
private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarBussionessStand.service;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 企业标准信息表 服务类
* </p>
*
* @author super_liu
* @since 2021-07-13
*/
public interface ISarBussionessStandService extends IService<SarBussionessStand> {
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
}
@@ -0,0 +1,27 @@
package com.adc.da.slrs.sarBussionessStand.service.impl;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 企业标准信息表 服务实现类
* </p>
*
* @author super_liu
* @since 2021-07-13
*/
@Service
public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStandDao, SarBussionessStand> implements ISarBussionessStandService {
@Override
public List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){
return this.baseMapper.queryByList(sarBussionessStandEOPage);
}
}
@@ -0,0 +1,40 @@
package com.adc.da.slrs.sarModelTree.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
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 super_liu
* @since 2021-07-15
*/
@RestController
@Api(tags = "福田标准法规--标准法规库-模块树结构")
@RequestMapping("/${restPath}/sarModelTree")
public class SarModelTreeController extends BaseController<SarModelTree> {
@Autowired
private ISarModelTreeService iSarModelTreeService;
@ApiOperation("查询所有资源")
@GetMapping("/list")
public ResponseMessage<List<SarModelTree>> getAll(SarModelTree sarVppsTree){
List<SarModelTree> tsResources = iSarModelTreeService.getAll(sarVppsTree);
return Result.success(tsResources);
}
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarModelTree.dao;
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
public interface SarModelTreeDao extends BaseMapper<SarModelTree> {
}
@@ -0,0 +1,68 @@
package com.adc.da.slrs.sarModelTree.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* <p>
*
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarModelTree对象", description="")
public class SarModelTree extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId("ID")
private String id;
@TableField("NAME")
private String name;
@TableField("PID")
private String pid;
@TableField("MODEL")
private String model;
@ApiModelProperty(value = "模块结构特性")
@TableField("FEATURES")
private String features;
@ApiModelProperty(value = "删除标识 1:未删除 2:已删除")
@TableField("DEL_FLAG")
private String delFlag;
@ApiModelProperty(value = "排序序号")
@TableField("SORT")
private Integer sort;
@ApiModelProperty(value = "子菜单")
@TableField(exist = false)
private List<SarModelTree> children;
@ApiModelProperty(value = "上级菜单名称")
@TableField(exist = false)
private String parentIdsName;
@TableField(exist=false)
private List<String> roleIds;
@TableField(exist=false)
private List<String> childMenuIds;
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarModelTree.service;
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
public interface ISarModelTreeService extends IService<SarModelTree> {
List<SarModelTree> getAll(SarModelTree sarModelTree);
}
@@ -0,0 +1,53 @@
package com.adc.da.slrs.sarModelTree.service.impl;
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao;
import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
@Service
public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarModelTree> implements ISarModelTreeService {
/**
* 查询所有菜单
* @param sarModelTree
*/
@Override
public List<SarModelTree> getAll(SarModelTree sarModelTree) {
QueryWrapper<SarModelTree> tsResourceQueryWrapper=new QueryWrapper<>();
tsResourceQueryWrapper.isNull("PID");
List<SarModelTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
for(SarModelTree tree:list){
tree.setChildren(recursionGetChildren((tree)));
}
return list;
}
/**
* 递归调用获取子节点
* @param parent:父节点
* @return List<SarMenu>
*/
private List<SarModelTree> recursionGetChildren(SarModelTree parent){
QueryWrapper<SarModelTree> sarMenuQueryWrapper=new QueryWrapper<>();
sarMenuQueryWrapper.orderByAsc("SORT");
sarMenuQueryWrapper.eq("PID",parent.getId());
List<SarModelTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
for(SarModelTree sarMenu:children){
sarMenu.setChildren(recursionGetChildren((sarMenu)));
}
return children;
}
}
@@ -187,8 +187,8 @@ public class SarStandAttrInfo extends BaseEntity {
private String sycpx;
@ApiModelProperty(value = "适用认证")
@TableField("SYZD")
private String syzd;
@TableField("SYRZ")
private String syrz;
@ApiModelProperty(value = "责任工程师")
@TableField("ZRGCS")
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
import cn.hutool.core.map.MapUtil;
import com.adc.da.base.web.BaseController;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
@@ -16,12 +17,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import oracle.ucp.proxy.annotation.Post;
import org.apache.commons.beanutils.BeanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -98,6 +104,55 @@ public class SarStandardComplianceAssessResultController {
}
}
}
private static class InsertEntity<T>{
List<Map> entityList;
T eo;
}
@ApiOperation(value="(插入/更新)标准清单")
@PostMapping("/standard")
public ResponseMessage insertStandard(@RequestBody InsertEntity<SarStandardsInfoEO> insertEntity) throws InvocationTargetException, IllegalAccessException {
SarStandardsInfoEO eo = insertEntity.eo;
if (eo.getStandApplicationType() == 1) {
List<SarStandardComplianceProductAssess> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList);
}else {
if(eo.getPosition()==1){
List<SarInterpretationNationalStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList);
}else{
List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList);
}
}
return Result.success();
}
@ApiOperation(value = "条件查询标准涉及项目符合性清单")
@GetMapping("/product")
public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
@@ -114,6 +169,17 @@ public class SarStandardComplianceAssessResultController {
return Result.success(page);
}
@ApiOperation(value = "插入标准涉及项目符合性清单")
@PostMapping("/product")
public ResponseMessage insertProduct(List<SarStandardComplianceProductAssess> eo) throws Exception {
iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo);
return Result.success();
}
@ApiOperation(value = "条件查询技术审核符合性清单")
@GetMapping("/interpretation")
public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
@@ -137,4 +203,37 @@ public class SarStandardComplianceAssessResultController {
return Result.success(page);
}
}
@ApiOperation(value = "插入技术审核符合性清单")
@PostMapping("/interpretation")
public ResponseMessage insertInterpretation(InsertEntity<InterpretationEO> insertEntity) throws Exception {
InterpretationEO eo = insertEntity.eo;
if (eo.getPosition()==1) {
List<SarInterpretationNationalStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList);
} else {
List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList);
}
return Result.success();
}
}
@@ -11,6 +11,8 @@ import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
import com.adc.da.slrs.sarStandardsInfo.entity.*;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
@@ -63,6 +65,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
@Autowired
private ISarStandardsInfoService sarStandardsInfoEOService;
@Autowired
private ISarBussionessStandService iSarBussionessStandService;
@Value("${file.path}")
private String filePath;
@@ -414,6 +419,15 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
}
}
@ApiOperation(value = "标准发布查询")
@GetMapping("/getStandInfoByList")
//@RequiresPermissions("lawss:sarStandardsInfo:get")
public ResponseMessage<List<SarStandardsInfo>> getStandInfoByList(String limit) throws Exception {
List<SarStandardsInfo> result = sarStandardsInfoEOService.getStandInfoByList(limit);
return Result.success(result);
}
@ApiOperation(value = "|SarStandardsInfoEO|详情")
@GetMapping("/getStandInfoById")
//@RequiresPermissions("lawss:sarStandardsInfo:get")
@@ -556,5 +570,33 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
}
@ApiOperation(value = "|SarStandardsInfoEO|根据标准号查询")
@GetMapping("/queryInfoByStandNum")
//@RequiresPermissions("lawss:sarStandardsInfo:list")
public ResponseMessage queryInfoByStandNum(SarStandardsInfoEOPage page) throws Exception {
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getStandNumber())){
String sort = "";
if (page.getStandNumber().length()>3) {
sort = page.getStandNumber().substring(0, 3);
}
if ("ECE".equals(sort)) {
int length = page.getStandNumber().length();
String number = page.getStandNumber().substring(3,length);
page.setStandNumber("UN(ECE)" + number);
}
}
List<SarStandardsInfo> getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType());
SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage();
sarBussionessStandEOPage.setStandCode(page.getStandNumber());
List<SarBussionessStand> list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage);
if(getList.size()>0){
return Result.success(getList.get(0));
}
if (list.size()>0){
return Result.success(list.get(0));
}
return Result.success("0","标准/企标已不存在");
}
}
@@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit);
Integer selectStandColumn(@Param("columnName") String columnName);
Integer selectCounterStandardsCount(SarStandardsInfo sarStandardsInfoEO);
@@ -0,0 +1,896 @@
package com.adc.da.slrs.sarStandardsInfo.entity;
import com.adc.da.sys.common.BasePage;
import java.util.List;
/**
* <b>功能:</b>SAR_BUSSIONESS_STAND SarBussionessStandEOPage<br>
* <b>作者:</b>code generator<br>
* <b>日期:</b> 2018-09-03 <br>
* <b>版权所有:<b>版权归北京卡达克数据技术中心所有。<br>
*/
public class SarBussionessStandEOPage extends BasePage {
private String modifyTime;
private String modifyTime1;
private String modifyTime2;
private String modifyTimeOperator = "=";
private String creationTime;
private String creationTime1;
private String creationTime2;
private String creationTimeOperator = "=";
private String validFlag;
private String validFlagOperator = "=";
private String putUser;
private String putUserOperator = "=";
private String citationUser;
private String citationUserOperator = "=";
private String responsibleUnit;
private String responsibleUnitOperator = "=";
private String standFile;
private String standFileOperator = "=";
private String tags;
private String tagsOperator = "=";
private String standStatus;
private String standStatusOperator = "=";
private String replacedStandNum;
private String replacedStandNumOperator = "=";
private String replaceStandNum;
private String replaceStandNumOperator = "=";
private String quoteStand;
private String quoteStandOperator = "=";
private String firstPutTime;
private String firstPutTime1;
private String firstPutTime2;
private String firstPutTimeOperator = "=";
private String putYear;
private String putYear1;
private String putYear2;
private String putYearOperator = "=";
private String putTime;
private String putTime1;
private String putTime2;
private String putTimeOperator = "=";
private String issueTime;
private String issueTime1;
private String issueTime2;
private String issueTimeOperator = "=";
private String energyKind;
private String energyKindOperator = "=";
private String applyArctic;
private String applyArcticOperator = "=";
private String standEnName;
private String standEnNameOperator = "=";
private String standName;
private String standNameOperator = "=";
private String standCode;
private String standCodeOperator = "=";
private String classifyCode;
private String classifyCodeOperator = "=";
private String standSubclass;
private String standSubclassOperator = "=";
private String standGenera;
private String standGeneraOperator = "=";
private String id;
private String idOperator = "=";
// 数据库新增字段
private String applyCountry;
private String standYear;
private String applyCountryOperator = "=";
private String standNature;
private String standNatureOperator = "=";
private String synopsis;
private String synopsisOperator = "=";
private String standSort;
private String standSortOperator = "=";
private String opinionFile;
private String opinionFileOperator = "=";
private String relevanceFile;
private String relevanceFileOperator = "=";
private String remark;
private String remarkOperator = "=";
private List<String> roleIds;
private String rootMenuId;
private String orgName;
private List<String> menuRoleList;
private String[] replacedStandNumList;
private String numberName;
// 树结构增加搜索条件
private String collectMenuId;
private String advanceSearchVOStr;
private String advanceSearchStr;
private List<String> menuAllChildrenIdList;
private String userId;
private String zqcrId;
//页面排序
private String paixu;
private String shunxu;
private String sql;
public String getZqcrId() {
return zqcrId;
}
public void setZqcrId(String zqcrId) {
this.zqcrId = zqcrId;
}
public String getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(String modifyTime) {
this.modifyTime = modifyTime;
}
public String getModifyTime1() {
return this.modifyTime1;
}
public void setModifyTime1(String modifyTime1) {
this.modifyTime1 = modifyTime1;
}
public String getModifyTime2() {
return this.modifyTime2;
}
public void setModifyTime2(String modifyTime2) {
this.modifyTime2 = modifyTime2;
}
public String getModifyTimeOperator() {
return this.modifyTimeOperator;
}
public void setModifyTimeOperator(String modifyTimeOperator) {
this.modifyTimeOperator = modifyTimeOperator;
}
public String getCreationTime() {
return this.creationTime;
}
public void setCreationTime(String creationTime) {
this.creationTime = creationTime;
}
public String getCreationTime1() {
return this.creationTime1;
}
public void setCreationTime1(String creationTime1) {
this.creationTime1 = creationTime1;
}
public String getCreationTime2() {
return this.creationTime2;
}
public void setCreationTime2(String creationTime2) {
this.creationTime2 = creationTime2;
}
public String getCreationTimeOperator() {
return this.creationTimeOperator;
}
public void setCreationTimeOperator(String creationTimeOperator) {
this.creationTimeOperator = creationTimeOperator;
}
public String getValidFlag() {
return this.validFlag;
}
public void setValidFlag(String validFlag) {
this.validFlag = validFlag;
}
public String getValidFlagOperator() {
return this.validFlagOperator;
}
public void setValidFlagOperator(String validFlagOperator) {
this.validFlagOperator = validFlagOperator;
}
public String getPutUser() {
return this.putUser;
}
public void setPutUser(String putUser) {
this.putUser = putUser;
}
public String getPutUserOperator() {
return this.putUserOperator;
}
public void setPutUserOperator(String putUserOperator) {
this.putUserOperator = putUserOperator;
}
public String getCitationUser() {
return this.citationUser;
}
public void setCitationUser(String citationUser) {
this.citationUser = citationUser;
}
public String getCitationUserOperator() {
return this.citationUserOperator;
}
public void setCitationUserOperator(String citationUserOperator) {
this.citationUserOperator = citationUserOperator;
}
public String getResponsibleUnit() {
return this.responsibleUnit;
}
public void setResponsibleUnit(String responsibleUnit) {
this.responsibleUnit = responsibleUnit;
}
public String getResponsibleUnitOperator() {
return this.responsibleUnitOperator;
}
public void setResponsibleUnitOperator(String responsibleUnitOperator) {
this.responsibleUnitOperator = responsibleUnitOperator;
}
public String getStandFile() {
return this.standFile;
}
public void setStandFile(String standFile) {
this.standFile = standFile;
}
public String getStandFileOperator() {
return this.standFileOperator;
}
public void setStandFileOperator(String standFileOperator) {
this.standFileOperator = standFileOperator;
}
public String getTags() {
return this.tags;
}
public void setTags(String tags) {
this.tags = tags;
}
public String getTagsOperator() {
return this.tagsOperator;
}
public void setTagsOperator(String tagsOperator) {
this.tagsOperator = tagsOperator;
}
public String getStandStatus() {
return this.standStatus;
}
public void setStandStatus(String standStatus) {
this.standStatus = standStatus;
}
public String getStandStatusOperator() {
return this.standStatusOperator;
}
public void setStandStatusOperator(String standStatusOperator) {
this.standStatusOperator = standStatusOperator;
}
public String getReplacedStandNum() {
return this.replacedStandNum;
}
public void setReplacedStandNum(String replacedStandNum) {
this.replacedStandNum = replacedStandNum;
}
public String getReplacedStandNumOperator() {
return this.replacedStandNumOperator;
}
public void setReplacedStandNumOperator(String replacedStandNumOperator) {
this.replacedStandNumOperator = replacedStandNumOperator;
}
public String getReplaceStandNum() {
return this.replaceStandNum;
}
public void setReplaceStandNum(String replaceStandNum) {
this.replaceStandNum = replaceStandNum;
}
public String getReplaceStandNumOperator() {
return this.replaceStandNumOperator;
}
public void setReplaceStandNumOperator(String replaceStandNumOperator) {
this.replaceStandNumOperator = replaceStandNumOperator;
}
public String getQuoteStand() {
return this.quoteStand;
}
public void setQuoteStand(String quoteStand) {
this.quoteStand = quoteStand;
}
public String getQuoteStandOperator() {
return this.quoteStandOperator;
}
public void setQuoteStandOperator(String quoteStandOperator) {
this.quoteStandOperator = quoteStandOperator;
}
public String getFirstPutTime() {
return this.firstPutTime;
}
public void setFirstPutTime(String firstPutTime) {
this.firstPutTime = firstPutTime;
}
public String getFirstPutTime1() {
return this.firstPutTime1;
}
public void setFirstPutTime1(String firstPutTime1) {
this.firstPutTime1 = firstPutTime1;
}
public String getFirstPutTime2() {
return this.firstPutTime2;
}
public void setFirstPutTime2(String firstPutTime2) {
this.firstPutTime2 = firstPutTime2;
}
public String getFirstPutTimeOperator() {
return this.firstPutTimeOperator;
}
public void setFirstPutTimeOperator(String firstPutTimeOperator) {
this.firstPutTimeOperator = firstPutTimeOperator;
}
public String getPutYear() {
return this.putYear;
}
public void setPutYear(String putYear) {
this.putYear = putYear;
}
public String getPutYear1() {
return this.putYear1;
}
public void setPutYear1(String putYear1) {
this.putYear1 = putYear1;
}
public String getPutYear2() {
return this.putYear2;
}
public void setPutYear2(String putYear2) {
this.putYear2 = putYear2;
}
public String getPutYearOperator() {
return this.putYearOperator;
}
public void setPutYearOperator(String putYearOperator) {
this.putYearOperator = putYearOperator;
}
public String getPutTime() {
return this.putTime;
}
public void setPutTime(String putTime) {
this.putTime = putTime;
}
public String getPutTime1() {
return this.putTime1;
}
public void setPutTime1(String putTime1) {
this.putTime1 = putTime1;
}
public String getPutTime2() {
return this.putTime2;
}
public void setPutTime2(String putTime2) {
this.putTime2 = putTime2;
}
public String getPutTimeOperator() {
return this.putTimeOperator;
}
public void setPutTimeOperator(String putTimeOperator) {
this.putTimeOperator = putTimeOperator;
}
public String getIssueTime() {
return this.issueTime;
}
public void setIssueTime(String issueTime) {
this.issueTime = issueTime;
}
public String getIssueTime1() {
return this.issueTime1;
}
public void setIssueTime1(String issueTime1) {
this.issueTime1 = issueTime1;
}
public String getIssueTime2() {
return this.issueTime2;
}
public void setIssueTime2(String issueTime2) {
this.issueTime2 = issueTime2;
}
public String getIssueTimeOperator() {
return this.issueTimeOperator;
}
public void setIssueTimeOperator(String issueTimeOperator) {
this.issueTimeOperator = issueTimeOperator;
}
public String getEnergyKind() {
return this.energyKind;
}
public void setEnergyKind(String energyKind) {
this.energyKind = energyKind;
}
public String getEnergyKindOperator() {
return this.energyKindOperator;
}
public void setEnergyKindOperator(String energyKindOperator) {
this.energyKindOperator = energyKindOperator;
}
public String getApplyArctic() {
return this.applyArctic;
}
public void setApplyArctic(String applyArctic) {
this.applyArctic = applyArctic;
}
public String getApplyArcticOperator() {
return this.applyArcticOperator;
}
public void setApplyArcticOperator(String applyArcticOperator) {
this.applyArcticOperator = applyArcticOperator;
}
public String getStandEnName() {
return this.standEnName;
}
public void setStandEnName(String standEnName) {
this.standEnName = standEnName;
}
public String getStandEnNameOperator() {
return this.standEnNameOperator;
}
public void setStandEnNameOperator(String standEnNameOperator) {
this.standEnNameOperator = standEnNameOperator;
}
public String getStandName() {
return this.standName;
}
public void setStandName(String standName) {
this.standName = standName;
}
public String getStandNameOperator() {
return this.standNameOperator;
}
public void setStandNameOperator(String standNameOperator) {
this.standNameOperator = standNameOperator;
}
public String getStandCode() {
return this.standCode;
}
public void setStandCode(String standCode) {
this.standCode = standCode;
}
public String getStandCodeOperator() {
return this.standCodeOperator;
}
public void setStandCodeOperator(String standCodeOperator) {
this.standCodeOperator = standCodeOperator;
}
public String getClassifyCode() {
return this.classifyCode;
}
public void setClassifyCode(String classifyCode) {
this.classifyCode = classifyCode;
}
public String getClassifyCodeOperator() {
return this.classifyCodeOperator;
}
public void setClassifyCodeOperator(String classifyCodeOperator) {
this.classifyCodeOperator = classifyCodeOperator;
}
public String getStandSubclass() {
return this.standSubclass;
}
public void setStandSubclass(String standSubclass) {
this.standSubclass = standSubclass;
}
public String getStandSubclassOperator() {
return this.standSubclassOperator;
}
public void setStandSubclassOperator(String standSubclassOperator) {
this.standSubclassOperator = standSubclassOperator;
}
public String getStandGenera() {
return this.standGenera;
}
public void setStandGenera(String standGenera) {
this.standGenera = standGenera;
}
public String getStandGeneraOperator() {
return this.standGeneraOperator;
}
public void setStandGeneraOperator(String standGeneraOperator) {
this.standGeneraOperator = standGeneraOperator;
}
public String getId() {
return this.id;
}
public void setId(String id) {
this.id = id;
}
public String getIdOperator() {
return this.idOperator;
}
public void setIdOperator(String idOperator) {
this.idOperator = idOperator;
}
private String menuId;
private String[] idlist; //用于导出数据过程中传递选择的标准id
private String[] replaceStandNumList;
public String getMenuId() {
return menuId;
}
public void setMenuId(String menuId) {
this.menuId = menuId;
}
public String[] getIdlist() {
return idlist;
}
public void setIdlist(String[] idlist) {
this.idlist = idlist;
}
public String[] getReplaceStandNumList() {
return replaceStandNumList;
}
public void setReplaceStandNumList(String[] replaceStandNumList) {
this.replaceStandNumList = replaceStandNumList;
}
private String[] applyArcticList;
private String[] energyKindList;
public String[] getApplyArcticList() {
return applyArcticList;
}
public void setApplyArcticList(String[] applyArcticList) {
this.applyArcticList = applyArcticList;
}
public String[] getEnergyKindList() {
return energyKindList;
}
public void setEnergyKindList(String[] energyKindList) {
this.energyKindList = energyKindList;
}
public String getApplyCountry() {
return applyCountry;
}
public void setApplyCountry(String applyCountry) {
this.applyCountry = applyCountry;
}
public String getApplyCountryOperator() {
return applyCountryOperator;
}
public void setApplyCountryOperator(String applyCountryOperator) {
this.applyCountryOperator = applyCountryOperator;
}
public String getStandNature() {
return standNature;
}
public void setStandNature(String standNature) {
this.standNature = standNature;
}
public String getStandNatureOperator() {
return standNatureOperator;
}
public void setStandNatureOperator(String standNatureOperator) {
this.standNatureOperator = standNatureOperator;
}
public String getSynopsis() {
return synopsis;
}
public void setSynopsis(String synopsis) {
this.synopsis = synopsis;
}
public String getSynopsisOperator() {
return synopsisOperator;
}
public void setSynopsisOperator(String synopsisOperator) {
this.synopsisOperator = synopsisOperator;
}
public String getStandSort() {
return standSort;
}
public void setStandSort(String standSort) {
this.standSort = standSort;
}
public String getStandSortOperator() {
return standSortOperator;
}
public void setStandSortOperator(String standSortOperator) {
this.standSortOperator = standSortOperator;
}
public String getOpinionFile() {
return opinionFile;
}
public void setOpinionFile(String opinionFile) {
this.opinionFile = opinionFile;
}
public String getOpinionFileOperator() {
return opinionFileOperator;
}
public void setOpinionFileOperator(String opinionFileOperator) {
this.opinionFileOperator = opinionFileOperator;
}
public String getRelevanceFile() {
return relevanceFile;
}
public void setRelevanceFile(String relevanceFile) {
this.relevanceFile = relevanceFile;
}
public String getRelevanceFileOperator() {
return relevanceFileOperator;
}
public void setRelevanceFileOperator(String relevanceFileOperator) {
this.relevanceFileOperator = relevanceFileOperator;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemarkOperator() {
return remarkOperator;
}
public void setRemarkOperator(String remarkOperator) {
this.remarkOperator = remarkOperator;
}
public List<String> getRoleIds() {
return roleIds;
}
public void setRoleIds(List<String> roleIds) {
this.roleIds = roleIds;
}
public String getStandYear() {
return standYear;
}
public void setStandYear(String standYear) {
this.standYear = standYear;
}
public List<String> getMenuRoleList() {
return menuRoleList;
}
public void setMenuRoleList(List<String> menuRoleList) {
this.menuRoleList = menuRoleList;
}
public String getNumberName() {
return numberName;
}
public void setNumberName(String numberName) {
this.numberName = numberName;
}
public String[] getReplacedStandNumList() {
return replacedStandNumList;
}
public void setReplacedStandNumList(String[] replacedStandNumList) {
this.replacedStandNumList = replacedStandNumList;
}
public String getRootMenuId() {
return rootMenuId;
}
public void setRootMenuId(String rootMenuId) {
this.rootMenuId = rootMenuId;
}
public String getCollectMenuId() {
return collectMenuId;
}
public void setCollectMenuId(String collectMenuId) {
this.collectMenuId = collectMenuId;
}
public String getAdvanceSearchVOStr() {
return advanceSearchVOStr;
}
public void setAdvanceSearchVOStr(String advanceSearchVOStr) {
this.advanceSearchVOStr = advanceSearchVOStr;
}
public String getAdvanceSearchStr() {
return advanceSearchStr;
}
public void setAdvanceSearchStr(String advanceSearchStr) {
this.advanceSearchStr = advanceSearchStr;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public List<String> getMenuAllChildrenIdList() {
return menuAllChildrenIdList;
}
public void setMenuAllChildrenIdList(List<String> menuAllChildrenIdList) {
this.menuAllChildrenIdList = menuAllChildrenIdList;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPaixu() {
return paixu;
}
public void setPaixu(String paixu) {
this.paixu = paixu;
}
public String getShunxu() {
return shunxu;
}
public void setShunxu(String shunxu) {
this.shunxu = shunxu;
}
public String getSql() {
return sql;
}
public void setSql(String sql) {
this.sql = sql;
}
}
@@ -154,6 +154,8 @@ public class SarStandardsInfo extends BaseEntity {
@TableField(exist = false)
private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
@TableField(exist = false)
private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
@TableField(exist = false)
private String sarStandAttrEOStr; //新增修改时属性表信息
@TableField(exist = false)
private String menuId; //目录ID
@@ -187,5 +189,7 @@ public class SarStandardsInfo extends BaseEntity {
@TableField(exist = false)
private String putTime2;
@TableField(exist = false)
private String standSystemName;
}
@@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
List<SarStandardsInfo> getStandInfoByList(String limit);
SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
public void attrInfoDetails (SarStandardsInfo row) throws Exception;
@@ -32,6 +32,7 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService;
import com.adc.da.slrs.sarStandPutTime.dao.SarStandPutTimeDao;
import com.adc.da.slrs.sarStandPutTime.entity.SarStandPutTime;
import com.adc.da.slrs.sarStandVal.dao.SarStandValDao;
@@ -47,6 +48,8 @@ import com.adc.da.sys.common.SelectionResult;
import com.adc.da.sys.constant.ValueStateEnum;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.entity.DicTypeEO;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.*;
@@ -96,6 +99,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private ITsResourceService sarMenuEOService;
@Autowired
private ISarMenuStandardService sarMenuStandardService;
@Autowired
private SarSarAccessInfoDao sarSarAccessInfoEODao;
@@ -114,6 +120,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private ISarSarAccessService sarSarAccessEOService;
@Autowired
private ISarStandMenuService sarStandMenuService;
@Autowired
private ISarLawsInfoService sarLawsInfoEOService;
@@ -277,10 +286,61 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
getAttrMap.putAll(newMap);
}
if (getAttrMap != null && !getAttrMap.isEmpty()) {
row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
}
row.setAttrInfoMap(getAttrMap);
}
}
private Map<String, Object> transformUpperCase(Map<String, Object> orgMap) {
Map<String, Object> resultMap = new HashMap<>();
for (Map.Entry<String, Object> entry : orgMap.entrySet()) {
String newKey = entry.getKey().toLowerCase();
resultMap.put(newKey, orgMap.get(entry.getKey()));
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && !InitStandAttrUtil.fileFieldList.isEmpty() && InitStandAttrUtil.fileFieldList.contains(entry.getKey())) {
String value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
if(!fileObj.isEmpty()){
resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName());
}
}
}
}
return resultMap;
}
public void attrInfoShowDetails(List<SarStandardsInfo> sarlist) throws Exception {
for (SarStandardsInfo row : sarlist) {
attrInfoDetails(row);
Map<String, Object> getAttrMap = row.getAttrInfoMap();
if (getAttrMap != null && getAttrMap.size() > 0) {
for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
String name = entry.getKey();
String value = "";
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
entry.setValue(fileObj);
}
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
entry.setValue(value);
}
}
}
}
}
public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception {
for (SarStandardsInfo row : sarlist) {
attrInfoDetails(row);
@@ -504,11 +564,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
public void createStandFile(String standId, Map<String, String> fileMap) throws Exception {
if (fileMap != null && fileMap.size() > 0) {
List<SarStandFile> standFileList = new ArrayList<>();
List<AttFileEO> fileList = new ArrayList<>();
for (Map.Entry<String, String> entry : fileMap.entrySet()) {
String value = entry.getValue();
String field = entry.getKey();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(value);
fileList = attFileEOService.getMultiFileInfos(value);
if (fileList != null && !fileList.isEmpty()) {
createStandFileAppend(standId, field, fileList, standFileList);
}
@@ -1768,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
return strhours;
}
@Override
public List<SarStandardsInfo> getStandInfoByList(String limit){
return dao.queryStandInfoByList(Integer.valueOf(limit));
}
/**
* 新增过程中验证标准号
*
@@ -1790,11 +1856,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (resultlist.size() > 0) {
List<SarStandardsInfo> sarStandardsInfoEOList = new ArrayList<>();
sarStandardsInfoEOList.add(resultlist.get(0));
attrInfoShow(sarStandardsInfoEOList);
attrInfoShowDetails(sarStandardsInfoEOList);
sarStandardsInfoEO = sarStandardsInfoEOList.get(0);
}
// 查询纳入清单的国家地区
if (sarStandardsInfoEO != null) {
if(sarStandardsInfoEO.getStandSystem() != null){
SarMenuStandard menu = sarMenuStandardService.selectMenuById(sarStandardsInfoEO.getStandSystem());
if(menu != null){
sarStandardsInfoEO.setStandSystemName(menu.getMenuName() == null ? "" : menu.getMenuName());
}
}
String accessCountry = sarSarAccessEOService.getCountryByRes(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND");
sarStandardsInfoEO.setAccessCountry(accessCountry);
}
@@ -0,0 +1,51 @@
package com.adc.da.slrs.sarTree.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarRole.entity.TsRole;
import com.adc.da.slrs.sarTree.entity.SarModel;
import com.adc.da.slrs.sarTree.entity.SarVPPS;
import com.adc.da.slrs.sarTree.service.SarModelService;
import com.adc.da.slrs.sarTree.service.SarVPPSService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@RestController
@Api(tags = "|获取树列表|")
@RequestMapping("/api/sarVpps")
public class TreeController extends BaseController<SarVPPS> {
@Autowired
private SarVPPSService sarVPPSService;
@Autowired
private SarModelService sarModelService;
@ApiOperation("VPPS树列表")
@GetMapping("/tree/list1")
public ResponseMessage<List<SarVPPS>> getTreeList1(){
List<SarVPPS> sarVpps = sarVPPSService.findTreeAll();
return Result.success(sarVpps);
}
@ApiOperation("模块结构单元树列表")
@GetMapping("/tree/list2")
public ResponseMessage<List<SarModel>> getTreeList2(){
List<SarModel> sarVpps = sarModelService.findTreeAll();
return Result.success(sarVpps);
}
// @ApiOperation("根据角色名筛选角色")
// @GetMapping("/tree/node/list")
// public ResponseMessage<Map<String,Object>> getTreeNodeList(String code){
// Map<String,Object> map = sarVPPSService.findTreeAll(code);
// return Result.success(map);
// }
}
@@ -0,0 +1,15 @@
package com.adc.da.slrs.sarTree.dao;
import com.adc.da.slrs.sarTree.entity.SarModel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
public interface SarModelDao extends BaseMapper<SarModel> {
// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)")
// List<SarModel> findTreeAll();
// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}")
// List<SarModel> selectList(@Param("pid") String pid);
}
@@ -0,0 +1,15 @@
package com.adc.da.slrs.sarTree.dao;
import com.adc.da.slrs.sarTree.entity.SarVPPS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
public interface SarVPPSDao extends BaseMapper<SarVPPS> {
@Select("select id,pid,CONCAT(VPPS_CODE,CHINESE_NAME,ENGLISH_NAME) name,code from sar_vpps_tree where 1=1 and isnull(pid)")
List<SarVPPS> findTreeAll();
@Select("select id,pid,CONCAT(VPPS_CODE,CHINESE_NAME,ENGLISH_NAME) name,code from sar_vpps_tree where 1=1 and pid = #{pid}")
List<SarVPPS> selectList(@Param("pid") String pid);
}
@@ -0,0 +1,35 @@
package com.adc.da.slrs.sarTree.entity;
import com.adc.da.base.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Transient;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarModel对象", description="")
public class SarModel extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
private String name;
private String pid;
private String model;
private String features;
private String delFlag;
@Transient
private List<SarModel> children;
}
@@ -0,0 +1,40 @@
package com.adc.da.slrs.sarTree.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Transient;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarVPPS对象", description="")
@TableName(value = "sar_vpps_tree")
public class SarVPPS extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
private String vppsCode;
private String pid;
private String code;
private String chineseName;
private String englishName;
private String delFlag;
@Transient
private List<SarVPPS> children;
@Transient
private String name;
}
@@ -0,0 +1,11 @@
package com.adc.da.slrs.sarTree.service;
import com.adc.da.slrs.sarTree.entity.SarModel;
import com.adc.da.slrs.sarTree.entity.SarVPPS;
import java.util.List;
public interface SarModelService {
List<SarModel> findTreeAll();
}
@@ -0,0 +1,9 @@
package com.adc.da.slrs.sarTree.service;
import com.adc.da.slrs.sarTree.entity.SarVPPS;
import java.util.List;
public interface SarVPPSService {
List<SarVPPS> findTreeAll();
}
@@ -0,0 +1,51 @@
package com.adc.da.slrs.sarTree.service.impl;
import com.adc.da.slrs.sarTree.dao.SarModelDao;
import com.adc.da.slrs.sarTree.entity.SarModel;
import com.adc.da.slrs.sarTree.service.SarModelService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class SarModelServiceImpl implements SarModelService {
private static final Logger logger = LoggerFactory.getLogger(SarModelServiceImpl.class);
@Autowired
private SarModelDao sarModelDao;
@Override
public List<SarModel> findTreeAll() {
//查询父级都为null的数据
QueryWrapper<SarModel> qw = new QueryWrapper<>();
qw.isNull("pid");
List<SarModel> sarVppsList = sarModelDao.selectList(qw);
for (SarModel sarVppsOne:sarVppsList) {
sarVppsOne.setChildren(getChildren(sarVppsOne));
}
return sarVppsList;
}
/**
* 递归调用获取子节点
* @param parent:父节点
* @return List<TsResource>
*/
private List<SarModel> getChildren(SarModel parent){
String pid = parent.getId();
QueryWrapper<SarModel> qw = new QueryWrapper<>();
qw.eq("pid",parent.getId());
List<SarModel> children=sarModelDao.selectList(qw);
for(SarModel sarVppsOne:children){
sarVppsOne.setChildren(getChildren((sarVppsOne)));
}
return children;
}
}
@@ -0,0 +1,52 @@
package com.adc.da.slrs.sarTree.service.impl;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarTree.dao.SarVPPSDao;
import com.adc.da.slrs.sarTree.entity.SarVPPS;
import com.adc.da.slrs.sarTree.service.SarVPPSService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class SarVPPSServiceImpl implements SarVPPSService {
private static final Logger logger = LoggerFactory.getLogger(SarVPPSServiceImpl.class);
@Autowired
private SarVPPSDao sarVPPSDao;
@Override
public List<SarVPPS> findTreeAll() {
//查询父级都为null的数据
QueryWrapper<SarVPPS> qw = new QueryWrapper<>();
qw.isNull("pid");
List<SarVPPS> sarVppsList = sarVPPSDao.selectList(qw);
for (SarVPPS sarVppsOne:sarVppsList) {
sarVppsOne.setChildren(getChildren(sarVppsOne));
}
return sarVppsList;
}
/**
* 递归调用获取子节点
* @param parent:父节点
* @return List<TsResource>
*/
private List<SarVPPS> getChildren(SarVPPS parent){
String pid = parent.getId();
QueryWrapper<SarVPPS> qw = new QueryWrapper<>();
qw.eq("pid",parent.getId());
List<SarVPPS> children=sarVPPSDao.selectList(qw);
for(SarVPPS sarVppsOne:children){
sarVppsOne.setChildren(getChildren((sarVppsOne)));
}
return children;
}
}
@@ -0,0 +1,41 @@
package com.adc.da.slrs.sarVppsTree.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
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 super_liu
* @since 2021-07-15
*/
@RestController
@Api(tags = "福田标准法规--标准法规库-Vpps树结构")
@RequestMapping("/${restPath}/sarVppsTree")
public class SarVppsTreeController extends BaseController<SarVppsTree> {
@Autowired
private ISarVppsTreeService iSarVppsTreeService;
@ApiOperation("查询所有资源")
@GetMapping("/list")
public ResponseMessage<List<SarVppsTree>> getAll(SarVppsTree sarVppsTree){
List<SarVppsTree> tsResources = iSarVppsTreeService.getAll(sarVppsTree);
return Result.success(tsResources);
}
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarVppsTree.dao;
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
public interface SarVppsTreeDao extends BaseMapper<SarVppsTree> {
}
@@ -0,0 +1,76 @@
package com.adc.da.slrs.sarVppsTree.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* <p>
*
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarVppsTree对象", description="")
public class SarVppsTree extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId("ID")
private String id;
@ApiModelProperty(value = "VPPS编码")
@TableField("VPPS_CODE")
private String vppsCode;
@ApiModelProperty(value = "父级id")
@TableField("PID")
private String pid;
@ApiModelProperty(value = "编码")
@TableField("CODE")
private String code;
@ApiModelProperty(value = "中文名称")
@TableField("CHINESE_NAME")
private String chineseName;
@ApiModelProperty(value = "中文名称")
@TableField("ENGLISH_NAME")
private String englishName;
@ApiModelProperty(value = "删除标识 1:未删除 2:已删除")
@TableField("DEL_FLAG")
private String delFlag;
@ApiModelProperty(value = "排序序号")
@TableField("SORT")
private Integer sort;
@ApiModelProperty(value = "子菜单")
@TableField(exist = false)
private List<SarVppsTree> children;
@ApiModelProperty(value = "上级菜单名称")
@TableField(exist = false)
private String parentIdsName;
@TableField(exist=false)
private List<String> roleIds;
@TableField(exist=false)
private List<String> childMenuIds;
}
@@ -0,0 +1,19 @@
package com.adc.da.slrs.sarVppsTree.service;
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
public interface ISarVppsTreeService extends IService<SarVppsTree> {
List<SarVppsTree> getAll(SarVppsTree sarVppsTree);
}
@@ -0,0 +1,53 @@
package com.adc.da.slrs.sarVppsTree.service.impl;
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao;
import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author super_liu
* @since 2021-07-15
*/
@Service
public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsTree> implements ISarVppsTreeService {
/**
* 查询所有菜单
* @param sarVppsTree
*/
@Override
public List<SarVppsTree> getAll(SarVppsTree sarVppsTree) {
QueryWrapper<SarVppsTree> tsResourceQueryWrapper=new QueryWrapper<>();
tsResourceQueryWrapper.isNull("PID");
List<SarVppsTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
for(SarVppsTree tree:list){
tree.setChildren(recursionGetChildren((tree)));
}
return list;
}
/**
* 递归调用获取子节点
* @param parent:父节点
* @return List<SarMenu>
*/
private List<SarVppsTree> recursionGetChildren(SarVppsTree parent){
QueryWrapper<SarVppsTree> sarMenuQueryWrapper=new QueryWrapper<>();
sarMenuQueryWrapper.orderByAsc("SORT");
sarMenuQueryWrapper.eq("PID",parent.getId());
List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
for(SarVppsTree sarMenu:children){
sarMenu.setChildren(recursionGetChildren((sarMenu)));
}
return children;
}
}
@@ -0,0 +1,132 @@
package com.adc.da.slrs.standardSplit.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.http.PageInfo;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService;
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsTableEOService;
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
@RestController
@RequestMapping("/${restPath}/lawss/sarFileSplitItemsVal")
@Api(description = "|SarFileSplitItemsValEO|")
public class SarFileSplitItemsValEOController extends BaseController<SarFileSplitItemsValEO> {
private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOController.class);
@Autowired
private SarFileSplitItemsValEOService sarFileSplitItemsValEOService;
@Autowired
private SarFileSplitItemsTableEOService sarFileSplitItemsTableEOService;
@Autowired
private SarFileSplitItemsEOService sarFileSplitItemsEOService;
@ApiOperation(value = "|SarFileSplitItemsValEO|分页查询")
@GetMapping("/page")
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarFileSplitItemsVal:page")
public ResponseMessage<PageInfo<SarFileSplitItemsValEO>> page(SarFileSplitItemsValEOPage page) throws Exception {
page.setOrderBy("modify_time desc");
List<SarFileSplitItemsValEO> rows = sarFileSplitItemsValEOService.queryByPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
@ApiOperation(value = "|SarFileSplitItemsValEO|查询")
@GetMapping("/getItemsValList")
// @RequiresPermissions("lawss:sarFileSplitItemsVal:list")
public ResponseMessage<List<SarFileSplitItemsValEO>> list(SarFileSplitItemsValEOPage page) throws Exception {
page.setOrderBy("DISPLAY_SEQ,ID");
List<SarFileSplitItemsValEO> getList = sarFileSplitItemsValEOService.queryByList(page);
if (getList != null && !getList.isEmpty()) {
for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) {
String imgPath = sarFileSplitItemsValEO.getItemContent();
if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) {
String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length());
sarFileSplitItemsValEO.setImgName(imgName);
}
/*else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) {
SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage();
tablePage.setItemsValId(sarFileSplitItemsValEO.getId());
List<SarFileSplitItemsTableEO> tableList = sarFileSplitItemsTableEOService.queryByList(tablePage);
List<SarFileSplitItemsTableEO> tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage);
sarFileSplitItemsValEO.setTableList(tableList);
if (tableListRow != null && !tableListRow.isEmpty()) {
List<List<SarFileSplitItemsTableEO>> getTableList = new ArrayList<>();
for (int i=1; i <= tableListRow.size();i++) {
List<SarFileSplitItemsTableEO> rowList = new ArrayList<>();
for (int j=0; j < tableList.size();j++) {
if (tableList.get(j).getRowNum() == i) {
rowList.add(tableList.get(j));
}
}
getTableList.add(rowList);
}
sarFileSplitItemsValEO.setTableListShow(getTableList);
}
}*/
}
}
return Result.success(getList);
}
@ApiOperation(value = "|SarFileSplitItemsValEO|详情")
@GetMapping("/{id}")
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarFileSplitItemsVal:get")
public ResponseMessage<SarFileSplitItemsValEO> find(@PathVariable String id) throws Exception {
return Result.success(sarFileSplitItemsValEOService.selectByPrimaryKey(id));
}
@ApiOperation(value = "|SarFileSplitItemsValEO|新增")
@PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarFileSplitItemsVal:save")
public ResponseMessage<SarFileSplitItemsValEO> create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception {
sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO);
return Result.success(sarFileSplitItemsValEO);
}
@ApiOperation(value = "|SarFileSplitItemsValEO|修改")
@PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarFileSplitItemsVal:update")
public ResponseMessage<SarFileSplitItemsValEO> update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception {
sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO);
return Result.success(sarFileSplitItemsValEO);
}
@ApiOperation(value = "|SarFileSplitItemsValEO|删除")
@DeleteMapping("/{id}")
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarFileSplitItemsVal:delete")
public ResponseMessage delete(@PathVariable String id) throws Exception {
sarFileSplitItemsValEOService.deleteByPrimaryKey(id);
logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id);
return Result.success();
}
@ApiOperation(value = "|SarFileSplitItemsEO|根据目录查询")
@GetMapping("/getSplitItemsByMenu")
// @RequiresPermissions("lawss:sarFileSplitItems:page")
public ResponseMessage<List<SarFileSplitItemsValEO>> getSplitItemsByMenu(String menuId,String infoId) throws Exception {
List<SarFileSplitItemsValEO> getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId);
return Result.success(getList);
}
}
@@ -3,6 +3,7 @@ package com.adc.da.slrs.standardSplit.controller;
import com.adc.da.att.service.IAttFileEOService;
import com.adc.da.base.web.BaseController;
import com.adc.da.http.PageInfo;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService;
@@ -118,6 +119,9 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
page.setFileSuffixList(suffix.split(","));
}
List<SarStandFileEO> rows = sarStandFileEOService.getStandFileListByPage(page);
for (SarStandFileEO one:rows) {
one.setAttId(one.getAttId1());
}
if (rows != null && !rows.isEmpty()) {
for (SarStandFileEO sarStandFileEO : rows) {
List<SelectionResult> getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify());
@@ -30,4 +30,6 @@ public interface SarFileSplitItemsTableEODao extends BaseMapper<SarFileSplitItem
List<SarFileSplitItemsTableEO> queryItemsTableByMenuId(@Param("idList") List<String> idList);
List<SarFileSplitItemsTableEO> queryByList(@Param("pager") SarFileSplitItemsTableEOPage pager);
}
@@ -36,4 +36,14 @@ public interface SarFileSplitItemsValEODao extends BaseMapper<SarFileSplitItemsV
List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
SarFileSplitItemsValEO selectByPrimaryKey(String id);
void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void deleteByPrimaryKey(String id);
}
@@ -21,6 +21,16 @@ public class SarStandFileEO extends BaseEntity {
private String validFlag;
private String useModel;
private String attId;
public String getAttId1() {
return attId1;
}
public void setAttId1(String attId1) {
this.attId1 = attId1;
}
private String attId1;
private String resId;
private String standId;
private String id;
@@ -8,4 +8,16 @@ import java.util.List;
public interface SarFileSplitItemsValEOService {
List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
SarFileSplitItemsValEO selectByPrimaryKey(String id);
void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void deleteByPrimaryKey(String id);
List<SarFileSplitItemsValEO> getSplitItemsByMenu(String menuId,String infoId);
}
@@ -37,9 +37,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.adc.da.person.dao.PersonShareEODao;
import com.adc.da.person.dao.PersonCollectEODao;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService {
private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class);
@@ -104,6 +104,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
}
@Override
@Transactional
public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){
// 拆分文件主表中插入数据
sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
@@ -135,7 +136,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
}
try {
AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId());
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
//String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName();
InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。
XWPFDocument doc = new XWPFDocument(is);
@@ -317,6 +319,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return -1;
}
if(treeList.size()>0 && messageList.size() > 0){
@@ -1,9 +1,11 @@
package com.adc.da.slrs.standardSplit.service.impl;
import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao;
import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsTableEODao;
import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsValEODao;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
import com.adc.da.slrs.standardSplit.entity.*;
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +13,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
@@ -20,9 +23,82 @@ public class SarFileSplitItemsValEOServiceImpl implements SarFileSplitItemsValEO
@Autowired
private SarFileSplitItemsValEODao sarFileSplitItemsValEODao;
@Autowired
private SarFileSplitItemsEODao sarFileSplitItemsEODao;
@Autowired
private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao;
@Override
public List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage) {
return sarFileSplitItemsValEODao.queryByList(valEOPage);
}
@Override
public List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page) {
return sarFileSplitItemsValEODao.queryByPage(page);
}
@Override
public SarFileSplitItemsValEO selectByPrimaryKey(String id) {
return sarFileSplitItemsValEODao.selectByPrimaryKey(id);
}
@Override
public void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) {
sarFileSplitItemsValEODao.insertSelective(sarFileSplitItemsValEO);
}
@Override
public void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) {
sarFileSplitItemsValEODao.updateByPrimaryKeySelective(sarFileSplitItemsValEO);
}
@Override
public void deleteByPrimaryKey(String id) {
sarFileSplitItemsValEODao.deleteByPrimaryKey(id);
}
@Override
public List<SarFileSplitItemsValEO> getSplitItemsByMenu(String menuId, String infoId) {
List<SarFileSplitItemsEO> rows = sarFileSplitItemsEODao.queryItemsByMenuId(menuId);;
List<SarFileSplitItemsValEO> getList = new ArrayList<>();
if (rows != null && !rows.isEmpty()) {
for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) {
SarFileSplitItemsValEOPage valpage = new SarFileSplitItemsValEOPage();
valpage.setItemId(sarFileSplitItemsEO.getId());
valpage.setOrderBy("DISPLAY_SEQ,ID");
List<SarFileSplitItemsValEO> getListVal = sarFileSplitItemsValEODao.queryByList(valpage);
if (getList != null && !getList.isEmpty()) {
for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) {
String imgPath = sarFileSplitItemsValEO.getItemContent();
if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) {
String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length());
sarFileSplitItemsValEO.setImgName(imgName);
} else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) {
SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage();
tablePage.setItemsValId(sarFileSplitItemsValEO.getId());
List<SarFileSplitItemsTableEO> tableList = sarFileSplitItemsTableEODao.queryByList(tablePage);
List<SarFileSplitItemsTableEO> tableListRow = sarFileSplitItemsTableEODao.queryByRowNum(tablePage);
sarFileSplitItemsValEO.setTableList(tableList);
if (tableListRow != null && !tableListRow.isEmpty()) {
List<List<SarFileSplitItemsTableEO>> getTableList = new ArrayList<>();
for (int i=1; i <= tableListRow.size();i++) {
List<SarFileSplitItemsTableEO> rowList = new ArrayList<>();
for (int j=0; j < tableList.size();j++) {
if (tableList.get(j).getRowNum() == i) {
rowList.add(tableList.get(j));
}
}
getTableList.add(rowList);
}
sarFileSplitItemsValEO.setTableListShow(getTableList);
}
}
}
}
getList.addAll(getListVal);
}
}
return getList;
}
}
@@ -0,0 +1,906 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao">
<!-- Result Map-->
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
<id column="id" property="id" />
<result column="modify_time" property="modifyTime" />
<result column="creation_time" property="creationTime" />
<result column="valid_flag" property="validFlag" />
<result column="stand_status" property="standStatus" />
<result column="replaced_stand_num" property="replacedStandNum" />
<result column="replace_stand_num" property="replaceStandNum" />
<result column="put_time" property="putTime" />
<result column="issue_time" property="issueTime" />
<result column="stand_en_name" property="standEnName" />
<result column="stand_name" property="standName" />
<result column="stand_code" property="standCode" />
<!-- 数据库新增字段-->
<result column="apply_country" property="applyCountry" />
<result column="stand_nature" property="standNature" />
<result column="stand_sort" property="standSort" />
<result column="stand_year" property="standYear" />
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
<result column="replaced_stand_num" property="replacedStandNum" />
<result column="replace_stand_num" property="replaceStandNum" />
<result column="put_time" property="putTime" />
<result column="issue_time" property="issueTime" />
<result column="stand_en_name" property="standEnName" />
<result column="stand_name" property="standName" />
<result column="stand_code" property="standCode" />
<!-- 数据库新增字段-->
<result column="applyCountryShow" property="applyCountryShow" />
<result column="standNatrueShow" property="standNatrueShow" />
<result column="standSortShow" property="standSortShow" />
<result column="stand_year" property="standYear" />
</resultMap>
<!-- SAR_BUSSIONESS_STAND table all fields -->
<sql id="Base_Column_List" >
modify_time, creation_time, valid_flag, stand_status, replaced_stand_num,replace_stand_num,
put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort
</sql>
<sql id="Base_Column_List_show" >
stand_year,dicapplyCountry.DIC_TYPE_NAME as applyCountryShow,dicstandSort.DIC_TYPE_NAME as standSortShow,
dicstandNature.DIC_TYPE_NAME as standNatrueShow,SAR_BUSSIONESS_STAND.modify_time,
SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,
stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
stand_name, stand_code,SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME as standStatusShow
</sql>
<sql id="Group_Column_List_show" >
stand_year,dicapplyCountry.DIC_TYPE_NAME,dicstandSort.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,SAR_BUSSIONESS_STAND.modify_time,
SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,
SAR_BUSSIONESS_STAND.stand_sort,
stand_status, replaced_stand_num, replace_stand_num,put_time,
issue_time, stand_en_name, stand_name, stand_code,
SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME
</sql>
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
where 1=1
<trim suffixOverrides="," >
<if test="modifyTime != null" >
and modify_time ${modifyTimeOperator} #{modifyTime}
</if>
<if test="modifyTime1 != null" >
and modify_time &gt;= #{modifyTime1}
</if>
<if test="modifyTime2 != null" >
and modify_time &lt;= #{modifyTime2}
</if>
<if test="creationTime != null" >
and creation_time ${creationTimeOperator} #{creationTime}
</if>
<if test="creationTime1 != null" >
and creation_time &gt;= #{creationTime1}
</if>
<if test="creationTime2 != null" >
and creation_time &lt;= #{creationTime2}
</if>
<if test="validFlag != null" >
and valid_flag ${validFlagOperator} #{validFlag}
</if>
<if test="standStatus != null" >
and stand_status ${standStatusOperator} #{standStatus}
</if>
<if test="replacedStandNum != null" >
and replaced_stand_num ${replacedStandNumOperator} #{replacedStandNum}
</if>
<if test="replaceStandNum != null" >
and replace_stand_num ${replaceStandNumOperator} #{replaceStandNum}
</if>
<if test="putTime != null" >
and put_time ${putTimeOperator} #{putTime}
</if>
<if test="putTime1 != null" >
and put_time &gt;= #{putTime1}
</if>
<if test="putTime2 != null" >
and put_time &lt;= #{putTime2}
</if>
<if test="issueTime != null" >
and issue_time ${issueTimeOperator} #{issueTime}
</if>
<if test="issueTime1 != null" >
and issue_time &gt;= #{issueTime1}
</if>
<if test="issueTime2 != null" >
and issue_time &lt;= #{issueTime2}
</if>
<if test="standEnName != null" >
and stand_en_name ${standEnNameOperator} #{standEnName}
</if>
<if test="standName != null" >
and stand_name ${standNameOperator} #{standName}
</if>
<if test="standCode != null" >
and stand_code ${standCodeOperator} #{standCode}
</if>
<if test="id != null" >
and id ${idOperator} #{id}
</if>
<!-- 数据库新加字段-->
<if test="applyCountry != null" >
and apply_country ${applyCountryOperator} #{applyCountry}
</if>
<if test="standNature != null" >
and stand_nature ${standNatureOperator} #{standNature}
</if>
<if test="standSort != null" >
and stand_sort ${standSortOperator} #{standSort}
</if>
<if test="opinionFile != null" >
and opinion_file ${opinionFileOperator} #{opinionFile}
</if>
<if test="relevanceFile != null" >
and relevance_file ${relevanceFileOperator} #{relevanceFile}
</if>
<if test="remark != null" >
and remark ${remarkOperator} #{remark}
</if>
</trim>
</sql>
<!-- 动态插入记录 主键是序列 -->
<insert id="insertSelective" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_SAR_BUSSIONESS_STAND.NEXTVAL FROM DUAL
</selectKey> -->
insert into SAR_BUSSIONESS_STAND
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="modifyTime != null" >modify_time,</if>
<if test="creationTime != null" >creation_time,</if>
<if test="validFlag != null" >valid_flag,</if>
<if test="standStatus != null" >stand_status,</if>
<if test="replacedStandNum != null" >replaced_stand_num,</if>
<if test="replaceStandNum != null" >replace_stand_num,</if>
<if test="putTime != null" >put_time,</if>
<if test="issueTime != null" >issue_time,</if>
<if test="standEnName != null" >stand_en_name,</if>
<if test="standName != null" >stand_name,</if>
<if test="standCode != null" >stand_code,</if>
<if test="id != null" >id,</if>
<!--数据库新增字段-->
<if test="applyCountry != null" >apply_country,</if>
<if test="standNature != null" >stand_Nature,</if>
<if test="standSort != null" >stand_sort,</if>
<if test="standYear != null" >stand_year,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
<if test="standStatus != null" >#{standStatus, jdbcType=VARCHAR},</if>
<if test="replacedStandNum != null" >#{replacedStandNum, jdbcType=VARCHAR},</if>
<if test="replaceStandNum != null" >#{replaceStandNum, jdbcType=VARCHAR},</if>
<if test="putTime != null" >#{putTime, jdbcType=TIMESTAMP},</if>
<if test="issueTime != null" >#{issueTime, jdbcType=TIMESTAMP},</if>
<if test="standEnName != null" >#{standEnName, jdbcType=VARCHAR},</if>
<if test="standName != null" >#{standName, jdbcType=VARCHAR},</if>
<if test="standCode != null" >#{standCode, jdbcType=VARCHAR},</if>
<if test="id != null" >#{id, jdbcType=VARCHAR},</if>
<!--数据库新增字段-->
<if test="applyCountry != null" >#{applyCountry, jdbcType=VARCHAR},</if>
<if test="standNature != null" >#{standNature, jdbcType=VARCHAR},</if>
<if test="standSort != null" >#{standSort, jdbcType=VARCHAR},</if>
<if test="standYear != null" >#{standYear, jdbcType=VARCHAR},</if>
</trim>
</insert>
<!-- 修改记录,只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
update SAR_BUSSIONESS_STAND
<set >
<if test="modifyTime != null" >
modify_time = #{modifyTime},
</if>
<if test="creationTime != null" >
creation_time = #{creationTime},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
<if test="standStatus != null" >
stand_status = #{standStatus},
</if>
<if test="replacedStandNum != null" >
replaced_stand_num = #{replacedStandNum},
</if>
<if test="replaceStandNum != null" >
replace_stand_num = #{replaceStandNum},
</if>
<if test="putTime != null" >
put_time = #{putTime},
</if>
<if test="putTime == null">
put_time = null,
</if>
<if test="issueTime != null" >
issue_time = #{issueTime},
</if>
<if test="issueTime == null">
issue_time = null,
</if>
<if test="standEnName != null" >
stand_en_name = #{standEnName},
</if>
<if test="standName != null" >
stand_name = #{standName},
</if>
<if test="standCode != null" >
stand_code = #{standCode},
</if>
<!-- 数据库新加字段-->
<if test="applyCountry != null" >
apply_country = #{applyCountry},
</if>
<if test="standNature != null" >
stand_nature = #{standNature},
</if>
<if test="standSort != null" >
stand_sort = #{standSort},
</if>
<if test="standYear != null" >
stand_year = #{standYear},
</if>
</set>
where id = #{id}
</update>
<!-- 修改记录,只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelectiveTimeNotNull" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
update SAR_BUSSIONESS_STAND
<set >
<if test="modifyTime != null" >
modify_time = #{modifyTime},
</if>
<if test="creationTime != null" >
creation_time = #{creationTime},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
<if test="standStatus != null" >
stand_status = #{standStatus},
</if>
<if test="replacedStandNum != null" >
replaced_stand_num = #{replacedStandNum},
</if>
<if test="replaceStandNum != null" >
replace_stand_num = #{replaceStandNum},
</if>
<if test="putTime != null" >
put_time = #{putTime},
</if>
<if test="issueTime != null" >
issue_time = #{issueTime},
</if>
<if test="standEnName != null" >
stand_en_name = #{standEnName},
</if>
<if test="standName != null" >
stand_name = #{standName},
</if>
<if test="standCode != null" >
stand_code = #{standCode},
</if>
<!-- 数据库新加字段-->
<if test="applyCountry != null" >
apply_country = #{applyCountry},
</if>
<if test="standNature != null" >
stand_nature = #{standNature},
</if>
<if test="standSort != null" >
stand_sort = #{standSort},
</if>
<if test="standYear != null" >
stand_year = #{standYear},
</if>
</set>
where id = #{id}
</update>
<!-- 根据id查询 SAR_BUSSIONESS_STAND -->
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List" />
from SAR_BUSSIONESS_STAND
where id = #{value} and valid_flag=0
</select>
<!-- 删除记录 -->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from SAR_BUSSIONESS_STAND
where id = #{value}
</delete>
<!-- SAR_BUSSIONESS_STAND 列表总数-->
<select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
select count(1) from SAR_BUSSIONESS_STAND
<include refid="Base_Where_Clause"/>
</select>
<!-- 查询SAR_BUSSIONESS_STAND列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List" /> from
(select tmp_tb.* from
(select <include refid="Base_Column_List" /> from SAR_BUSSIONESS_STAND
<include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List"/> from SAR_BUSSIONESS_STAND
<include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
</select>
<!-- 分页查询条件 -->
<sql id="SarBussionInfo_Where_Clause">
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0)
where 1=1
<trim suffixOverrides="," >
<if test="standCode != null" >
<!-- and (
(concat(dicstandSort.DIC_TYPE_NAME, ' ', SAR_BUSSIONESS_STAND.STAND_CODE, '-', SAR_BUSSIONESS_STAND.STAND_YEAR)
like concat('%', #{standCode}, '%') and SAR_BUSSIONESS_STAND.STAND_YEAR != '' and SAR_BUSSIONESS_STAND.STAND_YEAR is not null)
or
(concat(dicstandSort.DIC_TYPE_NAME, ' ', SAR_BUSSIONESS_STAND.STAND_CODE)
like concat('%', #{standCode}, '%') and (SAR_BUSSIONESS_STAND.STAND_YEAR = '' or SAR_BUSSIONESS_STAND.STAND_YEAR is null) )
) -->
and SAR_BUSSIONESS_STAND.STAND_CODE like concat('%', #{standCode}, '%')
</if>
<if test="numberName != null" >
and (
<!-- (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_BUSSIONESS_STAND.STAND_CODE,'-',
SAR_BUSSIONESS_STAND.STAND_YEAR) like concat(concat('%',#{numberName}),'%') and SAR_BUSSIONESS_STAND.STAND_YEAR != '' and SAR_BUSSIONESS_STAND.STAND_YEAR is not null)
or (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_BUSSIONESS_STAND.STAND_CODE) like concat(concat('%',#{numberName}),'%')
and (SAR_BUSSIONESS_STAND.STAND_YEAR = '' or SAR_BUSSIONESS_STAND.STAND_YEAR is null)) -->
SAR_BUSSIONESS_STAND.STAND_CODE like concat(concat('%',#{numberName}),'%')
or stand_name like concat(concat('%',#{numberName}),'%')
)
</if>
<if test="standName != null" >
and stand_name like concat(concat('%',#{standName}),'%')
</if>
<!-- 高级搜索项 -->
<if test="putTime1 != null" >
and DATE_FORMAT(put_time,'%Y-%m-%D') &gt;= #{putTime1}
</if>
<if test="putTime2 != null" >
and DATE_FORMAT(put_time,'%Y-%m-%D') &lt;= #{putTime2}
</if>
<if test="issueTime1 != null" >
and DATE_FORMAT(issue_time,'%Y-%m-%D') &gt;= #{issueTime1}
</if>
<if test="issueTime2 != null" >
-- and to_char(issue_time,'YYYY-MM-DD') &lt;= #{issueTime2}
and DATE_FORMAT(issue_time,'%Y-%m-%D') &lt;= #{issueTime2}
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null" >
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 游离态标准查询 -->
<if test="menuId != null and menuId =='nomenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)
</if>
<!-- 当第一次进入页面未选择记录时-->
<if test="(menuId == null or menuId =='') and menuRoleList == null" >
and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT SAR_MENU.id FROM SAR_MENU START WITH id =(
SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )
</if>
<!-- 新修改需求,根据角色查询有权限的菜单数据-->
<if test="menuRoleList != null">
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="collectMenuId != null">
and SAR_BUSSIONESS_STAND.id in (
select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
and collect_type='BUSINESS_STAND'
and TS_PERSON_COLLECT.user_id=#{userId}
)
</if>
<if test="validFlag != null" >
and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag}
</if>
<!-- 导出数据过程中,选择的id -->
<if test="idlist != null" >
and SAR_BUSSIONESS_STAND.id in
<foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="standSort != null" >
and SAR_BUSSIONESS_STAND.stand_sort = #{standSort}
</if>
<if test="replaceStandNum != null" >
and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
</if>
<if test="standStatus != null" >
and SAR_BUSSIONESS_STAND.STAND_STATUS = #{standStatus}
</if>
<if test="advanceSearchStr != null">
and (${advanceSearchStr})
</if>
<if test="zqcrId != null">
and (SELECT ZYQCR
FROM SAR_BUSS_STAND_ATTR_INFO
WHERE valid_flag = 0
and stand_id = SAR_BUSSIONESS_STAND.id) = #{zqcrId}
</if>
</trim>
</sql>
<!-- 根据角色分页查询条件 -->
<sql id="SarBussionInfoRole_Where_Clause">
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
where 1=1
<trim suffixOverrides="," >
<!-- 基本搜索项 -->
<if test="standCode != null" >
and stand_code like concat(concat('%',#{standCode}),'%')
</if>
<if test="standName != null" >
and stand_name like concat(concat('%',#{standName}),'%')
</if>
<!-- 高级搜索项 -->
<if test="putTime1 != null" >
-- and to_char(put_time,'YYYY-MM-DD') &gt;= #{putTime1}
and DATE_FORMAT(put_time,'%Y-%m-%D') &gt;= #{putTime1}
</if>
<if test="putTime2 != null" >
-- and to_char(put_time,'YYYY-MM-DD') &lt;= #{putTime2}
and DATE_FORMAT(put_time,'%Y-%m-%D') &lt;= #{putTime2}
</if>
<if test="issueTime1 != null" >
-- and to_char(issue_time,'YYYY-MM-DD') &gt;= #{issueTime1}
and DATE_FORMAT(issue_time,'%Y-%m-%D') &gt;= #{issueTime1}
</if>
<if test="issueTime2 != null" >
and DATE_FORMAT(issue_time,'%Y-%m-%D') &lt;= #{issueTime2}
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID in (
select a.* from (
select SAR_MENU.id from SAR_MENU,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id
)a,TS_ROLE_SAR_MENU
where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in
<foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY ID
)
</if>
<!-- 游离态标准查询 -->
<if test="menuId != null and menuId =='nomenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)
</if>
<!-- 当第一次进入页面未选择记录时-->
<if test="menuId == null or menuId ==''" >
and SAR_BUSS_STAND_MENU.MENU_ID in (
select a.* from (
SELECT SAR_MENU.id FROM SAR_MENU START WITH id =(
SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0) connect by prior id= parent_id
)a,TS_ROLE_SAR_MENU
where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in
<foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY ID
)
</if>
<if test="validFlag != null" >
and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag}
</if>
<!-- 导出数据过程中,选择的id -->
<if test="idlist != null" >
and SAR_BUSSIONESS_STAND.id in
<foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="standSort != null" >
and SAR_BUSSIONESS_STAND.stand_sort = #{standSort}
</if>
<if test="replaceStandNum != null" >
and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
</if>
</trim>
</sql>
<!-- 企标复审使用-->
<sql id="SarBussionInfoRole_Where_Clause_Qbfs">
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
where 1=1
<trim suffixOverrides="," >
<!-- 基本搜索项 -->
<if test="standCode != null" >
and stand_code like concat(concat('%',#{standCode}),'%')
</if>
<if test="standName != null" >
and stand_name like concat(concat('%',#{standName}),'%')
</if>
<if test="validFlag != null" >
and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag}
</if>
</trim>
</sql>
<!-- 分页查询条件当页数据 -->
<select id="getBussionessStandInfoPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select * from
(select tmp_tb.* from
(select <include refid="Base_Column_List_show" />,
(case WHEN dicstandStatus.DIC_TYPE_NAME = '已发布' THEN 1
WHEN dicstandStatus.DIC_TYPE_NAME = '计划修订' THEN 2
WHEN dicstandStatus.DIC_TYPE_NAME = '修订中' THEN 3
WHEN dicstandStatus.DIC_TYPE_NAME = '已修订' THEN 4
WHEN dicstandStatus.DIC_TYPE_NAME = '被替代' THEN 5
WHEN dicstandStatus.DIC_TYPE_NAME = '废止' THEN 6
WHEN dicstandStatus.DIC_TYPE_NAME IS NULL THEN 7 END) AS paixu
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
GROUP BY <include refid="Group_Column_List_show"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
<if test="sql != null and sql != ''" >
ORDER BY ${sql}
</if>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<!-- 企标复审使用-->
<select id="getBussionessStandInfoQbfs" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select <include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfoRole_Where_Clause_Qbfs"/>
GROUP BY <include refid="Group_Column_List_show"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
</select>
<select id="getBussionessStandInfoPageByRole" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select * from
(select tmp_tb.* from
(select <include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfoRole_Where_Clause"/>
GROUP BY <include refid="Group_Column_List_show"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<!-- 分页查询条件查询一共有多少条数据,配合分页 -->
<select id="getBussionessStandInfoCount" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select count(1) from (select count(*) from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
GROUP BY SAR_BUSSIONESS_STAND.id) a
</select>
<select id="getBussionessStandInfoCountByRole" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select count(1) from (select count(*) from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfoRole_Where_Clause"/>
GROUP BY SAR_BUSSIONESS_STAND.id)
</select>
<!-- 条件查询后,用于导出标准信息数据-->
<select id="getSarBussionessStand" resultMap="BaseResultMapExcel" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select <include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
GROUP BY <include refid="Group_Column_List_show"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
</select>
<!--liwenxuan:标准法规更新数量及清单:企业标准-->
<select id="selectBussionessStandardsCount" resultType="java.lang.Integer" parameterType="Date">
SELECT count(1)
FROM SAR_BUSSIONESS_STAND
WHERE MODIFY_TIME > #{visitTime} And Valid_flag = 0
</select>
<!--liwenxuan:标准法规更新数量及清单:企业标准All-->
<select id="selectBussionessStandardsCountAll" resultType="java.lang.Integer" >
SELECT count(1)
FROM SAR_BUSSIONESS_STAND
WHERE Valid_flag = 0
</select>
<!-- 根据id查询 SAR_BUSSIONESS_STAND 的详细信息-->
<select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
where SAR_BUSSIONESS_STAND.id = #{id}
</select>
<select id="selectSarBussionesDownloadFileInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" parameterType="string">
SELECT SAR_BUSS_STAND_RES.stand_file_classify as standFileClassify,SAR_BUSS_STAND_FILE.att_id as attId FROM "SAR_BUSSIONESS_STAND"
left join "SAR_BUSS_STAND_RES" on (SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_RES.stand_id)
left join "SAR_BUSS_STAND_FILE" on (SAR_BUSS_STAND_RES.id = SAR_BUSS_STAND_FILE.res_id)
where SAR_BUSSIONESS_STAND.id =#{id} and SAR_BUSS_STAND_FILE.use_module = 'SOURCE_FILE'
</select>
<!-- gaoyan 验证代替标准号是否存在 -->
<select id="selectStandardsByStandnumber" resultMap="BaseResultMap"
parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
select
<include refid="Base_Column_List"/>
from
SAR_BUSSIONESS_STAND
where SAR_BUSSIONESS_STAND.valid_flag = 0
<if test="standCode != null">
and SAR_BUSSIONESS_STAND.stand_code=#{standCode}
</if>
</select>
<select id="selectStandByStandNumber" resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" parameterType="java.util.Map">
select id from SAR_BUSSIONESS_STAND where stand_code = #{standCode}
</select>
<!-- gaoyan 搜索中心页面查询为我推荐 -->
<select id="selectRecommendStand" resultType="com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select tmp_tb.* from
(select
if(
SAR_STANDARDS_INFO.STAND_YEAR='',
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
) as numberShow,
SAR_BUSSIONESS_STAND.stand_name as nameShow,
SAR_BUSSIONESS_STAND.id,
'BUSINESS_STAND' as typeShow
from SAR_BUSSIONESS_STAND
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
where SAR_BUSSIONESS_STAND.valid_flag = '0' and ( 1=1
<if test="standSort != null" >
and STAND_SORT = #{standSort}
</if>
<if test="standCode != null" >
or stand_code like concat(concat('%',#{standCode}),'%')
</if>
<if test="standYear != null" >
or stand_year like concat(concat('%',#{standYear}),'%')
</if>
<if test="standName != null" >
or stand_name like concat(concat('%',#{standName}),'%')
</if>
<!-- 适用车型 多选需要修改-->
<!--<if test="applyArcticList != null">
or REGEXP_LIKE(apply_arctic,
<foreach collection="applyArcticList" index="index" item="item" open="'(" separator="|" close=")'">
${item}
</foreach>
)
</if>
<if test="energyKindList != null" >
or
REGEXP_LIKE(energy_kind,
<foreach collection="energyKindList" index="index" item="item" open="'(" separator="|" close=")'">
${item}
</foreach>
)
</if>-->
)
order by SAR_BUSSIONESS_STAND.modify_time desc
) tmp_tb limit 0,5
</select>
<!-- gaoyan 查找相近标准 -->
<select id="selectCloseStand" resultType="com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select tmp_tb.* from
(select
stand_code as numberShow,
SAR_BUSSIONESS_STAND.stand_name as nameShow,
SAR_BUSSIONESS_STAND.id,
'BUSINESS_STAND' as typeShow
from SAR_BUSSIONESS_STAND
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
where SAR_BUSSIONESS_STAND.valid_flag = '0' and (
<if test="standName != null" >
or stand_name like concat(concat('%',#{standName}),'%')
</if>
)
<if test="id != null" >
and SAR_BUSSIONESS_STAND.id != #{id}
</if>
order by SAR_BUSSIONESS_STAND.modify_time desc
) tmp_tb limit 0,5
</select>
<select id="queryByPutTimeList" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
select <include refid="Base_Column_List"/> from SAR_BUSSIONESS_STAND
where 1=1
<if test="putTime != null" >
and put_time &lt;= #{putTime}
</if>
<if test="standStatus != null" >
and stand_status = #{standStatus}
</if>
</select>
<update id="updateByStandNum" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
update SAR_BUSSIONESS_STAND
<set >
<if test="modifyTime != null" >
modify_time = #{modifyTime},
</if>
<if test="creationTime != null" >
creation_time = #{creationTime},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
<if test="replacedStandNum != null" >
replaced_stand_num = #{replacedStandNum},
</if>
<if test="replaceStandNum != null" >
replace_stand_num = #{replaceStandNum},
</if>
<if test="putTime != null" >
put_time = #{putTime},
</if>
<if test="issueTime != null" >
issue_time = #{issueTime},
</if>
<if test="standEnName != null" >
stand_en_name = #{standEnName},
</if>
<if test="standName != null" >
stand_name = #{standName},
</if>
</set>
where STAND_CODE = #{standCode}
</update>
<update id="updateRelacedNumByNumber" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
update SAR_BUSSIONESS_STAND set REPLACED_STAND_NUM = #{replacedStandNum} where
STAND_CODE in
<foreach collection="replaceStandNumList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<update id="updateRelaceNumByNumber" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
update SAR_BUSSIONESS_STAND set REPLACE_STAND_NUM = #{replaceStandNum} where
STAND_CODE in
<foreach collection="replacedStandNumList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<select id="selectBussStandByIdAndRole" resultMap="BaseResultMap"
parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select SAR_BUSSIONESS_STAND.id
from
SAR_BUSSIONESS_STAND
left join SAR_BUSS_STAND_MENU on SAR_BUSSIONESS_STAND.id=SAR_BUSS_STAND_MENU.BUSS_STAND_ID
where SAR_BUSSIONESS_STAND.valid_flag = 0
and SAR_BUSS_STAND_MENU.valid_flag = 0
<if test="id != null">
and SAR_BUSSIONESS_STAND.id = #{id}
</if>
<if test="menuRoleList != null">
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<update id="updateReplacedNumById" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
update SAR_BUSSIONESS_STAND set REPLACED_STAND_NUM = #{replacedStandNum} where id = #{id}
</update>
<select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">
SELECT COUNT(*)
FROM information_schema.columns
WHERE table_name = 'SAR_BUSSIONESS_STAND' AND column_name = #{columnName}
</select>
<select id="standRemindInfo" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
select
*
from
(
select
*
from
SAR_BUSSIONESS_STAND
where VALID_FLAG = 0
and
(select count(0) from SAR_BUSSIONESS_STAND_STATE where SAR_BUSSIONESS_STAND_STATE.ID = SAR_BUSSIONESS_STAND.ID) = 0
and date_format(ISSUE_TIME,'%Y-%m-%d') = date_format(DATE_SUB(curdate(), INTERVAL 35 MONTH),'%Y-%m-%d')
union
select
sbs.*
from
SAR_BUSSIONESS_STAND sbs
right join SAR_BUSSIONESS_STAND_STATE sbss on sbs.ID = sbss.ID
where sbs.VALID_FLAG = 0
and date_format(sbss.REVIEW_TIME,'%Y-%m-%d') = date_format(DATE_SUB(curdate(), INTERVAL 35 MONTH),'%Y-%m-%d')) as aa
<where>
1=1
<if test="standCode != null and standCode !=''">
and STAND_CODE = #{standCode}
</if>
<if test="standName != null and standName !=''">
and STAND_NAME = #{standName}
</if>
</where>
</select>
<select id="selectIsExit" resultType="java.lang.Integer">
select count(*) from SAR_LAWS_INFO where id = #{id} and valid_flag != 0
</select>
<insert id="insertPerson">
insert into SAR_BUSSIONESS_PERSON(ID,QBID,USID) VALUE
<foreach collection ="list" item="Person" separator =",">
(#{Person.id}, #{Person.qbid}, #{Person.usid})
</foreach >
</insert>
<insert id="deletePerson" parameterType="java.lang.String">
DELETE FROM SAR_BUSSIONESS_PERSON
where qbid=#{qbid}
</insert>
<select id="selectPerson" parameterType="java.lang.String" resultType="java.lang.String">
select usid from SAR_BUSSIONESS_PERSON where QBID=#{qbid}
</select>
</mapper>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao">
</mapper>
@@ -626,6 +626,16 @@
</if>
</select>
<select id="queryStandInfoByList" resultMap="BaseResultMap" parameterType="java.lang.Integer">
select
<include refid="Base_Column_List"/>
FROM sar_standards_info
LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
WHERE DATE_FORMAT(ssai.SSRQ,'%Y-%m-%D') &gt;= DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME,'%Y-%m-%D')
ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC
LIMIT #{limit}
</select>
<!-- 查询表中是否存在某字段-->
<select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">
SELECT COUNT(*)
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao">
</mapper>
@@ -263,6 +263,9 @@
<if test="standId != null and standId != ''">
and SAR_FILE_SPLIT_INFO.stand_id = #{standId}
</if>
<if test="sarType != null and sarType != ''">
and SAR_TYPE = #{sarType}
</if>
<if test="id != null and id != ''">
and SAR_FILE_SPLIT_INFO.id = #{id}
</if>
@@ -20,6 +20,7 @@
<result column="standNumber" property="standNumber" />
<result column="standName" property="standName" />
<result column="sarType" property="sarType" />
<result column="attId1" property="attId1" />
</resultMap>
<!-- SAR_STAND_FILE table all fields -->
@@ -278,7 +279,7 @@
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
) ) AS standNumber,
SAR_STANDARDS_INFO.stand_name as standName,
SAR_STAND_FILE.att_id AS attId,
SAR_STAND_FILE.att_id AS attId1,
SAR_STANDARDS_INFO.STAND_TYPE as sarType
FROM
SAR_STAND_FILE
@@ -136,7 +136,8 @@ public class AttFileEOController {
String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request);
response.setHeader("Content-Disposition", "attachment; filename=\""+ fileOldName +"\"");
response.setContentType("application/octet-stream");
is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName());
File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
is = new FileInputStream(file);
os = response.getOutputStream();
IOUtils.copy(is, os);
os.flush();
@@ -232,7 +233,8 @@ public class AttFileEOController {
String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request);
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
response.setContentType("application/octet-stream");
is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName());
File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
is = new FileInputStream(file);
os = response.getOutputStream();
IOUtils.copy(is, os);
os.flush();
@@ -280,7 +282,8 @@ public class AttFileEOController {
// WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
response.setContentType("application/octet-stream");
is = iFileStore.loadFile(attFileEO.getFilePath()+"waterPath/"+attFileEO.getOldFileName());
File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
is = new FileInputStream(file);
os = response.getOutputStream();
IOUtils.copy(is, os);
os.flush();
@@ -356,7 +359,8 @@ public class AttFileEOController {
String fileOldName = fileNameEncoding(fileName,request);
response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName);
response.setContentType("application/octet-stream");
is = iFileStore.loadFile("/modal/"+fileName);
File file = new File(filePath+"/modal/"+fileName);
is = new FileInputStream(file);
os = response.getOutputStream();
IOUtils.copy(is, os);
os.flush();
@@ -281,7 +281,7 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
if(StringUtils.isNotEmpty(idList[i])){
attFileEO.setId(idList[i]);
AttFileEO getFile = this.baseMapper.selectFileInfoById(attFileEO);
if(attFileEO != null){
if(attFileEO != null && getFile != null){
fileObj.add(getFile);
}
}
@@ -48,4 +48,7 @@ public interface ISarMenuStandardService extends IService<SarMenuStandard> {
* @return List<Menu>
*/
List<SarMenuStandard> getMenuByIds(List<String> menuIds);
SarMenuStandard selectMenuById(String id);
}
@@ -29,6 +29,11 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
@Autowired
private SarMenuStandardDao dao;
@Override
public SarMenuStandard selectMenuById(String id){
return dao.selectById(id);
}
/**
* 查询所有菜单
*/