Merge branch 'develop_3' into 'develop_master'
Develop 3 提交 See merge request !12
This commit is contained in:
super_liu
+23
@@ -0,0 +1,23 @@
|
||||
package com.adc.da.slrs.SarCompResAssess.controller;
|
||||
|
||||
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
|
||||
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-06-21
|
||||
*/
|
||||
@RestController
|
||||
@Api(tags = "|SarCompResAssess|")
|
||||
@RequestMapping("/SarCompResAssess/sar-comp-res-assess")
|
||||
public class SarCompResAssessController extends BaseController<SarCompResAssess> {
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.SarCompResAssess.dao;
|
||||
|
||||
import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 标准法规/政策技术评估汇总记录表 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface SarCompResAssessDao extends BaseMapper<SarCompResAssess> {
|
||||
|
||||
SarCompResAssess getResAssessDataByResId(String resId);
|
||||
|
||||
}
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
package com.adc.da.slrs.SarCompResAssess.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
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 org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 标准法规/政策技术评估汇总记录表
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarCompResAssess对象", description="标准法规/政策技术评估汇总记录表")
|
||||
public class SarCompResAssess extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "主键")
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "资源类型")
|
||||
@TableField("RES_TYPE")
|
||||
private String resType;
|
||||
|
||||
@ApiModelProperty(value = "资源ID")
|
||||
@TableField("RES_ID")
|
||||
private String resId;
|
||||
|
||||
@ApiModelProperty(value = "评估结果")
|
||||
@TableField("ASSESS_RESULT")
|
||||
private Integer assessResult;
|
||||
|
||||
@ApiModelProperty(value = "评估分级颜色")
|
||||
@TableField("ASSESS_COLOR")
|
||||
private String assessColor;
|
||||
|
||||
@ApiModelProperty(value = "评估完成时间")
|
||||
@TableField("ASSESS_TIME")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date assessTime;
|
||||
|
||||
@ApiModelProperty(value = "流程编号")
|
||||
@TableField("PROCESS_NUM")
|
||||
private String processNum;
|
||||
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
@TableField("PROCESS_STATE")
|
||||
private String processState;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@TableField("CREATED_TIME")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date createdTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
@TableField("MODIFY_TIME")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date modifyTime;
|
||||
|
||||
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.adc.da.slrs.SarCompResAssess.service;
|
||||
|
||||
import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 标准法规/政策技术评估汇总记录表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface ISarCompResAssessService extends IService<SarCompResAssess> {
|
||||
|
||||
SarCompResAssess getAssessInfoByResId(String resId);
|
||||
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.adc.da.slrs.SarCompResAssess.service.impl;
|
||||
|
||||
import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
|
||||
import com.adc.da.slrs.SarCompResAssess.dao.SarCompResAssessDao;
|
||||
import com.adc.da.slrs.SarCompResAssess.service.ISarCompResAssessService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 标准法规/政策技术评估汇总记录表 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Service
|
||||
public class SarCompResAssessServiceImpl extends ServiceImpl<SarCompResAssessDao, SarCompResAssess> implements ISarCompResAssessService {
|
||||
|
||||
@Autowired
|
||||
private SarCompResAssessDao dao;
|
||||
|
||||
public SarCompResAssessDao getDao() {
|
||||
return dao;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据资源ID获取评估汇总结果
|
||||
* @return
|
||||
*/
|
||||
public SarCompResAssess getAssessInfoByResId(String resId){
|
||||
return dao.getResAssessDataByResId(resId);
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.adc.da.slrs.SarCompStatusInfo.controller;
|
||||
|
||||
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
|
||||
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-06-21
|
||||
*/
|
||||
@RestController
|
||||
@Api(tags = "|SarCompStatusInfo|")
|
||||
@RequestMapping("/SarCompStatusInfo/sar-comp-status-info")
|
||||
public class SarCompStatusInfoController extends BaseController<SarCompStatusInfo> {
|
||||
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.SarCompStatusInfo.dao;
|
||||
|
||||
import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface SarCompStatusInfoDao extends BaseMapper<SarCompStatusInfo> {
|
||||
|
||||
}
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
package com.adc.da.slrs.SarCompStatusInfo.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
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-06-21
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarCompStatusInfo对象", description="")
|
||||
public class SarCompStatusInfo extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "ID")
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "标准/政策类别")
|
||||
@TableField("SAR_TYPE")
|
||||
private String sarType;
|
||||
|
||||
@ApiModelProperty(value = "标准/政策ID")
|
||||
@TableField("SAR_ID")
|
||||
private String sarId;
|
||||
|
||||
@ApiModelProperty(value = "标准/政策条款ID")
|
||||
@TableField("SAR_ITEM_ID")
|
||||
private String sarItemId;
|
||||
|
||||
@ApiModelProperty(value = "标准/政策符合性状态")
|
||||
@TableField("SAR_STATE")
|
||||
private String sarState;
|
||||
|
||||
@ApiModelProperty(value = "标准/政策条款符合性状态")
|
||||
@TableField("SAR_ITEM_STATE")
|
||||
private String sarItemState;
|
||||
|
||||
@ApiModelProperty(value = "流程编号")
|
||||
@TableField("PRC_NUM")
|
||||
private String prcNum;
|
||||
|
||||
@ApiModelProperty(value = "合规性分级颜色")
|
||||
@TableField("COLOR")
|
||||
private String color;
|
||||
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
@TableField("PRC_STATE")
|
||||
private String prcState;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@TableField("CREATION_TIME")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
private Date creationTime;
|
||||
|
||||
@ApiModelProperty(value = "不符合内容")
|
||||
@TableField("NON_CONFOMITY")
|
||||
private String nonConfomity;
|
||||
|
||||
@ApiModelProperty(value = "我司现状")
|
||||
@TableField("CURRENT")
|
||||
private String current;
|
||||
|
||||
@ApiModelProperty(value = "更改方案")
|
||||
@TableField("CHANGE_SCHEME")
|
||||
private String changeScheme;
|
||||
|
||||
@ApiModelProperty(value = "预估更改周期")
|
||||
@TableField("ESTIMATED_CHANGE_CYCLE")
|
||||
private String estimatedChangeCycle;
|
||||
|
||||
@ApiModelProperty(value = "预估成本")
|
||||
@TableField("ESTIMATED_COST")
|
||||
private String estimatedCost;
|
||||
|
||||
@ApiModelProperty(value = "风险点")
|
||||
@TableField("RISK_POINT")
|
||||
private String riskPoint;
|
||||
|
||||
@ApiModelProperty(value = "验证方案")
|
||||
@TableField("VERIFICATION_SCHEME")
|
||||
private String verificationScheme;
|
||||
|
||||
@ApiModelProperty(value = "符合理由")
|
||||
@TableField("JUSTIFIED")
|
||||
private String justified;
|
||||
|
||||
@ApiModelProperty(value = "评估人员")
|
||||
@TableField("COMP_PERSON")
|
||||
private String compPerson;
|
||||
|
||||
@ApiModelProperty(value = "评估时间")
|
||||
@TableField("COMP_TIME")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
private Date compTime;
|
||||
|
||||
|
||||
@TableField( exist = false)
|
||||
private String compPersonName;
|
||||
@TableField( exist = false)
|
||||
private String state;
|
||||
@TableField( exist = false)
|
||||
private String sarNumber;
|
||||
@TableField( exist = false)
|
||||
private String sarItemNumber;
|
||||
@TableField( exist = false)
|
||||
private String standId;
|
||||
@TableField( exist = false)
|
||||
private String standType;
|
||||
@TableField( exist = false)
|
||||
private String standCode;
|
||||
@TableField( exist = false)
|
||||
private String standName;
|
||||
@TableField( exist = false)
|
||||
private String createType;
|
||||
|
||||
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.SarCompStatusInfo.service;
|
||||
|
||||
import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface ISarCompStatusInfoService extends IService<SarCompStatusInfo> {
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.SarCompStatusInfo.service.impl;
|
||||
|
||||
import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
|
||||
import com.adc.da.slrs.SarCompStatusInfo.dao.SarCompStatusInfoDao;
|
||||
import com.adc.da.slrs.SarCompStatusInfo.service.ISarCompStatusInfoService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Service
|
||||
public class SarCompStatusInfoServiceImpl extends ServiceImpl<SarCompStatusInfoDao, SarCompStatusInfo> implements ISarCompStatusInfoService {
|
||||
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.adc.da.slrs.SarFileSplitItems.controller;
|
||||
|
||||
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.adc.da.slrs.SarFileSplitItems.entity.SarFileSplitItems;
|
||||
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-06-21
|
||||
*/
|
||||
@RestController
|
||||
@Api(tags = "|SarFileSplitItems|")
|
||||
@RequestMapping("/SarFileSplitItems/sar-file-split-items")
|
||||
public class SarFileSplitItemsController extends BaseController<SarFileSplitItems> {
|
||||
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.SarFileSplitItems.dao;
|
||||
|
||||
import com.adc.da.slrs.SarFileSplitItems.entity.SarFileSplitItems;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface SarFileSplitItemsDao extends BaseMapper<SarFileSplitItems> {
|
||||
|
||||
}
|
||||
+129
@@ -0,0 +1,129 @@
|
||||
package com.adc.da.slrs.SarFileSplitItems.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarFileSplitItems对象", description="")
|
||||
public class SarFileSplitItems extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "拆分信息记录ID")
|
||||
@TableField("INFO_ID")
|
||||
private String infoId;
|
||||
|
||||
@ApiModelProperty(value = "条款号")
|
||||
@TableField("ITEMS_NUM")
|
||||
private String itemsNum;
|
||||
|
||||
@ApiModelProperty(value = "条款名称")
|
||||
@TableField("ITEMS_NAME")
|
||||
private String itemsName;
|
||||
|
||||
@ApiModelProperty(value = "条款要求")
|
||||
@TableField("ITERMS_CONDITIONS")
|
||||
private String itermsConditions;
|
||||
|
||||
@ApiModelProperty(value = "新定车型实施日期")
|
||||
@TableField("NEWCAR_PUT_TIME")
|
||||
private Date newcarPutTime;
|
||||
|
||||
@ApiModelProperty(value = "在产车型实施日期")
|
||||
@TableField("PRODUCT_PUT_TIME")
|
||||
private Date productPutTime;
|
||||
|
||||
@ApiModelProperty(value = "拆分目录ID")
|
||||
@TableField("MENU_ID")
|
||||
private String menuId;
|
||||
|
||||
@ApiModelProperty(value = "SVPPS")
|
||||
@TableField("SVPPS")
|
||||
private String svpps;
|
||||
|
||||
@ApiModelProperty(value = "适用车型")
|
||||
@TableField("APPLY_ARCTIC")
|
||||
private String applyArctic;
|
||||
|
||||
@ApiModelProperty(value = "引用标准")
|
||||
@TableField("REFERENCE_STAND")
|
||||
private String referenceStand;
|
||||
|
||||
@ApiModelProperty(value = "特殊参数要求")
|
||||
@TableField("SPECIAL_REQUEST")
|
||||
private String specialRequest;
|
||||
|
||||
@ApiModelProperty(value = "关联文件")
|
||||
@TableField("RELEVANCE_FILE")
|
||||
private String relevanceFile;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
@TableField("REMARKS")
|
||||
private String remarks;
|
||||
|
||||
@ApiModelProperty(value = "是否有效")
|
||||
@TableField("VALID_FLAG")
|
||||
private Integer validFlag;
|
||||
|
||||
@TableField("CREATION_USER")
|
||||
private String creationUser;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@TableField("CREATION_TIME")
|
||||
private Date creationTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
@TableField("MODIFY_TIME")
|
||||
private Date modifyTime;
|
||||
|
||||
@TableField("MODIFY_USER")
|
||||
private String modifyUser;
|
||||
|
||||
@ApiModelProperty(value = "FO")
|
||||
@TableField("FO")
|
||||
private String fo;
|
||||
|
||||
@ApiModelProperty(value = "责任工程师")
|
||||
@TableField("DUTY_ENGINEER")
|
||||
private String dutyEngineer;
|
||||
|
||||
@ApiModelProperty(value = "要求类型")
|
||||
@TableField("CLAIM_TYPE")
|
||||
private String claimType;
|
||||
|
||||
@ApiModelProperty(value = "企标覆盖关系")
|
||||
@TableField("BUS_STAND_COVER")
|
||||
private String busStandCover;
|
||||
|
||||
@ApiModelProperty(value = "文件类型")
|
||||
@TableField("FILE_TYPE")
|
||||
private String fileType;
|
||||
|
||||
@ApiModelProperty(value = "责任部门")
|
||||
@TableField("RESPONSIBLE_UNIT")
|
||||
private String responsibleUnit;
|
||||
|
||||
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.SarFileSplitItems.service;
|
||||
|
||||
import com.adc.da.slrs.SarFileSplitItems.entity.SarFileSplitItems;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface ISarFileSplitItemsService extends IService<SarFileSplitItems> {
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.SarFileSplitItems.service.impl;
|
||||
|
||||
import com.adc.da.slrs.SarFileSplitItems.entity.SarFileSplitItems;
|
||||
import com.adc.da.slrs.SarFileSplitItems.dao.SarFileSplitItemsDao;
|
||||
import com.adc.da.slrs.SarFileSplitItems.service.ISarFileSplitItemsService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Service
|
||||
public class SarFileSplitItemsServiceImpl extends ServiceImpl<SarFileSplitItemsDao, SarFileSplitItems> implements ISarFileSplitItemsService {
|
||||
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.adc.da.slrs.SarStandItemVal.controller;
|
||||
|
||||
|
||||
import com.adc.da.base.web.BaseController;
|
||||
import com.adc.da.slrs.SarStandItemVal.entity.SarStandItemVal;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@RestController
|
||||
@Api(description = "|SarStandItemVal|")
|
||||
@RequestMapping("/SarStandItemVal/sar-stand-item-val")
|
||||
public class SarStandItemValController extends BaseController<SarStandItemVal> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.adc.da.slrs.SarStandItemVal.dao;
|
||||
|
||||
import com.adc.da.slrs.SarStandItemVal.entity.SarStandItemVal;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface SarStandItemValDao extends BaseMapper<SarStandItemVal> {
|
||||
|
||||
int deleteSarStandItemValByItemid(String itemid);
|
||||
|
||||
int updateSarStandItemValByItemid(String itemid);
|
||||
|
||||
int deleteByItemsIds(@Param("idList") List<String> idList);
|
||||
|
||||
int insertForeach(List<SarStandItemVal> list);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.adc.da.slrs.SarStandItemVal.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarStandItemVal对象", description="")
|
||||
public class SarStandItemVal extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "主键")
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "标准ID")
|
||||
@TableField("ITEM_ID")
|
||||
private String itemId;
|
||||
|
||||
@ApiModelProperty(value = "参数类型")
|
||||
@TableField("PROPERTY_TYPE")
|
||||
private String propertyType;
|
||||
|
||||
@ApiModelProperty(value = "参数内容")
|
||||
@TableField("PROPERTY_VAL")
|
||||
private String propertyVal;
|
||||
|
||||
@ApiModelProperty(value = "是否有效")
|
||||
@TableField("VALID_FLAG")
|
||||
private Integer validFlag;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@TableField("CREATION_TIME")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
@TableField("MODIFY_TIME")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date modifyTime;
|
||||
|
||||
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.SarStandItemVal.service;
|
||||
|
||||
import com.adc.da.slrs.SarStandItemVal.entity.SarStandItemVal;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
public interface ISarStandItemValService extends IService<SarStandItemVal> {
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.SarStandItemVal.service.impl;
|
||||
|
||||
import com.adc.da.slrs.SarStandItemVal.dao.SarStandItemValDao;
|
||||
import com.adc.da.slrs.SarStandItemVal.entity.SarStandItemVal;
|
||||
import com.adc.da.slrs.SarStandItemVal.service.ISarStandItemValService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-06-21
|
||||
*/
|
||||
@Service
|
||||
public class SarStandItemValServiceImpl extends ServiceImpl<SarStandItemValDao, SarStandItemVal> implements ISarStandItemValService {
|
||||
|
||||
}
|
||||
+3
@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
*/
|
||||
public interface ISarStandAttrInfoService extends IService<SarStandAttrInfo> {
|
||||
|
||||
String selectFieldValByStandId(String field,String standId);
|
||||
|
||||
int updateStandInfo(String standId,String field,String value);
|
||||
}
|
||||
|
||||
+13
@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
|
||||
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
|
||||
import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
@@ -17,4 +18,16 @@ import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class SarStandAttrInfoServiceImpl extends ServiceImpl<SarStandAttrInfoDao, SarStandAttrInfo> implements ISarStandAttrInfoService {
|
||||
|
||||
@Autowired
|
||||
private SarStandAttrInfoDao dao;
|
||||
|
||||
@Override
|
||||
public String selectFieldValByStandId (String field,String standId) {
|
||||
return dao.selectFieldValByStandId(field,standId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateStandInfo(String standId,String field,String value){
|
||||
return dao.updateStandInfo(standId,field,value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.adc.da.slrs.sarStandItems.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
@@ -152,6 +153,8 @@ public class SarStandItems extends BaseEntity {
|
||||
private String oldId;
|
||||
@TableField(exist = false)
|
||||
private String jspg;
|
||||
@TableField(exist = false)
|
||||
private SarCompStatusInfo pgForm;
|
||||
|
||||
|
||||
}
|
||||
|
||||
+5
-1
@@ -4,6 +4,8 @@ import com.adc.da.slrs.sarStandardsInfo.entity.*;
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -31,6 +33,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
|
||||
|
||||
List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
|
||||
|
||||
void attrInfoDetails(SarStandardsInfo row) throws IOException, SQLException;
|
||||
|
||||
SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
|
||||
|
||||
boolean updateStandardsMenu(SarStandardsInfoEOPage standardsInfoEO);
|
||||
@@ -40,4 +44,4 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
|
||||
List<RecommendVO> selectRecommendStand(SarStandardsInfoEOPage pagenew);
|
||||
|
||||
List<ActSarItemsEO> getStandAndItemsForAct (SarStandardsInfoEOPage page) throws Exception;
|
||||
}
|
||||
}
|
||||
+10
-8
@@ -61,7 +61,9 @@ import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.sql.Clob;
|
||||
import java.sql.SQLException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.regex.Matcher;
|
||||
@@ -192,7 +194,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
}
|
||||
}
|
||||
|
||||
public void attrInfoDetails (SarStandardsInfo row) throws Exception {
|
||||
public void attrInfoDetails (SarStandardsInfo row) throws IOException, SQLException {
|
||||
String fieldInfo = InitStandAttrUtil.queryField;
|
||||
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
|
||||
row.setCollectId(collectId);
|
||||
@@ -350,9 +352,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId());
|
||||
//编写预警信息
|
||||
// writeWarnings(sarStandardsInfoEO);
|
||||
updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");
|
||||
updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ");
|
||||
updateRelateStand(sarStandardsInfoEO,"CBBH");
|
||||
// updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");
|
||||
// updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ");
|
||||
// updateRelateStand(sarStandardsInfoEO,"CBBH");
|
||||
// 根据代替标准号修改被代替的标准的状态 修改为已修订状态
|
||||
replaseStandState(sarStandardsInfoEO);
|
||||
// 处理属性表信息
|
||||
@@ -364,7 +366,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
|
||||
number += "-" + sarStandardsInfoEO.getStandYear();
|
||||
}
|
||||
String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
|
||||
String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
|
||||
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandType()+"_STAND",content);
|
||||
// if(elasflag) {
|
||||
// // 消息队列
|
||||
@@ -911,10 +913,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
//修改标准过程中，重新修改代替标准号对应的标准的被代替标准号
|
||||
// updateReplacedNumber(sarStandardsInfoEO,beforeSarStandardsInfo);
|
||||
// 根据引用标准修改其他被引用标准
|
||||
updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH");
|
||||
updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ");
|
||||
// updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH");
|
||||
// updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ");
|
||||
// 根据对应其他标准修改其他对应其他标准
|
||||
updateRelateStand(sarStandardsInfoEO,"CBBH");
|
||||
// updateRelateStand(sarStandardsInfoEO,"CBBH");
|
||||
// 根据代替标准号修改被代替的标准的状态 修改为已修订状态
|
||||
replaseStandState(sarStandardsInfoEO);
|
||||
// 记录修改日志
|
||||
|
||||
Reference in New Issue
Block a user