优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.DetailsOfReceivablesAndUncollectedItemsJRVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRQuery;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -86,4 +87,6 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper<Fi
                                                                                      @Param("purchaseSystemSid") String purchaseSystemSid);
 
     FinUncollectedReceivablesDetailedJR selectByType(@Param("sid") String sid, @Param("type") String type);
+
+    LoanRepaymentPlanDetails selectDetails(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -349,4 +349,9 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
         select * from anrui_fin.fin_uncollected_receivables_detailed_jr where busSid = #{sid} and payCostTitleValue = #{type}
     </select>
+
+    <select id="selectDetails"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+        select * from anrui_riskcenter.loan_repayment_plan_details where sid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedR
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRQuery;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.result.ResultBean;
@@ -135,9 +136,27 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
     public ResultBean updateAll(String sid, String type, BigDecimal fundDay) {
         ResultBean rb = ResultBean.fireFail();
         FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = baseMapper.selectByType(sid, type);
-        BigDecimal bigDecimal =finUncollectedReceivablesDetailedJR.getReveivableMoney().add(fundDay);
-        finUncollectedReceivablesDetailedJR.setReveivableMoney(bigDecimal);
-        baseMapper.updateById(finUncollectedReceivablesDetailedJR);
+        if (finUncollectedReceivablesDetailedJR == null) {
+            LoanRepaymentPlanDetails planDetails = baseMapper.selectDetails(sid);
+            FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+            jr.setBusSid(planDetails.getSid());
+            jr.setReveivableMoney(fundDay);
+            jr.setPayCostTitleKey("006");
+            jr.setPayCostTitleValue("资金占用费");
+            jr.setOrgSidPath(planDetails.getOrgSidPath());
+            jr.setUseOrgName(planDetails.getUseOrgName());
+            jr.setUseOrgSid(planDetails.getUseOrgSid());
+            jr.setStaffDeptName(planDetails.getDept());
+            jr.setStaffName(planDetails.getStaffName());
+            jr.setStaffDeptSid(planDetails.getDeptSid());
+            jr.setStaffUserSid(planDetails.getSalesUserSid());
+            baseMapper.insert(jr);
+        } else {
+            BigDecimal bigDecimal = finUncollectedReceivablesDetailedJR.getReveivableMoney().add(fundDay);
+            finUncollectedReceivablesDetailedJR.setReveivableMoney(bigDecimal);
+            baseMapper.updateById(finUncollectedReceivablesDetailedJR);
+        }
+
         return rb.success();
     }
 }

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

@@ -74,7 +74,7 @@ public enum ProcDefEnum {
     LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:1:7945004"),
     LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
     LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
-    LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:3:8060012"),
+    LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"),
 
     /******************************测试流程id*********************************************/
 

anrui-system-ui/src/views/flow/havereadList.vue

@@ -251,7 +251,7 @@ export default {
       }
       selectUrl(this.selectUrl_list).then((response) => {
         if (response.success && response.data.url !== '') {
-          // this.url = 'http://192.168.1.103:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+          // this.url = 'http://192.168.0.109:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
           this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
           // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
         } else if (response.success && response.data.url === '') {