From ae0f7b6add66d8663d6a507a1f2e4463b81cd620 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 28 Dec 2022 16:57:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E6=B5=8B=E4=BD=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CustomerMeasureList.vue | 25 +-- .../admin/modules/CustomerMeasureForm.vue | 36 +++- .../entity/CustomerMeasure.java | 176 ++++++++++-------- 3 files changed, 137 insertions(+), 100 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue index acd47a0b..537a72d2 100644 --- a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue +++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue @@ -11,18 +11,18 @@ - + @@ -103,19 +103,20 @@ 编辑 - - 更多 - - + + + + 详情 - - + + 删除 - - - + + + diff --git a/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue b/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue index ba0f415c..ed17afe0 100644 --- a/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue +++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue @@ -97,18 +97,42 @@ - - + + - - + + - - + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java index cd17de6e..4e72af76 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java @@ -32,38 +32,38 @@ import lombok.experimental.Accessors; public class CustomerMeasure implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ + private java.lang.String id; + /**创建人*/ @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ + private java.util.Date createTime; + /**更新人*/ @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ + private java.util.Date updateTime; + /**所属部门*/ @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**用户*/ - @Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") - @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + private java.lang.String sysOrgCode; + /**用户*/ + @Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @ApiModelProperty(value = "用户") - private String userId; - /**用户名*/ - @Excel(name = "用户名", width = 15) - @ApiModelProperty(value = "用户名") - private String username; + private java.lang.String userId; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String username; /**登录名*/ @Excel(name = "登录名", width = 15) @ApiModelProperty(value = "登录名") @@ -72,82 +72,94 @@ public class CustomerMeasure implements Serializable { @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private java.lang.Integer sort; - /**身高（厘米）*/ - @Excel(name = "身高（厘米）", width = 15) + /**身高（厘米）*/ + @Excel(name = "身高（厘米）", width = 15) @ApiModelProperty(value = "身高（厘米）") - private Double height; - /**体重（千克）*/ - @Excel(name = "体重（千克）", width = 15) + private java.lang.Double height; + /**体重（千克）*/ + @Excel(name = "体重（千克）", width = 15) @ApiModelProperty(value = "体重（千克）") - private Double weight; - /**下摆（厘米）*/ - @Excel(name = "下摆（厘米）", width = 15) + private java.lang.Double weight; + /**下摆（厘米）*/ + @Excel(name = "下摆（厘米）", width = 15) @ApiModelProperty(value = "下摆（厘米）") - private Double hem; - /**袖口（厘米）*/ - @Excel(name = "袖口（厘米）", width = 15) + private java.lang.Double hem; + /**袖口（厘米）*/ + @Excel(name = "袖口（厘米）", width = 15) @ApiModelProperty(value = "袖口（厘米）") - private Double cuff; - /**袖长（厘米）*/ - @Excel(name = "袖长（厘米）", width = 15) + private java.lang.Double cuff; + /**袖长（厘米）*/ + @Excel(name = "袖长（厘米）", width = 15) @ApiModelProperty(value = "袖长（厘米）") - private Double sleeveLength; - /**胸围（厘米）*/ - @Excel(name = "胸围（厘米）", width = 15) + private java.lang.Double sleeveLength; + /**胸围（厘米）*/ + @Excel(name = "胸围（厘米）", width = 15) @ApiModelProperty(value = "胸围（厘米）") - private Double bust; - /**腰围（厘米）*/ - @Excel(name = "腰围（厘米）", width = 15) + private java.lang.Double bust; + /**腰围（厘米）*/ + @Excel(name = "腰围（厘米）", width = 15) @ApiModelProperty(value = "腰围（厘米）") - private Double theWaist; - /**肩宽（厘米）*/ - @Excel(name = "肩宽（厘米）", width = 15) + private java.lang.Double theWaist; + /**肩宽（厘米）*/ + @Excel(name = "肩宽（厘米）", width = 15) @ApiModelProperty(value = "肩宽（厘米）") - private Double shoulderWidth; - /**前身长（厘米）*/ - @Excel(name = "前身长（厘米）", width = 15) + private java.lang.Double shoulderWidth; + /**前身长（厘米）*/ + @Excel(name = "前身长（厘米）", width = 15) @ApiModelProperty(value = "前身长（厘米）") - private Double forebodyLength; - /**领围（厘米）*/ - @Excel(name = "领围（厘米）", width = 15) + private java.lang.Double forebodyLength; + /**领围（厘米）*/ + @Excel(name = "领围（厘米）", width = 15) @ApiModelProperty(value = "领围（厘米）") - private Double neck; - /**臀围（厘米）*/ - @Excel(name = "臀围（厘米）", width = 15) + private java.lang.Double neck; + /**臀围（厘米）*/ + @Excel(name = "臀围（厘米）", width = 15) @ApiModelProperty(value = "臀围（厘米）") - private Double hipline; - /**衣长*/ - @Excel(name = "衣长", width = 15) + private java.lang.Double hipline; + /**衣长*/ + @Excel(name = "衣长", width = 15) @ApiModelProperty(value = "衣长") - private Double length; - /**胸距*/ - @Excel(name = "胸距", width = 15) + private java.lang.Double length; + /**胸距*/ + @Excel(name = "胸距", width = 15) @ApiModelProperty(value = "胸距") - private Double sternalDistance; - /**量体方式*/ - @Excel(name = "量体方式", width = 15, dicCode = "ctfs") - @Dict(dicCode = "ctfs") + private java.lang.Double sternalDistance; + /**量体方式*/ + @Excel(name = "量体方式", width = 15, dicCode = "ctfs") + @Dict(dicCode = "ctfs") @ApiModelProperty(value = "量体方式") - private String measurementMethod; - /**量体店铺*/ - @Excel(name = "量体店铺", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + private java.lang.String measurementMethod; + /**量体店铺*/ + @Excel(name = "量体店铺", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @ApiModelProperty(value = "量体店铺") + private java.lang.String storeId; + /**量体店铺*/ + @Excel(name = "量体店铺", width = 15) @ApiModelProperty(value = "量体店铺") - private String storeId; - /**量体设备*/ - @Excel(name = "量体设备", width = 15, dictTable = "se_equipmenttype", dicText = "name", dicCode = "id") - @Dict(dictTable = "se_equipmenttype", dicText = "name", dicCode = "id") + private java.lang.String storename; + /**量体设备*/ + @Excel(name = "量体设备", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") @ApiModelProperty(value = "量体设备") - private String deviceId; - /**量体师*/ - @Excel(name = "量体师", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") - @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + private java.lang.String deviceId; + /**量体设备*/ + @Excel(name = "量体设备", width = 15) + @ApiModelProperty(value = "量体设备") + private java.lang.String devicename; + /**量体师*/ + @Excel(name = "量体师", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @ApiModelProperty(value = "量体师") + private java.lang.String measurerId; + /**量体师*/ + @Excel(name = "量体师", width = 15) @ApiModelProperty(value = "量体师") - private String measurerId; - /**量体时间*/ - @Excel(name = "量体时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + private java.lang.String measurername; + /**量体时间*/ + @Excel(name = "量体时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "量体时间") - private Date measurementTime; + private java.util.Date measurementTime; } From c95197fff847a3b2e38bfccbc195a73adacc722d Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 28 Dec 2022 17:22:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerpayment/admin/modules/CustomerPaymentForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue index 298cd53c..795e5210 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue @@ -26,7 +26,7 @@ - + @@ -57,6 +57,7 @@ data () { return { model:{ + paymentType:2 }, labelCol: { xs: { span: 24 }, @@ -119,7 +120,7 @@ that.confirmLoading = false; }) } - + }) }, popupCallback(value,row){ From 58ed54164f69d9115a633f7df2d5ae30a5c18164 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Thu, 29 Dec 2022 14:43:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/zybank/admin/ZybankList.vue | 177 ++++++++++++++++++ .../views/zybank/admin/modules/ZybankForm.vue | 109 +++++++++++ .../zybank/admin/modules/ZybankModal.vue | 60 ++++++ .../modules/ZybankModal__Style#Drawer.vue | 84 +++++++++ .../zybank/controller/ZybankController.java | 172 +++++++++++++++++ .../modules/demo/zybank/entity/Zybank.java | 67 +++++++ .../demo/zybank/mapper/ZybankMapper.java | 19 ++ .../demo/zybank/mapper/xml/ZybankMapper.xml | 5 + .../demo/zybank/service/IZybankService.java | 16 ++ .../service/impl/ZybankServiceImpl.java | 21 +++ 10 files changed, 730 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/zybank/admin/ZybankList.vue create mode 100644 ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankForm.vue create mode 100644 ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal.vue create mode 100644 ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal__Style#Drawer.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/controller/ZybankController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/entity/Zybank.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/ZybankMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/xml/ZybankMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/IZybankService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/impl/ZybankServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/zybank/admin/ZybankList.vue b/ant-design-vue-jeecg/src/views/zybank/admin/ZybankList.vue new file mode 100644 index 00000000..eda41d32 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zybank/admin/ZybankList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankForm.vue b/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankForm.vue new file mode 100644 index 00000000..96987043 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal.vue b/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal.vue new file mode 100644 index 00000000..25494e80 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal__Style#Drawer.vue new file mode 100644 index 00000000..40cb6f56 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zybank/admin/modules/ZybankModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/controller/ZybankController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/controller/ZybankController.java new file mode 100644 index 00000000..099498b7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/controller/ZybankController.java @@ -0,0 +1,172 @@ +package org.jeecg.modules.demo.zybank.controller; + + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.zybank.entity.Zybank; +import org.jeecg.modules.demo.zybank.service.IZybankService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 银行信息表 + * @Author: jeecg-boot + * @Date: 2022-12-29 + * @Version: V1.0 + */ +@Api(tags="银行信息表") +@RestController +@RequestMapping("/zybank/zybank") +@Slf4j +public class ZybankController extends JeecgController { + @Autowired + private IZybankService zybankService; + + /** + * 分页列表查询 + * + * @param zybank + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "银行信息表-分页列表查询") + @ApiOperation(value="银行信息表-分页列表查询", notes="银行信息表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(Zybank zybank, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zybank, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zybankService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zybank + * @return + */ + @AutoLog(value = "银行信息表-添加") + @ApiOperation(value="银行信息表-添加", notes="银行信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Zybank zybank) { + zybankService.save(zybank); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zybank + * @return + */ + @AutoLog(value = "银行信息表-编辑") + @ApiOperation(value="银行信息表-编辑", notes="银行信息表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody Zybank zybank) { + zybankService.updateById(zybank); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "银行信息表-通过id删除") + @ApiOperation(value="银行信息表-通过id删除", notes="银行信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zybankService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "银行信息表-批量删除") + @ApiOperation(value="银行信息表-批量删除", notes="银行信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zybankService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "银行信息表-通过id查询") + @ApiOperation(value="银行信息表-通过id查询", notes="银行信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Zybank zybank = zybankService.getById(id); + if(zybank==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zybank); + } + + /** + * 导出excel + * + * @param request + * @param zybank + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Zybank zybank) { + return super.exportXls(request, zybank, Zybank.class, "银行信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Zybank.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/entity/Zybank.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/entity/Zybank.java new file mode 100644 index 00000000..f10b31a3 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/entity/Zybank.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.zybank.entity; + + + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 银行信息表 + * @Author: jeecg-boot + * @Date: 2022-12-29 + * @Version: V1.0 + */ +@Data +@TableName("zybank") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zybank对象", description="银行信息表") +public class Zybank implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**银行名称*/ + @Excel(name = "银行名称", width = 15) + @ApiModelProperty(value = "银行名称") + private String bankname; + /**开户行*/ + @Excel(name = "开户行", width = 15) + @ApiModelProperty(value = "开户行") + private String bankkh; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/ZybankMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/ZybankMapper.java new file mode 100644 index 00000000..2094fdb6 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/ZybankMapper.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.zybank.mapper; + + + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.zybank.entity.Zybank; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 银行信息表 + * @Author: jeecg-boot + * @Date: 2022-12-29 + * @Version: V1.0 + */ +public interface ZybankMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/xml/ZybankMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/xml/ZybankMapper.xml new file mode 100644 index 00000000..b7e76ea6 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/mapper/xml/ZybankMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/IZybankService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/IZybankService.java new file mode 100644 index 00000000..743e7b54 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/IZybankService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.demo.zybank.service; + + + +import org.jeecg.modules.demo.zybank.entity.Zybank; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 银行信息表 + * @Author: jeecg-boot + * @Date: 2022-12-29 + * @Version: V1.0 + */ +public interface IZybankService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/impl/ZybankServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/impl/ZybankServiceImpl.java new file mode 100644 index 00000000..5054591c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zybank/service/impl/ZybankServiceImpl.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.demo.zybank.service.impl; + + + +import org.jeecg.modules.demo.zybank.entity.Zybank; +import org.jeecg.modules.demo.zybank.mapper.ZybankMapper; +import org.jeecg.modules.demo.zybank.service.IZybankService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 银行信息表 + * @Author: jeecg-boot + * @Date: 2022-12-29 + * @Version: V1.0 + */ +@Service +public class ZybankServiceImpl extends ServiceImpl implements IZybankService { + +} From 86108c481248ded405e89d700e0f9732e112e201 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Thu, 29 Dec 2022 14:56:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CustomerPaymentList.vue | 11 ++-- .../admin/modules/CustomerPaymentForm.vue | 21 ++++++-- .../controller/CustomerPaymentController.java | 16 +++--- .../entity/CustomerPayment.java | 52 +++++++++++-------- 4 files changed, 65 insertions(+), 35 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue index a665b45f..1cec0273 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue @@ -22,7 +22,7 @@ - + @@ -174,7 +174,12 @@ { title:'开户银行', align:"center", - dataIndex: 'bankDeposit' + dataIndex: 'bankDeposit_dictText' + }, + { + title:'开户支行', + align:"center", + dataIndex: 'bankzh' }, { title:'创建人', @@ -201,7 +206,7 @@ deleteBatch: "/customerpayment/customerPayment/deleteBatch", exportXlsUrl: "/customerpayment/customerPayment/exportXls", importExcelUrl: "customerpayment/customerPayment/importExcel", - + }, dictOptions:{}, superFieldList:[], diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue index 795e5210..d6960db9 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue @@ -26,11 +26,26 @@ - - - + + + + + + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java index ee8fd887..a8362916 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java @@ -50,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class CustomerPaymentController extends JeecgController { @Autowired private ICustomerPaymentService customerPaymentService; - + /** * 分页列表查询 * @@ -72,7 +72,7 @@ public class CustomerPaymentController extends JeecgController pageList = customerPaymentService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -86,7 +86,7 @@ public class CustomerPaymentController extends JeecgController Date: Thu, 29 Dec 2022 15:19:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CustomerReceivingAddressList.vue | 15 ++--- .../modules/CustomerReceivingAddressForm.vue | 35 +++++++---- .../entity/CustomerReceivingAddress.java | 58 +++++++++---------- 3 files changed, 62 insertions(+), 46 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue index 7d9f95f0..81a099c0 100644 --- a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue +++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue @@ -101,19 +101,20 @@ 编辑 - + 详情 - - + + 删除 - + @@ -209,7 +210,7 @@ deleteBatch: "/customerreceivingaddress/customerReceivingAddress/deleteBatch", exportXlsUrl: "/customerreceivingaddress/customerReceivingAddress/exportXls", importExcelUrl: "customerreceivingaddress/customerReceivingAddress/importExcel", - + }, dictOptions:{}, pcaData:'', diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue index 7efbc7bf..e3fbe59b 100644 --- a/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue +++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue @@ -28,7 +28,7 @@ - + @@ -76,6 +76,7 @@ import { httpAction, getAction } from '@/api/manage' import { validateDuplicateValue } from '@/utils/util' + import store from '@/store' export default { name: 'CustomerReceivingAddressForm', @@ -92,6 +93,8 @@ data () { return { model:{ + mobile : store.getters.userInfo.phone, + receiver : store.getters.userInfo.realname }, labelCol: { xs: { span: 24 }, @@ -103,14 +106,25 @@ }, confirmLoading: false, validatorRules: { - zipCode: [ - { required: true, message: '请输入邮编!'}, - { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'}, - ], - mobile: [ - { required: true, message: '请输入联系电话!'}, - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, - ], + zipCode: [ + { required: true, message: '请输入邮编!'}, + { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'}, + ], + receiver: [ + { required: true, message: '请输入收货人!'}, + ], + mobile: [ + { required: true, message: '请输入联系电话!'}, + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + ], + sort: [ + { required: false}, + { validator: (rule, value, callback) => validateDuplicateValue('customer_receiving_address', 'sort', value, this.model.id, callback)}, + ], + labelcl: [ + { required: false}, + { validator: (rule, value, callback) => validateDuplicateValue('customer_receiving_address', 'labelcl', value, this.model.id, callback)}, + ], }, url: { add: "/customerreceivingaddress/customerReceivingAddress/add", @@ -125,6 +139,7 @@ }, }, created () { + console.log(store.getters.userInfo) //备份model原始值 this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, @@ -162,7 +177,7 @@ that.confirmLoading = false; }) } - + }) }, popupCallback(value,row){ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/entity/CustomerReceivingAddress.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/entity/CustomerReceivingAddress.java index 3670e37a..3055361c 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/entity/CustomerReceivingAddress.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/entity/CustomerReceivingAddress.java @@ -31,65 +31,65 @@ import lombok.experimental.Accessors; public class CustomerReceivingAddress implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /**创建人*/ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**用户*/ - @Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") - @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + /**用户*/ + @Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @ApiModelProperty(value = "用户") private java.lang.String userId; - /**用户*/ - @Excel(name = "用户", width = 15) + /**用户*/ + @Excel(name = "用户", width = 15) @ApiModelProperty(value = "用户") private java.lang.String usernamme; - /**城市*/ - @Excel(name = "城市", width = 15) + /**城市*/ + @Excel(name = "城市", width = 15) @ApiModelProperty(value = "城市") private java.lang.String cityId; - /**地址*/ - @Excel(name = "地址", width = 15) + /**地址*/ + @Excel(name = "地址", width = 15) @ApiModelProperty(value = "地址") private java.lang.String address; - /**邮编*/ - @Excel(name = "邮编", width = 15) + /**邮编*/ + @Excel(name = "邮编", width = 15) @ApiModelProperty(value = "邮编") private java.lang.String zipCode; - /**收货人*/ - @Excel(name = "收货人", width = 15) + /**收货人*/ + @Excel(name = "收货人", width = 15) @ApiModelProperty(value = "收货人") private java.lang.String receiver; - /**联系电话*/ - @Excel(name = "联系电话", width = 15) + /**联系电话*/ + @Excel(name = "联系电话", width = 15) @ApiModelProperty(value = "联系电话") private java.lang.String mobile; - /**排序*/ - @Excel(name = "排序", width = 15) + /**排序*/ + @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private java.lang.Integer sort; - /**标识*/ - @Excel(name = "标识", width = 15, dicCode = "shdzbs") - @Dict(dicCode = "shdzbs") + /**标识*/ + @Excel(name = "标识", width = 15, dicCode = "shdzbs") + @Dict(dicCode = "shdzbs") @ApiModelProperty(value = "标识") private java.lang.String labelcl; }