feat 合并分支

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompResAssess/controller/SarCompResAssessController.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompResAssess/dao/SarCompResAssessDao.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompResAssess/entity/SarCompResAssess.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompResAssess/service/ISarCompResAssessService.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompResAssess/service/impl/SarCompResAssessServiceImpl.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompStatusInfo/controller/SarCompStatusInfoController.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompStatusInfo/dao/SarCompStatusInfoDao.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompStatusInfo/entity/SarCompStatusInfo.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompStatusInfo/service/ISarCompStatusInfoService.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompStatusInfo/service/impl/SarCompStatusInfoServiceImpl.java

@@ -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 {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarFileSplitItems/controller/SarFileSplitItemsController.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarFileSplitItems/dao/SarFileSplitItemsDao.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarFileSplitItems/entity/SarFileSplitItems.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarFileSplitItems/service/ISarFileSplitItemsService.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarFileSplitItems/service/impl/SarFileSplitItemsServiceImpl.java

@@ -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 {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarStandItemVal/controller/SarStandItemValController.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarStandItemVal/dao/SarStandItemValDao.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarStandItemVal/entity/SarStandItemVal.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/SarStandItemVal/service/ISarStandItemValService.java

@@ -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> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/SarStandItemVal/service/impl/SarStandItemValServiceImpl.java

@@ -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 {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/service/ISarStandAttrInfoService.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/service/impl/SarStandAttrInfoServiceImpl.java

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

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

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

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

@@ -36,6 +36,15 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     @Resource
     private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService;
 
+    /**
+    *
+     * @param Page
+     * @param PageSize
+     * @param sarDto
+    * @return
+    * @author zj
+    * date 2021-06-22
+    **/
     @GetMapping("/queryProject")
     @ApiOperation("车型/项目库")
     public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,
@@ -47,7 +56,14 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         map.put("notMaintenance",notMaintenanceList);
         return Result.success("200",map);
     }
-    @GetMapping("/api/queryById")
+    /**
+    *
+     * @param id
+    * @return
+    * @author zj
+    * date 2021-06-22
+    **/
+    @GetMapping("/queryById")
     @ApiOperation("点击项目id查询")
     public ResponseMessage queryByName(String id){
         List<SarStandProjectLibrary> list = sarStandProjectLibraryService.queryById(id);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -61,7 +61,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.sql.Clob;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -152,12 +151,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private SysInfoEOService sysInfoEOService;
 
-//    @Autowired
-//    private StandLawsSearchService standLawsSearchService;
-
-    @Value("${file.path}")
-    private String filePath;//文件存储路径
-
 
 
     /***
@@ -1860,7 +1853,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         return standList;
     }
-
     @Override
     public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
 
@@ -1992,6 +1984,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap);
 //    }
 
+
     public void getStandDetailsForAct (SarStandardsInfoEOPage page,String[] idArr,String standState,List<ActSarItemsEO> standList) throws Exception{
         page.setPageSize(100);
         page.setIdlist(idArr);