修改往来单位查询问题

dev
郑明梁 2 years ago
parent 658fb65413
commit ec39ea48d1

@ -198,7 +198,7 @@ public class ConstantStatus {
public static final int CORP_TYPE_SPECIAL = 4; //特殊往来 public static final int CORP_TYPE_SPECIAL = 4; //特殊往来
public static final int CORP_TYPE_DEPT = 4; //部门 public static final int CORP_TYPE_DEPT = 4; //部门
public static final int CORP_SICK_INN = 1;
public static final int CORP_SICK_SICK = 1; public static final int CORP_SICK_SICK = 1;
public static final int CORP_SICK_CUS = 2; public static final int CORP_SICK_CUS = 2;

@ -78,11 +78,6 @@ public class BasicCorpController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
List<BasicCorpEntity> basicUnitMaintainEntities; List<BasicCorpEntity> basicUnitMaintainEntities;
//是供应商的时候拉客户和供应商
// if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) {
// basicUnitMaintainFilterRequest.setCorpType(null);
// basicUnitMaintainFilterRequest.setCorpTypeLists(new ArrayList<>(Arrays.asList(1, 2)));
// }
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -128,8 +123,10 @@ public class BasicCorpController {
basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setErpId(CustomUtil.getId());
if(basicUnitMaintainSaveRequest.getCorpType()==1){ if(basicUnitMaintainSaveRequest.getCorpType()==1){
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
}else{ }else if(basicUnitMaintainSaveRequest.getCorpType()==2){
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
}else{
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN);
} }
basicUnitMaintainEntity.setUpdateTime(new Date()); basicUnitMaintainEntity.setUpdateTime(new Date());
basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());

@ -45,7 +45,7 @@
) )
</if> </if>
<if test="outType != null"> <if test="outType != null">
AND (outType = #{outType} or outType is NULL) AND (outType = #{outType})
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ <![CDATA[

Loading…
Cancel
Save