From 7db751ab74bd8c4e0fceca7510e918e9d1515483 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 30 Jul 2025 10:45:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/common/mapper/SelectMapper.java | 23 ++- .../service/impl/SelectServiceImpl.java | 37 +++- .../mapper/material/common/SelectMapper.xml | 195 +++++++++++++++++- 3 files changed, 239 insertions(+), 16 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java index 63371e04..491a96de 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java @@ -186,7 +186,7 @@ public interface SelectMapper { * @param bean * @return */ - List getTeamList(ProAuthorizeInfo bean); + List getTeamList(ProAuthorizeInfo bean); /** * 获取工程下拉选 @@ -257,4 +257,25 @@ public interface SelectMapper { * @return */ List getAgreementInfoByIdBack(SelectDto dto); + + /** + * 获取无需授权的项目部和后勤单位 + * @param bmUnit + * @return + */ + List getUnitListXm(BmUnit bmUnit); + + /** + * 获取项目部项目 + * @param bean + * @return + */ + List getUnitListPro(ProAuthorizeInfo bean); + + /** + * 获取部门项目 + * @param bmUnit + * @return + */ + BmUnit selectUnitByLeaseId(BmUnit bmUnit); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index 89843627..8022b466 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -209,13 +209,29 @@ public class SelectServiceImpl implements SelectService { @Override public AjaxResult getTeamList(ProAuthorizeInfo bean) { + List groupList = new ArrayList<>(); + List list; try { - // 班组固定查询，typeId为1731 - return AjaxResult.success(mapper.getTeamList(bean)); + list = mapper.getUnitListPro(bean); + list = list.stream() + .filter(Objects::nonNull) + .filter(unit -> unit.getId() != null && unit.getParentId() != null) + .collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + ProjectTreeBuild treeBuild = new ProjectTreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + // 获取已授权班组，进行数据拼接 + List newList = mapper.getTeamList(bean); + if (CollectionUtils.isNotEmpty(newList)) { + groupList.addAll(newList); + } + } } catch (Exception e) { - log.error("班组-查询失败", e); - return AjaxResult.success(new ArrayList<>()); + log.error("单位类型树-查询失败", e); } + return AjaxResult.success(groupList); } /** @@ -267,7 +283,18 @@ public class SelectServiceImpl implements SelectService { List groupList = new ArrayList<>(); List list; try { - list = mapper.getUnitList(bmUnit); + list = mapper.getUnitListXm(bmUnit); + // 根据leaseId查询授权单位 + BmUnit info = mapper.selectUnitByLeaseId(bmUnit); + if (info != null && info.getUnitId() != null) { + // 根据单位id查询授权单位树 + bmUnit.setUnitId(info.getUnitId()); + List unitList = mapper.getUnitList(bmUnit); + if (CollectionUtils.isNotEmpty(unitList)) { + list.addAll(unitList); + } + + } list = list.stream() .filter(Objects::nonNull) .filter(unit -> unit.getId() != null && unit.getParentId() != null) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 2a6e9a64..bf8df096 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bu.dept_id = #{deptId} + + AND bu.unit_id = #{unitId} + UNION @@ -59,6 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bu.dept_id = #{deptId} + + AND bu.unit_id = #{unitId} + UNION SELECT @@ -84,6 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bu.dept_id = #{deptId} + + AND bu.unit_id = #{unitId} + ) ff ORDER BY LEVEL @@ -455,16 +464,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + From 33df1a731128f58cbd1d2c946398876d8447ca95 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 30 Jul 2025 11:28:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E4=B8=8B=E6=8B=89=E9=80=89=E3=80=81=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClzSltAgreementInfoController.java | 7 ++ .../clz/mapper/ClzSltAgreementInfoMapper.java | 6 ++ .../service/ClzSltAgreementInfoService.java | 10 +++ .../impl/ClzSltAgreementInfoServiceImpl.java | 67 +++++++++++++++++- .../material/clz/ClzAgreementInfoMapper.xml | 69 +++++++++++++++++-- 5 files changed, 152 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java index cf3c06b7..7ae139f8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java @@ -3,6 +3,7 @@ package com.bonus.material.clz.controller; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.material.basic.domain.BmProject; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; import com.bonus.material.clz.service.ClzSltAgreementInfoService; @@ -50,6 +51,12 @@ public class ClzSltAgreementInfoController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "工程下拉选根据材料站单位查询") + @PostMapping("getProjectListByUnitIds") + public AjaxResult getProjectListByUnitIds(@RequestBody BmProject bmProject) { + return clzSltAgreementInfoService.getProjectListByUnitIds(bmProject); + } + @ApiOperation(value = "根据协议获取结算清单") @PostMapping("/getSltInfo") public AjaxResult getSltInfo(@RequestBody List list) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java index cbab6cb9..4fdabf03 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.clz.mapper; +import com.bonus.common.biz.domain.ProjectTreeNode; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; import com.bonus.material.settlement.domain.SltAgreementReduce; @@ -20,6 +21,11 @@ public interface ClzSltAgreementInfoMapper { */ List getSltAgreementInfo4Project(MaterialSltAgreementInfo bean); + Integer[] getProjectListByUnitIds(int unitId); + + List getProjectList(int projectId); + + /** * 获取租赁列表 * @param info diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java index f33c8eea..6a2967b0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java @@ -1,5 +1,7 @@ package com.bonus.material.clz.service; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.basic.domain.BmProject; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; @@ -25,6 +27,14 @@ public interface ClzSltAgreementInfoService { */ MaterialSltInfoVo getSltInfo(MaterialSltAgreementInfo info); + /** + * 工程下拉框 + * + * @param bmProject 工程下拉框 + * @return 工程下拉框 + */ + AjaxResult getProjectListByUnitIds(BmProject bmProject); + /** * 提交结算清单 * @param sltInfoVo diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java index d4d8389c..300e8ba6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java @@ -1,21 +1,24 @@ package com.bonus.material.clz.service.impl; +import com.bonus.common.biz.domain.ProjectTreeBuild; +import com.bonus.common.biz.domain.ProjectTreeNode; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.basic.domain.BmProject; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; import com.bonus.material.clz.mapper.ClzSltAgreementInfoMapper; import com.bonus.material.clz.service.ClzSltAgreementInfoService; import com.bonus.material.settlement.domain.SltAgreementReduce; import com.bonus.material.settlement.domain.SltAgreementRelation; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -103,6 +106,64 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic return sltInfoVo; } + /** + * 工程下拉框 + * + * @param bmProject 工程下拉框 + * @return 工程下拉框 + */ + @Override + public AjaxResult getProjectListByUnitIds(BmProject bmProject) { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + if (bmProject.getUnitIds()!=null) { + Map map= new HashMap<>(); + for (int i = 0; i < bmProject.getUnitIds().length; i++) { + int id = bmProject.getUnitIds()[i]; + Integer[] projectIds= clzSltAgreementInfoMapper.getProjectListByUnitIds(bmProject.getUnitIds()[i]); + Map mapTemp = new HashMap<>(); + for (int projectId : projectIds) { + mapTemp.put(projectId, 1); + } + mapTemp.forEach((k,v) -> { + if (map.containsKey(k)) { + map.put(k, map.get(k) + v); + } else { + map.put(k, v); + } + }); + } + if (!map.isEmpty()) { + List keys = new ArrayList<>(); + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue() == bmProject.getUnitIds().length) { + keys.add(entry.getKey()); + } + } + for (Integer key : keys) { + List listTemp = clzSltAgreementInfoMapper.getProjectList(key); + for (ProjectTreeNode node : listTemp) { + if (!list.contains(node)) { + list.add(node); + } + } + } + } + } + + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + ProjectTreeBuild treeBuild = new ProjectTreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + } catch (Exception e) { + return AjaxResult.error(e+"工程下拉树查询失败"); + } + return AjaxResult.success(groupList); + } + /** * 提交结算清单 * @param sltInfoVo diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml index 3a447bb5..8ef10673 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml @@ -50,8 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where agreement_id = #{agreementId} - SELECT bai.agreement_id as agreementId, bai.agreement_code as agreementCode, bui.unit_id as unitId,bui.unit_name as unitName, bp.pro_id as projectId , bp.pro_name as projectName, saa.remark,bai.protocol,saa.cost as costs, @@ -115,8 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sai.agreement_id = #{agreementId} - select sai.id, sai.agreement_id as agreementId, bui.unit_name as unitName, @@ -173,4 +171,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from clz_slt_agreement_apply saa where saa.agreement_id = #{agreementId} + + + + + + \ No newline at end of file From 5064809f9e190d203f660d78da12f224028a88e3 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 30 Jul 2025 13:50:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/mapper/BmAgreementInfoMapper.java | 12 ++++++++++++ .../service/impl/ClzSltAgreementInfoServiceImpl.java | 5 +++-- .../service/impl/MaterialLeaseInfoServiceImpl.java | 2 +- .../mapper/material/basic/BmAgreementInfoMapper.xml | 4 ++++ .../mapper/material/clz/ClzAgreementInfoMapper.xml | 4 ++-- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java index 9600b17d..2b519aa4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java @@ -82,5 +82,17 @@ public interface BmAgreementInfoMapper BmAgreementInfo queryByTeamIdAndProjectIdCl(BmAgreementInfo bmAgreementInfo); + /** + * 新增材料站协议信息 + * @param bmAgreementInfo + * @return + */ int insertBmAgreementInfoClz(BmAgreementInfo bmAgreementInfo); + + /** + * 查询材料站协议列表 + * @param nowDate + * @return + */ + int selectNumByMonthClz(Date nowDate); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java index 300e8ba6..2cc3156b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -394,7 +395,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic if (null == bean.getLeasePrice()) { bean.setLeasePrice(BigDecimal.valueOf(0.00)); }else{ - bean.setLeasePrice(bean.getLeasePrice().setScale(2, BigDecimal.ROUND_HALF_UP)); + bean.setLeasePrice(bean.getLeasePrice().setScale(2, RoundingMode.HALF_UP)); } if (null == bean.getNum()) { bean.setNum(BigDecimal.valueOf(0L)); @@ -405,7 +406,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = bean.getNum(); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); - BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays).setScale(2, BigDecimal.ROUND_HALF_UP); + BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays).setScale(2, RoundingMode.HALF_UP); bean.setCosts(costs); } return leaseList; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index bbb608dc..34e51f59 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -992,7 +992,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); String result = format.replace("-", ""); - int num = bmAgreementInfoMapper.selectNumByMonth(nowDate); + int num = bmAgreementInfoMapper.selectNumByMonthClz(nowDate); return MaterialConstants.AGREEMENT_PREFIX + result + String.format("-%03d", num + 1); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml index 209e4966..0069998d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml @@ -194,4 +194,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" unit_id = #{unitId} and project_id = #{projectId} + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml index 8ef10673..6c0a5eb2 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" saa.remark,bai.protocol,saa.cost as costs, case when (saa.id is null or saa.status = '0') then '0' when saa.status = '1' then '1' when saa.status = '2' then '2' when saa.status = '3' then '3' end as sltStatus FROM clz_slt_agreement_info sai - LEFT JOIN bm_agreement_info bai ON bai.agreement_id = sai.agreement_id + LEFT JOIN clz_bm_agreement_info bai ON bai.agreement_id = sai.agreement_id LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id LEFT JOIN clz_slt_agreement_apply saa on saa.agreement_id = bai.agreement_id @@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DATE(sai.end_time) as endTime, DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays from clz_slt_agreement_info sai - LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id + LEFT JOIN clz_bm_agreement_info bai on sai.agreement_id = bai.agreement_id LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id left join ma_type mt on sai.type_id = mt.type_id From 91efabadc6c4d29ec386c06d0871d541bea0dc5d Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 30 Jul 2025 14:12:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClzSltAgreementInfoController.java | 9 ++++++++- .../clz/mapper/ClzSltAgreementInfoMapper.java | 3 +++ .../service/ClzSltAgreementInfoService.java | 4 ++++ .../impl/ClzSltAgreementInfoServiceImpl.java | 18 ++++++++++++++++++ .../material/clz/ClzAgreementInfoMapper.xml | 15 +++++++++++++++ 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java index 7ae139f8..f15a56e7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java @@ -7,6 +7,7 @@ import com.bonus.material.basic.domain.BmProject; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; import com.bonus.material.clz.service.ClzSltAgreementInfoService; +import com.bonus.material.common.domain.dto.SelectDto; import com.bonus.material.settlement.domain.SltAgreementReduce; import com.bonus.material.settlement.domain.SltAgreementRelation; import com.bonus.material.task.domain.TmTask; @@ -51,12 +52,18 @@ public class ClzSltAgreementInfoController extends BaseController { return getDataTable(list); } - @ApiOperation(value = "工程下拉选根据材料站单位查询") + @ApiOperation(value = "工程下拉选根据材料站班组查询") @PostMapping("getProjectListByUnitIds") public AjaxResult getProjectListByUnitIds(@RequestBody BmProject bmProject) { return clzSltAgreementInfoService.getProjectListByUnitIds(bmProject); } + @ApiOperation(value = "往来单位id和标段工程id获取协议信息") + @PostMapping("getAgreementInfoById") + public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ + return clzSltAgreementInfoService.getAgreementInfoById(dto); + } + @ApiOperation(value = "根据协议获取结算清单") @PostMapping("/getSltInfo") public AjaxResult getSltInfo(@RequestBody List list) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java index 4fdabf03..b9329325 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/ClzSltAgreementInfoMapper.java @@ -3,6 +3,7 @@ package com.bonus.material.clz.mapper; import com.bonus.common.biz.domain.ProjectTreeNode; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; +import com.bonus.material.common.domain.vo.AgreementVo; import com.bonus.material.settlement.domain.SltAgreementReduce; import org.apache.ibatis.annotations.Param; @@ -25,6 +26,8 @@ public interface ClzSltAgreementInfoMapper { List getProjectList(int projectId); + List getAgreementInfoById(@Param("unitIds") List unitIds, @Param("projectId") int projectId); + /** * 获取租赁列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java index 6a2967b0..45aae129 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java @@ -4,6 +4,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.basic.domain.BmProject; import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; +import com.bonus.material.common.domain.dto.SelectDto; import java.util.List; @@ -35,6 +36,9 @@ public interface ClzSltAgreementInfoService { */ AjaxResult getProjectListByUnitIds(BmProject bmProject); + AjaxResult getAgreementInfoById(SelectDto dto); + + /** * 提交结算清单 * @param sltInfoVo diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java index 2cc3156b..a43bf311 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java @@ -11,6 +11,8 @@ import com.bonus.material.clz.domain.vo.MaterialSltAgreementInfo; import com.bonus.material.clz.domain.vo.sltAgreementInfo.MaterialSltInfoVo; import com.bonus.material.clz.mapper.ClzSltAgreementInfoMapper; import com.bonus.material.clz.service.ClzSltAgreementInfoService; +import com.bonus.material.common.domain.dto.SelectDto; +import com.bonus.material.common.domain.vo.AgreementVo; import com.bonus.material.settlement.domain.SltAgreementReduce; import com.bonus.material.settlement.domain.SltAgreementRelation; import org.apache.commons.collections4.CollectionUtils; @@ -165,6 +167,22 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic return AjaxResult.success(groupList); } + @Override + public AjaxResult getAgreementInfoById(SelectDto dto) { + List vo = new ArrayList<>(); + try { + List list = clzSltAgreementInfoMapper.getAgreementInfoById(dto.getUnitIds(), Integer.parseInt(dto.getProjectId())); + if (CollectionUtils.isNotEmpty(list)) { + vo = list; + } else { + return AjaxResult.error("未找到匹配的协议信息"); + } + } catch (Exception e) { + return AjaxResult.error(e+"协议查询失败"); + } + return AjaxResult.success(vo); + } + /** * 提交结算清单 * @param sltInfoVo diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml index 6c0a5eb2..5a010cdd 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml @@ -234,4 +234,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY level + + \ No newline at end of file From a754499791c50ecb9e3fa42f6c87815bcfd85c13 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 30 Jul 2025 14:23:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/repair/RepairMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 1e24f30c..f334ca71 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -2,8 +2,8 @@ - insert into repair_apply_record (task_id,ma_id,type_id,repair_num,scrap_num,repair_type,create_by,create_time,repair_content,company_id,scrap_id,scrap_reason,scrap_type,supplier_id,part_num,part_price,part_type,part_name,repairer,file_ids,remark,part_id,remark) - values (#{taskId},#{maId},#{typeId},#{repairNum},#{scrapNum},#{repairType},#{createBy},now(),#{repairContent},#{companyId}, #{scrapId},#{scrapReason},#{scrapType},#{supplierId},#{partNum},#{partPrice},#{partType},#{partName},#{repairer},#{fileIds},#{remark},#{partId},#{remark}); + insert into repair_apply_record (task_id,ma_id,type_id,repair_num,scrap_num,repair_type,create_by,create_time,repair_content,company_id,scrap_id,scrap_reason,scrap_type,supplier_id,part_num,part_price,part_type,part_name,repairer,file_ids,remark,part_id) + values (#{taskId},#{maId},#{typeId},#{repairNum},#{scrapNum},#{repairType},#{createBy},now(),#{repairContent},#{companyId}, #{scrapId},#{scrapReason},#{scrapType},#{supplierId},#{partNum},#{partPrice},#{partType},#{partName},#{repairer},#{fileIds},#{remark},#{partId}); From 847e0eaac8023aef18e15be3891e8056f22db6fa Mon Sep 17 00:00:00 2001 From: jiang Date: Wed, 30 Jul 2025 15:42:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=97=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/codeCollection/WsMaInfoMapper.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml index 0e176313..59663eed 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml @@ -89,10 +89,8 @@ ws_ma_info - and ma_code like concat('%', #{maCode}, '%') - - - and qr_code = #{qrCode} + and (ma_code like concat('%', #{maCode}, '%') + or qr_code = #{maCode}) LIMIT 10 @@ -115,10 +113,8 @@ LEFT JOIN ma_type mt1 ON mt1.type_id = mt.parent_id - and mm.ma_code like concat('%', #{maCode}, '%') - - - and qr_code = #{qrCode} + and (mm.ma_code like concat('%', #{maCode}, '%') + or mm.qr_code = #{maCode}) LIMIT 10 From 58d40d964a7c83ec3da5d07e77ae62e62b99aeec Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 30 Jul 2025 15:53:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor(bonus-material):=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E5=8D=8F=E8=AE=AE=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=92=8C=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 mergerData 和 handleData 方法从控制器移动到服务层 - 优化了数据合并和处理的逻辑 - 使用 StringUtils 和 Objects 类改进了字符串和对象的处理- 调整了方法参数和返回类型，提高了代码的可读性和可维护性 --- .../ClzSltAgreementInfoController.java | 58 +------- .../service/ClzSltAgreementInfoService.java | 4 + .../impl/ClzSltAgreementInfoServiceImpl.java | 126 ++++++++++++------ .../SltAgreementInfoController.java | 1 + 4 files changed, 89 insertions(+), 100 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java index f15a56e7..d3e1e224 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java @@ -60,7 +60,7 @@ public class ClzSltAgreementInfoController extends BaseController { @ApiOperation(value = "往来单位id和标段工程id获取协议信息") @PostMapping("getAgreementInfoById") - public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ + public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto) { return clzSltAgreementInfoService.getAgreementInfoById(dto); } @@ -79,7 +79,7 @@ public class ClzSltAgreementInfoController extends BaseController { dataList.add(vo); agreementId = info.getAgreementId(); } - bean = mergerData(bean, dataList,unitNames,projectNames); + bean = clzSltAgreementInfoService.mergerData(bean, dataList,unitNames,projectNames); // 根据协议id获取申请时间 TmTask tmTask = taskMapper.selectTaskByIdByCl(agreementId); if (tmTask != null) { @@ -88,60 +88,6 @@ public class ClzSltAgreementInfoController extends BaseController { return AjaxResult.success(bean); } - public MaterialSltInfoVo mergerData(MaterialSltInfoVo vo,List list,List unitNames,List projectNames){ - vo.setUnitName(handleData(unitNames)); - vo.setProjectName(handleData(projectNames)); - BigDecimal leaseCost = BigDecimal.valueOf(0.00); - BigDecimal repairCost = BigDecimal.valueOf(0.00); - BigDecimal scrapCost = BigDecimal.valueOf(0.00); - BigDecimal loseCost = BigDecimal.valueOf(0.00); - BigDecimal reducCost = BigDecimal.valueOf(0.00); - //租赁费用列表 - List leaseList = new ArrayList<>(); - //维修费用列表 - List repairList = new ArrayList<>(); - //报废费用列表 - List scrapList = new ArrayList<>(); - //丢失费用列表 - List loseList = new ArrayList<>(); - //减免费用列表 - List reductionList = new ArrayList<>(); - List relations = new ArrayList<>(); - for (MaterialSltInfoVo infoVo : list) { - leaseCost = leaseCost.add(infoVo.getLeaseCost()); - repairCost = repairCost.add(infoVo.getRepairCost()); - scrapCost = scrapCost.add(infoVo.getScrapCost()); - loseCost = loseCost.add(infoVo.getLoseCost()); - reducCost = reducCost.add(infoVo.getReductionCost()); - leaseList.addAll(infoVo.getLeaseList()); - repairList.addAll(infoVo.getRepairList()); - scrapList.addAll(infoVo.getScrapList()); - loseList.addAll(infoVo.getLoseList()); - reductionList.addAll(infoVo.getReductionList()); - relations.addAll(infoVo.getRelations()); - } - vo.setLeaseList(leaseList); - vo.setRepairList(repairList); - vo.setScrapList(scrapList); - vo.setLoseList(loseList); - vo.setReductionList(reductionList); - vo.setLeaseCost(leaseCost); - vo.setRepairCost(repairCost); - vo.setScrapCost(scrapCost); - vo.setLoseCost(loseCost); - vo.setReductionCost(reducCost); - vo.setRelations(relations); - return vo; - } - - public String handleData(List list){ - StringBuilder sb = new StringBuilder(); - Set set = new HashSet<>(list); - for (String str : set) { - sb.append(str).append("、"); - } - return StringUtils.removeEnd(sb.toString(), "、"); - } /** * 提交结算清单 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java index 45aae129..0fe8f76f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/ClzSltAgreementInfoService.java @@ -28,6 +28,10 @@ public interface ClzSltAgreementInfoService { */ MaterialSltInfoVo getSltInfo(MaterialSltAgreementInfo info); + MaterialSltInfoVo mergerData(MaterialSltInfoVo vo, List list, List unitNames, List projectNames); + + String handleData(List list); + /** * 工程下拉框 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java index a43bf311..57579da1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java @@ -16,6 +16,7 @@ import com.bonus.material.common.domain.vo.AgreementVo; import com.bonus.material.settlement.domain.SltAgreementReduce; import com.bonus.material.settlement.domain.SltAgreementRelation; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -36,8 +37,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic /** * 根据条件获取协议结算列表 - * @param bean - * @return + * @param bean 查询条件 */ @Override public List getSltAgreementInfo4Project(MaterialSltAgreementInfo bean) { @@ -79,16 +79,6 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic leaseCost = leaseCost.add(lease.getCosts()); } } - /*for (MaterialSltAgreementInfo repair : repairList) { - if(repair.getCosts()!=null && (repair.getPartType().equals("收费"))){ - repairCost = repairCost.add(repair.getCosts()); - } - } - for (MaterialSltAgreementInfo scrap : scrapList) { - if(scrap.getCosts()!=null && (scrap.getPartType().equals("收费"))){ - scrapCost = scrapCost.add(scrap.getCosts()); - } - }*/ for (MaterialSltAgreementInfo lose : loseList) { if(lose.getCosts()!=null){ loseCost = loseCost.add(lose.getCosts()); @@ -109,6 +99,63 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic return sltInfoVo; } + @Override + public MaterialSltInfoVo mergerData(MaterialSltInfoVo vo, List list, List unitNames, List projectNames) { + vo.setUnitName(handleData(unitNames)); + vo.setProjectName(handleData(projectNames)); + BigDecimal leaseCost = BigDecimal.valueOf(0.00); + BigDecimal repairCost = BigDecimal.valueOf(0.00); + BigDecimal scrapCost = BigDecimal.valueOf(0.00); + BigDecimal loseCost = BigDecimal.valueOf(0.00); + BigDecimal reducCost = BigDecimal.valueOf(0.00); + //租赁费用列表 + List leaseList = new ArrayList<>(); + //维修费用列表 + List repairList = new ArrayList<>(); + //报废费用列表 + List scrapList = new ArrayList<>(); + //丢失费用列表 + List loseList = new ArrayList<>(); + //减免费用列表 + List reductionList = new ArrayList<>(); + List relations = new ArrayList<>(); + for (MaterialSltInfoVo infoVo : list) { + leaseCost = leaseCost.add(infoVo.getLeaseCost()); + repairCost = repairCost.add(infoVo.getRepairCost()); + scrapCost = scrapCost.add(infoVo.getScrapCost()); + loseCost = loseCost.add(infoVo.getLoseCost()); + reducCost = reducCost.add(infoVo.getReductionCost()); + leaseList.addAll(infoVo.getLeaseList()); + repairList.addAll(infoVo.getRepairList()); + scrapList.addAll(infoVo.getScrapList()); + loseList.addAll(infoVo.getLoseList()); + reductionList.addAll(infoVo.getReductionList()); + relations.addAll(infoVo.getRelations()); + } + vo.setLeaseList(leaseList); + vo.setRepairList(repairList); + vo.setScrapList(scrapList); + vo.setLoseList(loseList); + vo.setReductionList(reductionList); + vo.setLeaseCost(leaseCost); + vo.setRepairCost(repairCost); + vo.setScrapCost(scrapCost); + vo.setLoseCost(loseCost); + vo.setReductionCost(reducCost); + vo.setRelations(relations); + return vo; + } + + @Override + public String handleData(List list) { + StringBuilder sb = new StringBuilder(); + Set set = new HashSet<>(list); + for (String str : set) { + sb.append(str).append("、"); + } + return StringUtils.removeEnd(sb.toString(), "、"); + } + /** * 工程下拉框 * @@ -169,7 +216,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic @Override public AjaxResult getAgreementInfoById(SelectDto dto) { - List vo = new ArrayList<>(); + List vo; try { List list = clzSltAgreementInfoMapper.getAgreementInfoById(dto.getUnitIds(), Integer.parseInt(dto.getProjectId())); if (CollectionUtils.isNotEmpty(list)) { @@ -191,7 +238,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic @Override public int submitCosts(MaterialSltInfoVo sltInfoVo) { try { - if(sltInfoVo.getAgreementIds()!=null) { + if (sltInfoVo.getAgreementIds() != null) { for (Long agreementId : sltInfoVo.getAgreementIds()) { Long id = null; @@ -260,7 +307,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic throw new ServiceException("bm_agreement_info修改失败"); }*/ } - if (sltInfoVo.getLeaseList().size() > 0) { + if (!sltInfoVo.getLeaseList().isEmpty()) { List filteredLeaseList = sltInfoVo.getLeaseList().stream() .filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId())) .collect(Collectors.toList()); @@ -284,7 +331,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic clzSltAgreementInfoMapper.insertSltAgreementDetailScrap(filteredScrapList, id); } }*/ - if (sltInfoVo.getLoseList().size() > 0) { + if (!sltInfoVo.getLoseList().isEmpty()) { List filteredLoseList = sltInfoVo.getLoseList().stream() .filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId())) .collect(Collectors.toList()); @@ -302,23 +349,22 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic /** * 获取结算关系列表 - * @param leaseList - * @param repairList - * @param scrapList - * @param loseList - * @param sltInfo - * @return + * @param leaseList 领料数据 + * @param repairList 维修数据 + * @param scrapList 报废数据 + * @param loseList 丢失数据 + * @param sltInfo 结算信息 + * @return 协议费用列表 */ private List getRelations(List leaseList, List repairList, List scrapList, List loseList, MaterialSltAgreementInfo sltInfo) { List relations = new ArrayList<>(); -// for (SltAgreementInfo info : list) { SltAgreementRelation relation = new SltAgreementRelation(); BigDecimal loseCost = BigDecimal.ZERO; BigDecimal leaseCost = BigDecimal.ZERO; BigDecimal scrapCost = BigDecimal.ZERO; BigDecimal repairCost = BigDecimal.ZERO; for (MaterialSltAgreementInfo lease : leaseList) { - if (lease.getAgreementId().equals(sltInfo.getAgreementId().toString())) { + if (lease.getAgreementId().equals(sltInfo.getAgreementId())) { relation.setAgreementId(String.valueOf(lease.getAgreementId())); relation.setProjectName(lease.getProjectName()); relation.setUnitName(lease.getUnitName()); @@ -328,19 +374,19 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic } } for (MaterialSltAgreementInfo repair : repairList) { - if (repair.getAgreementId().equals(sltInfo.getAgreementId().toString())) { + if (repair.getAgreementId().equals(sltInfo.getAgreementId())) { BigDecimal cost = repair.getCosts(); repairCost = repairCost.add(cost); } } for (MaterialSltAgreementInfo scrap : scrapList) { - if (scrap.getAgreementId().equals(sltInfo.getAgreementId().toString())) { + if (scrap.getAgreementId().equals(sltInfo.getAgreementId())) { BigDecimal cost = scrap.getCosts(); scrapCost = scrapCost.add(cost); } } for (MaterialSltAgreementInfo lose : loseList) { - if (lose.getAgreementId().equals(sltInfo.getAgreementId().toString())) { + if (lose.getAgreementId().equals(sltInfo.getAgreementId())) { //TODO 上面已经set过值，这里为什么还要set值 relation.setAgreementId(String.valueOf(lose.getAgreementId())); relation.setProjectName(lose.getProjectName()); @@ -355,14 +401,12 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic relation.setScrapCost(scrapCost); relation.setLoseCost(loseCost); relations.add(relation); -// } return relations; } /** * 获取减免费用列表 - * @param info - * @return + * @param info 信息表 */ private List getReductionList(MaterialSltAgreementInfo info) { SltAgreementReduce bean =new SltAgreementReduce(); @@ -372,20 +416,17 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic /** * 获取丢失费用列表 - * @param info - * @return + * @param info 信息表 */ private List getLoseList(MaterialSltAgreementInfo info) { - List loseList = new ArrayList<>(); - List oneOfList = clzSltAgreementInfoMapper.getLoseList(info); - loseList.addAll(oneOfList); + List loseList = new ArrayList<>(oneOfList); for (MaterialSltAgreementInfo bean : loseList) { - if (null == bean.getBuyPrice()) { + if (Objects.isNull(bean.getBuyPrice())) { bean.setBuyPrice(BigDecimal.valueOf(0.00)); } - if (null == bean.getNum()) { + if (Objects.isNull(bean.getNum())) { bean.setNum(BigDecimal.valueOf(0L)); } BigDecimal buyPrice = bean.getBuyPrice(); @@ -400,14 +441,11 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic /** * 获取租赁费用列表 - * @param info - * @return + * @param info 获取租赁费用列表参数 */ private List getLeaseList(MaterialSltAgreementInfo info) { - List leaseList = new ArrayList<>(); - List oneOfList = clzSltAgreementInfoMapper.getLeaseList(info); - leaseList.addAll(oneOfList); + List leaseList = new ArrayList<>(oneOfList); for (MaterialSltAgreementInfo bean : leaseList) { if (null == bean.getLeasePrice()) { @@ -415,10 +453,10 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic }else{ bean.setLeasePrice(bean.getLeasePrice().setScale(2, RoundingMode.HALF_UP)); } - if (null == bean.getNum()) { + if (Objects.isNull(bean.getNum())) { bean.setNum(BigDecimal.valueOf(0L)); } - if (null == bean.getLeaseDays()) { + if (Objects.isNull(bean.getLeaseDays())) { bean.setLeaseDay(0L); } BigDecimal leasePrice = bean.getLeasePrice(); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index 5e2f2396..2c190960 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -129,6 +129,7 @@ public class SltAgreementInfoController extends BaseController { } return AjaxResult.success(bean); } + public SltInfoVo mergerData(SltInfoVo vo,List list,List unitNames,List projectNames){ vo.setUnitName(handleData(unitNames)); vo.setProjectName(handleData(projectNames));