From 5520d5e2183af3c33263813f6ab7930379275f10 Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Thu, 3 Sep 2020 16:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=81=E4=B9=A0=E4=B9=8B=E6=98=9F=E8=80=83?= =?UTF-8?q?=E6=A0=B8-=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TsbzJxzxStatisticsController.java | 40 ++++ .../com/ruoyi/jxjs/domain/TsbzJxzxmd.java | 34 ++++ .../ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java | 8 + .../jxjs/service/ITsbzJxzxmdService.java | 8 + .../service/impl/TsbzJxzxmdServiceImpl.java | 47 ++--- .../mapper/jxjs/TsbzJxzxmdMapper.xml | 36 ++++ ruoyi-ui/src/api/jxzxkhgl/statistics.js | 18 ++ .../src/views/jxzxkhgl/statistics/index.vue | 178 ++++++++++++++++++ 8 files changed, 348 insertions(+), 21 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java create mode 100644 ruoyi-ui/src/api/jxzxkhgl/statistics.js create mode 100644 ruoyi-ui/src/views/jxzxkhgl/statistics/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java new file mode 100644 index 000000000..ebb3b710b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java @@ -0,0 +1,40 @@ +package com.ruoyi.web.controller.jxzxkhgl; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.jxjs.domain.TsbzJxzxmd; +import com.ruoyi.jxjs.service.ITsbzJxzxmdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 见习之星考核方案Controller + * + * @author ruoyi + * @date 2020-08-29 + */ +@RestController +@RequestMapping("/jxzxkhgl/statistics") +public class TsbzJxzxStatisticsController extends BaseController { + @Autowired + private ITsbzJxzxmdService tsbzJxzxmdService; + + /** + * 查询见习之星名单列表 + */ + @PreAuthorize("@ss.hasPermi('jxzxkhgl:statistics:list')") + @GetMapping("/list") + public TableDataInfo list(TsbzJxzxmd tsbzJxzxmd) { + System.out.println("nf:" + tsbzJxzxmd.getNf()); + System.out.println("faid:" + tsbzJxzxmd.getFaid()); + startPage(); + List list = tsbzJxzxmdService.selectTsbzJxzxmdKhjdList(tsbzJxzxmd); + return getDataTable(list); + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java index 0e180693d..a9923918a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; + /** * 见习之星名单对象 tsbz_jxzxmd * @@ -37,6 +39,11 @@ public class TsbzJxzxmd extends BaseEntity { @Excel(name = "创建人") private Long createuserid; + + private BigDecimal bfb; + private String faid; + private TsbzJxjsjbxx tsbzJxjsjbxx; + public void setId(Long id) { this.id = id; } @@ -69,6 +76,30 @@ public class TsbzJxzxmd extends BaseEntity { return createuserid; } + public BigDecimal getBfb() { + return bfb; + } + + public void setBfb(BigDecimal bfb) { + this.bfb = bfb; + } + + public String getFaid() { + return faid; + } + + public void setFaid(String faid) { + this.faid = faid; + } + + public TsbzJxjsjbxx getTsbzJxjsjbxx() { + return tsbzJxjsjbxx; + } + + public void setTsbzJxjsjbxx(TsbzJxjsjbxx tsbzJxjsjbxx) { + this.tsbzJxjsjbxx = tsbzJxjsjbxx; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -77,6 +108,9 @@ public class TsbzJxzxmd extends BaseEntity { .append("nf", getNf()) .append("createuserid", getCreateuserid()) .append("createTime", getCreateTime()) + .append("bfb", getBfb()) + .append("faid", getFaid()) + .append("tsbzJxjsjbxx", getTsbzJxjsjbxx()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java index 97d5e1afb..e5028e725 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java @@ -58,4 +58,12 @@ public interface TsbzJxzxmdMapper { * @return 结果 */ public int deleteTsbzJxzxmdByIds(Long[] ids); + + /** + * 查询见习之星名单列表 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 见习之星名单集合 + */ + public List selectTsbzJxzxmdKhjdList(TsbzJxzxmd tsbzJxzxmd); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java index fa5782e8a..642a43528 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java @@ -58,4 +58,12 @@ public interface ITsbzJxzxmdService * @return 结果 */ public int deleteTsbzJxzxmdById(Long id); + + /** + * 查询见习之星名单列表 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 见习之星名单集合 + */ + public List selectTsbzJxzxmdKhjdList(TsbzJxzxmd tsbzJxzxmd); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java index 4b9ea498e..365525999 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.jxjs.service.impl; import java.util.List; + import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,86 +11,90 @@ import com.ruoyi.jxjs.service.ITsbzJxzxmdService; /** * 见习之星名单Service业务层处理 - * + * * @author ruoyi * @date 2020-08-23 */ @Service -public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService -{ +public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService { @Autowired private TsbzJxzxmdMapper tsbzJxzxmdMapper; /** * 查询见习之星名单 - * + * * @param id 见习之星名单ID * @return 见习之星名单 */ @Override - public TsbzJxzxmd selectTsbzJxzxmdById(Long id) - { + public TsbzJxzxmd selectTsbzJxzxmdById(Long id) { return tsbzJxzxmdMapper.selectTsbzJxzxmdById(id); } /** * 查询见习之星名单列表 - * + * * @param tsbzJxzxmd 见习之星名单 * @return 见习之星名单 */ @Override - public List selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd) - { + public List selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd) { return tsbzJxzxmdMapper.selectTsbzJxzxmdList(tsbzJxzxmd); } /** * 新增见习之星名单 - * + * * @param tsbzJxzxmd 见习之星名单 * @return 结果 */ @Override - public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) - { + public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) { tsbzJxzxmd.setCreateTime(DateUtils.getNowDate()); return tsbzJxzxmdMapper.insertTsbzJxzxmd(tsbzJxzxmd); } /** * 修改见习之星名单 - * + * * @param tsbzJxzxmd 见习之星名单 * @return 结果 */ @Override - public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) - { + public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) { return tsbzJxzxmdMapper.updateTsbzJxzxmd(tsbzJxzxmd); } /** * 批量删除见习之星名单 - * + * * @param ids 需要删除的见习之星名单ID * @return 结果 */ @Override - public int deleteTsbzJxzxmdByIds(Long[] ids) - { + public int deleteTsbzJxzxmdByIds(Long[] ids) { return tsbzJxzxmdMapper.deleteTsbzJxzxmdByIds(ids); } /** * 删除见习之星名单信息 - * + * * @param id 见习之星名单ID * @return 结果 */ @Override - public int deleteTsbzJxzxmdById(Long id) - { + public int deleteTsbzJxzxmdById(Long id) { return tsbzJxzxmdMapper.deleteTsbzJxzxmdById(id); } + + /** + * 查询见习之星名单列表 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 见习之星名单集合 + */ + @Override + public List selectTsbzJxzxmdKhjdList(TsbzJxzxmd tsbzJxzxmd) { + return tsbzJxzxmdMapper.selectTsbzJxzxmdKhjdList(tsbzJxzxmd); + } } diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml index 45213f46f..0ce8b4a1e 100644 --- a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml @@ -10,6 +10,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,5 +96,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/jxzxkhgl/statistics.js b/ruoyi-ui/src/api/jxzxkhgl/statistics.js new file mode 100644 index 000000000..5eae831b6 --- /dev/null +++ b/ruoyi-ui/src/api/jxzxkhgl/statistics.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询见习之星名单列表 +export function listJxzxKhjd(query) { + return request({ + url: '/jxzxkhgl/statistics/list', + method: 'get', + params: query + }) +} + +// 查询见习之星名单详细 +export function getJxzxKhjd(id) { + return request({ + url: '/jxzxkhgl/statistics/' + id, + method: 'get' + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/jxzxkhgl/statistics/index.vue b/ruoyi-ui/src/views/jxzxkhgl/statistics/index.vue new file mode 100644 index 000000000..463129272 --- /dev/null +++ b/ruoyi-ui/src/views/jxzxkhgl/statistics/index.vue @@ -0,0 +1,178 @@ + + +