Commit 3318e294ee2587c77c2d343098a4f642a8f810ec

Authored by 房远帅
1 parent 6c2eb1bc

楚江ERP:客户资信增加是否变更标识

@@ -458,6 +458,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD @@ -458,6 +458,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
458 private String frozenStatus; 458 private String frozenStatus;
459 459
460 /** 460 /**
  461 + * 是否发起过变更
  462 + */
  463 + @ApiModelProperty(value = "是否发起过变更")
  464 + private String isChange;
  465 +
  466 + /**
461 * 核心人员 467 * 核心人员
462 */ 468 */
463 @ApiModelProperty("核心人员") 469 @ApiModelProperty("核心人员")
@@ -343,6 +343,11 @@ public class CustomerCredit extends BaseEntity implements BaseDto { @@ -343,6 +343,11 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
343 private String frozenStatus; 343 private String frozenStatus;
344 344
345 /** 345 /**
  346 + * 是否发起过变更
  347 + */
  348 + private String isChange;
  349 +
  350 + /**
346 * 是否展示审核按钮(非持久化字段) 351 * 是否展示审核按钮(非持久化字段)
347 */ 352 */
348 @TableField(exist = false) 353 @TableField(exist = false)
@@ -337,7 +337,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM @@ -337,7 +337,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
337 List<CorePersonnel> corePersonnelList = corePersonnelService.query(queryCorePersonnelVo); 337 List<CorePersonnel> corePersonnelList = corePersonnelService.query(queryCorePersonnelVo);
338 String historyId = null; 338 String historyId = null;
339 String sort = "1"; 339 String sort = "1";
340 - if ("CHANGE".equals(type)) { 340 + if ("CHANGE".equals(type) || "true".equals(data.getIsChange())) {
341 CreateCustomerCreditHistoryVo historyVo = new CreateCustomerCreditHistoryVo(); 341 CreateCustomerCreditHistoryVo historyVo = new CreateCustomerCreditHistoryVo();
342 historyVo.setCreditId(data.getId()); 342 historyVo.setCreditId(data.getId());
343 //第几次变更序号 343 //第几次变更序号
@@ -754,6 +754,11 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM @@ -754,6 +754,11 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
754 redisHandler.set(vo.getId(), jsonString); 754 redisHandler.set(vo.getId(), jsonString);
755 //修改状态 755 //修改状态
756 updateStatus(vo.getId(), "AUDIT"); 756 updateStatus(vo.getId(), "AUDIT");
  757 + //增加标识
  758 + LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
  759 + .set(CustomerCredit::getIsChange, "true")
  760 + .eq(CustomerCredit::getId, vo.getId());
  761 + getBaseMapper().update(updateWrapper);
757 } else { 762 } else {
758 //变更审核通过后再修改入库 763 //变更审核通过后再修改入库
759 LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class) 764 LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
66 <result column="status" property="status"/> 66 <result column="status" property="status"/>
67 <result column="enterprise_operation_type" property="enterpriseOperationType"/> 67 <result column="enterprise_operation_type" property="enterpriseOperationType"/>
68 <result column="frozen_status" property="frozenStatus"/> 68 <result column="frozen_status" property="frozenStatus"/>
  69 + <result column="is_change" property="isChange"/>
69 <result column="create_by_id" property="createById"/> 70 <result column="create_by_id" property="createById"/>
70 <result column="create_by" property="createBy"/> 71 <result column="create_by" property="createBy"/>
71 <result column="update_by_id" property="updateById"/> 72 <result column="update_by_id" property="updateById"/>
@@ -139,6 +140,7 @@ @@ -139,6 +140,7 @@
139 tb.shareholder_file_id, 140 tb.shareholder_file_id,
140 tb.enterprise_operation_type, 141 tb.enterprise_operation_type,
141 tb.frozen_status, 142 tb.frozen_status,
  143 + tb.is_change,
142 tb.create_by_id, 144 tb.create_by_id,
143 tb.create_by, 145 tb.create_by,
144 tb.update_by_id, 146 tb.update_by_id,