1、合同列表查询修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java

@@ -28,10 +28,10 @@ public class ContractController {
     /******************************************************************************************************************/
 
     //我的服务-电子合同
-    @ApiOperation(value="电子合同-列表", notes="role(用户类型): 0-个人 1-企业")
+    @ApiOperation(value="电子合同-列表", notes="role(用户类型): 0-个人 1-企业  status(签署状态)：0查询全部、1待我签署、2他人签署、3签约完成")
     @RequestMapping(value = "/queryContractList", method = {RequestMethod.GET})
-    public Result<?> queryContractList(@RequestHeader("X-Access-Token")String token, String role, EmployContract employContract, PageBean pageBean){
-        return contractService.queryContractList(token, role, employContract, pageBean);
+    public Result<?> queryContractList(@RequestHeader("X-Access-Token")String token, String role, String status, PageBean pageBean){
+        return contractService.queryContractList(token, role, status, pageBean);
     }
 
     //我的服务-电子合同

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java

@@ -14,11 +14,10 @@ public interface ContractService {
      * 电子合同-获取电子合同列表
      * @param token
      * @param role
-     * @param employContract
      * @param pageBean
      * @return
      */
-    public Result<?> queryContractList(String token, String role, EmployContract employContract, PageBean pageBean);
+    public Result<?> queryContractList(String token, String role, String status, PageBean pageBean);
 
     /**
      * 电子合同-获取电子合同详情

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java

@@ -59,24 +59,63 @@ public class ContractServiceImpl implements ContractService {
 
     //电子合同-获取电子合同列表
     @Override
-    public Result<?> queryContractList(String token, String role, EmployContract employContract, PageBean pageBean) {
+    public Result<?> queryContractList(String token, String role, String status, PageBean pageBean) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+        EmployContract employContract = new EmployContract();
+
         try{
             //分页
             Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
             LambdaQueryChainWrapper<EmployContract> query = employContractService
-                    .lambdaQuery()
-                    .eq(EmployContract::getBossId, hanHaiMember.getId());
+                    .lambdaQuery();
 
             //组装查询条件
             if("0".equals(role)){
                 //用户为个人
                 query.eq(EmployContract::getEmployeeId, hanHaiMember.getId());
+                //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成
+                switch (status){
+                    case "0":
+                        //查询全部
+                        break;
+                    case "1":
+                        //未签署
+                        employContract.setEmployeeStatus(0);
+                        break;
+                    case "2":
+                        //他人未签署
+                        employContract.setBossStatus(0);
+                        break;
+                    case "3":
+                        //签署完成
+                        employContract.setEmployeeStatus(1);
+                        employContract.setBossStatus(1);
+                        break;
+                }
             }else if("1".equals(role)){
                 //用户为企业
                 query.eq(EmployContract::getBossId, hanHaiMember.getId());
+                //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成
+                switch (status){
+                    case "0":
+                        //查询全部
+                        break;
+                    case "1":
+                        //未签署
+                        employContract.setBossStatus(0);
+                        break;
+                    case "2":
+                        //他人未签署
+                        employContract.setEmployeeStatus(0);
+                        break;
+                    case "3":
+                        //签署完成
+                        employContract.setBossStatus(1);
+                        employContract.setEmployeeStatus(1);
+                        break;
+                }
             }else {
                 return Result.error("角色类型输入错误，电子合同列表查询失败");
             }
@@ -436,6 +475,7 @@ public class ContractServiceImpl implements ContractService {
             document.close();
             pdfInputStream.close();
 
+
         }catch (Exception e){
             e.printStackTrace();
             return Result.OK("pdf添加签名失败！");