Browse Source

外采合同附件新增

zhanglei
God 3 years ago
parent
commit
69ff236783
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
  3. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@ -28,6 +28,7 @@ package com.yxt.anrui.base.api.baseoutsourcingapplication;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.common.core.dto.Dto;
@ -120,5 +121,5 @@ public class BaseOutsourcingApplicationDto implements Dto {
@ApiModelProperty("外采车辆列表")
private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
@ApiModelProperty("合同附件信息")
private List<CommonAppendixDto> contract;
private List<CommonAppendix> contract;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@ -49,7 +49,8 @@ public enum CommonAttachTypeEnum {
BILL_APPLICAYION("0012", "开票申请附件"),
MANUFACTOR_SUB("0013", "厂商认款附件"),
MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"),
SHUNTINGINVOICINAPPLY("0015", "调车开票附件");
SHUNTINGINVOICINAPPLY("0015", "调车开票附件"),
OUTSOURCINGAPPLY("0016", "外采申请附件");
/**
* 附件类型
*/

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -35,8 +35,12 @@ import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingA
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -112,6 +116,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
private FlowableFeign flowableFeign;
@Autowired
private FinPaymentrecordFeign finPaymentrecordFeign;
@Autowired
private CommonAppendixService commonAppendixService;
private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -165,6 +171,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
ResultBean rb = ResultBean.fireFail();
BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos();
List<CommonAppendix> contract = dto.getContract();
String sid1 = entity.getSid();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {//新增
@ -204,6 +211,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
}
for (CommonAppendix commonAppendix : contract) {
commonAppendix.setLinkSid(entity.getSid());
commonAppendix.setAttachType(CommonAttachTypeEnum.OUTSOURCINGAPPLY.getAttachType());
commonAppendixService.save(commonAppendix);
}
return rb.success().setMsg("添加成功").setData(entity.getSid());
}
updateBySid(dto, sid);

Loading…
Cancel
Save