Merge remote-tracking branch 'origin/master'

zhc4dev
lenovo 2 years ago
commit b3b349b789
  1. 20
      ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
  2. 279
      ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureList1.vue
  3. 61
      ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureModal1.vue
  4. 61
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/controller/CustomerMeasureController.java
  5. 17
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/CustomerMeasureMapper.java
  6. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/ICustomerMeasureService.java
  7. 39
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/impl/CustomerMeasureServiceImpl.java

@ -101,7 +101,7 @@
<span slot="action" slot-scope="text, record">
<!-- <a @click="paixu(record.id,record.processName)">排序</a>-->
<!-- <a @click="paixu(record)">排序</a>-->
<a @click="paixu(record)">排序</a>
<a-divider type="vertical" />
<a @click="handleEdit(record)">编辑</a>
@ -126,7 +126,7 @@
</div>
<customer-measure-modal ref="modalForm" @ok="modalFormOk"></customer-measure-modal>
<!-- <customer-measure-modalpaixu ref="modalFormpaixu" @ok="modalFormOk"></customer-measure-modalpaixu>-->
<customer-measure-modal1 ref="modalFormpaixu" @ok="modalFormOk"></customer-measure-modal1>
</a-card>
</template>
@ -136,7 +136,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CustomerMeasureModal from './modules/CustomerMeasureModal'
/* import CustomerMeasureModalpaixu from './modules/CustomerMeasureModalpaixu'*/
import CustomerMeasureModal1 from './modules/CustomerMeasureModal1'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import { getAction } from '@/api/manage'
@ -144,8 +144,8 @@
name: 'CustomerMeasureList',
mixins:[JeecgListMixin, mixinDevice],
components: {
CustomerMeasureModal/*,
CustomerMeasureModalpaixu*/
CustomerMeasureModal,
CustomerMeasureModal1
},
data () {
return {
@ -284,20 +284,20 @@
superFieldList:[],
}
},
created(record){
/* created(record){
getAction(this.url.moreYear,{ id: record.id})
},
},*/
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
/* paixu: function (record) {
this.$refs.modalFormpaixu.edit(record.id);
paixu: function (record) {
this.$refs.modalFormpaixu.edit(record.userId);
this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理";
this.$refs.modalFormpaixu.disableSubmit = false;
},*/
},
initDictConfig(){
},
getSuperFieldList(){

@ -0,0 +1,279 @@
<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="用户">
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</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.storeId" dict="sys_depart,depart_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="量体设备">
<j-search-select-tag placeholder="请选择量体设备" v-model="queryParam.deviceId" dict="zy_devicetypettype,name,id"/>
</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.measurerId" dict="sys_user,realname,id"/>
</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">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" 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="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<a-divider type="vertical" />
<a @click="up(record.id)">升序</a>
<a-divider type="vertical" />
<a @click="down(record.id)">降序</a>
</span>
</a-table>
</div>
<customer-measure-modal ref="modalForm" @ok="modalFormOk"></customer-measure-modal>
<!-- <customer-measure-modal1 ref="modalFormpaixu" @ok="modalFormOk"></customer-measure-modal1>-->
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import { getAction } from '@/api/manage'
export default {
name: 'CustomerMeasureList1',
mixins:[JeecgListMixin, mixinDevice],
components: {
},
data () {
return {
description: '顾客测体管理管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'登录名',
align:"center",
dataIndex: 'userdlm'
},
{
title:'排序',
align:"center",
sorter: true,
dataIndex: 'sort'
},
{
title:'量体方式',
align:"center",
dataIndex: 'measurementMethod_dictText'
},
{
title:'量体店铺',
align:"center",
dataIndex: 'storeId_dictText'
},
{
title:'量体设备',
align:"center",
dataIndex: 'deviceId_dictText'
},
{
title:'量体师',
align:"center",
dataIndex: 'measurerId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
up: "/customermeasure/customerMeasure/up",
down: "/customermeasure/customerMeasure/down",
list: "/customermeasure/customerMeasure/list1",
delete: "/customermeasure/customerMeasure/delete",
deleteBatch: "/customermeasure/customerMeasure/deleteBatch",
exportXlsUrl: "/customermeasure/customerMeasure/exportXls",
importExcelUrl: "customermeasure/customerMeasure/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
up(id){
getAction(this.url.up,{id:id}).then((res)=>{
if(res.success){
this.loadData();
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
})},
down(id){
getAction(this.url.down,{id:id}).then((res)=>{
if(res.success){
this.loadData();
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
})},
edit (id) {
console.log("+++++++++")
console.log("========================================")
/*this.queryParam.userId=this.id;*/
this.queryParam.userId=id,
this.url.list='/customermeasure/customerMeasure/list1'
this.loadData();
this.visible = true;
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'string',value:'userdlm',text:'登录名',dictCode:''})
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
fieldList.push({type:'double',value:'height',text:'身高(厘米)',dictCode:''})
fieldList.push({type:'double',value:'weight',text:'体重(千克)',dictCode:''})
fieldList.push({type:'double',value:'hem',text:'下摆(厘米)',dictCode:''})
fieldList.push({type:'double',value:'cuff',text:'袖口(厘米)',dictCode:''})
fieldList.push({type:'double',value:'sleeveLength',text:'袖长(厘米)',dictCode:''})
fieldList.push({type:'double',value:'bust',text:'胸围(厘米)',dictCode:''})
fieldList.push({type:'double',value:'theWaist',text:'腰围(厘米)',dictCode:''})
fieldList.push({type:'double',value:'shoulderWidth',text:'肩宽(厘米)',dictCode:''})
fieldList.push({type:'double',value:'forebodyLength',text:'前身长(厘米)',dictCode:''})
fieldList.push({type:'double',value:'neck',text:'领围(厘米)',dictCode:''})
fieldList.push({type:'double',value:'hipline',text:'臀围(厘米)',dictCode:''})
fieldList.push({type:'double',value:'length',text:'衣长',dictCode:''})
fieldList.push({type:'double',value:'sternalDistance',text:'胸距',dictCode:''})
fieldList.push({type:'string',value:'measurementMethod',text:'量体方式',dictCode:'ctfs'})
fieldList.push({type:'sel_depart',value:'storeId',text:'量体店铺'})
fieldList.push({type:'sel_search',value:'deviceId',text:'量体设备',dictTable:'se_equipmenttype', dictText:'name', dictCode:'id'})
fieldList.push({type:'sel_user',value:'measurerId',text:'量体师'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

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

@ -8,6 +8,7 @@ import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
@ -50,7 +51,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerMeasureController extends JeecgController<CustomerMeasure, ICustomerMeasureService> {
@Autowired
private ICustomerMeasureService customerMeasureService;
/**
* 分页列表查询
*
@ -72,7 +73,33 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
IPage<CustomerMeasure> pageList = customerMeasureService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customerMeasure
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "顾客测体管理-分页列表查询")
@ApiOperation(value="顾客测体管理-分页列表查询", notes="顾客测体管理-分页列表查询")
@GetMapping(value = "/list1")
public Result<?> queryPageList1(CustomerMeasure customerMeasure,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CustomerMeasure> queryWrapper = QueryGenerator.initQueryWrapper(customerMeasure, req.getParameterMap());
System.out.println(req.toString());
System.out.println(customerMeasure);
queryWrapper.eq("user_id",customerMeasure.getUserId());
Page<CustomerMeasure> page = new Page<CustomerMeasure>(pageNo, pageSize);
IPage<CustomerMeasure> pageList = customerMeasureService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
@ -142,7 +169,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
}
return Result.OK("");
}
/**
* 编辑
*
@ -213,7 +240,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
return Result.OK("");
}
/**
* 通过id删除
*
@ -227,7 +254,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
customerMeasureService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -241,7 +268,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
this.customerMeasureService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
@ -282,4 +309,26 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
return super.importExcel(request, response, CustomerMeasure.class);
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/up")
public Result<?> shang(@RequestParam(name="id",required=true) String id) {
customerMeasureService.up(id);
return Result.ok("升序成功");
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/down")
public Result<?> xia(@RequestParam(name="id",required=true) String id) {
int a=customerMeasureService.findSort(id);
if(a==0){
return Result.error("当前已经是最低级别!!!");}else {
customerMeasureService.down(id);
return Result.ok("降序成功");
}
}
}

@ -5,6 +5,8 @@ package org.jeecg.modules.demo.customermeasure.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
@ -17,4 +19,19 @@ import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
*/
public interface CustomerMeasureMapper extends BaseMapper<CustomerMeasure> {
@Select("select sort from customer_measure where id=#{id} ")
Integer upfindsort(String id);
@Select("select id from customer_measure where sort=#{i} ")
String findproid(int i);
@Update("update customer_measure set sort =#{i} where id = #{id} ")
void innew(String id, int i);
@Update("update customer_measure set sort =#{sort} where id = #{proid} ")
void innewpro(String proid, Integer sort);
@Select("select sort from customer_measure where id=#{id} ")
int findSort(String id);
}

@ -13,4 +13,9 @@ import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
*/
public interface ICustomerMeasureService extends IService<CustomerMeasure> {
void up(String id);
int findSort(String id);
void down(String id);
}

@ -6,6 +6,7 @@ package org.jeecg.modules.demo.customermeasure.service.impl;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import org.jeecg.modules.demo.customermeasure.mapper.CustomerMeasureMapper;
import org.jeecg.modules.demo.customermeasure.service.ICustomerMeasureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -19,4 +20,42 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class CustomerMeasureServiceImpl extends ServiceImpl<CustomerMeasureMapper, CustomerMeasure> implements ICustomerMeasureService {
@Autowired
CustomerMeasureMapper customerMeasureMapper;
@Override
public void up(String id) {
Integer sort = customerMeasureMapper.upfindsort(id);
if (sort>0) {
//升序前找到后一个排序
String proid = customerMeasureMapper.findproid(sort + 1);
if (proid!="") {
//调换排序
customerMeasureMapper.innew(id,sort+1);
customerMeasureMapper.innewpro(proid,sort);
}
}
}
@Override
public int findSort(String id) {
return customerMeasureMapper.findSort(id);
}
@Override
public void down(String id) {
Integer sort = customerMeasureMapper.upfindsort(id);
if (sort>0) {
String proid = customerMeasureMapper.findproid(sort - 1);
if (proid!="") {
customerMeasureMapper.innew(id,sort-1);
customerMeasureMapper.innewpro(proid,sort);
}
}
}
}

Loading…
Cancel
Save