FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!399
This commit is contained in:
super_liu
2022-02-11 17:16:20 +08:00
parent b985a9933b 012df3992a
commit 658058a84f
8 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+2
View File
@@ -37,6 +37,8 @@ public class ActDefineStartMap {
// 企标制修订-产品标准
map.put("buss2","bussLibraryProductWkflow");
map.put("buss3","bussFsWkflow");
//张超然
map.put("20","StandardApplyMeetProcess");
map.put("21","StandardMeetProcess");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java
+13
View File
@@ -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
+4
View File
@@ -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
+5
View File
@@ -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
+3
View File
@@ -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
+2
View File
@@ -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
+8
View File
@@ -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);
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+38 -13
View File
@@ -6,19 +6,19 @@
</resultMap>
<sql id="Base_Column_List" >
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
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
@@ -75,6 +75,31 @@
</trim>
</sql>
<!-- 分页查询条件当页数据 -->
<select id="getSarBussionessStandStatePageNo" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
SELECT A.* FROM (
select
<include refid="Base_Column_List" />,
sar_buss_stand_attr_info.QCDW,
sar_buss_stand_attr_info.QCRBUSS
from sar_bussioness_stand_state
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
ORDER BY
REVIEW_RESULTS ASC,
REVIEW_TIME DESC,
ISSUE_TIME DESC
) A
limit ${pager.startIndex-1},${pageSize}
</select>
<select id="getBussionessStandStateCountNo" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
select count(1) from (
select id from sar_bussioness_stand_state
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
) a
</select>
<!-- 分页查询条件当页数据 -->
<select id="getBussionessStandStatePage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
SELECT A.* FROM (