From ff06225e6e4d04719d7c0774ffb3bf8bced36f0a Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 13 Jun 2024 09:43:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BC=82=E5=91=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/largeScreen/util/CommonUtil.java | 114 +++++++++--------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java index db9039b1..3b4c8f8d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java @@ -52,11 +52,11 @@ public class CommonUtil { if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(maType)) { return 0; } - BigDecimal value = new BigDecimal(new Double(0).toString()); + BigDecimal value = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { Map map = list.get(i); String num = Objects.isNull(map.get("num")) ? "0" : String.valueOf(map.get("num")); - BigDecimal value2 = new BigDecimal(new Double(num)); + BigDecimal value2 = new BigDecimal(num); value = value.add(value2); } double doubleValue = value.doubleValue(); @@ -78,16 +78,16 @@ public class CommonUtil { valueList.add(0); return valueList; } - BigDecimal numberValue = new BigDecimal(new Double(0).toString()); - BigDecimal countValue = new BigDecimal(new Double(0).toString()); + BigDecimal numberValue = new BigDecimal("0"); + BigDecimal countValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { if (Objects.nonNull(list.get(i).getNum()) && Objects.equals("0", list.get(i).getManageType())) { // 编号 - BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString()); + BigDecimal value = BigDecimal.valueOf(list.get(i).getNum()); numberValue = numberValue.add(value); } else if (Objects.nonNull(list.get(i).getNum()) && Objects.equals("1", list.get(i).getManageType())) { // 计数 - BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString()); + BigDecimal value = BigDecimal.valueOf(list.get(i).getNum()); countValue = countValue.add(value); } } @@ -112,17 +112,17 @@ public class CommonUtil { valueList.add(0); return valueList; } - BigDecimal jjValue = new BigDecimal(new Double(0).toString()); - BigDecimal tsValue = new BigDecimal(new Double(0).toString()); + BigDecimal jjValue = new BigDecimal("0"); + BigDecimal tsValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { if (Objects.isNull(list.get(i))) { continue; } if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.JJ)) { - BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString()); + BigDecimal value = BigDecimal.valueOf(list.get(i).getNum()); jjValue = jjValue.add(value); } else if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.TS)) { - BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString()); + BigDecimal value = BigDecimal.valueOf(list.get(i).getNum()); tsValue = tsValue.add(value); } } @@ -147,17 +147,15 @@ public class CommonUtil { List nameList = new ArrayList<>(); List valueList = new ArrayList<>(); List valueList2 = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(lyList)) { - for (int i = 0; i < lyList.size(); i++) { - MaterialDataVo vo = lyList.get(i); - if (Objects.nonNull(vo.getUnitName())) { - nameList.add(vo.getUnitName()); - valueList.add((int) Math.round(vo.getNum())); - for (int j = 0; j < bfList.size(); j++) { - MaterialDataVo vo2 = bfList.get(j); - if (Objects.nonNull(vo2.getUnitName()) && Objects.equals(vo.getUnitName(), vo2.getUnitName())) { - valueList2.add((int) Math.round(vo2.getNum())); - } + for (int i = 0; i < lyList.size(); i++) { + MaterialDataVo vo = lyList.get(i); + if (Objects.nonNull(vo.getUnitName())) { + nameList.add(vo.getUnitName()); + valueList.add((int) Math.round(vo.getNum())); + for (int j = 0; j < bfList.size(); j++) { + MaterialDataVo vo2 = bfList.get(j); + if (Objects.nonNull(vo2.getUnitName()) && Objects.equals(vo.getUnitName(), vo2.getUnitName())) { + valueList2.add((int) Math.round(vo2.getNum())); } } } @@ -182,12 +180,12 @@ public class CommonUtil { valueList.add(0); return valueList; } - BigDecimal planValue = new BigDecimal(new Double(0).toString()); - BigDecimal realityValue = new BigDecimal(new Double(0).toString()); + BigDecimal planValue = new BigDecimal("0"); + BigDecimal realityValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getPlanNum()))); - BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRealityNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getPlanNum()); + BigDecimal value2 = BigDecimal.valueOf(vo.getRealityNum()); planValue = planValue.add(value); realityValue = realityValue.add(value2); } @@ -214,15 +212,15 @@ public class CommonUtil { return valueList; } /*维修总量/维修合格数量/维修报废数量/待维修数量*/ - BigDecimal repairValue = new BigDecimal(new Double(0).toString()); - BigDecimal repairedValue = new BigDecimal(new Double(0).toString()); - BigDecimal scrapValue = new BigDecimal(new Double(0).toString()); - BigDecimal waitRepairedValue = new BigDecimal(new Double(0).toString()); + BigDecimal repairValue = new BigDecimal("0"); + BigDecimal repairedValue = new BigDecimal("0"); + BigDecimal scrapValue = new BigDecimal("0"); + BigDecimal waitRepairedValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getRepairNum()))); - BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRepairedNum()))); - BigDecimal value3 = new BigDecimal(new Double(String.valueOf(vo.getScrapNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getRepairNum()); + BigDecimal value2 = BigDecimal.valueOf(vo.getRepairedNum()); + BigDecimal value3 = BigDecimal.valueOf(vo.getScrapNum()); repairValue = repairValue.add(value); repairedValue = repairedValue.add(value2); scrapValue = scrapValue.add(value3); @@ -251,10 +249,10 @@ public class CommonUtil { if (CollectionUtils.isEmpty(list)) { return 0; } - BigDecimal totalValue = new BigDecimal(new Double(0).toString()); + BigDecimal totalValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getNum()); totalValue = totalValue.add(value); } double doubleTotalValue = totalValue.doubleValue(); @@ -272,14 +270,14 @@ public class CommonUtil { if (CollectionUtils.isEmpty(list)) { return 0; } - BigDecimal finalValue = new BigDecimal(new Double(0).toString()); - BigDecimal totalValue = new BigDecimal(new Double(0).toString()); - BigDecimal totalValue2 = new BigDecimal(new Double(0).toString()); + BigDecimal finalValue = new BigDecimal("0"); + BigDecimal totalValue = new BigDecimal("0"); + BigDecimal totalValue2 = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getNum()); totalValue = totalValue.add(value); - BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum2()))); + BigDecimal value2 = BigDecimal.valueOf(vo.getNum2()); totalValue2 = totalValue2.add(value2); } finalValue = totalValue.subtract(totalValue2); @@ -298,16 +296,16 @@ public class CommonUtil { if (CollectionUtils.isEmpty(list)) { return 0; } - BigDecimal finalValue = new BigDecimal(new Double(0).toString()); - BigDecimal totalValue = new BigDecimal(new Double(0).toString()); - BigDecimal totalValue2 = new BigDecimal(new Double(0).toString()); + BigDecimal finalValue = new BigDecimal("0"); + BigDecimal totalValue = new BigDecimal("0"); + BigDecimal totalValue2 = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); if (Objects.equals("1", vo.getType())) { - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getNum()); totalValue = totalValue.add(value); } else if (Objects.equals("2", vo.getType())) { - BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum()))); + BigDecimal value2 = BigDecimal.valueOf(vo.getNum()); totalValue2 = totalValue2.add(value2); } } @@ -328,15 +326,15 @@ public class CommonUtil { return 0; } /*维修总量/维修合格数量/维修报废数量/待维修数量*/ - BigDecimal repairValue = new BigDecimal(new Double(0).toString()); - BigDecimal repairedValue = new BigDecimal(new Double(0).toString()); - BigDecimal scrapValue = new BigDecimal(new Double(0).toString()); - BigDecimal waitRepairedValue = new BigDecimal(new Double(0).toString()); + BigDecimal repairValue = new BigDecimal("0"); + BigDecimal repairedValue = new BigDecimal("0"); + BigDecimal scrapValue = new BigDecimal("0"); + BigDecimal waitRepairedValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getRepairNum()))); - BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRepairedNum()))); - BigDecimal value3 = new BigDecimal(new Double(String.valueOf(vo.getScrapNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getRepairNum()); + BigDecimal value2 = BigDecimal.valueOf(vo.getRepairedNum()); + BigDecimal value3 = BigDecimal.valueOf(vo.getScrapNum()); repairValue = repairValue.add(value); repairedValue = repairedValue.add(value2); scrapValue = scrapValue.add(value3); @@ -357,10 +355,10 @@ public class CommonUtil { if (CollectionUtils.isEmpty(list)){ return 0; } - BigDecimal totalValue = new BigDecimal(new Double(0).toString()); + BigDecimal totalValue = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getNum()); totalValue = totalValue.add(value); } double doubleTotalValue = totalValue.doubleValue(); @@ -376,14 +374,14 @@ public class CommonUtil { if (CollectionUtils.isEmpty(list)){ return 0; } - BigDecimal finalValue = new BigDecimal(new Double(0).toString()); - BigDecimal totalValue = new BigDecimal(new Double(0).toString()); - BigDecimal totalValue2 = new BigDecimal(new Double(0).toString()); + BigDecimal finalValue = new BigDecimal("0"); + BigDecimal totalValue = new BigDecimal("0"); + BigDecimal totalValue2 = new BigDecimal("0"); for (int i = 0; i < list.size(); i++) { ScrapAnalysisVo vo = list.get(i); - BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum()))); + BigDecimal value = BigDecimal.valueOf(vo.getNum()); totalValue = totalValue.add(value); - BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum2()))); + BigDecimal value2 = BigDecimal.valueOf(vo.getNum2()); totalValue2 = totalValue2.add(value2); } finalValue = totalValue.subtract(totalValue2); From 01907829660c41e154abbe78bd867982c692bee8 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 13 Jun 2024 11:29:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E5=92=8C=E6=8A=A5=E5=BA=9F=E5=9B=BE=E7=89=87=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/system/api/domain/SysFile.java | 47 ++++++++-- .../sgzb/material/mapper/FileInfoMapper.java | 25 ++++++ .../impl/RepairAuditDetailsServiceImpl.java | 14 +++ .../mapper/material/FileInfoMapper.xml | 85 +++++++++++++++++++ 4 files changed, 166 insertions(+), 5 deletions(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/FileInfoMapper.java create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/material/FileInfoMapper.xml diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysFile.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysFile.java index 6783aa82..188a9033 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysFile.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysFile.java @@ -1,23 +1,29 @@ package com.bonus.sgzb.system.api.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; + /** * 文件信息 * * @author ruoyi */ +@Data public class SysFile { - /** + /* *//** * 文件名称 - */ + *//* private String name; - /** + *//** * 文件地址 - */ + *//* private String url; public String getName() @@ -46,5 +52,36 @@ public class SysFile .append("name", getName()) .append("url", getUrl()) .toString(); - } + }*/ + + /** $column.columnComment */ + private Long id; + + /** 模块id */ + private Long modelId; + /** 文件名称 */ + @ApiModelProperty(value = "文件名称") + private String fileName; + + /** 文件路径 */ + @ApiModelProperty(value = "文件路径") + private String fileUrl; + + /** 数据字典 */ + @ApiModelProperty(value = "数据字典") + private Long dicId; + + /** 创建者 */ + private String createBy; + + private String ids; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + private String size; + private String type; + private int words; + private String creator; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/FileInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/FileInfoMapper.java new file mode 100644 index 00000000..bf25e2f0 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/FileInfoMapper.java @@ -0,0 +1,25 @@ +package com.bonus.sgzb.material.mapper; + +import com.bonus.sgzb.system.api.domain.SysFile; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author laker + * @since 2021-08-05 + */ +public interface FileInfoMapper { + + /** + * 新增 + * @param fileIsList + * @return int + */ + List selectSysFileByFileIds(String[] fileIsList); + + SysFile selectSysFileInfoById(Long valueOf); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index c4543ce2..94d907c3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -20,6 +20,7 @@ import com.bonus.sgzb.material.vo.GlobalContants; import com.bonus.sgzb.material.vo.RepairAuditDetailsVO; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import com.bonus.sgzb.material.vo.ScrapAudit; +import com.bonus.sgzb.system.api.domain.SysFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +50,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService @Resource private RepairTestInputMapper repairTestInputMapper; + @Resource + private FileInfoMapper sysFileMapper; + /** * 查询修试审核详细repair_apply_details @@ -288,6 +292,16 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetails.setCompanyId((long) companyId); + scrapApplyDetails.setAuditRemark(bean.getScrapReason()); + //根据fileIds获取所有的图片地址 + String[] fileIsList = bean.getFileIds().split(","); + StringBuffer fileUrl = new StringBuffer(); + for (int i = 0; i < fileIsList.length; i++) { + SysFile sysFile = sysFileMapper.selectSysFileInfoById(Long.valueOf(fileIsList[i])); + //对获取的图片地址进行拼接 + fileUrl.append(","+sysFile.getFileUrl()); + } + scrapApplyDetails.setFileUrl(fileUrl.toString()); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/FileInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/FileInfoMapper.xml new file mode 100644 index 00000000..56fb512d --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/FileInfoMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + select id, model_id, file_name, file_url, dic_id, create_by, create_time from sys_file_info + + + + + + + + + insert into sys_file_info + + model_id, + file_name, + file_url, + dic_id, + create_by, + create_time, + + + #{modelId}, + #{fileName}, + #{fileUrl}, + #{dicId}, + #{createBy}, + #{createTime}, + + + + + update sys_file_info + + model_id = #{modelId}, + file_name = #{fileName}, + file_url = #{fileUrl}, + dic_id = #{dicId}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from sys_file_info where id = #{id} + + + + delete from sys_file_info where id in + + #{id} + + + \ No newline at end of file