Browse Source

修复代码

master
主管理员 8 months ago
parent
commit
ca4559d20c
26 changed files with 1202 additions and 177 deletions
  1. +1
    -1
      admin-hanhai-vue/.env.development
  2. +1
    -1
      admin-hanhai-vue/.env.production
  3. +12
    -12
      admin-hanhai-vue/src/views/HanHaiMember/HanHaiMemberList.vue
  4. +31
    -31
      admin-hanhai-vue/src/views/HanHaiMember/modules/HanHaiMemberForm.vue
  5. +22
    -22
      admin-hanhai-vue/src/views/HanHaiMemberAccount/HanHaiMemberList.vue
  6. +7
    -7
      admin-hanhai-vue/src/views/HanHaiMemberAccount/modules/HanHaiMemberForm.vue
  7. +20
    -20
      admin-hanhai-vue/src/views/HanHaiMemberPass/HanHaiMemberList.vue
  8. +344
    -0
      admin-hanhai-vue/src/views/subSchool/ShcoolSubList.vue
  9. +184
    -0
      admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubForm.vue
  10. +84
    -0
      admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.Style#Drawer.vue
  11. +60
    -0
      admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.vue
  12. +7
    -6
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
  13. +60
    -20
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java
  14. +25
    -7
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java
  15. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java
  16. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java
  17. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java
  18. +88
    -8
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue
  19. +21
    -16
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue
  20. +108
    -15
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts
  21. BIN
      jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.class
  22. BIN
      jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class
  23. BIN
      jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class
  24. BIN
      jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class
  25. +123
    -7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
  26. +1
    -1
      jeecg-boot-module-system/src/main/resources/application-dev.yml

+ 1
- 1
admin-hanhai-vue/.env.development View File

@ -1,5 +1,5 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=http://localhost:8003/school-api/
VUE_APP_API_BASE_URL=http://localhost:8000/school-api/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


+ 1
- 1
admin-hanhai-vue/.env.production View File

@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=http://localhost:8003/school-api/
VUE_APP_API_BASE_URL=http://localhost:8000/school-api/
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 12
- 12
admin-hanhai-vue/src/views/HanHaiMember/HanHaiMemberList.vue View File

@ -132,11 +132,11 @@
dataIndex: 'headImage',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'真实姓名',
align:"center",
dataIndex: 'name'
},
// {
// title:'',
// align:"center",
// dataIndex: 'name'
// },
{
title:'openid',
align:"center",
@ -182,7 +182,7 @@
deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch",
exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls",
importExcelUrl: "hanHaiMember/hanHaiMember/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -202,12 +202,12 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''})
fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''})
fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''})
// fieldList.push({type:'string',value:'headImage',text:'',dictCode:''})
// fieldList.push({type:'string',value:'name',text:'',dictCode:''})
// fieldList.push({type:'string',value:'phone',text:'',dictCode:''})
// fieldList.push({type:'string',value:'account',text:'',dictCode:''})
// fieldList.push({type:'string',value:'password',text:'',dictCode:''})
// fieldList.push({type:'string',value:'passwordSalt',text:'',dictCode:''})
fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
this.superFieldList = fieldList
}


+ 31
- 31
admin-hanhai-vue/src/views/HanHaiMember/modules/HanHaiMemberForm.vue View File

@ -13,41 +13,41 @@
<j-image-upload isMultiple v-model="model.headImage" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="真实姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入真实姓名" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input v-model="model.phone" placeholder="请输入手机号码" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="登录账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="account">
<a-input v-model="model.account" placeholder="请输入登录账号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">
<a-input v-model="model.password" placeholder="请输入登录密码" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="真实姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">-->
<!-- <a-input v-model="model.name" placeholder="请输入真实姓名" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">-->
<!-- <a-input v-model="model.phone" placeholder="请输入手机号码" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="登录账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="account">-->
<!-- <a-input v-model="model.account" placeholder="请输入登录账号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">-->
<!-- <a-input v-model="model.password" placeholder="请输入登录密码" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="登录盐" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="passwordSalt">-->
<!-- <a-input v-model="model.passwordSalt" placeholder="请输入登录盐" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
<a-input v-model="model.sex" placeholder="请输入性别" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isDa">
<a-input v-model="model.isDai" placeholder="请输入角色" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">-->
<!-- <a-input v-model="model.sex" placeholder="请输入性别" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isDa">-->
<!-- <a-input v-model="model.isDai" placeholder="请输入角色" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
</a-row>
</a-form-model>
</j-form-container>
@ -136,7 +136,7 @@
that.confirmLoading = false;
})
}
})
},
}


+ 22
- 22
admin-hanhai-vue/src/views/HanHaiMemberAccount/HanHaiMemberList.vue View File

@ -68,9 +68,9 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<!-- <a @click="handleEdit(record)">编辑</a>-->
<a-divider type="vertical" />
<!-- <a-divider type="vertical" />-->
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
@ -137,13 +137,13 @@
align:"center",
dataIndex: 'name'
},
// {
// title:'',
// align:"center",
// dataIndex: 'phone'
// },
{
title:'手机号码',
align:"center",
dataIndex: 'phone'
},
{
title:'登录账号',
title:'登录账号(手机号码)',
align:"center",
dataIndex: 'account'
},
@ -162,11 +162,11 @@
align:"center",
dataIndex: 'sex'
},
{
title:'角色',
align:"center",
dataIndex: 'isDa'
},
// {
// title:'',
// align:"center",
// dataIndex: 'isDai'
// },
{
title: '操作',
dataIndex: 'action',
@ -182,7 +182,7 @@
deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch",
exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls",
importExcelUrl: "hanHaiMember/hanHaiMember/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -201,14 +201,14 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''})
fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''})
fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''})
fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
// fieldList.push({type:'string',value:'nickName',text:'',dictCode:''})
// fieldList.push({type:'string',value:'headImage',text:'',dictCode:''})
// fieldList.push({type:'string',value:'name',text:'',dictCode:''})
// fieldList.push({type:'string',value:'phone',text:'',dictCode:''})
fieldList.push({type:'string',value:'account',text:'登录账号(手机号码)',dictCode:''})
// fieldList.push({type:'string',value:'password',text:'',dictCode:''})
// fieldList.push({type:'string',value:'passwordSalt',text:'',dictCode:''})
// fieldList.push({type:'string',value:'sex',text:'',dictCode:''})
this.superFieldList = fieldList
}
}


+ 7
- 7
admin-hanhai-vue/src/views/HanHaiMemberAccount/modules/HanHaiMemberForm.vue View File

@ -18,14 +18,14 @@
<a-input v-model="model.name" placeholder="请输入真实姓名" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">-->
<!-- <a-input v-model="model.phone" placeholder="请输入手机号码" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input v-model="model.phone" placeholder="请输入手机号码" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="登录账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="account">
<a-input v-model="model.account" placeholder="请输入登录账号" ></a-input>
<a-form-model-item label="登录账号(手机号码)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="account">
<a-input v-model="model.account" placeholder="请输入登录账号(手机号码)" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">


+ 20
- 20
admin-hanhai-vue/src/views/HanHaiMemberPass/HanHaiMemberList.vue View File

@ -137,13 +137,13 @@
align:"center",
dataIndex: 'name'
},
// {
// title:'',
// align:"center",
// dataIndex: 'phone'
// },
{
title:'手机号码',
align:"center",
dataIndex: 'phone'
},
{
title:'登录账号',
title:'登录账号(手机号码)',
align:"center",
dataIndex: 'account'
},
@ -162,11 +162,11 @@
align:"center",
dataIndex: 'sex'
},
{
title:'角色',
align:"center",
dataIndex: 'isDa'
},
// {
// title:'',
// align:"center",
// dataIndex: 'isDa'
// },
{
title: '操作',
dataIndex: 'action',
@ -182,7 +182,7 @@
deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch",
exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls",
importExcelUrl: "hanHaiMember/hanHaiMember/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -201,14 +201,14 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''})
fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''})
fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''})
fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
// fieldList.push({type:'string',value:'nickName',text:'',dictCode:''})
// fieldList.push({type:'string',value:'headImage',text:'',dictCode:''})
// fieldList.push({type:'string',value:'name',text:'',dictCode:''})
// fieldList.push({type:'string',value:'phone',text:'',dictCode:''})
fieldList.push({type:'string',value:'account',text:'登录账号(手机号码)',dictCode:''})
// fieldList.push({type:'string',value:'password',text:'',dictCode:''})
// fieldList.push({type:'string',value:'passwordSalt',text:'',dictCode:''})
// fieldList.push({type:'string',value:'sex',text:'',dictCode:''})
this.superFieldList = fieldList
}
}


+ 344
- 0
admin-hanhai-vue/src/views/subSchool/ShcoolSubList.vue View File

@ -0,0 +1,344 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="楼栋">
<a-input placeholder="请输入楼栋" v-model="queryParam.building"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="室号">
<a-input placeholder="请输入室号" v-model="queryParam.room"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目">
<a-input placeholder="请输入项目" v-model="queryParam.project"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="姓名">
<a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="电话">
<a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="状态">
<j-dict-select-tag placeholder="请选择状态" v-model="queryParam.state" dictCode="sch_order_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="结单/驳回">
<j-dict-select-tag placeholder="请选择结单/驳回" v-model="queryParam.cleckState" dictCode="sch_pay_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="分配维修员">
<j-search-select-tag placeholder="请选择分配维修员" v-model="queryParam.giveAccount" dict="han_hai_member,nick_name,id,is_dai=1"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('报修表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">分配维修员</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<shcool-sub-modal ref="modalForm" @ok="modalFormOk"></shcool-sub-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ShcoolSubModal from './modules/ShcoolSubModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ShcoolSubList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ShcoolSubModal
},
data () {
return {
description: '报修表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'楼栋',
align:"center",
dataIndex: 'building'
},
{
title:'工单号',
align:"center",
dataIndex: 'orderNo'
},
{
title:'室号',
align:"center",
dataIndex: 'room'
},
{
title:'项目',
align:"center",
dataIndex: 'project'
},
{
title:'姓名',
align:"center",
dataIndex: 'name'
},
{
title:'简介',
align:"center",
dataIndex: 'context'
},
{
title:'电话',
align:"center",
dataIndex: 'phone'
},
{
title:'照片',
align:"center",
dataIndex: 'image',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'用户标识',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'状态',
align:"center",
dataIndex: 'state_dictText'
},
{
title:'结单/驳回',
align:"center",
dataIndex: 'cleckState_dictText'
},
{
title:'驳回原因',
align:"center",
dataIndex: 'returnValue'
},
{
title:'填单日期',
align:"center",
dataIndex: 'startTime'
},
{
title:'结单结果',
align:"center",
dataIndex: 'successTitle'
},
{
title:'结单金额',
align:"center",
dataIndex: 'successPrice'
},
{
title:'处理说明',
align:"center",
dataIndex: 'sucessText'
},
{
title:'照片',
align:"center",
dataIndex: 'successImage',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'分配维修员',
align:"center",
dataIndex: 'giveAccount_dictText'
},
{
title:'结单日期',
align:"center",
dataIndex: 'endTime'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/shcoolSub/shcoolSub/list",
delete: "/shcoolSub/shcoolSub/delete",
deleteBatch: "/shcoolSub/shcoolSub/deleteBatch",
exportXlsUrl: "/shcoolSub/shcoolSub/exportXls",
importExcelUrl: "shcoolSub/shcoolSub/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'date',value:'createTime',text:'创建日期'})
fieldList.push({type:'string',value:'building',text:'楼栋',dictCode:''})
fieldList.push({type:'string',value:'orderNo',text:'工单号',dictCode:''})
fieldList.push({type:'string',value:'room',text:'室号',dictCode:''})
fieldList.push({type:'string',value:'project',text:'项目',dictCode:''})
fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
fieldList.push({type:'string',value:'context',text:'简介',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
fieldList.push({type:'string',value:'image',text:'照片',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'string',value:'state',text:'状态',dictCode:'sch_order_state'})
fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:'sch_pay_state'})
fieldList.push({type:'string',value:'returnValue',text:'驳回原因',dictCode:''})
fieldList.push({type:'datetime',value:'startTime',text:'填单日期'})
fieldList.push({type:'string',value:'successTitle',text:'结单结果',dictCode:''})
fieldList.push({type:'BigDecimal',value:'successPrice',text:'结单金额',dictCode:''})
fieldList.push({type:'string',value:'sucessText',text:'处理说明',dictCode:''})
fieldList.push({type:'string',value:'successImage',text:'照片',dictCode:''})
fieldList.push({type:'sel_search',value:'giveAccount',text:'分配维修员',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'datetime',value:'endTime',text:'结单日期'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 184
- 0
admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubForm.vue View File

@ -0,0 +1,184 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="楼栋" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="building">
<a-input v-model="model.building" placeholder="请输入楼栋" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
<a-input v-model="model.orderNo" placeholder="请输入工单号" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="室号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="room">
<a-input v-model="model.room" placeholder="请输入室号" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="project">
<a-input v-model="model.project" placeholder="请输入项目" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入姓名" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="context">
<a-textarea v-model="model.context" rows="4" placeholder="请输入简介" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input v-model="model.phone" placeholder="请输入电话" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<j-image-upload isMultiple v-model="model.image" disabled></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id,is_dai=0" disabled />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="驳回原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnValue">
<a-textarea v-model="model.returnValue" rows="4" placeholder="请输入驳回原因" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="填单日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startTime">
<j-date placeholder="请选择填单日期" v-model="model.startTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successTitle">
<a-input v-model="model.successTitle" placeholder="请输入结单结果" disabled ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successPrice">
<a-input-number v-model="model.successPrice" placeholder="请输入结单金额" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="处理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sucessText">
<a-textarea v-model="model.sucessText" rows="4" placeholder="请输入处理说明" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successImage">
<j-image-upload isMultiple v-model="model.successImage" disabled></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="分配维修员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveAccount">
<j-search-select-tag v-model="model.giveAccount" dict="han_hai_member,nick_name,id,is_dai=1" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endTime">
<j-date placeholder="请选择结单日期" v-model="model.endTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'ShcoolSubForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/shcoolSub/shcoolSub/add",
edit: "/shcoolSub/shcoolSub/edit",
queryById: "/shcoolSub/shcoolSub/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<shcool-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></shcool-sub-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import ShcoolSubForm from './ShcoolSubForm'
export default {
name: 'ShcoolSubModal',
components: {
ShcoolSubForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<shcool-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></shcool-sub-form>
</j-modal>
</template>
<script>
import ShcoolSubForm from './ShcoolSubForm'
export default {
name: 'ShcoolSubModal',
components: {
ShcoolSubForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 7
- 6
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java View File

@ -54,7 +54,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHaiMemberService> {
@Autowired
private IHanHaiMemberService hanHaiMemberService;
/**
* 分页列表查询
*
@ -135,7 +135,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
/**
* 添加
*
@ -178,11 +178,12 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
String encrypt = PasswordUtil.encrypt(hanHaiMember.getAccount(), hanHaiMember.getPassword(), salt);
hanHaiMember.setPassword(encrypt);
hanHaiMember.setPasswordSalt(salt);
hanHaiMember.setIsDai("1");
hanHaiMemberService.save(hanHaiMember);
return Result.OK("添加成功!");
}
/**
* 编辑
*
@ -203,7 +204,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
hanHaiMemberService.updateById(hanHaiMember);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
@ -217,7 +218,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
hanHaiMemberService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -231,7 +232,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*


+ 60
- 20
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java View File

@ -1,6 +1,8 @@
package org.jeecg.modules.shcoolSub.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -9,9 +11,16 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.jeecg.modules.hanHaiMember.service.impl.HanHaiMemberServiceImpl;
import org.jeecg.modules.schoolOrderLog.entity.SchoolOrderLog;
import org.jeecg.modules.schoolOrderLog.service.ISchoolOrderLogService;
import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
import org.jeecg.modules.shcoolSub.service.IShcoolSubService;
@ -39,7 +48,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 报修表
* @Author: jeecg-boot
* @Date: 2024-09-03
* @Date: 2024-09-29
* @Version: V1.0
*/
@Api(tags="报修表")
@ -49,7 +58,11 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class ShcoolSubController extends JeecgController<ShcoolSub, IShcoolSubService> {
@Autowired
private IShcoolSubService shcoolSubService;
@Autowired
private IHanHaiMemberService hanHaiMemberService;
@Autowired
private ISchoolOrderLogService schoolOrderLogService;
/**
* 分页列表查询
*
@ -71,7 +84,7 @@ public class ShcoolSubController extends JeecgController<ShcoolSub, IShcoolSubSe
IPage<ShcoolSub> pageList = shcoolSubService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
@ -85,21 +98,48 @@ public class ShcoolSubController extends JeecgController<ShcoolSub, IShcoolSubSe
shcoolSubService.save(shcoolSub);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param shcoolSub
* @return
*/
@AutoLog(value = "报修表-编辑")
@ApiOperation(value="报修表-编辑", notes="报修表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ShcoolSub shcoolSub) {
shcoolSubService.updateById(shcoolSub);
return Result.OK("编辑成功!");
}
/**
* 编辑
*
* @param shcoolSub
* @return
*/
@AutoLog(value = "报修表-编辑")
@ApiOperation(value="报修表-编辑", notes="报修表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ShcoolSub shcoolSub) {
ShcoolSub byId1 = shcoolSubService.getById(shcoolSub.getId());
//查看订单状态是否已完成
if(byId1.getState().equals("1")){
return Result.error("订单订单已结单,不能修改");
}
if(StringUtils.isNotBlank(shcoolSub.getGiveAccount())){
//增加转单记录
//根据标识查询转单师傅信息
HanHaiMember byId = hanHaiMemberService.getById(shcoolSub.getGiveAccount());
SchoolOrderLog schoolOrderLog = new SchoolOrderLog();
schoolOrderLog.setOrderNo(shcoolSub.getOrderNo());
schoolOrderLog.setType("0");
schoolOrderLog.setGiveUser(shcoolSub.getGiveAccount());
schoolOrderLog.setOrderId(shcoolSub.getId());
schoolOrderLog.setCreateTime(new Date());
schoolOrderLog.setCentext("后台员转单给:"+byId.getName());
schoolOrderLog.setUserId(shcoolSub.getUserId());
schoolOrderLogService.save(schoolOrderLog);
}
shcoolSub.setCleckState("0");
shcoolSub.setReturnValue("");
shcoolSub.setSuccessPrice(BigDecimal.ZERO);
shcoolSub.setSuccessTitle("");
shcoolSub.setSucessText("");
shcoolSub.setSuccessImage("");
shcoolSubService.updateById(shcoolSub);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
@ -113,7 +153,7 @@ public class ShcoolSubController extends JeecgController<ShcoolSub, IShcoolSubSe
shcoolSubService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -127,7 +167,7 @@ public class ShcoolSubController extends JeecgController<ShcoolSub, IShcoolSubSe
this.shcoolSubService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*


+ 25
- 7
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 报修表
* @Author: jeecg-boot
* @Date: 2024-09-03
* @Date: 2024-09-29
* @Version: V1.0
*/
@Data
@ -39,18 +39,26 @@ public class ShcoolSub implements Serializable {
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**楼栋*/
@Excel(name = "楼栋", width = 15)
@ApiModelProperty(value = "楼栋")
private java.lang.String building;
/**工单号*/
@Excel(name = "工单号", width = 15)
@ApiModelProperty(value = "工单号")
private java.lang.String orderNo;
/**室号*/
@Excel(name = "室号", width = 15)
@ApiModelProperty(value = "室号")
@ -76,22 +84,28 @@ public class ShcoolSub implements Serializable {
@ApiModelProperty(value = "照片")
private java.lang.String image;
/**用户标识*/
@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "account", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "account", dicCode = "id")
@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "用户标识")
private java.lang.String userId;
/**状态*/
@Excel(name = "状态", width = 15)
@Excel(name = "状态", width = 15, dicCode = "sch_order_state")
@Dict(dicCode = "sch_order_state")
@ApiModelProperty(value = "状态")
private java.lang.String state;
/**结单/驳回*/
@Excel(name = "结单/驳回", width = 15)
@Excel(name = "结单/驳回", width = 15, dicCode = "sch_pay_state")
@Dict(dicCode = "sch_pay_state")
@ApiModelProperty(value = "结单/驳回")
private java.lang.String cleckState;
/**驳回原因*/
@Excel(name = "驳回原因", width = 15)
@ApiModelProperty(value = "驳回原因")
private java.lang.String returnValue;
/**填单日期*/
@Excel(name = "填单日期", width = 15)
@ApiModelProperty(value = "填单日期")
private java.util.Date startTime;
/**结单结果*/
@Excel(name = "结单结果", width = 15)
@ApiModelProperty(value = "结单结果")
@ -109,8 +123,12 @@ public class ShcoolSub implements Serializable {
@ApiModelProperty(value = "照片")
private java.lang.String successImage;
/**分配维修员*/
@Excel(name = "分配维修员", width = 15, dictTable = "han_hai_member", dicText = "account", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "account", dicCode = "id")
@Excel(name = "分配维修员", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "分配维修员")
private java.lang.String giveAccount;
/**结单日期*/
@Excel(name = "结单日期", width = 15)
@ApiModelProperty(value = "结单日期")
private java.util.Date endTime;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 报修表
* @Author: jeecg-boot
* @Date: 2024-09-03
* @Date: 2024-09-29
* @Version: V1.0
*/
public interface ShcoolSubMapper extends BaseMapper<ShcoolSub> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 报修表
* @Author: jeecg-boot
* @Date: 2024-09-03
* @Date: 2024-09-29
* @Version: V1.0
*/
public interface IShcoolSubService extends IService<ShcoolSub> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 报修表
* @Author: jeecg-boot
* @Date: 2024-09-03
* @Date: 2024-09-29
* @Version: V1.0
*/
@Service


+ 88
- 8
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue View File

@ -4,6 +4,58 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="楼栋">
<a-input placeholder="请输入楼栋" v-model="queryParam.building"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="室号">
<a-input placeholder="请输入室号" v-model="queryParam.room"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目">
<a-input placeholder="请输入项目" v-model="queryParam.project"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="姓名">
<a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="电话">
<a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="状态">
<j-dict-select-tag placeholder="请选择状态" v-model="queryParam.state" dictCode="sch_order_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="结单/驳回">
<j-dict-select-tag placeholder="请选择结单/驳回" v-model="queryParam.cleckState" dictCode="sch_pay_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="分配维修员">
<j-search-select-tag placeholder="请选择分配维修员" v-model="queryParam.giveAccount" dict="han_hai_member,nick_name,id,is_dai=1"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -122,11 +174,25 @@
return parseInt(index)+1;
}
},
{
title:'创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'楼栋',
align:"center",
dataIndex: 'building'
},
{
title:'工单号',
align:"center",
dataIndex: 'orderNo'
},
{
title:'室号',
align:"center",
@ -166,18 +232,23 @@
{
title:'状态',
align:"center",
dataIndex: 'state'
dataIndex: 'state_dictText'
},
{
title:'结单/驳回',
align:"center",
dataIndex: 'cleckState'
dataIndex: 'cleckState_dictText'
},
{
title:'驳回原因',
align:"center",
dataIndex: 'returnValue'
},
{
title:'填单日期',
align:"center",
dataIndex: 'startTime'
},
{
title:'结单结果',
align:"center",
@ -204,6 +275,11 @@
align:"center",
dataIndex: 'giveAccount_dictText'
},
{
title:'结单日期',
align:"center",
dataIndex: 'endTime'
},
{
title: '操作',
dataIndex: 'action',
@ -219,7 +295,7 @@
deleteBatch: "/shcoolSub/shcoolSub/deleteBatch",
exportXlsUrl: "/shcoolSub/shcoolSub/exportXls",
importExcelUrl: "shcoolSub/shcoolSub/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -238,22 +314,26 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'date',value:'createTime',text:'创建日期'})
fieldList.push({type:'string',value:'building',text:'楼栋',dictCode:''})
fieldList.push({type:'string',value:'orderNo',text:'工单号',dictCode:''})
fieldList.push({type:'string',value:'room',text:'室号',dictCode:''})
fieldList.push({type:'string',value:'project',text:'项目',dictCode:''})
fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
fieldList.push({type:'string',value:'context',text:'简介',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
fieldList.push({type:'string',value:'image',text:'照片',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'account', dictCode:'id'})
fieldList.push({type:'string',value:'state',text:'状态',dictCode:''})
fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'string',value:'state',text:'状态',dictCode:'sch_order_state'})
fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:'sch_pay_state'})
fieldList.push({type:'string',value:'returnValue',text:'驳回原因',dictCode:''})
fieldList.push({type:'datetime',value:'startTime',text:'填单日期'})
fieldList.push({type:'string',value:'successTitle',text:'结单结果',dictCode:''})
fieldList.push({type:'BigDecimal',value:'successPrice',text:'结单金额',dictCode:''})
fieldList.push({type:'string',value:'sucessText',text:'处理说明',dictCode:''})
fieldList.push({type:'string',value:'successImage',text:'照片',dictCode:''})
fieldList.push({type:'sel_search',value:'giveAccount',text:'分配维修员',dictTable:"han_hai_member", dictText:'account', dictCode:'id'})
fieldList.push({type:'sel_search',value:'giveAccount',text:'分配维修员',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'datetime',value:'endTime',text:'结单日期'})
this.superFieldList = fieldList
}
}
@ -261,4 +341,4 @@
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>
</style>

+ 21
- 16
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue View File

@ -8,6 +8,11 @@
<a-input v-model="model.building" placeholder="请输入楼栋" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
<a-input v-model="model.orderNo" placeholder="请输入工单号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="室号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="room">
<a-input v-model="model.room" placeholder="请输入室号" ></a-input>
@ -40,37 +45,32 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-search-select-tag v-model="model.userId" dict="han_hai_member,account,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
<a-input v-model="model.state" placeholder="请输入状态" ></a-input>
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" disabled />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单/驳回" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cleckState">
<a-input v-model="model.cleckState" placeholder="请输入结单/驳回" ></a-input>
<a-form-model-item label="驳回原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnValue">
<a-textarea v-model="model.returnValue" rows="4" placeholder="请输入驳回原因" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="驳回原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnValue">
<a-input v-model="model.returnValue" placeholder="请输入驳回原因" ></a-input>
<a-form-model-item label="填单日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startTime">
<j-date placeholder="请选择填单日期" v-model="model.startTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successTitle">
<a-input v-model="model.successTitle" placeholder="请输入结单结果" ></a-input>
<a-input v-model="model.successTitle" placeholder="请输入结单结果" disabled ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successPrice">
<a-input-number v-model="model.successPrice" placeholder="请输入结单金额" style="width: 100%" />
<a-input-number v-model="model.successPrice" placeholder="请输入结单金额" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="处理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sucessText">
<a-input v-model="model.sucessText" placeholder="请输入处理说明" ></a-input>
<a-textarea v-model="model.sucessText" rows="4" placeholder="请输入处理说明" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -80,7 +80,12 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="分配维修员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveAccount">
<j-search-select-tag v-model="model.giveAccount" dict="han_hai_member,account,id" />
<j-search-select-tag v-model="model.giveAccount" dict="han_hai_member,nick_name,id,is_dai=1" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结单日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endTime">
<j-date placeholder="请选择结单日期" v-model="model.endTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
</a-row>
@ -171,9 +176,9 @@
that.confirmLoading = false;
})
}
})
},
}
}
</script>
</script>

+ 108
- 15
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts View File

@ -5,10 +5,24 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
},
},
{
title: '楼栋',
align:"center",
dataIndex: 'building'
},
{
title: '工单号',
align:"center",
dataIndex: 'orderNo'
},
{
title: '室号',
align:"center",
@ -48,18 +62,23 @@ export const columns: BasicColumn[] = [
{
title: '状态',
align:"center",
dataIndex: 'state'
dataIndex: 'state_dictText'
},
{
title: '结单/驳回',
align:"center",
dataIndex: 'cleckState'
dataIndex: 'cleckState_dictText'
},
{
title: '驳回原因',
align:"center",
dataIndex: 'returnValue'
},
{
title: '填单日期',
align:"center",
dataIndex: 'startTime'
},
{
title: '结单结果',
align:"center",
@ -86,9 +105,71 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'giveAccount_dictText'
},
{
title: '结单日期',
align:"center",
dataIndex: 'endTime'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: "楼栋",
field: "building",
component: 'Input',
colProps: {span: 6},
},
{
label: "室号",
field: "room",
component: 'Input',
colProps: {span: 6},
},
{
label: "项目",
field: "project",
component: 'Input',
colProps: {span: 6},
},
{
label: "姓名",
field: "name",
component: 'Input',
colProps: {span: 6},
},
{
label: "电话",
field: "phone",
component: 'Input',
colProps: {span: 6},
},
{
label: "状态",
field: "state",
component: 'JDictSelectTag',
componentProps:{
dictCode:"sch_order_state"
},
colProps: {span: 6},
},
{
label: "结单/驳回",
field: "cleckState",
component: 'JDictSelectTag',
componentProps:{
dictCode:"sch_pay_state"
},
colProps: {span: 6},
},
{
label: "分配维修员",
field: "giveAccount",
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
@ -97,6 +178,11 @@ export const formSchema: FormSchema[] = [
field: 'building',
component: 'Input',
},
{
label: '工单号',
field: 'orderNo',
component: 'Input',
},
{
label: '室号',
field: 'room',
@ -134,38 +220,39 @@ export const formSchema: FormSchema[] = [
field: 'userId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,account,id"
dict:"han_hai_member,nick_name,id"
},
},
{
label: '状态',
field: 'state',
component: 'Input',
},
{
label: '结单/驳回',
field: 'cleckState',
component: 'Input',
dynamicDisabled:true
},
{
label: '驳回原因',
field: 'returnValue',
component: 'InputTextArea',//TODO 注意string转换问题
dynamicDisabled:true
},
{
label: '填单日期',
field: 'startTime',
component: 'Input',
dynamicDisabled:true
},
{
label: '结单结果',
field: 'successTitle',
component: 'Input',
dynamicDisabled:true
},
{
label: '结单金额',
field: 'successPrice',
component: 'InputNumber',
dynamicDisabled:true
},
{
label: '处理说明',
field: 'sucessText',
component: 'Input',
component: 'InputTextArea',//TODO 注意string转换问题
dynamicDisabled:true
},
{
label: '照片',
@ -179,7 +266,13 @@ export const formSchema: FormSchema[] = [
field: 'giveAccount',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,account,id"
dict:"han_hai_member,nick_name,id"
},
},
{
label: '结单日期',
field: 'endTime',
component: 'Input',
dynamicDisabled:true
},
];

BIN
jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.class View File


BIN
jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class View File


BIN
jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class View File


BIN
jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class View File


+ 123
- 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java View File

@ -1,5 +1,6 @@
package org.jeecg.modules.apiservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import org.apache.commons.lang.StringUtils;
@ -16,15 +17,23 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.jeecg.modules.pay.MpWxPayService;
import org.jeecg.modules.schoolIndex.entity.SchoolIndex;
import org.jeecg.modules.schoolIndex.service.ISchoolIndexService;
import org.jeecg.modules.schoolOrderLog.entity.SchoolOrderLog;
import org.jeecg.modules.schoolOrderLog.service.ISchoolOrderLogService;
import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService;
import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
import org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper;
import org.jeecg.modules.shcoolSub.service.IShcoolSubService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.transaction.Transactional;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
@ -47,6 +56,11 @@ public class IndexApiServiceImpl implements IndexApiService {
@Resource
private ISchoolIndexService schoolIndexService;
//工单流转明细
@Resource
private ISchoolOrderLogService schoolOrderLogService;
@Resource
private ShcoolSubMapper shcoolSubMapper;
@ -89,11 +103,38 @@ public class IndexApiServiceImpl implements IndexApiService {
@Override
public Result<?> addUserSchoolOrder(String token,ShcoolSub bean){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
// 获取当前日期
LocalDate today = LocalDate.now();
// 定义一个DateTimeFormatter用于将日期格式化为YYYYMMDD
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
// 使用formatter将today格式化为字符串
String formattedDate = today.format(formatter);
LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
LocalDateTime todayEnd = todayStart.plusDays(1).minusNanos(1); // 加上一天然后减去一秒得到当天的23:59:59.999999999
// 使用lambdaQuery()构建查询条件注意lambdaQuery()并非MyBatis-Plus的标准API这里使用LambdaQueryWrapper作为示例
LambdaQueryWrapper<ShcoolSub> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.between(ShcoolSub::getCreateTime, todayStart, todayEnd); // 假设getCreateTime是获取创建时间的getter方法
// 执行查询并获取数量
// 注意这里假设orderMapper有一个selectCount方法它实际上可能是自定义的或使用MyBatis-Plus提供的工具方法
Long aLong = shcoolSubMapper.selectCount(queryWrapper);
String orderNo = formattedDate + (aLong+1);
bean.setOrderNo(orderNo);
bean.setUserId(hanHaiMember.getId());
bean.setState("0");
bean.setCreateTime(new Date());
bean.setStartTime(new Date());
//接单人
String giveUser = "";
//查看传入的是几楼
HanHaiMember hanHaiMember1 = new HanHaiMember();
if(StringUtils.isNotBlank(bean.getBuilding())){
ShcoolFloor shcoolFloor = shcoolFloorService.lambdaQuery()
.eq(ShcoolFloor::getName,bean.getBuilding())
@ -101,30 +142,77 @@ public class IndexApiServiceImpl implements IndexApiService {
//得到维修账号
if(shcoolFloor!=null){
//根据维修账号查询用户信息
HanHaiMember hanHaiMember1 = hanHaiMemberService.lambdaQuery()
hanHaiMember1 = hanHaiMemberService.lambdaQuery()
.eq(HanHaiMember::getAccount,shcoolFloor.getUserAccount())
.one();
bean.setGiveAccount(hanHaiMember1.getId());
}
}
//判断是否为空
if(hanHaiMember1==null){
return Result.error("该楼栋暂无维修人员");
}
giveUser = hanHaiMember1.getId();
bean.setGiveAccount(giveUser);
}
}
shcoolSubService.save(bean);
//增加工单流转明细
SchoolOrderLog schoolOrderLog = new SchoolOrderLog();
schoolOrderLog.setOrderId(bean.getId());
//生成工单号逻辑:// 年月份日期 + 当天的需要到单日期
schoolOrderLog.setOrderNo(orderNo);
schoolOrderLog.setGiveUser(giveUser);
schoolOrderLog.setType("0");
schoolOrderLog.setCentext(hanHaiMember.getNickName()+"提交工单"+"=>分配给"+hanHaiMember1.getName());
schoolOrderLog.setUserId(hanHaiMember.getId());
schoolOrderLog.setOrderName(bean.getName());
schoolOrderLog.setCreateTime(new Date());
schoolOrderLogService.save(schoolOrderLog);
return Result.OK("增加成功");
}
//驳回
@Override
@Transactional
public Result<?> editSchoolOrderError(String token,ShcoolSub bean){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
if(StringUtils.isBlank(bean.getId())){
return Result.error("订单标识不能为空");
}
//驳回原因不能为空
if(StringUtils.isBlank(bean.getReturnValue())){
return Result.error("驳回原因不能为空");
}
//根据标识查询用户信息
ShcoolSub sub = shcoolSubService.getById(bean.getId());
//增加转单记录
//根据标识查询转单师傅信息
HanHaiMember byId = hanHaiMemberService.getById(sub.getGiveAccount());
SchoolOrderLog schoolOrderLog = new SchoolOrderLog();
schoolOrderLog.setOrderNo(sub.getOrderNo());
schoolOrderLog.setType("2");
schoolOrderLog.setGiveUser(sub.getGiveAccount());
schoolOrderLog.setOrderId(sub.getId());
schoolOrderLog.setCreateTime(new Date());
schoolOrderLog.setCentext(byId.getName()+":驳回订单");
schoolOrderLog.setUserId(sub.getUserId());
schoolOrderLogService.save(schoolOrderLog);
bean.setSuccessPrice(BigDecimal.ZERO);
bean.setSuccessTitle("");
bean.setSucessText("");
bean.setSuccessImage("");
bean.setCleckState("2");
bean.setGiveAccount("-------");
shcoolSubService.updateById(bean);
return Result.OK("驳回成功");
}
@ -135,8 +223,14 @@ public class IndexApiServiceImpl implements IndexApiService {
if(StringUtils.isBlank(bean.getId())){
return Result.error("订单标识不能为空");
}
bean.setGiveAccount("-----");
bean.setGiveAccount("");
bean.setCleckState("2");
//驳回原因不能为空
if(StringUtils.isBlank(bean.getReturnValue())){
return Result.error("驳回原因不能为空");
}
shcoolSubService.updateById(bean);
return Result.OK("驳回成功");
}
@ -150,7 +244,28 @@ public class IndexApiServiceImpl implements IndexApiService {
}
bean.setCleckState("1");
bean.setState("1");
bean.setEndTime(new Date());
bean.setReturnValue("");
shcoolSubService.updateById(bean);
//根据标识查询用户信息
ShcoolSub sub = shcoolSubService.getById(bean.getId());
//增加转单记录
//根据标识查询转单师傅信息
HanHaiMember byId = hanHaiMemberService.getById(sub.getGiveAccount());
SchoolOrderLog schoolOrderLog = new SchoolOrderLog();
schoolOrderLog.setOrderNo(sub.getOrderNo());
schoolOrderLog.setType("1");
schoolOrderLog.setGiveUser(sub.getGiveAccount());
schoolOrderLog.setOrderId(sub.getId());
schoolOrderLog.setCreateTime(new Date());
schoolOrderLog.setCentext(byId.getName()+":师傅结单");
schoolOrderLog.setUserId(sub.getUserId());
schoolOrderLogService.save(schoolOrderLog);
return Result.OK("结单成功");
}
@ -163,6 +278,7 @@ public class IndexApiServiceImpl implements IndexApiService {
}
bean.setCleckState("1");
bean.setState("1");
bean.setEndTime(new Date());
shcoolSubService.updateById(bean);
return Result.OK("结单成功");
}


+ 1
- 1
jeecg-boot-module-system/src/main/resources/application-dev.yml View File

@ -1,5 +1,5 @@
server:
port: 8003
port: 8000
tomcat:
max-swallow-size: -1
error:


Loading…
Cancel
Save