Merge branch 'develop_migration' into 'develop_master'

Develop migration

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java

@@ -36,6 +36,19 @@ public class SarBussionessStandStateController extends BaseController<SarBussion
     @Autowired
     private ISarBussionessStandStateService bussionessStandStateService;
 
+    /**
+     * 自定义分页复审流程查询列表
+     * @param page  标准信息
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandState|自定义分页复审流程查询列表")
+    @GetMapping("/getSarBussionStandPageNo")
+    //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage")
+    public ResponseMessage<PageInfo<SarBussionessStandState>> getSarBussionStandPageNo(SarBussionessStandStatePage page) throws Exception {
+        List<SarBussionessStandState> rows = bussionessStandStateService.getSarBussionessStandStatePageNo(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
     /**
      * 自定义分页查询列表
      * @param page  标准信息

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java

@@ -20,4 +20,8 @@ public interface SarBussionessStandStateDao extends BaseMapper<SarBussionessStan
 
     int getBussionessStandStateCount(SarBussionessStandStatePage page);
 
+    List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page);
+
+    int getBussionessStandStateCountNo(SarBussionessStandStatePage page);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java

@@ -86,5 +86,10 @@ public class SarBussionessStandState extends BaseEntity {
     @TableField("PARAM2")
     private String param2;
 
+    @TableField(exist = false)
+    private String QCDW;
+
+    @TableField(exist = false)
+    private String QCRBUSS;
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java

@@ -70,5 +70,8 @@ public class SarBussionessStandStatePage extends BasePage {
     private String issueTimeStart;
     private String issueTimeEnd;
 
+    private String QCDW;
+    private String QCRBUSS;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandStateService extends IService<SarBussionessStandState> {
 
+    List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception;
+
     List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception;
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java

@@ -20,6 +20,14 @@ import java.util.List;
 @Service
 public class SarBussionessStandStateServiceImpl extends ServiceImpl<SarBussionessStandStateDao, SarBussionessStandState> implements ISarBussionessStandStateService {
 
+    @Override
+    public List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{
+        Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarBussionessStandState> stateList = this.baseMapper.getSarBussionessStandStatePageNo(page);
+        return stateList;
+    }
+
     @Override
     public List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{
         Integer rowCount = this.baseMapper.getBussionessStandStateCount(page);