优惠包交接修改、随车资料修改、其他融备案

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@@ -396,12 +396,38 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+
         //新增修改保存
         ResultBean<String> resultBean = saveDiscountPackageApplyInfo(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        BaseDiscountpackageApply discountpackageApply = fetchBySid(businessSid);
+        String orgSidPath = "";
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(discountpackageApply.getOrgSidPath())) {
+            orgSidPath = discountpackageApply.getOrgSidPath();
+        } else {
+            SysUserVo data = sysUserFeign.fetchBySid(discountpackageApply.getCreateBySid()).getData();
+            if (null != data) {
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(data.getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                //用户的组织全路径
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
+        }
+        List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
+        if (sysOrganization == null) {
+            return rb.setMsg("当前所在的组织机构不存在");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(sysOrganization.getManagerSid())) {
+//            return rb.setMsg("当前所在的组织机构未设置主管人员");
+            sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+        }
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
@@ -419,6 +445,8 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         //用户sid
         bv.setUserSid(dto.getUserSid());
         bv.setFormVariables(variables);
+        String nextNodeUserSids_ = sysOrganization.getManagerSid();
+        bv.setNextNodeUserSids(nextNodeUserSids_);
         //流程定义id
         bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
         if (r == 1) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java

@@ -44,5 +44,6 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
     private Boolean showHandleBtn; // 待交接显示
     @ApiModelProperty("已交接显示")
     private Boolean showUploadBtn; // 已交接显示
-
+    @ApiModelProperty("车架号")
+    private String vins; // 车架号
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@@ -37,7 +37,8 @@
         recTime as receiveDate,
         transferName as receiveName,
         transferPhone as receivePhone,
-        transferStateValue as nodeState
+        transferStateValue as nodeState,
+        vins
         FROM
         bus_discountpackage_handover
         <where>${ew.sqlSegment}</where>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -572,7 +572,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         }
         dataMap.put("newList", newList);
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/discountPackage.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/packageHandover.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -650,6 +650,9 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         if (null != records && records.size() > 0) {
             for (AppBusDiscountpackageHandoverVo record : records) {
                 if (null != record) {
+                    if (StringUtils.isBlank(record.getVins())) {
+                        record.setVins("-");
+                    }
                     if (StringUtils.isNotBlank(record.getContractId())) {
                         CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData();
                         if (null != data) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -1813,6 +1813,9 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 } else {
                     record.setShowUpdate(false);
                 }
+                if (!record.getNodeState().equals("待提交") && !record.getNodeState().equals("已办结") && !record.getNodeState().equals("发起申请")) {
+                    record.setHandoverStateValue("审批中");
+                }
                 if (record.getHandoverStateValue().equals("已交车")) {
                     List<BusHandoverInitListVo> deliveryConfirmInfo = busHandoverItemsService.getDeliveryConfirmInfo(record.getSid());
                     deliveryConfirmInfo.removeAll(Collections.singleton(null));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -196,11 +196,13 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                 if (busVehicleInformation.getDirverCard() > 0) {
                     str.append("驾驶员卡、");
                 }
+                if (null != busVehicleInformation.getGasCertificate()) {
                     if (busVehicleInformation.getGasCertificate() > 0) {
                         if (busVehicleInformation.getIsFuelVehicle() == 0) {
                             str.append("气瓶检测合格证、");
                         }
                     }
+                }
                 str.delete(str.length() - 1, str.length());
                 busVehicleInformation.setVehicleHandoverData(str.toString());
                 busVehicleInformationService.updateById(busVehicleInformation);
@@ -233,12 +235,14 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                         ) {
                             entity.setCompleteState(0);
                         } else {
+                            if (null != busVehicleInformation.getGasCertificate()) {
                                 if (busVehicleInformation.getGasCertificate() < 1) {
                                     if (busVehicleInformation.getIsFuelVehicle() == 0) {
                                         entity.setCompleteState(0);
                                     } else {
                                         entity.setCompleteState(1);
                                     }
+                                }
                             } else {
                                 entity.setCompleteState(1);
                             }
@@ -441,11 +445,13 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                     if (infor.getDirverCard() < 1) {
                         str.append("驾驶员卡、");
                     }
+                    if (null != infor.getGasCertificate()) {
                         if (infor.getGasCertificate() < 1) {
                             if (infor.getIsFuelVehicle() == 0) {
                                 str.append("气瓶检测合格证、");
                             }
                         }
+                    }
                     str.delete(str.length() - 1, str.length());
                     informationVo.setVehicleHandoverData(str.toString());
                     informationVo.setInformationSid(informationServiceByHandoverSid.getSid());

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

@@ -54,7 +54,7 @@ public enum ProcDefEnum {
     BUSHANDOVER("交车确认", "process_e8feloik:5:1747508"),
     LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
     LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
-    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:2:2472504"),
+    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"),
 
     /******************************测试流程id*********************************************/
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyApplyVo.java

@@ -39,5 +39,7 @@ public class LoanFinOtherPolicyApplyVo implements Vo {
     private String nodeState;
     @ApiModelProperty("备注")
     private String remarks;
-
+    private String procDefId;
+    @ApiModelProperty("实例id")
+    private String procInstId;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApply.java

@@ -21,7 +21,7 @@ import java.util.Date;
  * @since 1.0
  */
 @ApiModel(value = "金融产品政策报备", description = "金融产品政策报备")
-@TableName("loan_fin_other_policy_record_apply")
+@TableName("loan_fin_otherpolicy_record_apply")
 @Data
 public class LoanFinOtherPolicyRecordApply extends BaseEntity {
     private static final long serialVersionUID = 1L;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -116,10 +117,10 @@ public interface LoanFinOtherPolicyRecordApplyFeign {
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
-    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
-    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java

@@ -23,6 +23,6 @@ public interface LoanFinOtherPolicyRecordApplyMapper extends BaseMapper<LoanFinO
 
     int updateFlowFiled(Map<String, Object> map);
 
-    @Update("update loan_fin_other_policy_record_apply set isDelete = 1 where sid =#{sid}")
+    @Update("update loan_fin_otherpolicy_record_apply set isDelete = 1 where sid =#{sid}")
     int updateBySidDelete(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanfinotherpolicyrecordapply.LoanFinOtherPolicyRecordApplyMapper">
 
     <update id="updateFlowFiled">
-        UPDATE loan_fin_policy_record_apply
+        UPDATE loan_fin_otherpolicy_record_apply
         SET nodeState=#{nodeState}
         , nodeSid=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
@@ -26,8 +26,10 @@
         applicant,
         applyDate,
         nodeState,
-        remarks
+        remarks,
-        FROM loan_fin_other_policy_record_apply
+        procDefId,
+        procInstId
+        FROM loan_fin_otherpolicy_record_apply
         <where>
             ${ew.sqlSegment}
         </where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java

@@ -204,6 +204,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
         LoanFinOtherPolicyRecordApply entity = fetchBySid(sid);
         String urlPrefix = fileUploadComponent.getUrlPrefix();
         BeanUtil.copyProperties(entity, vo);
+        vo.setUserSid(entity.getCreateBySid());
         if (StringUtils.isNotBlank(entity.getProcInstId())) {
             vo.setInstanceId(entity.getProcInstId());
         }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java

@@ -44,6 +44,8 @@ public class AppBusDiscountpackageHandoversVo implements Vo {
     private Boolean showHandleBtn; // 待交接显示
     @ApiModelProperty("已交接显示")
     private Boolean showUploadBtn; // 已交接显示
+    @ApiModelProperty("车架号")
+    private String vins; // 车架号
 
 
 }