yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
3df0627246 3e1e863546
commit
23eb74d012
10 changed files with 109 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  3. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java
  4. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java
  5. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java
  6. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml
  7. 77
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  8. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  9. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  10. 93
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -2620,8 +2620,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ResultBean rb = ResultBean.fireFail();
CommonContractQKQuery params = query.getParams();
QueryWrapper<CommonContractVo> qw = new QueryWrapper<>();
qw.eq("staffSid",params.getStaffSid());
qw.eq("orgSid",params.getDeptSid());
ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(),params.getOrgPath());
if(!busList.getData().isEmpty()){
qw.in("busSid",busList.getData());
}
if (StringUtils.isNotBlank(params.getCustomerName())){
qw.like("partyB",params.getCustomerName());
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
View File

@ -123,8 +123,8 @@ public interface BusArrearsCarryVehicleApplyFeign {
@ResponseBody
public ResultBean completeBy(@RequestBody CompleteByQuery query);
@ApiOperation(value = "办理（同意）")
@PostMapping("/InitiatorToAnswerInfo")
@ApiOperation(value = "跨事业部办理（同意）")
@PostMapping("/initiatorToAnswerInfo")
@ResponseBody
public ResultBean InitiatorToAnswerInfo(@Valid @RequestBody AppCompleteAdvanceArrearsDto query);

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java
View File

@ -5,8 +5,6 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class BusArrearsCarryVehicleApplyPageVo implements Vo {
@ -42,4 +40,10 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo {
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("流程定义id")
private String procDefId;
@ApiModelProperty("流程实例id")
private String procInstId;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java
View File

@ -15,7 +15,4 @@ public class GetNodeQuery implements Query {
private String taskDefKey;
private String businessSid;
// @ApiModelProperty(value = "分支字段及业务字段")
// private Map<String, Object> formVariables;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java
View File

@ -41,6 +41,8 @@ public class BusArrearsCarryVehicleDetailsVo implements Vo {
@ApiModelProperty("备注")
private String remarks;
private String vinSid;
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml
View File

@ -23,7 +23,9 @@
<!-- 申请日期 -->
DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate,
<!-- 申请人 -->
bacva.applyName
bacva.applyName,
bacva.procDefId,
bacva.procInstId
FROM bus_arrears_carry_vehicle_apply bacva
<where>
${ew.sqlSegment}

77
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -602,6 +602,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
BeanUtil.copyProperties(busArrearsCarryVehicleApply, appArrearsCarryInfoVo, "sid");
appArrearsCarryInfoVo.setSid(sid);
appArrearsCarryInfoVo.setUserSid(busArrearsCarryVehicleApply.getCreateBySid());
appArrearsCarryInfoVo.setContractId(busArrearsCarryVehicleApply.getContractNo());
appArrearsCarryInfoVo.setPublishInfo(busArrearsCarryVehicleApply.getApplyDept() + "-" + busArrearsCarryVehicleApply.getApplyName());
appArrearsCarryInfoVo.setCreateDate(DateUtil.format(busArrearsCarryVehicleApply.getCreateTime(), "yyyy-MM-dd"));
@ -1612,7 +1613,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
baseVehicleTempstateDto.setTempValue("待审核");
List<BusArrearsCarryVehicleDetailsVo> busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) {
baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid());
baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVinSid());
baseVehicleTempstateDto.setVinNo(busArrearsCarryVehicleDetailsVo.getVinNo());
baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
}
@ -2194,47 +2195,49 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
public ResultBean completeBy(CompleteByQuery query) {
ResultBean rb = ResultBean.fireFail();
if ("Activity_0tieuz3".equals(query.getTaskDefKey()) || "Activity_0ynxtyz".equals(query.getTaskDefKey())) {
//销售内勤审批|| //销售部经理审批上传信审
}
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
if (busArrearsCarryVehicleApply == null) {
return rb.setMsg("该申请不存在");
}
List<String> carContract = query.getCarContract();
if (carContract.isEmpty()) {
return rb.setMsg("请上传车辆买卖合同");
} else {
String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setCarContractFile(carContractImages);
}
List<String> guaranteeLetter = query.getGuaranteeLetter();
if (guaranteeLetter.isEmpty()) {
return rb.setMsg("请上传欠款提车担保承诺书");
} else {
String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages);
}
List<String> gdLetter = query.getGdLetter();
if (!gdLetter.isEmpty()) {
String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages);
}
List<String> zjlLetter = query.getZjlLetter();
if (zjlLetter.isEmpty()) {
return rb.setMsg("请上传总经理担保书");
} else {
String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
if ("Activity_0tieuz3".equals(query.getTaskDefKey())) {
//销售内勤审批
List<String> carContract = query.getCarContract();
if (carContract.isEmpty()) {
return rb.setMsg("请上传车辆买卖合同");
} else {
String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setCarContractFile(carContractImages);
}
List<String> guaranteeLetter = query.getGuaranteeLetter();
if (guaranteeLetter.isEmpty()) {
return rb.setMsg("请上传欠款提车担保承诺书");
} else {
String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages);
}
List<String> gdLetter = query.getGdLetter();
if (!gdLetter.isEmpty()) {
String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages);
}
List<String> zjlLetter = query.getZjlLetter();
if (zjlLetter.isEmpty()) {
return rb.setMsg("请上传总经理担保书");
} else {
String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
}
}
List<String> fileList = query.getFileList();
if (fileList.isEmpty()) {
return rb.setMsg("请上传其他附件");
} else {
String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setOtherFile(fileLists);
if("Activity_0ynxtyz".equals(query.getTaskDefKey())){
//销售经理信审截图
List<String> fileList = query.getFileList();
if (fileList.isEmpty()) {
return rb.setMsg("请上传其他附件");
} else {
String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setOtherFile(fileLists);
}
}
baseMapper.updateById(busArrearsCarryVehicleApply);
BusinessVariables bv = new BusinessVariables();

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -746,7 +746,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
}
if("3".equals(type)){
if("3".equals(type) || "2".equals(type)){
for (int i = 0; i < num; i++) {
BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -17,7 +17,7 @@ public enum ProcDefEnum {
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:1:1202504"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:2:1347504"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),

93
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java
View File

@ -301,49 +301,56 @@ public class AppBusArrearsCarryVehicleApplyService {
AdvanceArrearsInfoVo advanceArrearsInfoVo = details.getData();
if (advanceArrearsInfoVo != null) {
ArrearVo arrearVo = new ArrearVo();
arrearVo.setTitle("车辆买卖合同（欠款）");
arrearVo.setType(1);
arrearVo.setKey("carContract");
arrearVo.setNullAble(false);
List<String> carContract = advanceArrearsInfoVo.getCarContract();
arrearVo.setFilesPath(carContract);
list.add(arrearVo);
//=================================================
arrearVo = new ArrearVo();
arrearVo.setTitle("欠款提车担保承诺书");
arrearVo.setType(1);
arrearVo.setKey("guaranteeLetter");
arrearVo.setNullAble(false);
List<String> guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter();
arrearVo.setFilesPath(guaranteeLetter);
list.add(arrearVo);
//=================================================
arrearVo = new ArrearVo();
arrearVo.setTitle("股东会对外担保决议");
arrearVo.setType(1);
arrearVo.setKey("gdLetter");
arrearVo.setNullAble(true);
List<String> gdLetter = advanceArrearsInfoVo.getGdLetter();
arrearVo.setFilesPath(gdLetter);
list.add(arrearVo);
//=================================================
arrearVo = new ArrearVo();
arrearVo.setTitle("总经理担保书");
arrearVo.setType(1);
arrearVo.setKey("zjlLetter");
arrearVo.setNullAble(false);
List<String> zjlLetter = advanceArrearsInfoVo.getZjlLetter();
arrearVo.setFilesPath(zjlLetter);
list.add(arrearVo);
arrearVo = new ArrearVo();
arrearVo.setTitle("其他附件");
arrearVo.setType(1);
arrearVo.setKey("fileList");
arrearVo.setNullAble(false);
List<String> fileList = advanceArrearsInfoVo.getFileList();
arrearVo.setFilesPath(fileList);
list.add(arrearVo);
arrearsVo.setList(list);
if ("Activity_0tieuz3".equals(query.getTaskDefKey())) {
//销售内勤审批
arrearVo.setTitle("车辆买卖合同（欠款）");
arrearVo.setType(1);
arrearVo.setKey("carContract");
arrearVo.setNullAble(false);
List<String> carContract = advanceArrearsInfoVo.getCarContract();
arrearVo.setFilesPath(carContract);
list.add(arrearVo);
//=================================================
arrearVo = new ArrearVo();
arrearVo.setTitle("欠款提车担保承诺书");
arrearVo.setType(1);
arrearVo.setKey("guaranteeLetter");
arrearVo.setNullAble(false);
List<String> guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter();
arrearVo.setFilesPath(guaranteeLetter);
list.add(arrearVo);
//=================================================
arrearVo = new ArrearVo();
arrearVo.setTitle("股东会对外担保决议");
arrearVo.setType(1);
arrearVo.setKey("gdLetter");
arrearVo.setNullAble(true);
List<String> gdLetter = advanceArrearsInfoVo.getGdLetter();
arrearVo.setFilesPath(gdLetter);
list.add(arrearVo);
//=================================================
arrearVo = new ArrearVo();
arrearVo.setTitle("总经理担保书");
arrearVo.setType(1);
arrearVo.setKey("zjlLetter");
arrearVo.setNullAble(false);
List<String> zjlLetter = advanceArrearsInfoVo.getZjlLetter();
arrearVo.setFilesPath(zjlLetter);
list.add(arrearVo);
}
if ("Activity_0ynxtyz".equals(query.getTaskDefKey())) {
//销售经理信审截图
arrearVo = new ArrearVo();
arrearVo.setTitle("其他附件");
arrearVo.setType(1);
arrearVo.setKey("fileList");
arrearVo.setNullAble(false);
List<String> fileList = advanceArrearsInfoVo.getFileList();
arrearVo.setFilesPath(fileList);
list.add(arrearVo);
arrearsVo.setList(list);
}
}
return rb.success().setData(arrearsVo);
}

Write Preview
Loading…
Cancel
Save