Commit 87f6cb12 by wangweidong

内部检测不流转到待验收

parent be1066ca
...@@ -236,6 +236,7 @@ public class ContractSampleController extends ServiceController { ...@@ -236,6 +236,7 @@ public class ContractSampleController extends ServiceController {
ContractSampleStatusEnum.OUT_DRIFT, ContractSampleStatusEnum.OUT_DRIFT,
ContractSampleStatusEnum.ENTRUST_REG ContractSampleStatusEnum.ENTRUST_REG
)); ));
contractSample.setNeType(0);
return success(contractSampleService.pageVO(getPage(), contractSample)); return success(contractSampleService.pageVO(getPage(), contractSample));
} }
......
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
<sql id="sqlWhere"> <sql id="sqlWhere">
<if test="null!=vo.neType">
AND s.type != #{vo.neType}
</if>
<if test="null!=vo.status"> <if test="null!=vo.status">
AND s.status = #{vo.status} AND s.status = #{vo.status}
</if> </if>
......
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