diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 59408875..fbd1eb1e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -37,6 +37,8 @@ public class ActDefineStartMap { // 企标制修订-产品标准 map.put("buss2","bussLibraryProductWkflow"); + map.put("buss3","bussFsWkflow"); + //张超然 map.put("20","StandardApplyMeetProcess"); map.put("21","StandardMeetProcess"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java index 03275114..ad89adae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java @@ -36,6 +36,19 @@ public class SarBussionessStandStateController extends BaseController> getSarBussionStandPageNo(SarBussionessStandStatePage page) throws Exception { + List rows = bussionessStandStateService.getSarBussionessStandStatePageNo(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + /** * 自定义分页查询列表 * @param page 标准信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java index fd0fa12e..71f7fcdd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java @@ -20,4 +20,8 @@ public interface SarBussionessStandStateDao extends BaseMapper getSarBussionessStandStatePageNo(SarBussionessStandStatePage page); + + int getBussionessStandStateCountNo(SarBussionessStandStatePage page); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java index d1c2adf4..e22d5559 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java +++ b/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; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java index 3cca7a54..8a9504f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java +++ b/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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java index d0656649..e5800a99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java +++ b/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 { + List getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception; + List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java index ce8fd653..28159d8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java +++ b/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 implements ISarBussionessStandStateService { + @Override + public List getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{ + Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page); + page.getPager().setRowCount(rowCount); + List stateList = this.baseMapper.getSarBussionessStandStatePageNo(page); + return stateList; + } + @Override public List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{ Integer rowCount = this.baseMapper.getBussionessStandStateCount(page); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index 1acd176c..acd38f45 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -6,19 +6,19 @@ - ID, - STAND_ID, - STAND_NAME, - STAND_CODE, - REVIEW_TIME, - ISSUE_TIME, - REVIEW_RESULTS, - REVIEW_PROCESS_NUM, - CREATION_TIME, - MODIFY_TIME, - VALID_FLAG, - PARAM1, - PARAM2 + sar_bussioness_stand_state.ID, + sar_bussioness_stand_state.STAND_ID, + sar_bussioness_stand_state.STAND_NAME, + sar_bussioness_stand_state.STAND_CODE, + sar_bussioness_stand_state.REVIEW_TIME, + sar_bussioness_stand_state.ISSUE_TIME, + sar_bussioness_stand_state.REVIEW_RESULTS, + sar_bussioness_stand_state.REVIEW_PROCESS_NUM, + sar_bussioness_stand_state.CREATION_TIME, + sar_bussioness_stand_state.MODIFY_TIME, + sar_bussioness_stand_state.VALID_FLAG, + sar_bussioness_stand_state.PARAM1, + sar_bussioness_stand_state.PARAM2 @@ -75,6 +75,31 @@ + + + + +