Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, xxx

See merge request LiuChao/foton-slrs-system-rest!345

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -70,6 +70,20 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @Autowired
     private IDicTypeEOService dicTypeEOService;
 
+    /**
+     * 根据计划库制定状态查询企标编号
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandEO|根据计划库制定状态查询企标编号")
+    @GetMapping("/getStandInfoByReviseStatus")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus) {
+        SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus);
+        return Result.success(result);
+    }
+
     @ApiOperation(value = "|SarBussionessStandEO|删除")
     @PostMapping("deleteSarBussionessStand")
     //401问题2021-03-31暂时注释掉 liuhuiwen

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -22,6 +22,8 @@ import java.util.List;
 @Repository
 public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
+
     SarBussionessStand selectByPrimaryKey(String standId);
 
     List<SarBussionessStand> selectStandardsByStandNumber(SarBussionessStand sarBussionessStand);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -111,8 +111,20 @@ public class SarBussionessStand extends BaseEntity {
     @TableField("TEXT_STATUS_BUSS")
     private String textStatusBuss;
 
+    @ApiModelProperty(value = "计划库制定状态 0 默认 1 制定 2修订")
+    @TableField("REVISE_STATUS")
+    private String reviseStatus;
+
+    @ApiModelProperty(value = "标准顺序号")
+    @TableField("STAND_SN")
+    private String standSn;
+
 
     // 非表字段
+    @TableField(exist = false)
+    private String newStandSn;
+
+
     @TableField(exist = false)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private String firstPutTime;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -18,6 +18,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {
 
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
+
     void attrInfoDetails (SarBussionessStand row) throws Exception;
 
     ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -145,6 +145,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private StandLawsSearchService standLawsSearchService;
 
+    @Override
+    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus){
+        return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus);
+    }
+
     public ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception {
         SarBussionessStand sarStandardsInfoEO = new SarBussionessStand();
         sarStandardsInfoEO.setValidFlag(1);