From 6a4bed6d4c98d35f5f02e0e80603f6926afa9226 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 23 Aug 2024 15:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E6=96=BD=E5=B7=A5=E8=AE=B0=E5=BD=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/bracelet/vo/SidebandVo.java | 19 ++++++++++ .../mapper/QueryConstructionMapper.java | 15 ++++++++ .../impl/QueryConstructionServiceImpl.java | 4 +++ .../bracelet/QueryConstructionMapper.xml | 36 ++++++++++++------- .../mapper/bracelet/SidebandMapper.xml | 7 ++-- 5 files changed, 67 insertions(+), 14 deletions(-) diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandVo.java index d303475..a5ebb35 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandVo.java @@ -5,13 +5,16 @@ import com.bonus.common.core.annotation.Excel.ColumnType; import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.entity.file.ResourceFileVo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.Api; import lombok.Data; import org.springframework.web.multipart.MultipartFile; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 边带表 sys_sideband @@ -58,5 +61,21 @@ public class SidebandVo @Excel(name = "绑定设备数量", cellType = ColumnType.NUMERIC) private int bindNum; + /** 请求参数 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map params; + public Map getParams() + { + if (params == null) + { + params = new HashMap<>(); + } + return params; + } + + public void setParams(Map params) + { + this.params = params; + } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java index 35ab373..4eef337 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java @@ -46,4 +46,19 @@ public interface QueryConstructionMapper * @return */ public List getConstructionSomeLists(int[] ids); + + + /** + * 获取施工班组人数 + * @param teamId + * @return + */ + int getTeamNum(Long teamId); + + /** + * 获取临时人数 + * @param teamId + * @return + */ + int getTempNum(Long teamId); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java index c20f1b8..24316d4 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java @@ -49,6 +49,10 @@ public class QueryConstructionServiceImpl implements IQueryConstructionService public List selectConstructionList(QueryConstruction construction) { List list = constructionMapper.selectConstructionList(construction); + for (int i = 0; i < list.size(); i++) { + list.get(i).setTeamNum(constructionMapper.getTeamNum(list.get(i).getTeamId())); + list.get(i).setTempNum(constructionMapper.getTempNum(list.get(i).getTeamId())); + } for (QueryConstruction vo : list) { vo.setTeamPhone(Sm4Utils.decode(vo.getTeamPhone())); } diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/QueryConstructionMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/QueryConstructionMapper.xml index c048416..b6e816e 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/QueryConstructionMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/QueryConstructionMapper.xml @@ -6,17 +6,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select tp.id as id,tp.name as name,tp.sex as sex,tp.id_card as idCard,tp.phone as phone, tp.aqm_code as aqmCode,tp.mj_code as mjCode,sfs.file_path AS filePath,sfs.id AS fileId - from t_work_team twt - left join tb_people tp on twt.team_id = tp.team_id and tp.del_flag = 0 + from tb_people tp + left join t_work_team twt on tp.team_id = twt.team_id and twt.del_flag = 0 left join sys_file_source sfs on tp.id = sfs.source_id AND sfs.source_type = #{sourceType} AND sfs.del_flag = 0 - twt.team_id = #{teamId} and twt.del_flag = 0 + twt.team_id = #{teamId} and tp.del_flag = 0 AND INSTR(tp.name,#{name}) > 0 @@ -59,11 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/SidebandMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/SidebandMapper.xml index 9fdf48c..aedba36 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/SidebandMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/SidebandMapper.xml @@ -23,8 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND INSTR(ss.gt_code,#{gtCode}) > 0 - - and date_format(ss.bind_time,'%y%m%d') = date_format(#{bindTime},'%y%m%d') + + and date_format(ss.bind_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + and date_format(ss.bind_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') group by ss.id order by ss.id ASC