欠款提车

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

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

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

@@ -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"));
@@ -2194,15 +2195,13 @@ 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("该申请不存在");
         }
+
+        if ("Activity_0tieuz3".equals(query.getTaskDefKey())) {
+            //销售内勤审批
             List<String> carContract = query.getCarContract();
             if (carContract.isEmpty()) {
                 return rb.setMsg("请上传车辆买卖合同");
@@ -2229,6 +2228,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
             }
+        }
+        if("Activity_0ynxtyz".equals(query.getTaskDefKey())){
+            //销售经理信审截图
             List<String> fileList = query.getFileList();
             if (fileList.isEmpty()) {
                 return rb.setMsg("请上传其他附件");
@@ -2236,6 +2238,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setOtherFile(fileLists);
             }
+        }
         baseMapper.updateById(busArrearsCarryVehicleApply);
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);

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

@@ -301,6 +301,8 @@ public class AppBusArrearsCarryVehicleApplyService {
         AdvanceArrearsInfoVo advanceArrearsInfoVo = details.getData();
         if (advanceArrearsInfoVo != null) {
             ArrearVo arrearVo = new ArrearVo();
+            if ("Activity_0tieuz3".equals(query.getTaskDefKey())) {
+                //销售内勤审批
                 arrearVo.setTitle("车辆买卖合同（欠款）");
                 arrearVo.setType(1);
                 arrearVo.setKey("carContract");
@@ -335,6 +337,9 @@ public class AppBusArrearsCarryVehicleApplyService {
                 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);
@@ -345,6 +350,8 @@ public class AppBusArrearsCarryVehicleApplyService {
                 list.add(arrearVo);
                 arrearsVo.setList(list);
             }
+
+        }
         return rb.success().setData(arrearsVo);
     }
 }