diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue index 350151d8..06427403 100644 --- a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue +++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue @@ -105,28 +105,22 @@ - 编辑 + 排序 + + 编辑 - - 详情 - - - - 删除 - - + 详情 + + + 删除 + + @@ -137,13 +131,15 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CustomerInvoiceModal from './modules/CustomerInvoiceModal' + import CustomerInvoiceModal1 from './modules/CustomerInvoiceModal1' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'CustomerInvoiceList', mixins:[JeecgListMixin, mixinDevice], components: { - CustomerInvoiceModal + CustomerInvoiceModal, + CustomerInvoiceModal1 }, data () { return { @@ -248,6 +244,11 @@ }, }, methods: { + paixu: function (record) { + this.$refs.modalFormpaixu.edit(record.userId); + this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理"; + this.$refs.modalFormpaixu.disableSubmit = false; + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue index a969c57a..f60e0c98 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue @@ -123,7 +123,7 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - + import { getAction } from '@/api/manage' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { @@ -202,6 +202,7 @@ exportXlsUrl: "/customerpayment/customerPayment/exportXls", importExcelUrl: "customerpayment/customerPayment/importExcel", + }, dictOptions:{}, superFieldList:[], diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java index 4d479e21..7e731d06 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java @@ -74,6 +74,29 @@ public class CustomerInvoiceController extends JeecgController queryPageList1(CustomerInvoice customerInvoice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap()); + queryWrapper.eq("user_id",customerInvoice.getUserId()); + Page page = new Page(pageNo, pageSize); + IPage pageList = customerInvoiceService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * @@ -243,7 +266,27 @@ public class CustomerInvoiceController extends JeecgController shang(@RequestParam(name="id",required=true) String id) { + System.out.println(id); + customerInvoiceService.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=customerInvoiceService.findSort(id); + if(a==0){ + return Result.error("当前已经是最低级别！！！");}else { + customerInvoiceService.down(id); + return Result.ok("降序成功"); + } + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java index 56b2e273..ee8d8130 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java @@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerinvoice.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.customerinvoice.entity.CustomerInvoice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface CustomerInvoiceMapper extends BaseMapper { + + @Select("select sort from customer_invoice where id=#{id} ") + Integer upfindsort(String id); + + @Select("select id from customer_invoice where sort=#{i} ") + String findproid(int i); + + @Update("update customer_invoice set sort =#{i} where id = #{id} ") + void innew(String id, int i); + + @Update("update customer_invoice set sort =#{sort} where id = #{proid} ") + void innewpro(String proid, Integer sort); + + @Select("select sort from customer_invoice where id=#{id} ") + int findSort(String id); + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java index c8ac60f7..5988b99a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java @@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ICustomerInvoiceService extends IService { + void down(String id); + + int findSort(String id); + + void up(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java index 47804111..9cade0cc 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerinvoice.service.impl; import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice; import org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper; import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CustomerInvoiceServiceImpl extends ServiceImpl implements ICustomerInvoiceService { + @Autowired + CustomerInvoiceMapper customerInvoiceMapper; + + @Override + public void up(String id) { + Integer sort = customerInvoiceMapper.upfindsort(id); + if (sort>0) { + //升序前找到后一个排序 + String proid = customerInvoiceMapper.findproid(sort + 1); + if (proid!="") { + //调换排序 + customerInvoiceMapper.innew(id,sort+1); + customerInvoiceMapper.innewpro(proid,sort); + } + } + } + + @Override + public int findSort(String id) { + return customerInvoiceMapper.findSort(id); + } + + @Override + public void down(String id) { + Integer sort = customerInvoiceMapper.upfindsort(id); + if (sort>0) { + String proid = customerInvoiceMapper.findproid(sort - 1); + if (proid!="") { + customerInvoiceMapper.innew(id,sort-1); + customerInvoiceMapper.innewpro(proid,sort); + } + } + } }