diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index de055859..9e211b8e 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; @@ -16,10 +17,17 @@ import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.system.util.MyStringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -47,6 +55,12 @@ public class SarFileCompareInfoController extends JeroController r = new Result<>(); + r.setSuccess(true); + r.setCode(CommonConstant.SC_OK_200); + r.setResult(InfoId); + return r; } catch (Exception ex) { log.error("发起文档对比失败:" + ex.getMessage()); return Result.OK("发起文档对比失败!"); diff --git a/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java b/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java index c21d9c87..8b2ca5ff 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java @@ -138,4 +138,18 @@ public class SarFileCompareInfo implements Serializable { @ApiModelProperty(value = "评论") private String comments; + + @TableField(exist = false) + @ApiModelProperty(value = "标准ID1") + private String standardIdLeft; + @TableField(exist = false) + @ApiModelProperty(value = "标准来源1") + private String standardSourceLeft; + @TableField(exist = false) + @ApiModelProperty(value = "标准ID2") + private String standardIdRight; + @TableField(exist = false) + @ApiModelProperty(value = "标准来源2") + private String standardSourceRight; + }