From 49bfb5e2a9eeb2417a742f47a5c605778ea303a1 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 2 Sep 2025 22:10:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=9D=E7=89=88=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/modules/bean/LoginReq.java | 6 + .../entity/ExhibitMaintenance.java | 2 +- .../entity/ExhibitMalfunction.java | 10 ++ .../ExhibitMalfunctionDescController.java | 171 +++++++++++++++++++++ .../entity/ExhibitMalfunctionDesc.java | 54 +++++++ .../mapper/ExhibitMalfunctionDescMapper.java | 17 ++ .../mapper/xml/ExhibitMalfunctionDescMapper.xml | 5 + .../service/IExhibitMalfunctionDescService.java | 14 ++ .../impl/ExhibitMalfunctionDescServiceImpl.java | 19 +++ .../vue/ExhibitMalfunctionDescList.vue | 171 +++++++++++++++++++++ .../vue/modules/ExhibitMalfunctionDescForm.vue | 104 +++++++++++++ .../ExhibitMalfunctionDescModal.Style#Drawer.vue | 84 ++++++++++ .../vue/modules/ExhibitMalfunctionDescModal.vue | 60 ++++++++ .../vue3/ExhibitMalfunctionDesc.api.ts | 61 ++++++++ .../vue3/ExhibitMalfunctionDesc.data.ts | 23 +++ .../vue3/ExhibitMalfunctionDescList.vue | 162 +++++++++++++++++++ .../components/ExhibitMalfunctionDescModal.vue | 58 +++++++ .../exhibitRepair/entity/ExhibitRepair.java | 2 +- .../exhibitShowpiece/entity/ExhibitShowpiece.java | 2 + .../controller/HanHaiMemberController.java | 2 +- .../modules/hanHaiMember/entity/HanHaiMember.java | 6 +- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 2 +- .../hanHaiMember/service/IHanHaiMemberService.java | 2 +- .../service/impl/HanHaiMemberServiceImpl.java | 2 +- .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 6 + .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 5 + .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 10 ++ .../api/exhibitController/ConfigController.java | 14 ++ .../api/exhibitController/ShowpieceController.java | 8 +- .../api/exhibitController/UserInfoController.java | 12 +- .../jeecg/modules/api/service/ConfigService.java | 6 + .../modules/api/service/ShowpieceService.java | 4 +- .../jeecg/modules/api/service/UserInfoService.java | 9 +- .../api/service/impl/ConfigServiceImpl.java | 87 ++++++++++- .../api/service/impl/LoginApiServiceImpl.java | 2 + .../api/service/impl/ShowpieceServiceImpl.java | 111 +++++++++---- .../api/service/impl/UserInfoServiceImpl.java | 50 +++++- 37 files changed, 1316 insertions(+), 47 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/controller/ExhibitMalfunctionDescController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/entity/ExhibitMalfunctionDesc.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/ExhibitMalfunctionDescMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/xml/ExhibitMalfunctionDescMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/IExhibitMalfunctionDescService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/impl/ExhibitMalfunctionDescServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/ExhibitMalfunctionDescList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDescList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/components/ExhibitMalfunctionDescModal.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java index ad7cb3f..86fee4a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java @@ -64,4 +64,10 @@ public class LoginReq { */ @ApiModelProperty(value = "所在部门") private String department; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java index 2a9f8ee..6d41c2e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java @@ -101,5 +101,5 @@ public class ExhibitMaintenance implements Serializable { //保养费用表 @TableField(exist = false) - List expenseList; + List exhibitMaintenanceExpenses; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunction/entity/ExhibitMalfunction.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunction/entity/ExhibitMalfunction.java index 49582e2..b3061d9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunction/entity/ExhibitMalfunction.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunction/entity/ExhibitMalfunction.java @@ -4,11 +4,17 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenanceExpense; +import org.jeecg.modules.exhibitShowpiece.entity.ExhibitShowpiece; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -119,4 +125,8 @@ public class ExhibitMalfunction implements Serializable { @Dict(dictTable = "exhibit_showpiece", dicText = "title", dicCode = "id") @ApiModelProperty(value = "关联展品id") private java.lang.String showpieceId; + + //展品信息 + @TableField(exist = false) + ExhibitShowpiece showpiece; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/controller/ExhibitMalfunctionDescController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/controller/ExhibitMalfunctionDescController.java new file mode 100644 index 0000000..476c927 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/controller/ExhibitMalfunctionDescController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.exhibitMalfunctionDesc.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.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc; +import org.jeecg.modules.exhibitMalfunctionDesc.service.IExhibitMalfunctionDescService; + +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: 2025-09-02 + * @Version: V1.0 + */ +@Api(tags="常见故障情况表") +@RestController +@RequestMapping("/exhibitMalfunctionDesc/exhibitMalfunctionDesc") +@Slf4j +public class ExhibitMalfunctionDescController extends JeecgController { + @Autowired + private IExhibitMalfunctionDescService exhibitMalfunctionDescService; + + /** + * 分页列表查询 + * + * @param exhibitMalfunctionDesc + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "常见故障情况表-分页列表查询") + @ApiOperation(value="常见故障情况表-分页列表查询", notes="常见故障情况表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExhibitMalfunctionDesc exhibitMalfunctionDesc, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(exhibitMalfunctionDesc, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = exhibitMalfunctionDescService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param exhibitMalfunctionDesc + * @return + */ + @AutoLog(value = "常见故障情况表-添加") + @ApiOperation(value="常见故障情况表-添加", notes="常见故障情况表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ExhibitMalfunctionDesc exhibitMalfunctionDesc) { + exhibitMalfunctionDescService.save(exhibitMalfunctionDesc); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param exhibitMalfunctionDesc + * @return + */ + @AutoLog(value = "常见故障情况表-编辑") + @ApiOperation(value="常见故障情况表-编辑", notes="常见故障情况表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExhibitMalfunctionDesc exhibitMalfunctionDesc) { + exhibitMalfunctionDescService.updateById(exhibitMalfunctionDesc); + 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) { + exhibitMalfunctionDescService.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.exhibitMalfunctionDescService.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) { + ExhibitMalfunctionDesc exhibitMalfunctionDesc = exhibitMalfunctionDescService.getById(id); + if(exhibitMalfunctionDesc==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(exhibitMalfunctionDesc); + } + + /** + * 导出excel + * + * @param request + * @param exhibitMalfunctionDesc + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExhibitMalfunctionDesc exhibitMalfunctionDesc) { + return super.exportXls(request, exhibitMalfunctionDesc, ExhibitMalfunctionDesc.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, ExhibitMalfunctionDesc.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/entity/ExhibitMalfunctionDesc.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/entity/ExhibitMalfunctionDesc.java new file mode 100644 index 0000000..a72d538 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/entity/ExhibitMalfunctionDesc.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.exhibitMalfunctionDesc.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: 2025-09-02 + * @Version: V1.0 + */ +@Data +@TableName("exhibit_malfunction_desc") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="exhibit_malfunction_desc对象", description="常见故障情况表") +public class ExhibitMalfunctionDesc implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**故障描述*/ + @Excel(name = "故障描述", width = 15) + @ApiModelProperty(value = "故障描述") + private java.lang.String malfunction; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/ExhibitMalfunctionDescMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/ExhibitMalfunctionDescMapper.java new file mode 100644 index 0000000..b266b5e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/ExhibitMalfunctionDescMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.exhibitMalfunctionDesc.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 常见故障情况表 + * @Author: jeecg-boot + * @Date: 2025-09-02 + * @Version: V1.0 + */ +public interface ExhibitMalfunctionDescMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/xml/ExhibitMalfunctionDescMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/xml/ExhibitMalfunctionDescMapper.xml new file mode 100644 index 0000000..b6424f9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/xml/ExhibitMalfunctionDescMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/IExhibitMalfunctionDescService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/IExhibitMalfunctionDescService.java new file mode 100644 index 0000000..bce760e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/IExhibitMalfunctionDescService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.exhibitMalfunctionDesc.service; + +import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 常见故障情况表 + * @Author: jeecg-boot + * @Date: 2025-09-02 + * @Version: V1.0 + */ +public interface IExhibitMalfunctionDescService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/impl/ExhibitMalfunctionDescServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/impl/ExhibitMalfunctionDescServiceImpl.java new file mode 100644 index 0000000..ab09dfc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/impl/ExhibitMalfunctionDescServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.exhibitMalfunctionDesc.service.impl; + +import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc; +import org.jeecg.modules.exhibitMalfunctionDesc.mapper.ExhibitMalfunctionDescMapper; +import org.jeecg.modules.exhibitMalfunctionDesc.service.IExhibitMalfunctionDescService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 常见故障情况表 + * @Author: jeecg-boot + * @Date: 2025-09-02 + * @Version: V1.0 + */ +@Service +public class ExhibitMalfunctionDescServiceImpl extends ServiceImpl implements IExhibitMalfunctionDescService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/ExhibitMalfunctionDescList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/ExhibitMalfunctionDescList.vue new file mode 100644 index 0000000..6c3081c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/ExhibitMalfunctionDescList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescForm.vue new file mode 100644 index 0000000..6608268 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.Style#Drawer.vue new file mode 100644 index 0000000..c460a83 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.vue new file mode 100644 index 0000000..90a302f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.api.ts new file mode 100644 index 0000000..89b26b0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/list', + save='/exhibitMalfunctionDesc/exhibitMalfunctionDesc/add', + edit='/exhibitMalfunctionDesc/exhibitMalfunctionDesc/edit', + deleteOne = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/delete', + deleteBatch = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/deleteBatch', + importExcel = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/importExcel', + exportXls = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.data.ts new file mode 100644 index 0000000..7462eee --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.data.ts @@ -0,0 +1,23 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '故障描述', + align:"center", + dataIndex: 'malfunction' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '故障描述', + field: 'malfunction', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDescList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDescList.vue new file mode 100644 index 0000000..8a081f7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDescList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/components/ExhibitMalfunctionDescModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/components/ExhibitMalfunctionDescModal.vue new file mode 100644 index 0000000..81453bd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/components/ExhibitMalfunctionDescModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java index d94617b..4be14d1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java @@ -93,5 +93,5 @@ public class ExhibitRepair implements Serializable { //维修费用表 @TableField(exist = false) - List expenseList; + List exhibitRepairExpenseList; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitShowpiece/entity/ExhibitShowpiece.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitShowpiece/entity/ExhibitShowpiece.java index d0a4a03..9d26251 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitShowpiece/entity/ExhibitShowpiece.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitShowpiece/entity/ExhibitShowpiece.java @@ -40,12 +40,14 @@ public class ExhibitShowpiece implements Serializable { private java.lang.String createBy; /**创建日期*/ @ApiModelProperty(value = "创建日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新日期*/ @ApiModelProperty(value = "更新日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.util.Date updateTime; /**展品名称*/ @Excel(name = "展品名称", width = 15) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 4c1e719..b210bc5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-02 * @Version: V1.0 */ @Api(tags="han_hai_member") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index f8472de..463e63f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-02 * @Version: V1.0 */ @Data @@ -210,4 +210,8 @@ public class HanHaiMember implements Serializable { @Dict(dicCode = "authentic_status") @ApiModelProperty(value = "审核状态") private java.lang.String status; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java index 95dcdc4..0d6a6fd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-02 * @Version: V1.0 */ public interface HanHaiMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index c56f674..3c93707 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-02 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index c783085..231a0d7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-02 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 7e3dc6f..c88478a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -153,6 +153,11 @@ align:"center", dataIndex: 'status_dictText' }, + { + title:'备注', + align:"center", + dataIndex: 'remark' + }, { title: '操作', dataIndex: 'action', @@ -193,6 +198,7 @@ fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) fieldList.push({type:'string',value:'department',text:'所在部门',dictCode:"exhibit_department,title,id"}) fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'authentic_status'}) + fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index 6cb3faa..0083942 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -33,6 +33,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 861cbc1..4e40287 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -35,6 +35,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'status_dictText' }, + { + title: '备注', + align:"center", + dataIndex: 'remark' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -79,4 +84,9 @@ export const formSchema: FormSchema[] = [ dictCode:"authentic_status" }, }, + { + label: '备注', + field: 'remark', + component: 'Input', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ConfigController.java index d219d79..1684f11 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ConfigController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ConfigController.java @@ -52,4 +52,18 @@ public class ConfigController { return configService.queryConfigByParamCode(paramCode); } + //获取展品分类列表 + @ApiOperation(value="配置-查询展品分类列表", notes="配置-查询展品分类列表") + @RequestMapping(value = "/queryCategoryList", method = {RequestMethod.GET}) + public Result queryCategoryList(String pid, PageBean pageBean){ + return configService.queryCategoryList(pid, pageBean); + } + + //查看常见故障情况 + @ApiOperation(value="配置-查询常见故障情况", notes="系统配置-查询常见故障情况") + @RequestMapping(value = "/queryMalfunctionDescList", method = {RequestMethod.GET}) + public Result queryMalfunctionDescList(PageBean pageBean){ + return configService.queryMalfunctionDescList(pageBean); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java index 257b4f2..a882622 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java @@ -74,8 +74,8 @@ public class ShowpieceController { @ApiOperation(value="维修-新增维修记录", notes="维修-新增维修记录") @RequestMapping(value = "/addRepair", method = {RequestMethod.POST}) - public Result addRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair){ - return showpieceService.addRepair(token, exhibitRepair); + public Result addRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair, String expenseList){ + return showpieceService.addRepair(token, exhibitRepair, expenseList); } @ApiOperation(value="保养-查看保养记录列表", notes="保养-查看保养记录列表") @@ -92,8 +92,8 @@ public class ShowpieceController { @ApiOperation(value="保养-新增保养记录", notes="保养-新增保养记录") @RequestMapping(value = "/addMaintenance", method = {RequestMethod.POST}) - public Result addMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance){ - return showpieceService.addMaintenance(token, exhibitMaintenance); + public Result addMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance, String expenseList){ + return showpieceService.addMaintenance(token, exhibitMaintenance, expenseList); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/UserInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/UserInfoController.java index 34760bd..6749d7e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/UserInfoController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/UserInfoController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.UserInfoService; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; @@ -33,8 +34,15 @@ public class UserInfoController { //修改个人信息 @ApiOperation(value="我的资料-修改个人信息", notes="我的资料-修改个人信息") @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) - public Result updateUser(@RequestHeader("X-Access-Token") String token, String nickName,String phone,String headImage){ - return userInfoService.updateUserInfo(token, nickName, phone, headImage); + public Result updateUser(@RequestHeader("X-Access-Token") String token, String nickName,String phone,String headImage, String department, String remark){ + return userInfoService.updateUserInfo(token, nickName, phone, headImage, department, remark); + } + + //维修/保养记录-人员列表 + @ApiOperation(value="维修/保养记录-查询人员列表", notes="维修/保养记录-查询人员列表") + @RequestMapping(value = "/queryUserList", method = {RequestMethod.GET}) + public Result queryUserList(PageBean pageBean){ + return userInfoService.queryUserList(pageBean); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java index c4f0518..49ff2d1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java @@ -21,4 +21,10 @@ public interface ConfigService { //配置-查询系统配置详情 public Result queryConfigByParamCode(String paramCode); + //配置-查询展品分类列表 + public Result queryCategoryList(String pid, PageBean pageBean); + + //配置-查看常见故障情况 + public Result queryMalfunctionDescList(PageBean pageBean); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java index bb73bd1..0579b1c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java @@ -35,7 +35,7 @@ public interface ShowpieceService { public Result queryRepairById(String repairId); //维修-新增维修记录 - public Result addRepair(String token, ExhibitRepair exhibitRepair); + public Result addRepair(String token, ExhibitRepair exhibitRepair, String expenseList); //保养-查看保养记录列表 public Result queryMaintenanceList(ExhibitMaintenance exhibitMaintenance, PageBean pageBean); @@ -44,6 +44,6 @@ public interface ShowpieceService { public Result queryMaintenanceById(String maintenanceId); //保养-新增保养记录 - public Result addMaintenance(String token, ExhibitMaintenance exhibitMaintenance); + public Result addMaintenance(String token, ExhibitMaintenance exhibitMaintenance, String expenseList); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java index fb7d452..e8095bc 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java @@ -1,6 +1,10 @@ package org.jeecg.modules.api.service; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; public interface UserInfoService { @@ -8,6 +12,9 @@ public interface UserInfoService { Result queryUserInfo(String token); //修改个人信息 - Result updateUserInfo(String token,String nickName,String phone,String headImage); + Result updateUserInfo(String token,String nickName,String phone,String headImage, String department, String remark); + + //维修/保养记录-查询人员列表 + public Result queryUserList(PageBean pageBean); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java index 19cc8c9..db546df 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java @@ -10,10 +10,14 @@ import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.ConfigService; import org.jeecg.modules.exhibitBanner.entity.ExhibitBanner; import org.jeecg.modules.exhibitBanner.service.IExhibitBannerService; +import org.jeecg.modules.exhibitCategory.entity.ExhibitCategory; +import org.jeecg.modules.exhibitCategory.service.IExhibitCategoryService; import org.jeecg.modules.exhibitConfig.entity.ExhibitConfig; import org.jeecg.modules.exhibitConfig.service.IExhibitConfigService; import org.jeecg.modules.exhibitDepartment.entity.ExhibitDepartment; import org.jeecg.modules.exhibitDepartment.service.IExhibitDepartmentService; +import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc; +import org.jeecg.modules.exhibitMalfunctionDesc.service.IExhibitMalfunctionDescService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,15 +27,21 @@ import javax.annotation.Resource; public class ConfigServiceImpl implements ConfigService { /******************************************************************************************************************/ - //轮播图列表 + //轮播图信息 @Resource private IExhibitBannerService exhibitBannerService; - //轮播图列表 + //部门信息 @Resource private IExhibitDepartmentService exhibitDepartmentService; //轮播图列表 @Resource private IExhibitConfigService exhibitConfigService; + //展品分类列表 + @Resource + private IExhibitCategoryService exhibitCategoryService; + //展品分类列表 + @Resource + private IExhibitMalfunctionDescService exhibitMalfunctionDescService; /******************************************************************************************************************/ //配置-查看轮播图列表 @@ -169,4 +179,77 @@ public class ConfigServiceImpl implements ConfigService { } } + //查询展品分类列表 + @Override + public Result queryCategoryList(String pid, PageBean pageBean) { + log.info("开始查询展品分类列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = exhibitCategoryService + .lambdaQuery(); + + //组装查询条件 + if(StringUtils.isNotEmpty(pid)){ + query.eq(ExhibitCategory::getPid, pid); + } + + //按照创建时间降序排列 + query.orderByDesc(ExhibitCategory::getCreateTime); + + //获取展品分类列表信息 + pageList = query.page(page); + + log.info("展品分类查询结束"); + return Result.OK("展品分类列表", pageList); + }catch (Exception e){ + log.error("展品分类查询失败"); + e.printStackTrace(); + return Result.error("展品分类列表查询失败"); + } + } + + @Override + public Result queryMalfunctionDescList(PageBean pageBean) { + log.info("开始查询常见故障列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = exhibitMalfunctionDescService + .lambdaQuery(); + + //组装查询条件 + //按照创建时间降序排列 + query.orderByDesc(ExhibitMalfunctionDesc::getCreateTime); + + //获取常见故障列表信息 + pageList = query.page(page); + + log.info("常见故障查询结束"); + return Result.OK("常见故障列表", pageList); + }catch (Exception e){ + log.error("常见故障查询失败"); + e.printStackTrace(); + return Result.error("常见故障列表查询失败"); + } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java index f5bd972..9fba887 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java @@ -71,6 +71,8 @@ public class LoginApiServiceImpl implements LoginApiService { member.setAppletOpenid(wxOpenid); member.setNickName(loginReq.getNickName()); member.setHeadImage(loginReq.getHeadimgurl()); + member.setDepartment(loginReq.getDepartment());//所在部门 + member.setRemark(loginReq.getRemark());//备注 // 生成token返回给小程序端 String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); hanHaiMemberService.save(member); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java index 6e99616..a5d4c00 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.api.service.impl; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; @@ -28,6 +29,8 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; @Service @@ -125,8 +128,12 @@ public class ShowpieceServiceImpl implements ShowpieceService { //组装查询条件 if(StringUtils.isNotBlank(exhibitMalfunction.getFrequency())){ + //发生频率 + query.eq(ExhibitMalfunction::getFrequency, exhibitMalfunction.getFrequency()); + } + if(StringUtils.isNotBlank(exhibitMalfunction.getUrgency())){ //紧急程度 - query.like(ExhibitMalfunction::getFrequency, exhibitMalfunction.getFrequency()); + query.eq(ExhibitMalfunction::getUrgency, exhibitMalfunction.getUrgency()); } if(StringUtils.isNotBlank(exhibitMalfunction.getStatus())){ //维修状态 @@ -139,6 +146,11 @@ public class ShowpieceServiceImpl implements ShowpieceService { //获取报修单信息列表 pageList = query.page(page); + for (ExhibitMalfunction record : pageList.getRecords()) { + ExhibitShowpiece showpiece = exhibitShowpieceService.getById(record.getShowpieceId()); + record.setShowpiece(showpiece); + } + log.info("报修单信息列表查询结束"); return Result.OK("报修单信息列表", pageList); }catch (Exception e){ @@ -178,8 +190,8 @@ public class ShowpieceServiceImpl implements ShowpieceService { public Result addMalfunction(String token, ExhibitMalfunction exhibitMalfunction) { log.info("开始新增报修单"); //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); //返回信息 String massege = ""; @@ -215,8 +227,8 @@ public class ShowpieceServiceImpl implements ShowpieceService { public Result updateMalfunction(String token, ExhibitMalfunction exhibitMalfunction) { log.info("开始修改报修单"); //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); //返回信息 String massege = ""; @@ -268,12 +280,12 @@ public class ShowpieceServiceImpl implements ShowpieceService { //组装查询条件 if(StringUtils.isNotBlank(exhibitRepair.getShowpieceId())){ //关联维修单 - query.like(ExhibitRepair::getShowpieceId, exhibitRepair.getShowpieceId()); - } - if(StringUtils.isNotBlank(exhibitRepair.getRepairDate().toString())){ - //时间 - query.eq(ExhibitRepair::getRepairDate, exhibitRepair.getRepairDate()); + query.eq(ExhibitRepair::getShowpieceId, exhibitRepair.getShowpieceId()); } +// if(StringUtils.isNotBlank(exhibitRepair.getRepairDate().toString())){ +// //时间 +// query.eq(ExhibitRepair::getRepairDate, exhibitRepair.getRepairDate()); +// } if(StringUtils.isNotBlank(exhibitRepair.getRepairName())){ //人员 query.eq(ExhibitRepair::getRepairName, exhibitRepair.getRepairName()); @@ -288,11 +300,11 @@ public class ShowpieceServiceImpl implements ShowpieceService { //添加维修费用 for (ExhibitRepair record : pageList.getRecords()) { //添加维修费用 - List expenseList = exhibitRepairExpenseService + List exhibitRepairExpenseList = exhibitRepairExpenseService .lambdaQuery() .eq(ExhibitRepairExpense::getRepairId, record.getId()) .list(); - record.setExpenseList(expenseList); + record.setExhibitRepairExpenseList(exhibitRepairExpenseList); } log.info("维修记录信息列表查询结束"); @@ -316,11 +328,11 @@ public class ShowpieceServiceImpl implements ShowpieceService { ExhibitRepair one = exhibitRepairService.getById(repairId); //添加维修费用 - List expenseList = exhibitRepairExpenseService + List exhibitRepairExpenseList = exhibitRepairExpenseService .lambdaQuery() .eq(ExhibitRepairExpense::getRepairId, repairId) .list(); - one.setExpenseList(expenseList); + one.setExhibitRepairExpenseList(exhibitRepairExpenseList); log.info("维修记录信息详情查询结束"); return Result.OK("维修记录信息详情", one); @@ -333,11 +345,11 @@ public class ShowpieceServiceImpl implements ShowpieceService { //维修-新增维修记录 @Override - public Result addRepair(String token, ExhibitRepair exhibitRepair) { + public Result addRepair(String token, ExhibitRepair exhibitRepair, String expenseList) { log.info("开始新增维修记录"); //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); //返回信息 String massege = ""; @@ -350,9 +362,31 @@ public class ShowpieceServiceImpl implements ShowpieceService { } //2、新增维修记录 - boolean result = exhibitRepairService.save(exhibitRepair); + String id = IdWorker.getIdStr();//生成维修单id + exhibitRepair.setId(id); + boolean result1 = exhibitRepairService.save(exhibitRepair); + + //3、新增费用明细 + List list = new ArrayList<>(); + String[] split = expenseList.split(";"); + for (String s : split) { + String[] expense = s.split(","); + String title = expense[0];//费用名称 + int num = Integer.parseInt(expense[1]);//数量 + BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额 + + ExhibitRepairExpense exhibitRepairExpense = new ExhibitRepairExpense(); + exhibitRepairExpense.setRepairId(id); + exhibitRepairExpense.setTitle(title); + exhibitRepairExpense.setNum(num); + exhibitRepairExpense.setAmount(amount); + + list.add(exhibitRepairExpense); + } + boolean result2 = exhibitRepairExpenseService.saveBatch(list); - if(result){ + //4、判断维修记录是否新增成功 + if(result1 && result2){ log.info("维修记录新增成功"); return Result.OK("维修记录新增成功"); }else { @@ -391,10 +425,10 @@ public class ShowpieceServiceImpl implements ShowpieceService { //关联维修单 query.like(ExhibitMaintenance::getShowpieceId, exhibitMaintenance.getShowpieceId()); } - if(StringUtils.isNotBlank(exhibitMaintenance.getMaintenanceDate().toString())){ - //时间 - query.eq(ExhibitMaintenance::getMaintenanceDate, exhibitMaintenance.getMaintenanceDate()); - } +// if(StringUtils.isNotBlank(exhibitMaintenance.getMaintenanceDate().toString())){ +// //时间 +// query.eq(ExhibitMaintenance::getMaintenanceDate, exhibitMaintenance.getMaintenanceDate()); +// } if(StringUtils.isNotBlank(exhibitMaintenance.getMaintenanceName())){ //人员 query.eq(ExhibitMaintenance::getMaintenanceName, exhibitMaintenance.getMaintenanceName()); @@ -409,11 +443,11 @@ public class ShowpieceServiceImpl implements ShowpieceService { //添加维修费用 for (ExhibitMaintenance record : pageList.getRecords()) { //添加维修费用 - List expenseList = exhibitMaintenanceExpenseService + List exhibitMaintenanceExpenseList = exhibitMaintenanceExpenseService .lambdaQuery() .eq(ExhibitMaintenanceExpense::getMaintenanceId, record.getId()) .list(); - record.setExpenseList(expenseList); + record.setExhibitMaintenanceExpenses(exhibitMaintenanceExpenseList); } log.info("维修记录信息列表查询结束"); @@ -437,11 +471,11 @@ public class ShowpieceServiceImpl implements ShowpieceService { ExhibitMaintenance one = exhibitMaintenanceService.getById(maintenanceId); //填充保养费用 - List expenseList = exhibitMaintenanceExpenseService + List exhibitMaintenanceExpenseList = exhibitMaintenanceExpenseService .lambdaQuery() .eq(ExhibitMaintenanceExpense::getMaintenanceId, maintenanceId) .list(); - one.setExpenseList(expenseList); + one.setExhibitMaintenanceExpenses(exhibitMaintenanceExpenseList); log.info("保养记录详情查询结束"); return Result.OK("保养记录详情", one); @@ -454,7 +488,7 @@ public class ShowpieceServiceImpl implements ShowpieceService { //保养-新增保养记录 @Override - public Result addMaintenance(String token, ExhibitMaintenance exhibitMaintenance) { + public Result addMaintenance(String token, ExhibitMaintenance exhibitMaintenance, String expenseList) { log.info("开始新增保养记录"); //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -471,8 +505,29 @@ public class ShowpieceServiceImpl implements ShowpieceService { } //2、新增维修记录 + String id = IdWorker.getIdStr();//生成保养单id + exhibitMaintenance.setId(id); boolean result = exhibitMaintenanceService.save(exhibitMaintenance); + //3、新增费用明细 + List list = new ArrayList<>(); + String[] split = expenseList.split(";"); + for (String s : split) { + String[] expense = s.split(","); + String title = expense[0];//费用名称 + int num = Integer.parseInt(expense[1]);//数量 + BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额 + + ExhibitMaintenanceExpense exhibitMaintenanceExpense = new ExhibitMaintenanceExpense(); + exhibitMaintenanceExpense.setMaintenanceId(id); + exhibitMaintenanceExpense.setTitle(title); + exhibitMaintenanceExpense.setNum(num); + exhibitMaintenanceExpense.setAmount(amount); + + list.add(exhibitMaintenanceExpense); + } + boolean result2 = exhibitMaintenanceExpenseService.saveBatch(list); + if(result){ log.info("保养记录新增成功"); return Result.OK("保养记录新增成功"); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java index 01e8cb0..0ceaaac 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java @@ -1,10 +1,14 @@ package org.jeecg.modules.api.service.impl; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.UserInfoService; +import org.jeecg.modules.exhibitBanner.entity.ExhibitBanner; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; @@ -45,13 +49,16 @@ public class UserInfoServiceImpl implements UserInfoService { //修改个人信息 @Override - public Result updateUserInfo(String token,String nickName,String phone,String headImage){ + public Result updateUserInfo(String token,String nickName,String phone,String headImage, String department, String remark){ log.info("开始修改个人信息"); //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); try{ + if(!"1".equals(hanHaiMember.getStatus())){ + return Result.error("用户审核未通过，请联系管理员进行审核"); + } //用户昵称不能为空 if(StringUtils.isBlank(nickName)){ log.error("用户昵称不能为空"); @@ -71,6 +78,12 @@ public class UserInfoServiceImpl implements UserInfoService { return Result.error("该号码已经有人使用，不能重复填写"); } } + if(StringUtils.isNotEmpty(department)){ + hanHaiMember.setDepartment(department); + } + if(StringUtils.isNotEmpty(remark)){ + hanHaiMember.setRemark(remark); + } hanHaiMember.setNickName(nickName); hanHaiMember.setPhone(phone); @@ -92,4 +105,39 @@ public class UserInfoServiceImpl implements UserInfoService { } } + @Override + public Result queryUserList(PageBean pageBean) { + log.info("开始查询用户信息列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = hanHaiMemberService + .lambdaQuery(); + + //组装查询条件 + + //按照排序编号升序排列 + query.orderByDesc(HanHaiMember::getCreateTime); + + //获取用户信息列表 + pageList = query.page(page); + + log.info("用户信息列表查询结束"); + return Result.OK("用户信息列表", pageList); + }catch (Exception e){ + log.info("用户信息列表查询失败"); + e.printStackTrace(); + return Result.error("用户信息列表查询失败"); + } + } + }