Commit a17064687ab4fe47555c5fd5b4a840a5621762d3

Authored by 陈翱
1 parent 99dfb0b0

优化审核流程配置

ant-design-vue-jeecg/src/views/system/flow/FlowDetailList.vue
... ... @@ -109,6 +109,10 @@
109 109 return {
110 110 description: '流程头表管理页面',
111 111 disableMixinCreated:true,
  112 + isorter: {
  113 + column: 'sequence',
  114 + order: 'asc',
  115 + },
112 116 // 表头
113 117 columns: [
114 118 {
... ...
ant-design-vue-jeecg/src/views/system/flow/modules/FlowDetailModal.vue
... ... @@ -12,6 +12,7 @@
12 12 <a-form-model ref="form" :model="model" :rules="validatorRules">
13 13 <a-row>
14 14 <a-col :span="24">
  15 + <p style="color: red;margin-left: 100px">注*:选择先后顺序决定审核流程顺序</p>
15 16 <a-form-model-item label="选择审核人" prop="multiUser" :labelCol="labelCol" :wrapperCol="wrapperCol">
16 17 <j-select-multi-user v-model="model.auditorId" :query-config="selectUserQueryConfig"/>
17 18 </a-form-model-item>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/controller/FlowHeaderController.java
... ... @@ -173,7 +173,6 @@ public class FlowHeaderController extends JeecgController&lt;FlowHeader, IFlowHeade
173 173 HttpServletRequest req) {
174 174 QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, req.getParameterMap());
175 175 Page<FlowDetail> page = new Page<FlowDetail>(pageNo, pageSize);
176   - queryWrapper.orderByAsc("sequence");
177 176 IPage<FlowDetail> pageList = flowDetailService.page(page, queryWrapper);
178 177 return Result.OK(pageList);
179 178 }
... ... @@ -191,7 +190,7 @@ public class FlowHeaderController extends JeecgController&lt;FlowHeader, IFlowHeade
191 190 //批量新增的时候,按前台选择用户的顺序,生成审核顺序
192 191 LambdaQueryWrapper<FlowDetail>lambdaQueryWrapper=new LambdaQueryWrapper<>();
193 192 lambdaQueryWrapper.eq(FlowDetail::getHeadId,flowDetail.getHeadId())
194   - .orderByAsc(FlowDetail::getSequence).last("limit 1");
  193 + .orderByDesc(FlowDetail::getSequence).last("limit 1");
195 194 FlowDetail detail=flowDetailService.getOne(lambdaQueryWrapper);
196 195 Integer sequence=0;
197 196 if (detail!=null){
... ...