Commit fa21bb63 by 穆龙飞

modify:修改同舟查询条件

parent a4e5a20a
...@@ -71,4 +71,9 @@ public class ChangeFlowListQueryReq { ...@@ -71,4 +71,9 @@ public class ChangeFlowListQueryReq {
* @see CreateSourceEnum * @see CreateSourceEnum
*/ */
private Integer createSource; private Integer createSource;
/**
* 创建端
*/
private String createSupplier;
} }
\ No newline at end of file
...@@ -78,6 +78,9 @@ ...@@ -78,6 +78,9 @@
<if test="endTime != null"> <if test="endTime != null">
and create_time <![CDATA[ < ]]> #{endTime} and create_time <![CDATA[ < ]]> #{endTime}
</if> </if>
<if test="createSupplier != null">
and create_supplier = #{createSupplier}
</if>
</where> </where>
order by create_time desc order by create_time desc
</select> </select>
......
...@@ -110,6 +110,9 @@ public class ChangeFlowController { ...@@ -110,6 +110,9 @@ public class ChangeFlowController {
} }
if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) { if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空"); Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
changeFlowListQueryReq.setCreateSource(createSource);
changeFlowListQueryReq.setSupplier(null);
changeFlowListQueryReq.setCreateSupplier(supplier);
} }
return AjaxResult.success(changeFlowBiz.query(page, pageSize, changeFlowListQueryReq)); return AjaxResult.success(changeFlowBiz.query(page, pageSize, changeFlowListQueryReq));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment