diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java index 573fed99..f13645da 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java @@ -60,8 +60,8 @@ public class DgGuaranteeAssignUserController { public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size, @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName){ //获取当前登录用户userId - String userId = dgApplyAmountInfoController.getUserId(); - //String userId = "5"; + //String userId = dgApplyAmountInfoController.getUserId(); + String userId = "5"; //根据角色查询担保部调查列表 String roleIds = RedisUtil.get("dq:userRole:" + userId); PageUtils data = null; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java index 5eab7732..f3631054 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java @@ -23,7 +23,11 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.AUTO) private Integer id; - + /** + * 业务id + */ + @ApiModelProperty(value = "业务id") + private Integer businessId; /** * 企业id */ @@ -81,9 +85,23 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable private String phone; /** - * 状态 + * 审批状态 */ - @ExcelProperty(value = "状态",index = 7) - @ApiModelProperty(value = "状态") + @ExcelProperty(value = "审批状态",index = 7) + @ApiModelProperty(value = "审批状态") private Integer status; + + /** + * 业务状态 + */ + @ExcelProperty(value = "业务状态",index = 8) + @ApiModelProperty(value = "业务状态") + private Integer businessStatus; + + /** + * 操作状态 + */ + @ExcelProperty(value = "操作状态",index = 9) + @ApiModelProperty(value = "操作状态") + private Integer operatingStatus; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index b70dc205..41a0e5eb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -14,23 +14,19 @@ import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.framework.domain.crms.CrmsCustomerRelated; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; -import com.daqing.framework.domain.crms.response.CompanyCustomerResponse; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import com.daqing.framework.domain.guarantee.DgEnclosureInfo; import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; -import com.daqing.framework.domain.hrms.DeptEntity; -import com.daqing.framework.domain.hrms.ext.EmployeeListVO; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RandomUtil; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.excel.ExcelUtil; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.springframework.data.redis.core.RedisTemplate; @@ -87,6 +83,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl().eq("business_id",businessApplication.getId())); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java index 148ea0e7..1398d435 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java @@ -13,6 +13,7 @@ import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest; import com.daqing.financial.guarantee.model.response.*; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import com.daqing.framework.domain.guarantee.DgEnclosureInfo; @@ -116,12 +117,15 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl(); for(int i=0;i0){ + List arr1List; + if(list.get(i)!=null){ String a1 = list.get(i).substring(1,list.get(i).length()-1); String arr1[]=a1.split(","); - List arr1List = Arrays.asList(arr1); + arr1List = Arrays.asList(arr1); arr1List2.add(i,arr1List); - + System.out.println("arr1LIst===="+arr1List); + }else{ + arr1List2.add(i,null); } } dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); @@ -164,15 +168,15 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl().eq("business_id",guaranteeAssignUser.getBusinessId())); @@ -205,7 +209,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl + @@ -18,12 +19,13 @@