diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 5b9b806129..afc3c2da1a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -12,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.io.IOException; import java.text.ParseException; -import java.util.List; import java.util.Map; /** @@ -44,9 +43,9 @@ public interface CommonContractFeign { @PostMapping("/generateContractNo") public Map generateContractNo(@RequestParam("userSid") String userSid); - @ApiOperation("新增保存") + /* @ApiOperation("新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody CommonContractDto dto); + public ResultBean save(@RequestBody CommonContractDto dto);*/ @ApiOperation("修改保存") @PostMapping("/update/{sid}") @@ -92,10 +91,10 @@ public interface CommonContractFeign { public ResultBean delAppCommonContractByBusSid(@RequestParam("busSid") String busSid); /*销售订单*/ - @ApiOperation("手机端根据销售订单sid查询合同信息") + /* @ApiOperation("手机端根据销售订单sid查询合同信息") @GetMapping("/getAppBusOrderContractByOrderSid") public ResultBean getAppBusOrderContractByOrderSid(@RequestParam("userSid") String userSid, @RequestParam("orderSid") String orderSid); - +*/ @ApiOperation("手机端保存、修改销售订单合同信息") @PostMapping("/saveOrUpdateAppBusOrderContract") public ResultBean saveOrUpdateAppBusOrderContract(@RequestBody AppBusOrderContractDto dto); @@ -133,9 +132,9 @@ public interface CommonContractFeign { @GetMapping("/printItemSet") public ResultBean printItemSet(@RequestParam("busSid") String busSid, @RequestParam("customerName") String customerName); - @ApiOperation(value = "打印项确认(生成word后转为pdf)") + /* @ApiOperation(value = "打印项确认(生成word后转为pdf)") @PostMapping("/printConfirm") - public ResultBean> printConfirm(@RequestBody PrintConfirmDto dto); + public ResultBean> printConfirm(@RequestBody PrintConfirmDto dto);*/ /******************************************************新车买卖合同审核(流程)******************************************************/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index 189fd364b8..ce5051555e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -8,7 +8,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.text.ParseException; -import java.util.List; import java.util.Map; /** @@ -38,11 +37,11 @@ public class CommonContractFeignFallback implements CommonContractFeign { return null; } - @Override + /* @Override public ResultBean save(CommonContractDto dto) { return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/save无法访问"); } - +*/ @Override public ResultBean update(CommonContractDto dto, String sid) { return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/update无法访问"); @@ -100,11 +99,11 @@ public class CommonContractFeignFallback implements CommonContractFeign { return rb.setMsg("接口anrui-base/commoncontract/delAppCommonContractByBusSid无法访问"); } - @Override + /* @Override public ResultBean getAppBusOrderContractByOrderSid(String userSid, String orderSid) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/commoncontract/getAppBusOrderContractByOrderSid无法访问"); - } + }*/ @Override public ResultBean saveOrUpdateAppBusOrderContract(AppBusOrderContractDto dto) { @@ -140,11 +139,11 @@ public class CommonContractFeignFallback implements CommonContractFeign { return rb.setMsg("接口anrui-base/commoncontract/printItemSet无法访问"); } - @Override + /* @Override public ResultBean printConfirm(PrintConfirmDto dto) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/commoncontract/printConfirm无法访问"); - } + }*/ @Override public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 4f3e90b8e2..ca06b93e4b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -1,21 +1,10 @@ package com.yxt.anrui.base.biz.commoncontract; -import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; -import com.yxt.anrui.buscenter.api.busorder.BusOrder; -import com.yxt.anrui.buscenter.api.busorder.BusOrderAllVo; -import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; -import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; -import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; -import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo; -import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel; -import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo; -import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; @@ -74,8 +63,8 @@ public class CommonContractRest implements CommonContractFeign { private FileUploadComponent fileUploadComponent; @Autowired private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; - @Autowired - private BusOrderFeign busOrderFeign; + /* @Autowired + private BusOrderFeign busOrderFeign;*/ @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { @@ -90,7 +79,7 @@ public class CommonContractRest implements CommonContractFeign { return map; } - @Override + /* @Override public ResultBean save(CommonContractDto dto) { ResultBean rb = ResultBean.fireFail(); dto.setSid(UUID.randomUUID().toString()); @@ -169,7 +158,7 @@ public class CommonContractRest implements CommonContractFeign { finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto); } return rb.success().setData(commonContract.getSid()); - } + }*/ @Override public ResultBean update(CommonContractDto dto, String sid) { @@ -298,7 +287,7 @@ public class CommonContractRest implements CommonContractFeign { * @param orderSid * @return */ - @Override + /* @Override public ResultBean getAppBusOrderContractByOrderSid(String userSid, String orderSid) { if (StringUtils.isBlank(userSid)) { return new ResultBean().fail().setMsg("用户sid不能为空"); @@ -307,7 +296,7 @@ public class CommonContractRest implements CommonContractFeign { return new ResultBean().fail().setMsg("销售sid不能为空"); } return commonContractService.getAppBusOrderContractByOrderSid(userSid, orderSid); - } + }*/ /** * 手机端保存、修改销售订单合同信息 @@ -411,10 +400,10 @@ public class CommonContractRest implements CommonContractFeign { return commonContractService.printItemSet(busSid, customerName); } - @Override + /* @Override public ResultBean> printConfirm(PrintConfirmDto dto) { return commonContractService.printConfirm(dto); - } + }*/ public List getSheetVal(Sheet sheet, int[] resultCell) throws ParseException { SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 7d243efa74..317c35a14f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -3,8 +3,6 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo; -import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; @@ -15,20 +13,13 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.biz.flow.FlowableService; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; -import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; -import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo; -import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountFeign; -import com.yxt.anrui.buscenter.api.busordermodel.AppBusOrderModelVo; -import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign; -import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; -import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; @@ -51,12 +42,8 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.math.BigDecimal; -import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.stream.Collectors; /** @@ -94,14 +81,14 @@ public class CommonContractService extends MybatisBaseService getAppBusOrderContractByOrderSid(String userSid, String orderSid) { + /* public ResultBean getAppBusOrderContractByOrderSid(String userSid, String orderSid) { Map map = generateContractNo(userSid); String staffSid = map.get("staffSid"); CommonContractVo commonContractVo = baseMapper.selectCountByCusAndStaAndBusSid(staffSid, orderSid); @@ -439,7 +426,7 @@ public class CommonContractService extends MybatisBaseService().success().setData(contractVo); - } + }*/ /** * 手机端保存/修改销售订单 @@ -580,7 +567,7 @@ public class CommonContractService extends MybatisBaseService> printConfirm(PrintConfirmDto dto) { + /* public ResultBean> printConfirm(PrintConfirmDto dto) { Map map = new HashMap(); // 合同信息 CommonContract contract = fetchBySid(dto.getSid()); @@ -699,7 +686,7 @@ public class CommonContractService extends MybatisBaseService getMap(Map map, PrintConfirmDto dto) { - Map commonContractMap = map; + /* public Map getMap(Map map, PrintConfirmDto dto) { + Map commonContractMap = map;*/ /** * 车辆登记合同参数: * 甲方:${partyA} @@ -971,7 +958,7 @@ public class CommonContractService extends MybatisBaseService busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); + /* ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) { BusOrderVo orderVo = busOrderVoResultBean.getData(); //乙方 @@ -979,9 +966,9 @@ public class CommonContractService extends MybatisBaseService