Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -38,7 +38,8 @@ public enum BillTypeEnum {
     HKSQ("HKSQ", "划扣申请单据编号"),
     DSDFSQ("DSDFSQ", "代收代付申请单据编号"),
     YHJT("YHJT", "月还计提单据编号"),
-    FKCEQRSQ("FKCEQRSQ", "放款差额确认申请");
+    FKCEQRSQ("FKCEQRSQ", "放款差额确认申请"),
+    AJBH("AJBH", "案件进程编号");
 
 
     private String billType;

anrui-riskcenter-ui/src/router/index.js

@@ -1341,6 +1341,27 @@ export const constantRoutes = [
     component: () =>
       import('@/views/workFlow/shangsuFlow/caseappealYiBan.vue'),
     name: 'CaseAppealYiBan'
+  },
+  // 案件执行管理--编辑
+  {
+    path: '/zhixingFlow/CaseExecutionEdit',
+    component: () =>
+      import('@/views/workFlow/zhixingFlow/caseexecutionEdit.vue'),
+    name: 'CaseExecutionEdit'
+  },
+  // 案件执行管理--待办
+  {
+    path: '/zhixingFlow/caseexecutionDaiBan',
+    component: () =>
+      import('@/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue'),
+    name: 'CaseExecutionDaiBan'
+  },
+  // 案件执行管理--已办
+  {
+    path: '/zhixingFlow/caseexecutionYiBan',
+    component: () =>
+      import('@/views/workFlow/zhixingFlow/caseexecutionYiBan.vue'),
+    name: 'CaseExecutionYiBan'
   },
 	// 404 page must be placed at the end !!!
 	// { path: '*', redirect: '/404', hidden: true }

anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue

@@ -43,7 +43,9 @@
                 <el-date-picker v-model="listQuery.params.executeRegisEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="执行时限">
-                <el-input v-model="listQuery.params.executeDeadline" placeholder="" clearable/>
+                <el-select v-model="listQuery.params.executeDeadlineKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in executeDeadline_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="执行立案金额">
                 <el-input v-model="listQuery.params.executeRegisMoney" placeholder="" clearable/>
@@ -116,6 +118,7 @@ import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/caseexecution/caseexecution'
 import { getStorage } from '@/utils/auth'
+import { typeValues } from '@/api/Common/dictcommons'
 import caseexecutionAdd from './caseexecutionAdd'
 import caseexecutionInfo from './caseexecutionInfo'
 
@@ -156,6 +159,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      executeDeadline_list: [],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -169,7 +173,7 @@ export default {
           createStartTime: '',
           customName: '',
           deptName: '',
-          executeDeadline: '',
+          executeDeadlineKey: '',
           executeRegisEndDate: '',
           executeRegisMoney: '',
           executeRegisStartDate: '',
@@ -189,6 +193,7 @@ export default {
   created() {
     // 初始化变量
     this.getList()
+    this.init()
   },
   mounted() {
     // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
@@ -224,6 +229,13 @@ export default {
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
+    init() {
+      typeValues({ type: 'executeDeadline' }).then((res) => {
+        if (res.success) {
+          this.executeDeadline_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -294,7 +306,7 @@ export default {
           createStartTime: '',
           customName: '',
           deptName: '',
-          executeDeadline: '',
+          executeDeadlineKey: '',
           executeRegisEndDate: '',
           executeRegisMoney: '',
           executeRegisStartDate: '',

anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue

@@ -122,13 +122,13 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">判决生效后回款金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.judgPayMoney" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="judgPayMoneyInput" v-model="formobj.judgPayMoney" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">判决资料</div>
-              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.pjclFiles" :key="index" :src="item" :preview-src-list="formobj.pjclFiles" /></el-form-item>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" /></el-form-item>
             </el-col>
           </el-row>
           <div class="title">车辆信息</div>
@@ -147,11 +147,15 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">执行时限</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.executeDeadline }}</span></el-form-item>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.executeDeadlineKey" placeholder="请选择" @change="executeDeadlineChange" clearable filterable>
+                  <el-option v-for="item in executeDeadline_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">执行立案金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.executeRegisMoney" clearable placeholder="" /></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -170,6 +174,7 @@
 
 <script>
 import req from '@/api/caseexecution/caseexecution'
+import { typeValues } from '@/api/Common/dictcommons'
 import uploadImg from '@/components/uploadFile/uploadImg'
 
 export default {
@@ -184,6 +189,8 @@ export default {
       submitdisabled: false,
       tableKey: 0,
       index: 0,
+      executeDeadline_list: [],
+      image_list: [],
       formobj: {
         arrearsTotal: '',
         bankContract: '',
@@ -230,14 +237,29 @@ export default {
     }
   },
   methods: {
+    init() {
+      typeValues({ type: 'executeDeadline' }).then((res) => {
+        if (res.success) {
+          this.executeDeadline_list = res.data
+        }
+      })
+    },
     showAdd(sid) {
       this.viewTitle = '【新增】执行立案申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.init()
       req.init({ sid: sid, userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          if (this.formobj.pjclFiles.length > 0) {
+            const aa = []
+            this.formobj.pjclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.image_list = aa
+          }
         }
       })
     },
@@ -246,12 +268,32 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.init()
       req.fetchBySid(row.sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstSid
+          if (this.formobj.pjclFiles.length > 0) {
+            const aa = []
+            this.formobj.pjclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.image_list = aa
+          }
         }
       })
     },
+    judgPayMoneyInput() {
+      this.formobj.executeRegisMoney = parseFloat(this.formobj.judgMoney !== '' ? this.formobj.judgMoney : 0) - parseFloat(this.formobj.judgPayMoney !== '' ? this.formobj.judgPayMoney : 0)
+    },
+    executeDeadlineChange(value) {
+      const choose = this.executeDeadline_list.filter((item) => item.dictKey === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.executeDeadline = choose[0].dictValue
+      } else {
+        this.formobj.executeDeadline = ''
+      }
+    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -330,6 +372,7 @@ export default {
         useOrgSid: '',
         zxclFiles: []
       }
+      this.image_list = []
       this.submitdisabled = false
       this.$emit('doback')
     }

anrui-riskcenter-ui/src/views/caseexecution/caseexecutionInfo.vue

@@ -229,6 +229,20 @@ export default {
       req.fetchBySid(row.sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          if (this.formobj.pjclFiles.length > 0) {
+            const aa = []
+            this.formobj.pjclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.pjclFiles = aa
+          }
+          if (this.formobj.zxclFiles.length > 0) {
+            const aa = []
+            this.formobj.zxclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.zxclFiles = aa
+          }
         }
       })
     },

anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue

@@ -0,0 +1,559 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">案件创建日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseCreateDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">公司负责人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.compHead }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">法务部门负责人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.legalDeptHead }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">案件编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">案件类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContract }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人证件号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderIdNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">贷款人户籍/注册地址</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderAddress }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContract }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否全额诉讼</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isFullLitigation }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">起诉金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sueMoneyTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">部分诉讼说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">判决日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决结果</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgResult }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">判决备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决生效后回款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgPayMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">判决资料</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.pjclFiles" :key="index" :src="item" :preview-src-list="formobj.pjclFiles" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="carNum" label="车牌号" align="center" />
+            <el-table-column prop="affiliatedCompany" label="挂靠公司" align="center" />
+            <el-table-column prop="carState" label="车辆状态" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" />
+          </el-table>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">预执行立案日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeRegisDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">执行时限</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeDeadline }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">执行立案金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">执行材料</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.zxclFiles" :key="index" :src="item" :preview-src-list="formobj.zxclFiles" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/caseexecution/caseexecution'
+import { selectStaffListss } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'CaseExecutionDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        arrearsTotal: '',
+        bankContract: '',
+        bankName: '',
+        billNo: '',
+        caseCreateDate: '',
+        caseNo: '',
+        caseType: '',
+        compHead: '',
+        createByName: '',
+        customName: '',
+        deptName: '',
+        deptSid: '',
+        executeDeadline: '',
+        executeRegisDate: '',
+        executeRegisMoney: '',
+        isFullLitigation: '',
+        judgDate: '',
+        judgMoney: '',
+        judgPayMoney: '',
+        judgRemarks: '',
+        judgResult: '',
+        legalDeptHead: '',
+        lenderAddress: '',
+        lenderIdNo: '',
+        lenderName: '',
+        loanCaseExecuteVehList: [],
+        loanContract: '',
+        nodeSid: '',
+        nodeState: '',
+        orgPath: '',
+        partProceRemarks: '',
+        pjclFiles: [],
+        procDefId: '',
+        procInstSid: '',
+        sid: '',
+        sueMoneyTotal: '',
+        taskId: '',
+        useOrgName: '',
+        useOrgSid: '',
+        zxclFiles: []
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '执行立案申请详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.pjclFiles.length > 0) {
+            const aa = []
+            this.formobj.pjclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.pjclFiles = aa
+          }
+          if (this.formobj.zxclFiles.length > 0) {
+            const aa = []
+            this.formobj.zxclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.zxclFiles = aa
+          }
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue

@@ -0,0 +1,366 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">案件创建日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseCreateDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">公司负责人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.compHead }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">法务部门负责人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.legalDeptHead }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">案件编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">案件类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContract }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人证件号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderIdNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">贷款人户籍/注册地址</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderAddress }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContract }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否全额诉讼</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isFullLitigation }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">起诉金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sueMoneyTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">部分诉讼说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">判决日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决结果</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgResult }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">判决备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决生效后回款金额</div>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="judgPayMoneyInput" v-model="formobj.judgPayMoney" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">判决资料</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="carNum" label="车牌号" align="center" />
+            <el-table-column prop="affiliatedCompany" label="挂靠公司" align="center" />
+            <el-table-column prop="carState" label="车辆状态" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" />
+          </el-table>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">预执行立案日期</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.executeRegisDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">执行时限</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.executeDeadlineKey" placeholder="请选择" @change="executeDeadlineChange" clearable filterable>
+                  <el-option v-for="item in executeDeadline_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">执行立案金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">执行材料</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.zxclFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/caseexecution/caseexecution'
+import { typeValues } from '@/api/Common/dictcommons'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'CaseExecutionEdit',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      executeDeadline_list: [],
+      image_list: [],
+      formobj: {
+        arrearsTotal: '',
+        bankContract: '',
+        bankName: '',
+        billNo: '',
+        caseCreateDate: '',
+        caseNo: '',
+        caseType: '',
+        compHead: '',
+        createByName: '',
+        customName: '',
+        deptName: '',
+        deptSid: '',
+        executeDeadline: '',
+        executeRegisDate: '',
+        executeRegisMoney: '',
+        isFullLitigation: '',
+        judgDate: '',
+        judgMoney: '',
+        judgPayMoney: '',
+        judgRemarks: '',
+        judgResult: '',
+        legalDeptHead: '',
+        lenderAddress: '',
+        lenderIdNo: '',
+        lenderName: '',
+        loanCaseExecuteVehList: [],
+        loanContract: '',
+        nodeSid: '',
+        nodeState: '',
+        orgPath: '',
+        partProceRemarks: '',
+        pjclFiles: [],
+        procDefId: '',
+        procInstSid: '',
+        sid: '',
+        sueMoneyTotal: '',
+        taskId: '',
+        useOrgName: '',
+        useOrgSid: '',
+        zxclFiles: []
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'executeDeadline' }).then((res) => {
+        if (res.success) {
+          this.executeDeadline_list = res.data
+        }
+      })
+    },
+    showInfo(sid) {
+      this.viewTitle = '【编辑】执行立案申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstSid
+          if (this.formobj.pjclFiles.length > 0) {
+            const aa = []
+            this.formobj.pjclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.image_list = aa
+          }
+        }
+      })
+    },
+    judgPayMoneyInput() {
+      this.formobj.executeRegisMoney = parseFloat(this.formobj.judgMoney !== '' ? this.formobj.judgMoney : 0) - parseFloat(this.formobj.judgPayMoney !== '' ? this.formobj.judgPayMoney : 0)
+    },
+    executeDeadlineChange(value) {
+      const choose = this.executeDeadline_list.filter((item) => item.dictKey === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.executeDeadline = choose[0].dictValue
+      } else {
+        this.formobj.executeDeadline = ''
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">案件创建日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseCreateDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">公司负责人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.compHead }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">法务部门负责人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.legalDeptHead }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">案件编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">案件类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.caseType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContract }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人证件号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderIdNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">贷款人户籍/注册地址</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.lenderAddress }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContract }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否全额诉讼</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isFullLitigation }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">起诉金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sueMoneyTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">部分诉讼说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">判决日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决结果</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgResult }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">判决备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">判决生效后回款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.judgPayMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">判决资料</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.pjclFiles" :key="index" :src="item" :preview-src-list="formobj.pjclFiles" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="carNum" label="车牌号" align="center" />
+            <el-table-column prop="affiliatedCompany" label="挂靠公司" align="center" />
+            <el-table-column prop="carState" label="车辆状态" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" />
+          </el-table>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">预执行立案日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeRegisDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">执行时限</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeDeadline }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">执行立案金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">执行材料</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.zxclFiles" :key="index" :src="item" :preview-src-list="formobj.zxclFiles" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/caseexecution/caseexecution'
+
+export default {
+  name: 'CaseExecutionYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        arrearsTotal: '',
+        bankContract: '',
+        bankName: '',
+        billNo: '',
+        caseCreateDate: '',
+        caseNo: '',
+        caseType: '',
+        compHead: '',
+        createByName: '',
+        customName: '',
+        deptName: '',
+        deptSid: '',
+        executeDeadline: '',
+        executeRegisDate: '',
+        executeRegisMoney: '',
+        isFullLitigation: '',
+        judgDate: '',
+        judgMoney: '',
+        judgPayMoney: '',
+        judgRemarks: '',
+        judgResult: '',
+        legalDeptHead: '',
+        lenderAddress: '',
+        lenderIdNo: '',
+        lenderName: '',
+        loanCaseExecuteVehList: [],
+        loanContract: '',
+        nodeSid: '',
+        nodeState: '',
+        orgPath: '',
+        partProceRemarks: '',
+        pjclFiles: [],
+        procDefId: '',
+        procInstSid: '',
+        sid: '',
+        sueMoneyTotal: '',
+        taskId: '',
+        useOrgName: '',
+        useOrgSid: '',
+        zxclFiles: []
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '执行立案申请详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.pjclFiles.length > 0) {
+            const aa = []
+            this.formobj.pjclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.pjclFiles = aa
+          }
+          if (this.formobj.zxclFiles.length > 0) {
+            const aa = []
+            this.formobj.zxclFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.zxclFiles = aa
+          }
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.api.loancaseappealapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDto;
 import com.yxt.common.core.vo.Vo;
@@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -58,7 +60,8 @@ public class LoanCaseAppealApplyDetailsVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("申请日期")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("创建人sid")
     private String createBySid;
 	@ApiModelProperty("创建人")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java

@@ -54,6 +54,8 @@ public class LoanCaseAppealApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java

@@ -26,14 +26,17 @@
 package com.yxt.anrui.riskcenter.api.loancasecloseapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto;
+import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -58,7 +61,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("申请日期")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("创建人sid")
     private String createBySid;
 	@ApiModelProperty("创建人")
@@ -107,10 +111,6 @@ public class LoanCaseCloseApplyDetailsVo implements Vo {
     private String returnMoney; // 回款金额
 	@ApiModelProperty("未回款金额")
     private String notReturnMoney; // 未回款金额
-	@ApiModelProperty("执行措施")
-    private String executeMeasure; // 执行措施
-	@ApiModelProperty("执行说明")
-    private String executeRemarks; // 执行说明
 	@ApiModelProperty("结案方式key")
     private String closeTypeKey; // 结案方式key
 	@ApiModelProperty("结案方式value")
@@ -140,6 +140,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo {
 
     @ApiModelProperty
     private List<LoanCaseCloseFile> jaclFiles;
+    @ApiModelProperty("执行措施")
+    private List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures;
     @ApiModelProperty("上诉车辆")
     private List<LoanCaseCloseVehDetailsVo> loanCaseCloseVehList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java

@@ -56,6 +56,8 @@ public class LoanCaseCloseApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.riskcenter.api.loancasecloseapply;
 
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*;
+import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -80,6 +81,11 @@ public interface LoanCaseCloseApplyFeign {
     @ResponseBody
     public ResultBean<LoanCaseCloseApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("初始化")
+    @PostMapping("/details")
+    @ResponseBody
+    public ResultBean<LoanCaseCloseApplyDetailsVo> details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
     public ResultBean submit(@RequestBody @Valid SubmitLoanCaseCloseApplyDto dto);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java

@@ -71,6 +71,11 @@ public class LoanCaseCloseApplyFeignFallback implements LoanCaseCloseApplyFeign
 		return rb.setMsg("接口anrui-riskcenter/loancasecloseapply/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<LoanCaseCloseApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) {
 		return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java

@@ -26,12 +26,14 @@
 package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +55,13 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java

@@ -54,6 +54,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java

@@ -102,6 +102,8 @@ public class LoanCaseExecuteApply extends BaseEntity {
     private String judgPayMoney; // 判决生效后回款金额
 	@ApiModelProperty("预执行立案日期")
     private String executeRegisDate; // 预执行立案日期
+    @ApiModelProperty("执行时限key")
+    private String executeDeadlineKey;
 	@ApiModelProperty("执行时限")
     private String executeDeadline; // 执行时限
 	@ApiModelProperty("执行立案金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
 import com.yxt.common.core.vo.Vo;
@@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -58,7 +60,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("申请日期")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("创建人sid")
     private String createBySid;
 	@ApiModelProperty("创建人")
@@ -113,6 +116,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
     private String judgPayMoney; // 判决生效后回款金额
 	@ApiModelProperty("预执行立案日期")
     private String executeRegisDate; // 预执行立案日期
+    @ApiModelProperty("执行时限key")
+    private String executeDeadlineKey;
 	@ApiModelProperty("执行时限")
     private String executeDeadline; // 执行时限
 	@ApiModelProperty("执行立案金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java

@@ -56,6 +56,8 @@ public class LoanCaseExecuteApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")
@@ -108,6 +110,8 @@ public class LoanCaseExecuteApplyDto implements Dto {
     private String judgPayMoney; // 判决生效后回款金额
 	@ApiModelProperty("预执行立案日期")
     private String executeRegisDate; // 预执行立案日期
+    @ApiModelProperty("执行时限key")
+    private String executeDeadlineKey;
 	@ApiModelProperty("执行时限")
     private String executeDeadline; // 执行时限
 	@ApiModelProperty("执行立案金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
 
+import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*;
 import io.swagger.annotations.Api;
@@ -80,6 +81,11 @@ public interface LoanCaseExecuteApplyFeign {
     @ResponseBody
     public ResultBean<LoanCaseExecuteApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("初始化")
+    @PostMapping("/details")
+    @ResponseBody
+    public ResultBean<LoanCaseExecuteApplyDetailsVo> details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
     public ResultBean submit(@RequestBody @Valid SubmitLoanCaseExecuteApplyDto dto);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java

@@ -71,6 +71,11 @@ public class LoanCaseExecuteApplyFeignFallback implements LoanCaseExecuteApplyFe
 		return rb.setMsg("接口anrui-riskcenter/loancaseexecuteapply/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<LoanCaseExecuteApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) {
 		return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java

@@ -59,6 +59,8 @@ public class LoanCaseExecuteVehDetailsVo implements Vo {
     private String affiliatedCompany; // 挂靠公司
 	@ApiModelProperty("车辆状态")
     private String carState; // 车辆状态
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("案件执行立案申请sid")
     private String mainSid; // 案件执行立案申请sid
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:14
+ */
+@Data
+public class DetailsFees {
+    @ApiModelProperty("缴费项目")
+    private String paymentItems;
+    @ApiModelProperty("缴费时间")
+    private String paymentTime;
+    @ApiModelProperty("缴费金额")
+    private String paymentMoney;
+    @ApiModelProperty("操作时间")
+    private String operatingTime;
+//    @ApiModelProperty("附件")
+//    private String filePath;
+    @ApiModelProperty("操作人")
+    private String operator;
+    @ApiModelProperty("操作人Sid")
+    private String operatorSid;
+    private List<UrlQuery> feesfile = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:14
+ */
+@Data
+public class DetailsGuarantor {
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("身份证号")
+    private String idCardNo;
+    @ApiModelProperty("户籍地址")
+    private String registerAddress;
+    @ApiModelProperty("现住址")
+    private String currentAddress;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:15
+ */
+@Data
+public class DetailsPreserve {
+    @ApiModelProperty("保全类型key")
+    private String preserveTypeKey;
+    @ApiModelProperty("保全类型")
+    private String preserveType;
+    @ApiModelProperty("保全项目")
+    private String preserveItems;
+    @ApiModelProperty("保全日期")
+    private String preserveTime;
+    @ApiModelProperty("保全金额")
+    private String preserveMoney;
+    @ApiModelProperty("有效期至")
+    private String dateTo;
+    @ApiModelProperty("操作时间")
+    private String operatingTime;
+//    @ApiModelProperty("附件")
+//    private String filePath;
+    @ApiModelProperty("操作人")
+    private String operator;
+    @ApiModelProperty("操作人Sid")
+    private String operatorSid;
+    private List<UrlQuery> preservefile = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsVeh.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:13
+ */
+@Data
+public class DetailsVeh {
+    private String busVinSid;
+    private String vinNo;
+    private String vehMark;
+    @ApiModelProperty("车辆状态（已控制、已收回、已处置）")
+    private String vehStatus;
+    @ApiModelProperty("挂靠公司")
+    private String affiliatedCompany;
+    @ApiModelProperty("挂车情况")
+    private String trailerInfo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 14:49
+ */
+@Data
+public class FirstReviewVo {
+    private String sid;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java

@@ -89,4 +89,12 @@ public class LoanCaseProgress extends BaseEntity {
     private String busSid;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("律师事务所")
+    private String lawFirms;
+    @ApiModelProperty("承办律师")
+    private String lawer;
+    @ApiModelProperty("律师联系电话")
+    private String lawerPhone;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java

@@ -4,6 +4,10 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Administrator
  * @description
@@ -12,4 +16,67 @@ import lombok.Data;
 @Data
 public class LoanCaseProgressDetailsVo implements Vo {
 
+    private String sid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建部门")
+    private String createDept;
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("创建日期")
+    private String createDate;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("公司负责人sid")
+    private String companyHeadSid;
+    @ApiModelProperty("法务部门负责人")
+    private String legalHead;
+    @ApiModelProperty("法务部门负责人sid")
+    private String legalHeadSid;
+    @ApiModelProperty("案件类型")
+    private String caseType;
+    @ApiModelProperty("案件编号")
+    private String caseNo;
+    @ApiModelProperty("案件类型Key")
+    private String caseTypeKey;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人证件号码")
+    private String idNumber;
+    @ApiModelProperty("贷款人户籍/注册地址")
+    private String borrowerAddress;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("欠款合计")
+    private String amountAll;
+    @ApiModelProperty("是否全额诉讼")
+    private String full;
+    @ApiModelProperty("起诉金额合计")
+    private String sueMoney;
+    @ApiModelProperty("部分诉讼说明")
+    private String sueShows;
+    @ApiModelProperty("起诉原因")
+    private String sueReason;
+    @ApiModelProperty("案件当前阶段")
+    private String caseStage;
+    @ApiModelProperty("用时天数")
+    private String useDays;
+    @ApiModelProperty("进入当前环节日期")
+    private String enterDate;
+    @ApiModelProperty("案件当前环节")
+    private String caseTache;
+    @ApiModelProperty("诉讼时效")
+    private String sueAging;
+    private List<DetailsVeh> veh = new ArrayList<>(); //车辆信息
+    private List<DetailsFees> fees = new ArrayList(); //相关费用
+    private List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
+    private List<DetailsPreserve> preserve = new ArrayList(); //保全
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Administrator
  * @description
@@ -12,6 +15,66 @@ import lombok.Data;
 @Data
 public class LoanCaseProgressDto implements Dto {
 
-
+    private String sid;
+//    @ApiModelProperty("使用组织名称")
+//    private String useOrgName;
+//    @ApiModelProperty("创建部门")
+//    private String createDept;
+//    @ApiModelProperty("创建人")
+//    private String createByName;
+//    @ApiModelProperty("创建日期")
+//    private String createDate;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("公司负责人sid")
+    private String companyHeadSid;
+    @ApiModelProperty("法务部门负责人")
+    private String legalHead;
+    @ApiModelProperty("法务部门负责人sid")
+    private String legalHeadSid;
+//    @ApiModelProperty("案件类型")
+//    private String caseType;
+//    @ApiModelProperty("案件编号")
+//    private String caseNo;
+//    @ApiModelProperty("案件类型Key")
+//    private String caseTypeKey;
+//    @ApiModelProperty("贷款合同编号")
+//    private String loanContractNo;
+//    @ApiModelProperty("贷款人")
+//    private String loanName;
+//    @ApiModelProperty("贷款人证件号码")
+//    private String idNumber;
+//    @ApiModelProperty("贷款人户籍/注册地址")
+//    private String borrowerAddress;
+//    @ApiModelProperty("客户名称")
+//    private String customerName;
+//    @ApiModelProperty("资方")
+//    private String bankName;
+//    @ApiModelProperty("资方合同编号")
+//    private String bankContractNo;
+//    @ApiModelProperty("欠款合计")
+//    private String amountAll;
+//    @ApiModelProperty("是否全额诉讼")
+//    private String full;
+//    @ApiModelProperty("起诉金额合计")
+//    private String sueMoney;
+//    @ApiModelProperty("部分诉讼说明")
+//    private String sueShows;
+    @ApiModelProperty("起诉原因")
+    private String sueReason;
+//    @ApiModelProperty("案件当前阶段")
+//    private String caseStage;
+//    @ApiModelProperty("用时天数")
+//    private String useDays;
+//    @ApiModelProperty("进入当前环节日期")
+//    private String enterDate;
+//    @ApiModelProperty("案件当前环节")
+//    private String caseTache;
+    @ApiModelProperty("诉讼时效")
+    private String sueAging;
+    private List<DetailsVeh> veh = new ArrayList<>(); //车辆信息
+    private List<DetailsFees> fees = new ArrayList(); //相关费用
+    private List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
+    private List<DetailsPreserve> preserve = new ArrayList(); //保全
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java

@@ -1,11 +1,15 @@
 package com.yxt.anrui.riskcenter.api.loancaseprogress;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 
 /**
@@ -26,4 +30,21 @@ public interface LoanCaseProgressFeign {
     @PostMapping("/pushCase")
     public ResultBean pushCase(@RequestBody PushCaseDto dto);
 
+    @ApiOperation("根据条件分页查询分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanCaseProgressVo>> listPage(@RequestBody PagerQuery<LoanCaseProgressQuery> pq);
+
+
+    @ApiOperation("查询详情")
+    @GetMapping("/getDetails")
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(@RequestParam("sid") String sid);
+
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveProgress")
+    public ResultBean saveProgress(@RequestBody LoanCaseProgressDto dto);
+
+    //-----------------一审----------------------------
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java

@@ -1,6 +1,8 @@
 package com.yxt.anrui.riskcenter.api.loancaseprogress;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 /**
@@ -15,4 +17,19 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign {
     public ResultBean pushCase(PushCaseDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<LoanCaseProgressVo>> listPage(PagerQuery<LoanCaseProgressQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveProgress(LoanCaseProgressDto dto) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java

@@ -13,6 +13,43 @@ import lombok.Data;
 public class LoanCaseProgressQuery implements Query {
 
 
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建部门")
+    private String createDept;
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("创建时间")
+    private String createStartTime;
+    private String createEndTime;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("案件编号")
+    private String caseNo;
+    @ApiModelProperty("案件类型")
+    private String caseType;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("案件当前阶段")
+    private String caseStage;
+    @ApiModelProperty("案件当前环节")
+    private String caseTache;
+    @ApiModelProperty("律师事务所")
+    private String lawFirms;
+    @ApiModelProperty("承办律师")
+    private String lawer;
+    @ApiModelProperty("是否全额诉讼")
+    private String full;
+
+
     @ApiModelProperty("组织全路径")
     private String orgPath;
     @ApiModelProperty("菜单sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author Administrator
  * @description
@@ -12,4 +14,42 @@ import lombok.Data;
 @Data
 public class LoanCaseProgressVo implements Vo {
 
+    private String sid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建部门")
+    private String createDept;
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("创建时间")
+    private String createTime;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("案件编号")
+    private String caseNo;
+    @ApiModelProperty("案件类型")
+    private String caseType;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("案件当前阶段")
+    private String caseStage;
+    @ApiModelProperty("案件当前环节")
+    private String caseTache;
+    @ApiModelProperty("用时天数")
+    private String useDays;
+    @ApiModelProperty("律师事务所")
+    private String lawFirms;
+    @ApiModelProperty("承办律师")
+    private String lawer;
+    @ApiModelProperty("是否全额诉讼")
+    private String full;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,6 +46,10 @@ public class PushCaseDto {
     private String orgSidPath;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("欠款合计")
+    private String amountAll;
     private List<PushCaseVehDto> vehList = new ArrayList<>();
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java

@@ -28,14 +28,14 @@ public class LoanCaseProgressTrial extends BaseEntity {
     @ApiModelProperty("案号")
     private String caseNumber;
     //委派情况
-    @ApiModelProperty("律师事务所")
+//    @ApiModelProperty("律师事务所")
-    private String lawFirms;
+//    private String lawFirms;
-    @ApiModelProperty("承办律师")
+//    @ApiModelProperty("承办律师")
-    private String lawer;
+//    private String lawer;
-    @ApiModelProperty("律师联系电话")
+//    @ApiModelProperty("律师联系电话")
-    private String lawerPhone;
+//    private String lawerPhone;
-    @ApiModelProperty("委托协议附件")
+//    @ApiModelProperty("委托协议附件")
-    private String agreement;
+//    private String agreement;
     //待立案
     @ApiModelProperty("待立案-材料提交法院日期")
     private Date submitTime;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java

@@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -80,6 +81,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -104,6 +106,8 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 	@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
+	private SysParameterFeign sysParameterFeign;
+	@Autowired
 	private LoanCaseAppealVehService loanCaseAppealVehService;
 	@Autowired
 	private LoanCaseProgressService loanCaseProgressService;
@@ -373,7 +377,7 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
 		loanCaseAppealApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
 		loanCaseAppealApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
-		loanCaseAppealApplyDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
+		loanCaseAppealApplyDetailsVo.setCreateTime(new Date());
 		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
 		loanCaseAppealApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
 		loanCaseAppealApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
@@ -415,6 +419,11 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		}else if ("二审".equals(loanCaseProgress.getCaseStage())){
 			loanCaseAppealApplyDetailsVo.setCaseStage("再审");
 		}
+		String ajssyxq = sysParameterFeign.fetchByParNo("AJSSYXQ").getData();
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(DateUtil.parseDate(loanCaseProgressTrial.getReceiveTime()));
+		calendar.add(Calendar.DAY_OF_YEAR, Integer.parseInt(ajssyxq));
+		loanCaseAppealApplyDetailsVo.setAppealDueDate(DateUtil.formatDate(calendar.getTime()));
 		List<LoanCaseAppealVehDetailsVo> loanCaseAppealVehDetailsVos = new ArrayList<>();
 		List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
 		for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
@@ -477,8 +486,6 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASEAPPEALAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseAppealApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java

@@ -100,6 +100,13 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign {
 		return rb.success().setData(vo);
 	}
 
+	@Override
+	public ResultBean<LoanCaseCloseApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		ResultBean rb = ResultBean.fireFail();
+		LoanCaseCloseApplyDetailsVo vo = loanCaseCloseApplyService.details(sid,userSid,orgPath);
+		return rb.success().setData(vo);
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) {
 		return loanCaseCloseApplyService.submit(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java

@@ -46,6 +46,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto;
@@ -57,10 +58,20 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
+import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
+import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure;
+import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
+import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService;
 import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogressexecute.LoanCaseProgressExecuteService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasureService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
@@ -102,6 +113,16 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 	@Autowired
 	private LoanCaseCloseVehService loanCaseCloseVehService;
 	@Autowired
+	private LoanCaseProgressService loanCaseProgressService;
+	@Autowired
+	private LoanCaseProgressTrialService loanCaseProgressTrialService;
+	@Autowired
+	private LoanCaseProgressVehService loanCaseProgressVehService;
+	@Autowired
+	private LoanCaseProgressExecuteService loanCaseProgressExecuteService;
+	@Autowired
+	private LoanCaseProgressExecuteMeasureService loanCaseProgressExecuteMeasureService;
+	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
 	private LoanFileService loanFileService;
@@ -351,8 +372,6 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseCloseApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
@@ -613,4 +632,52 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public LoanCaseCloseApplyDetailsVo details(String sid, String userSid, String orgPath) {
+		LoanCaseCloseApplyDetailsVo loanCaseCloseApplyDetailsVo = new LoanCaseCloseApplyDetailsVo();
+		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+		loanCaseCloseApplyDetailsVo.setCreateBySid(userSid);
+		loanCaseCloseApplyDetailsVo.setCreateByName(sysUserVo.getName());
+		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+		loanCaseCloseApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+		loanCaseCloseApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+		loanCaseCloseApplyDetailsVo.setCreateTime(new Date());
+		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
+		loanCaseCloseApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
+		loanCaseCloseApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
+		loanCaseCloseApplyDetailsVo.setLegalDeptHead(loanCaseProgress.getLegalHead());
+		loanCaseCloseApplyDetailsVo.setCaseNo(loanCaseProgress.getCaseNo());
+		loanCaseCloseApplyDetailsVo.setCaseType(loanCaseProgress.getCaseType());
+		loanCaseCloseApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
+		loanCaseCloseApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
+		loanCaseCloseApplyDetailsVo.setLenderIdNo(loanCaseProgress.getIdNumber());
+		loanCaseCloseApplyDetailsVo.setLenderAddress(loanCaseProgress.getBorrowerAddress());
+		loanCaseCloseApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
+		loanCaseCloseApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
+		loanCaseCloseApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
+		loanCaseCloseApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
+		loanCaseCloseApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
+		loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+		loanCaseCloseApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
+		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
+		loanCaseCloseApplyDetailsVo.setFinalJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		LoanCaseProgressExecute loanCaseProgressExecute = loanCaseProgressExecuteService.selByMainSid(sid);
+		loanCaseCloseApplyDetailsVo.setReturnMoney(loanCaseProgressExecute.getExecuteAmountAll().toString());
+		loanCaseCloseApplyDetailsVo.setNotReturnMoney(loanCaseProgressExecute.getExecuteNotAmount().toString());
+		List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures = loanCaseProgressExecuteMeasureService.selByMainSid(loanCaseProgressExecute.getSid());
+		loanCaseCloseApplyDetailsVo.setLoanCaseProgressExecuteMeasures(loanCaseProgressExecuteMeasures);
+		List<LoanCaseCloseVehDetailsVo> loanCaseCloseVehDetailsVos = new ArrayList<>();
+		List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
+		for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
+			LoanCaseCloseVehDetailsVo loanCaseCloseVehDetailsVo = new LoanCaseCloseVehDetailsVo();
+			loanCaseCloseVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo());
+			loanCaseCloseVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark());
+			loanCaseCloseVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany());
+			loanCaseCloseVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus());
+			loanCaseCloseVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks());
+			loanCaseCloseVehDetailsVos.add(loanCaseCloseVehDetailsVo);
+		}
+		loanCaseCloseApplyDetailsVo.setLoanCaseCloseVehList(loanCaseCloseVehDetailsVos);
+		return loanCaseCloseApplyDetailsVo;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java

@@ -332,8 +332,6 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASEENTRUSTLAWYERAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseEntrustLawyerApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java

@@ -100,6 +100,13 @@ public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign {
 		return rb.success().setData(vo);
 	}
 
+	@Override
+	public ResultBean<LoanCaseExecuteApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		ResultBean rb = ResultBean.fireFail();
+		LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.details(sid,userSid,orgPath);
+		return rb.success().setData(vo);
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) {
 		return loanCaseExecuteApplyService.submit(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java

@@ -46,16 +46,25 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply;
+import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto;
+import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.*;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
+import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
+import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
@@ -97,6 +106,12 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 	@Autowired
 	private LoanCaseExecuteVehService loanCaseExecuteVehService;
 	@Autowired
+	private LoanCaseProgressService loanCaseProgressService;
+	@Autowired
+	private LoanCaseProgressTrialService loanCaseProgressTrialService;
+	@Autowired
+	private LoanCaseProgressVehService loanCaseProgressVehService;
+	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
 	private LoanFileService loanFileService;
@@ -391,8 +406,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseExecuteApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
@@ -653,4 +666,63 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public LoanCaseExecuteApplyDetailsVo details(String sid, String userSid, String orgPath) {
+		LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = new LoanCaseExecuteApplyDetailsVo();
+		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+		loanCaseExecuteApplyDetailsVo.setCreateBySid(userSid);
+		loanCaseExecuteApplyDetailsVo.setCreateByName(sysUserVo.getName());
+		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+		loanCaseExecuteApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+		loanCaseExecuteApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+		loanCaseExecuteApplyDetailsVo.setCreateTime(new Date());
+		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
+		loanCaseExecuteApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
+		loanCaseExecuteApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
+		loanCaseExecuteApplyDetailsVo.setLegalDeptHead(loanCaseProgress.getLegalHead());
+		loanCaseExecuteApplyDetailsVo.setCaseNo(loanCaseProgress.getCaseNo());
+		loanCaseExecuteApplyDetailsVo.setCaseType(loanCaseProgress.getCaseType());
+		loanCaseExecuteApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
+		loanCaseExecuteApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
+		loanCaseExecuteApplyDetailsVo.setLenderIdNo(loanCaseProgress.getIdNumber());
+		loanCaseExecuteApplyDetailsVo.setLenderAddress(loanCaseProgress.getBorrowerAddress());
+		loanCaseExecuteApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
+		loanCaseExecuteApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
+		loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
+		loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
+		loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
+		loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+		loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
+		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
+		loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
+		loanCaseExecuteApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult());
+		loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		loanCaseExecuteApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
+		List<LoanCaseExecuteFile> pjclFiles = new ArrayList<>();
+		String verdictFiles = loanCaseProgressTrial.getVerdictFiles();
+		if (StringUtils.isNotBlank(verdictFiles)){
+			String[] files = verdictFiles.split(",");
+			for (String file : files) {
+				LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
+				String urlPrefix = fileUploadComponent.getUrlPrefix();
+				file = urlPrefix + file;
+				loanCaseExecuteFile.setUrl(file);
+				pjclFiles.add(loanCaseExecuteFile);
+			}
+		}
+		loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles);
+		List<LoanCaseExecuteVehDetailsVo> loanCaseExecuteVehDetailsVos = new ArrayList<>();
+		List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
+		for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
+			LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo();
+			loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo());
+			loanCaseExecuteVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark());
+			loanCaseExecuteVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany());
+			loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus());
+			loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks());
+			loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo);
+		}
+		loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos);
+		return loanCaseExecuteApplyDetailsVo;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java

@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 
 /**
@@ -25,4 +23,12 @@ public interface LoanCaseProgressMapper extends BaseMapper<LoanCaseProgress> {
     LoanReturnVehLedger fetchLedgerByBusVinSid(@Param("busVinSid") String busVinSid);
 
     int selControlVehCount(@Param("busVinSid") String busVinSid);
+
+    int selectNum(@Param("bill") String bill);
+
+    IPage<LoanCaseProgressVo> listPage(IPage<LoanCaseProgress> page,@Param(Constants.WRAPPER) QueryWrapper<LoanCaseProgress> qw);
+
+
+    String selMaxDueDateByOrderSid(@Param("salesOrderSid") String salesOrderSid);
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml

@@ -19,4 +19,45 @@
           AND lv.lockCarState = 1
 
     </select>
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(caseNo), #{bill}, '') AS SIGNED), 0) as code
+        from loan_case_progress
+        where caseNo LIKE concat(#{bill}, '%')
+    </select>
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo">
+        SELECT
+        p.sid,
+        p.companyHead,
+        p.lawsuitSubject,
+        p.useOrgName,
+        p.createDept,
+        p.createByName,
+        date_format( p.createTime, '%Y-%m-%d' ) AS createTime,
+        p.loanContractNo,
+        p.bankName,
+        p.bankContractNo,
+        p.loanName,
+        p.customerName,
+        b.lawyerFirm as lawFirms,
+        b.lawyerName as lawer,
+        p.caseNo,
+        p.caseType,
+        p.caseStage,
+        p.caseTache,
+        p.useDays,
+        p.`full`
+        FROM
+        loan_case_progress as p
+        LEFT JOIN
+        (	SELECT * FROM loan_case_entrust_lawyer_apply as a WHERE a.nodeState = '已办结') as b
+        ON p.sid = b.busSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="selMaxDueDateByOrderSid" resultType="java.lang.String">
+        SELECT p.dueDate FROM loan_repayment_plan_details as p WHERE p.salesOrderSid = #{salesOrderSid}
+        ORDER BY p.dueDate DESC LIMIT 1
+    </select>
+
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java

@@ -1,8 +1,8 @@
 package com.yxt.anrui.riskcenter.biz.loancaseprogress;
 
 
-import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressFeign;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.*;
-import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseDto;
+import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApplyVo;
 import com.yxt.anrui.riskcenter.api.loanparameter.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -30,4 +30,21 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign {
     public ResultBean pushCase(PushCaseDto dto) {
         return loanCaseProgressService.pushCase(dto);
     }
+
+    @Override
+    public ResultBean<PagerVo<LoanCaseProgressVo>> listPage(PagerQuery<LoanCaseProgressQuery> pq) {
+        ResultBean<PagerVo<LoanCaseProgressVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanCaseProgressVo> pv = loanCaseProgressService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(String sid) {
+        return loanCaseProgressService.getDetails(sid);
+    }
+
+    @Override
+    public ResultBean saveProgress(LoanCaseProgressDto dto) {
+        return loanCaseProgressService.saveProgress(dto);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java

@@ -1,8 +1,12 @@
 package com.yxt.anrui.riskcenter.biz.loancaseprogress;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
@@ -14,13 +18,18 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.*;
-import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseDto;
+import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees;
-import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseVehDto;
+import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor;
+import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
-import com.yxt.anrui.riskcenter.api.loanparameter.*;
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
+import com.yxt.anrui.riskcenter.biz.loancaseprogressfees.LoanCaseProgressFeesService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor.LoanCaseProgressGuarantorService;
+import com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve.LoanCaseProgressPreserveService;
 import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -32,7 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -57,12 +69,43 @@ public class LoanCaseProgressService extends MybatisBaseService<LoanCaseProgress
     private LoanCaseProgressVehService loanCaseProgressVehService;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private LoanCaseProgressFeesService loanCaseProgressFeesService;
+    @Autowired
+    private LoanCaseProgressGuarantorService loanCaseProgressGuarantorService;
+    @Autowired
+    private LoanCaseProgressPreserveService loanCaseProgressPreserveService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    /**
+     * 生成交车资料确认单单据编号
+     *
+     * @param orgSid
+     * @return
+     */
+    public String getApplyCode(String orgSid) {
+        //获取分公司sid
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.AJBH.getBillType());
+        String bill = Rule.getBill(b);
+        int i = baseMapper.selectNum(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
+    }
 
     @Transactional(rollbackFor = Exception.class)
     public ResultBean pushCase(PushCaseDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanCaseProgress entity = new LoanCaseProgress();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        String applyCode = getApplyCode(dto.getUseOrgSid());
+        if (StringUtils.isNotBlank(applyCode)) {
+            entity.setCaseNo(applyCode);
+        }
         String province = "";
         String city = "";
         String county = "";
@@ -137,17 +180,17 @@ public class LoanCaseProgressService extends MybatisBaseService<LoanCaseProgress
         return rb.success();
     }
 
-//    public PagerVo<LoanParameterVo> listPage(PagerQuery<LoanParameterQuery> pq) {
+    public PagerVo<LoanCaseProgressVo> listPage(PagerQuery<LoanCaseProgressQuery> pq) {
-//        IPage<LoanParameter> page = PagerUtil.queryToPage(pq);
+        IPage<LoanCaseProgress> page = PagerUtil.queryToPage(pq);
-//        LoanParameterQuery pagerQuery = pq.getParams();
+        LoanCaseProgressQuery pagerQuery = pq.getParams();
-//        QueryWrapper<LoanParameter> qw = new QueryWrapper<>();
+        QueryWrapper<LoanCaseProgress> qw = new QueryWrapper<>();
-//        //=======================
+        //=======================
-//        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-//        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
+        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
-//        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
-//        privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
+        privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
-//        privilegeQuery.setUserSid(pagerQuery.getUserSid());
+        privilegeQuery.setUserSid(pagerQuery.getUserSid());
-//        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
 //        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
 //            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
 //            String orgSidPath = pagerQuery.getOrgPath();
@@ -159,41 +202,305 @@ public class LoanCaseProgressService extends MybatisBaseService<LoanCaseProgress
 //            String orgLevelKey = defaultIdReltBean.getData();
 //            if ("1".equals(orgLevelKey)) {
 //                orgSidPath = orgSidPath.substring(0, i1);
-//                qw.like("orgSidPath", orgSidPath);
+//                qw.like("p.orgSidPath", orgSidPath);
 //            } else if ("2".equals(orgLevelKey)) {
 //                orgSidPath = orgSidPath.substring(0, i2);
-//                qw.like("orgSidPath", orgSidPath);
+//                qw.like("p.orgSidPath", orgSidPath);
 //            } else if ("3".equals(orgLevelKey)) {
 //                orgSidPath = orgSidPath.substring(0, i3);
-//                qw.like("orgSidPath", orgSidPath);
+//                qw.like("p.orgSidPath", orgSidPath);
 //            } else if ("4".equals(orgLevelKey)) {
 //                orgSidPath = orgSidPath.substring(0, i4);
-//                qw.like("orgSidPath", orgSidPath);
+//                qw.like("p.orgSidPath", orgSidPath);
 //            } else if ("5".equals(orgLevelKey)) {
-//                qw.eq("createBySid", pagerQuery.getUserSid());
+//                qw.eq("p.createBySid", pagerQuery.getUserSid());
 //            } else {
-//                PagerVo<LoanParameterVo> p = new PagerVo<>();
+//                PagerVo<LoanCaseProgressVo> p = new PagerVo<>();
 //                return p;
 //            }
 //        } else {
-//            PagerVo<LoanParameterVo> p = new PagerVo<>();
+//            PagerVo<LoanCaseProgressVo> p = new PagerVo<>();
 //            return p;
 //        }
-//        //=======================
+        //=======================
-//        //参数编码
+        //分公司
-//        if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) {
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
-//            qw.like("parameterNo", pagerQuery.getParameterNo());
+            qw.like("p.useOrgName", pagerQuery.getUseOrgName());
-//        }
+        }
-//        //参数名称
+        //申请部门
-//        if (StringUtils.isNotBlank(pagerQuery.getParameterName())) {
+        if (StringUtils.isNotBlank(pagerQuery.getCreateDept())) {
-//            qw.like("parameterName", pagerQuery.getParameterName());
+            qw.like("p.createDept", pagerQuery.getCreateDept());
-//        }
+        }
-//        qw.eq("isDelete", 0);
+        //申请人
-//        qw.orderByDesc("createTime");
+        if (StringUtils.isNotBlank(pagerQuery.getCreateByName())) {
-//        IPage<LoanParameterVo> pagging = baseMapper.listPage(page, qw);
+            qw.like("p.createByName", pagerQuery.getCreateByName());
-//        PagerVo<LoanParameterVo> p = PagerUtil.pageToVo(pagging, null);
+        }
-//        return p;
+        String applyStartTime = pagerQuery.getCreateStartTime();
-//    }
+        String applyEndTime = pagerQuery.getCreateEndTime();
+        qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (p.createTime,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(applyEndTime), "date_format (p.createTime,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
+                );
+        //公司负责人
+        if (StringUtils.isNotBlank(pagerQuery.getCompanyHead())) {
+            qw.like("p.companyHead", pagerQuery.getCompanyHead());
+        }
+        //案件类型
+        if (StringUtils.isNotBlank(pagerQuery.getCaseType())) {
+            qw.like("p.caseType", pagerQuery.getCaseType());
+        }
+        //案件编号
+        if (StringUtils.isNotBlank(pagerQuery.getCaseNo())) {
+            qw.like("p.caseNo", pagerQuery.getCaseNo());
+        }
+        //诉讼主体
+        if (StringUtils.isNotBlank(pagerQuery.getLawsuitSubject())) {
+            qw.like("p.lawsuitSubject", pagerQuery.getLawsuitSubject());
+        }
+        //消贷合同号
+        if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
+            qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
+        }
+        //资方
+        if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
+            qw.like("p.bankName", pagerQuery.getBankName());
+        }
+        //客户名称
+        if (StringUtils.isNotBlank(pagerQuery.getCustomerName())) {
+            qw.like("p.customerName", pagerQuery.getCustomerName());
+        }
+        //贷款人
+        if (StringUtils.isNotBlank(pagerQuery.getLoanName())) {
+            qw.like("p.loanName", pagerQuery.getLoanName());
+        }
+        //案件当前阶段
+        if (StringUtils.isNotBlank(pagerQuery.getCaseStage())) {
+            qw.like("p.caseStage", pagerQuery.getCaseStage());
+        }
+        //案件当前环节
+        if (StringUtils.isNotBlank(pagerQuery.getCaseTache())) {
+            qw.like("p.caseTache", pagerQuery.getCaseTache());
+        }
+        //律师事务所
+        if (StringUtils.isNotBlank(pagerQuery.getLawFirms())) {
+            qw.like("b.lawyerFirm", pagerQuery.getLawFirms());
+        }
+        //承办律师
+        if (StringUtils.isNotBlank(pagerQuery.getLawer())) {
+            qw.like("b.lawyerName", pagerQuery.getLawer());
+        }
+        //是否全额诉讼
+        if (StringUtils.isNotBlank(pagerQuery.getFull())) {
+            qw.like("p.`full`", pagerQuery.getFull());
+        }
+        qw.eq("p.isDelete", 0);
+        qw.orderByDesc("p.createTime");
+        qw.groupBy("p.sid");
+        IPage<LoanCaseProgressVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<LoanCaseProgressVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
 
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseProgressDetailsVo vo = new LoanCaseProgressDetailsVo();
+        List<DetailsVeh> detailsVehs = new ArrayList<>(); //车辆信息
+        List<DetailsFees> fees = new ArrayList(); //相关费用
+        List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
+        List<DetailsPreserve> preserve = new ArrayList(); //保全
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        LoanCaseProgress entity = fetchBySid(sid);
+        if (null != entity) {
+            BeanUtil.copyProperties(entity, vo);
+            vo.setCreateDate(DateUtil.formatDate(entity.getCreateTime()));
+            List<LoanCaseProgressVeh> vehs = loanCaseProgressVehService.selByMainSid(sid);
+            List<LoanCaseProgressFees> caseProgressFees = loanCaseProgressFeesService.selByMainSid(sid);
+            List<LoanCaseProgressGuarantor> caseProgressGuarantors = loanCaseProgressGuarantorService.selByMainSid(sid);
+            List<LoanCaseProgressPreserve> caseProgressPreserves = loanCaseProgressPreserveService.selByMainSid(sid);
+            if (StringUtils.isBlank(entity.getSueAging())) {
+                //诉讼时效
+                String secondSale = ""; //是否存在二次销售
+                List<Date> dateList = new ArrayList<>();//日期列表
+                if (!vehs.isEmpty()) {
+                    for (LoanCaseProgressVeh veh : vehs) {
+                        LoanReturnVehLedger loanReturnVehLedger = baseMapper.fetchLedgerByBusVinSid(veh.getBusVinSid());
+                        if (null != loanReturnVehLedger) {
+                            if (loanReturnVehLedger.getDisposal().equals("二次销售")) {
+                                secondSale = "是";
+                                if (null != loanReturnVehLedger.getOutboundDate()) {
+                                    dateList.add(loanReturnVehLedger.getOutboundDate());
+                                }
+                            }
+                        }
+                    }
+                    if (secondSale.equals("是") && !dateList.isEmpty()) {
+                        Date date = dateList.stream().max(Date::compareTo).orElse(null);
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(date);
+                        calendar.add(Calendar.YEAR, 3);
+                        Date time = calendar.getTime();
+                        vo.setSueAging(DateUtil.formatDate(time));
+                    } else {
+                        String salesOrderSid = entity.getSalesOrderSid();
+                        String maxDate = baseMapper.selMaxDueDateByOrderSid(salesOrderSid);
+                        if (StringUtils.isNotBlank(maxDate)) {
+                            try {
+                                Date date = sdf.parse(maxDate);
+                                Calendar calendar = Calendar.getInstance();
+                                calendar.setTime(date);
+                                calendar.add(Calendar.YEAR, 3);
+                                Date time = calendar.getTime();
+                                vo.setSueAging(DateUtil.formatDate(time));
+                            } catch (ParseException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }
+            }
+            if (!vehs.isEmpty()) {
+                vehs.stream().forEach(v -> {
+                    DetailsVeh detailsVeh = new DetailsVeh();
+                    BeanUtil.copyProperties(v, detailsVeh);
+                    detailsVehs.add(detailsVeh);
+                });
+            }
+            if (!caseProgressFees.isEmpty()) {
+                caseProgressFees.stream().forEach(v -> {
+                    DetailsFees detailsFees = new DetailsFees();
+                    BeanUtil.copyProperties(v, detailsFees);
+                    String filesss = v.getFilePath();
+                    List<UrlQuery> lists = new ArrayList<>();
+                    if (StringUtils.isNotBlank(filesss)) {
+                        List<String> fileList = Arrays.asList(filesss.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                        for (int i = 0; i < fileList.size(); i++) {
+                            UrlQuery urlQuery = new UrlQuery();
+                            urlQuery.setUrl(fileList.get(i));
+                            lists.add(urlQuery);
+                        }
+                        detailsFees.setFeesfile(lists);
+                    }
+                    if (null != v.getOperatingTime()) {
+                        detailsFees.setOperatingTime(sdf.format(v.getOperatingTime()));
+                    }
+                    if (null != v.getPaymentTime()) {
+                        detailsFees.setPaymentTime(sdf.format(v.getPaymentTime()));
+                    }
+                    fees.add(detailsFees);
+                });
+            }
+            if (!caseProgressGuarantors.isEmpty()) {
+                caseProgressGuarantors.stream().forEach(v -> {
+                    DetailsGuarantor detailsGuarantor = new DetailsGuarantor();
+                    BeanUtil.copyProperties(v, detailsGuarantor);
+                    guarantor.add(detailsGuarantor);
+                });
+            }
+            if (!caseProgressPreserves.isEmpty()) {
+                caseProgressPreserves.stream().forEach(v -> {
+                    DetailsPreserve detailsPreserve = new DetailsPreserve();
+                    BeanUtil.copyProperties(v, detailsPreserve);
+                    String filesss = v.getFilePath();
+                    List<UrlQuery> lists = new ArrayList<>();
+                    if (StringUtils.isNotBlank(filesss)) {
+                        List<String> fileList = Arrays.asList(filesss.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                        for (int i = 0; i < fileList.size(); i++) {
+                            UrlQuery urlQuery = new UrlQuery();
+                            urlQuery.setUrl(fileList.get(i));
+                            lists.add(urlQuery);
+                        }
+                        detailsPreserve.setPreservefile(lists);
+                    }
+                    if (null != v.getOperatingTime()) {
+                        detailsPreserve.setOperatingTime(sdf.format(v.getOperatingTime()));
+                    }
+                    if (null != v.getPreserveTime()) {
+                        detailsPreserve.setPreserveTime(sdf.format(v.getPreserveTime()));
+                    }
+                    preserve.add(detailsPreserve);
+                });
+            }
+            vo.setVeh(detailsVehs);
+            vo.setFees(fees);
+            vo.setGuarantor(guarantor);
+            vo.setPreserve(preserve);
+        }
+        return rb.success().setData(vo);
+    }
 
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean saveProgress(LoanCaseProgressDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        System.out.println(urlPrefix);
+        LoanCaseProgress progress = fetchBySid(sid);
+        if (null != progress) {
+            BeanUtil.copyProperties(dto, progress);
+            baseMapper.updateById(progress);
+            List<DetailsVeh> veh = dto.getVeh(); //车辆信息
+            List<DetailsFees> fees = dto.getFees(); //相关费用
+            List<DetailsGuarantor> guarantor = dto.getGuarantor(); //担保人
+            List<DetailsPreserve> preserve = dto.getPreserve(); //保全
+            if (!veh.isEmpty()) {
+                for (DetailsVeh detailsVeh : veh) {
+                    LoanCaseProgressVeh vin = loanCaseProgressVehService.selByMainSidAndBusVinSid(sid, detailsVeh.getBusVinSid());
+                    if (null != vin) {
+                        BeanUtil.copyProperties(detailsVeh, vin);
+                        loanCaseProgressVehService.updateById(vin);
+                    }
+                }
+            }
+            int i1 = loanCaseProgressFeesService.delByMainSid(sid);
+            int i2 = loanCaseProgressGuarantorService.delByMainSid(sid);
+            int i3 = loanCaseProgressPreserveService.delByMainSid(sid);
+            if (!fees.isEmpty()) {
+                for (DetailsFees detailsFees : fees) {
+                    LoanCaseProgressFees newFees = new LoanCaseProgressFees();
+                    BeanUtil.copyProperties(detailsFees, newFees, "id", "sid");
+                    newFees.setMainSid(sid);
+                    //保存附件
+                    List<UrlQuery> filss = detailsFees.getFeesfile();
+                    filss.removeAll(Collections.singleton(null));
+                    if (!filss.isEmpty()) {
+                        List<String> filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList());
+                        filesList.removeAll(Collections.singleton(null));
+                        if (!filesList.isEmpty()) {
+                            String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                            newFees.setFilePath(files);
+                        }
+                    }
+                    loanCaseProgressFeesService.insert(newFees);
+                }
+            }
+            if (!guarantor.isEmpty()) {
+                for (DetailsGuarantor detailsGuarantor : guarantor) {
+                    LoanCaseProgressGuarantor entity = new LoanCaseProgressGuarantor();
+                    BeanUtil.copyProperties(detailsGuarantor, entity, "id", "sid");
+                    entity.setMainSid(sid);
+                    loanCaseProgressGuarantorService.insert(entity);
+                }
+            }
+            if (!preserve.isEmpty()) {
+                for (DetailsPreserve detailsPreserve : preserve) {
+                    LoanCaseProgressPreserve entity = new LoanCaseProgressPreserve();
+                    BeanUtil.copyProperties(detailsPreserve, entity, "id", "sid");
+                    entity.setMainSid(sid);
+                    //保存附件
+                    List<UrlQuery> filss = detailsPreserve.getPreservefile();
+                    filss.removeAll(Collections.singleton(null));
+                    if (!filss.isEmpty()) {
+                        List<String> filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList());
+                        filesList.removeAll(Collections.singleton(null));
+                        if (!filesList.isEmpty()) {
+                            String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                            entity.setFilePath(files);
+                        }
+                    }
+                    loanCaseProgressPreserveService.insert(entity);
+                }
+            }
+        }
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 
 /**
@@ -14,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanCaseProgressExecuteMapper extends BaseMapper<LoanCaseProgressExecute> {
 
-
+    @Select("select * from loan_case_progress_execute where mainSid = #{sid}")
+    LoanCaseProgressExecute selByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java

@@ -26,6 +26,7 @@ public class LoanCaseProgressExecuteService extends MybatisBaseService<LoanCaseP
     private SysOrganizationFeign sysOrganizationFeign;
 
 
-
+    public LoanCaseProgressExecute selByMainSid(String sid) {
-
+        return baseMapper.selByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -14,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanCaseProgressExecuteMeasureMapper extends BaseMapper<LoanCaseProgressExecuteMeasure> {
 
-
+    @Select("select * from loan_case_progress_execute_measure where mainSid = #{sid}")
+    List<LoanCaseProgressExecuteMeasure> selByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java

@@ -9,6 +9,8 @@ import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * @description:
@@ -26,6 +28,7 @@ public class LoanCaseProgressExecuteMeasureService extends MybatisBaseService<Lo
     private SysOrganizationFeign sysOrganizationFeign;
 
 
-
+    public List<LoanCaseProgressExecuteMeasure> selByMainSid(String sid) {
-
+        return baseMapper.selByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesMapper.java

@@ -3,7 +3,12 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressfees;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
 import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -14,5 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanCaseProgressFeesMapper extends BaseMapper<LoanCaseProgressFees> {
 
+    @Select("select * from loan_case_progress_fees where mainSid = #{sid}")
+    List<LoanCaseProgressFees> selByMainSid(String sid);
 
+    @Delete("delete from loan_case_progress_fees where mainSid = #{sid}")
+    int delByMainSid(@Param("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesService.java

@@ -9,6 +9,8 @@ import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * @description:
@@ -26,6 +28,11 @@ public class LoanCaseProgressFeesService extends MybatisBaseService<LoanCaseProg
     private SysOrganizationFeign sysOrganizationFeign;
 
 
+    public List<LoanCaseProgressFees> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 
-
+    public int delByMainSid(String sid) {
+        return baseMapper.delByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorMapper.java

@@ -3,7 +3,11 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees;
 import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -15,4 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
 public interface LoanCaseProgressGuarantorMapper extends BaseMapper<LoanCaseProgressGuarantor> {
 
 
+    @Select("select * from loan_case_progress_guarantor where mainSid = #{sid}")
+    List<LoanCaseProgressGuarantor> selByMainSid(String sid);
+
+    @Delete("delete from loan_case_progress_guarantor where mainSid = #{sid}")
+    int delByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorService.java

@@ -8,6 +8,8 @@ import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * @description:
@@ -25,6 +27,11 @@ public class LoanCaseProgressGuarantorService extends MybatisBaseService<LoanCas
     private SysOrganizationFeign sysOrganizationFeign;
 
 
+    public List<LoanCaseProgressGuarantor> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 
-
+    public int delByMainSid(String sid) {
+        return baseMapper.delByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveMapper.java

@@ -3,7 +3,11 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor;
 import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -15,4 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
 public interface LoanCaseProgressPreserveMapper extends BaseMapper<LoanCaseProgressPreserve> {
 
 
+    @Select("select * from loan_case_progress_preserve where mainSid = #{sid}")
+    List<LoanCaseProgressPreserve> selByMainSid(String sid);
+
+    @Delete("delete from loan_case_progress_preserve where mainSid = #{sid}")
+    int delByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveService.java

@@ -9,6 +9,8 @@ import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * @description:
@@ -26,6 +28,11 @@ public class LoanCaseProgressPreserveService extends MybatisBaseService<LoanCase
     private SysOrganizationFeign sysOrganizationFeign;
 
 
+    public List<LoanCaseProgressPreserve> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 
-
+    public int delByMainSid(String sid) {
+        return baseMapper.delByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresstrial/LoanCaseProgressTrialMapper.java

@@ -16,6 +16,6 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface LoanCaseProgressTrialMapper extends BaseMapper<LoanCaseProgressTrial> {
 
-    @Select("select * from loan_case_progress_trial where sid = #{sid} and caseStage = #{caseStage}")
+    @Select("select * from loan_case_progress_trial where mainSid = #{sid} and caseStage = #{caseStage}")
     LoanCaseProgressTrial selByJdAndSid(@Param("sid") String sid,@Param("caseStage") String caseStage);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.riskcenter.biz.loancaseprogressveh;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.DetailsVeh;
 import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -19,4 +22,9 @@ public interface LoanCaseProgressVehMapper extends BaseMapper<LoanCaseProgressVe
 
     @Select("select * from loan_case_progress_veh where mainSid = #{sid}")
     List<LoanCaseProgressVeh> selByMainSid(String sid);
+
+    @Select("select * from loan_case_progress_veh where mainSid = #{sid} and busVinSid =#{busVinSid}")
+    LoanCaseProgressVeh selByMainSidAndBusVinSid(@Param("sid") String sid, @Param("busVinSid") String busVinSid);
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressveh;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.DetailsVeh;
 import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -31,4 +32,11 @@ public class LoanCaseProgressVehService extends MybatisBaseService<LoanCaseProgr
     public List<LoanCaseProgressVeh> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
+
+
+    public LoanCaseProgressVeh selByMainSidAndBusVinSid(String sid, String busVinSid) {
+        return baseMapper.selByMainSidAndBusVinSid(sid,busVinSid);
+    }
+
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java

@@ -110,6 +110,8 @@ public class AppCaseCloseApplyDetailsVo implements Vo {
 
     @ApiModelProperty
     private List<String> appJaclFiles;
+    @ApiModelProperty("执行措施")
+    private List<AppCaseProgressExecuteMeasureDetailsVo> appCaseProgressExecuteMeasureDetailsVoList;
     @ApiModelProperty("结案车辆")
     private List<AppCaseCloseVehDetailsVo> appCaseCloseVehList;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.api.risk.caseclose;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+public class AppCaseProgressExecuteMeasureDetailsVo {
+
+    @ApiModelProperty("执行措施")
+    private String measure;
+    @ApiModelProperty("执行日期")
+    private String measureTime;
+    @ApiModelProperty("执行回款金额")
+    private String measureMoney;
+    @ApiModelProperty("执行说明")
+    private String measureShows;
+    @ApiModelProperty("操作时间")
+    private String operatorTime;
+    @ApiModelProperty("操作人")
+    private String operator;
+    @ApiModelProperty("附件")
+    private List<String> appMeasureFiles;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseappeal;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyFeign;
 import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
@@ -154,7 +155,7 @@ public class CaseAppealService {
         AppCaseAppealApplyDetailsVo appCaseAppealApplyDetailsVo = new AppCaseAppealApplyDetailsVo();
         BeanUtil.copyProperties(loanCaseAppealApplyDetailsVo,appCaseAppealApplyDetailsVo);
         appCaseAppealApplyDetailsVo.setPublishInfo(loanCaseAppealApplyDetailsVo.getDeptName() + "-" + loanCaseAppealApplyDetailsVo.getCreateByName());
-        appCaseAppealApplyDetailsVo.setTime(loanCaseAppealApplyDetailsVo.getCreateTime());
+        appCaseAppealApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseAppealApplyDetailsVo.getCreateTime()));
         appCaseAppealApplyDetailsVo.setProcInsId(loanCaseAppealApplyDetailsVo.getProcInstSid());
         List<LoanCaseAppealFile> pjclFiles = loanCaseAppealApplyDetailsVo.getPjclFiles();
         List<String> appPjcl = new ArrayList<>();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseclose;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyFeign;
 import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile;
@@ -37,8 +38,10 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFei
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure;
 import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseCloseApplyDetailsVo;
 import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseCloseVehDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseProgressExecuteMeasureDetailsVo;
 import com.yxt.anrui.terminal.api.risk.caseclose.flowable.AppCaseCloseDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.caseclose.flowable.CaseCloseQuery;
 import com.yxt.anrui.terminal.api.risk.caseclose.flowable.CaseCloseTaskQuery;
@@ -49,6 +52,7 @@ import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelega
 import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteQuery;
 import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteTaskQuery;
 import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CompleteCaseExecuteDto;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,6 +66,8 @@ public class CaseCloseService {
 
     @Autowired
     private LoanCaseCloseApplyFeign loanCaseCloseApplyFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public ResultBean agreeCreditInfo(CompleteCaseCloseDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -148,7 +154,7 @@ public class CaseCloseService {
         AppCaseCloseApplyDetailsVo appCaseCloseApplyDetailsVo = new AppCaseCloseApplyDetailsVo();
         BeanUtil.copyProperties(loanCaseCloseApplyDetailsVo,appCaseCloseApplyDetailsVo);
         appCaseCloseApplyDetailsVo.setPublishInfo(loanCaseCloseApplyDetailsVo.getDeptName() + "-" + loanCaseCloseApplyDetailsVo.getCreateByName());
-        appCaseCloseApplyDetailsVo.setTime(loanCaseCloseApplyDetailsVo.getCreateTime());
+        appCaseCloseApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseCloseApplyDetailsVo.getCreateTime()));
         appCaseCloseApplyDetailsVo.setProcInsId(loanCaseCloseApplyDetailsVo.getProcInstSid());
         List<LoanCaseCloseFile> jaclFiles = loanCaseCloseApplyDetailsVo.getJaclFiles();
         List<String> appJacl = new ArrayList<>();
@@ -166,6 +172,28 @@ public class CaseCloseService {
             appCaseCloseVehDetailsVos.add(appCaseCloseVehDetailsVo);
         }
         appCaseCloseApplyDetailsVo.setAppCaseCloseVehList(appCaseCloseVehDetailsVos);
+        List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures = loanCaseCloseApplyDetailsVo.getLoanCaseProgressExecuteMeasures();
+        List<AppCaseProgressExecuteMeasureDetailsVo> appCaseProgressExecuteMeasureDetailsVos = new ArrayList<>();
+        for (LoanCaseProgressExecuteMeasure loanCaseProgressExecuteMeasure : loanCaseProgressExecuteMeasures) {
+            AppCaseProgressExecuteMeasureDetailsVo appCaseProgressExecuteMeasureDetailsVo = new AppCaseProgressExecuteMeasureDetailsVo();
+            appCaseProgressExecuteMeasureDetailsVo.setMeasure(loanCaseProgressExecuteMeasure.getMeasure());
+            appCaseProgressExecuteMeasureDetailsVo.setMeasureTime(DateUtil.formatDate(loanCaseProgressExecuteMeasure.getMeasureTime()));
+            appCaseProgressExecuteMeasureDetailsVo.setMeasureMoney(loanCaseProgressExecuteMeasure.getMeasureMoney().toString());
+            appCaseProgressExecuteMeasureDetailsVo.setMeasureShows(loanCaseProgressExecuteMeasure.getMeasureShows());
+            appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(loanCaseProgressExecuteMeasure.getOperatorTime());
+            appCaseProgressExecuteMeasureDetailsVo.setOperator(loanCaseProgressExecuteMeasure.getOperator());
+            ArrayList<String> appMeasureFiles = new ArrayList<>();
+            String measureFiles = loanCaseProgressExecuteMeasure.getMeasureFiles();
+            String[] measureFile = measureFiles.split(",");
+            for (String s : measureFile) {
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                s = urlPrefix + s;
+                appMeasureFiles.add(s);
+            }
+            appCaseProgressExecuteMeasureDetailsVo.setAppMeasureFiles(appMeasureFiles);
+            appCaseProgressExecuteMeasureDetailsVos.add(appCaseProgressExecuteMeasureDetailsVo);
+        }
+        appCaseCloseApplyDetailsVo.setAppCaseProgressExecuteMeasureDetailsVoList(appCaseProgressExecuteMeasureDetailsVos);
         return rb.success().setData(appCaseCloseApplyDetailsVo);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseexecute;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile;
@@ -137,7 +138,7 @@ public class CaseExecuteService {
         AppCaseExecuteApplyDetailsVo appCaseExecuteApplyDetailsVo = new AppCaseExecuteApplyDetailsVo();
         BeanUtil.copyProperties(loanCaseExecuteApplyDetailsVo,appCaseExecuteApplyDetailsVo);
         appCaseExecuteApplyDetailsVo.setPublishInfo(loanCaseExecuteApplyDetailsVo.getDeptName() + "-" + loanCaseExecuteApplyDetailsVo.getCreateByName());
-        appCaseExecuteApplyDetailsVo.setTime(loanCaseExecuteApplyDetailsVo.getCreateTime());
+        appCaseExecuteApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseExecuteApplyDetailsVo.getCreateTime()));
         appCaseExecuteApplyDetailsVo.setProcInsId(loanCaseExecuteApplyDetailsVo.getProcInstSid());
         List<LoanCaseExecuteFile> pjclFiles = loanCaseExecuteApplyDetailsVo.getPjclFiles();
         List<String> appPjcl = new ArrayList<>();