From 8deba884a6109dcd99fc870deb22d18dbc6e4d4c Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Fri, 11 Apr 2025 17:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=EF=BC=8C=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=88=90=E5=A5=97=E8=AE=BE=E5=A4=87=E6=98=8E?= =?UTF-8?q?=E7=BB=86=EF=BC=8C=E7=BC=96=E7=A0=81=E7=BB=93=E7=AE=97=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/domain/SltAgreementInfo.java | 4 + .../sgzb/app/controller/TmTaskController.java | 12 +++ .../sgzb/app/domain/LeaseApplyDetails.java | 2 + .../sgzb/app/domain/LeaseOutDetailRecord.java | 12 +++ .../com/bonus/sgzb/app/domain/TmTask.java | 1 + .../app/mapper/LeaseApplyDetailsMapper.java | 4 + .../bonus/sgzb/app/mapper/TmTaskMapper.java | 2 + .../bonus/sgzb/app/service/TmTaskService.java | 2 + .../impl/LeaseOutDetailsServiceImpl.java | 12 ++- .../app/service/impl/TmTaskServiceImpl.java | 84 +++++++++++++++++++ .../SltAgreementInfoController.java | 1 + .../sgzb/material/domain/AgreementInfo.java | 1 + .../bonus/sgzb/material/domain/MaWholeVo.java | 6 ++ .../mapper/SltAgreementInfoMapper.java | 2 + .../impl/SltAgreementInfoServiceImpl.java | 82 +++++++++++++++++- .../mapper/app/LeaseApplyDetailsMapper.xml | 34 +++++++- .../resources/mapper/app/TmTaskMapper.xml | 15 ++++ .../mapper/material/MaWholeSetMapper.xml | 2 +- .../material/SltAgreementInfoMapper.xml | 29 +++++++ 19 files changed, 300 insertions(+), 7 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java index d97c6f5..99fbfb4 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java @@ -231,4 +231,8 @@ public class SltAgreementInfo { private Integer leaseType; private List node; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String endTimeTemp; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 7475aa1..f211eba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -627,6 +627,18 @@ public class TmTaskController extends BaseController { List leaseAuditList = tmTaskService.getLeaseListAllCq(task); return getDataTable(leaseAuditList); } + + @Log(title = "重庆获取领料管理-详情列表", businessType = BusinessType.QUERY) + @GetMapping("/getLeaseListAllCqTwo") + @RequiresPermissions(value = {"picking:auditing:view", "picking:auditing:list"}, logical = Logical.OR) + public TableDataInfo getLeaseListAllCqTwo(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId, + @RequestParam(value = "maTypeUserId", required = false, defaultValue = "") String maTypeUserId) { + TmTask task = new TmTask(); + task.setTaskId(Long.parseLong(taskId)); + task.setMaTypeUserId(maTypeUserId); + List leaseAuditList = tmTaskService.getLeaseListAllCqTwo(task); + return getDataTable(leaseAuditList); + } @Log(title = "查询差缺量在哪些工程上申请", businessType = BusinessType.QUERY) @GetMapping("/getPreNumInUse") public AjaxResult getPreNumInUse(PreNumInUse tmTask) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index b5400b7..d767f4b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -219,4 +219,6 @@ public class LeaseApplyDetails implements Serializable { private Integer setsNum; @ApiModelProperty(value="默认1,0不是库存管理") private String isStorage; + + private List ctList; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java index 1f22134..163c400 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java @@ -1,8 +1,11 @@ package com.bonus.sgzb.app.domain; import com.bonus.sgzb.common.core.annotation.Excel; +import com.bonus.sgzb.material.domain.MaWholeVo; import lombok.Data; +import java.util.List; + /** * @Author：liang.chao * @Date：2024/9/26 - 18:01 @@ -10,6 +13,11 @@ import lombok.Data; @Data public class LeaseOutDetailRecord { + + private Integer taskId; + + private Integer typeId; + @Excel(name = "规格型号") private String typeModelName; @@ -41,4 +49,8 @@ public class LeaseOutDetailRecord { //计量单位 private String unitNames; + + //成套设备信息 + private List maWholeVos; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index 3257b6f..91d5bc3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -172,6 +172,7 @@ public class TmTask implements Serializable { private List leaseApplyDetails; /** 机具规格详情列表 */ private Map> ctLeaseApplyDetails; + private List ctList; private List leaseOutDetailRecord; @ApiModelProperty(value = "协议id") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java index 3b1efd6..ceb40c1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java @@ -4,6 +4,8 @@ import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.domain.LeaseOutDetailRecord; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.MaMachine; +import com.bonus.sgzb.material.domain.MaWholeVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -56,6 +58,8 @@ public interface LeaseApplyDetailsMapper { List getOrderBody(@Param("parentId") String parentId,@Param("typeId") String typeId); + List getCtList(LeaseOutDetailRecord record); + List getLeaseApplyDetailsTypeCount(BackApplyInfo bean); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 3f954ea..4f731c5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -171,4 +171,6 @@ public interface TmTaskMapper { String getLeaseInfoId(String taskId); int deleteDetailsById(String id); + + LeaseApplyDetails getCtBean(Integer typeId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 7a167a3..70c41d5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -104,6 +104,8 @@ public interface TmTaskService{ List getLeaseListAllCq(TmTask task); + List getLeaseListAllCqTwo(TmTask task); + List getLeaseOutListByUser(TmTask task); /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 5e592ee..cae7538 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -18,6 +18,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; +import com.bonus.sgzb.material.domain.MaWholeVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -149,11 +150,20 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { public TmTask getLeaseOutOrder(String parentId, String typeId) { TmTask orderHead = leaseApplyDetailsMapper.getOrderHead(parentId); List list = leaseApplyDetailsMapper.getOrderBody(parentId, typeId); + for (LeaseOutDetailRecord record : list) { + List maWholeVoList = leaseApplyDetailsMapper.getCtList(record); + if (CollUtil.isNotEmpty(maWholeVoList)) { + record.setOutNum(String.valueOf(maWholeVoList.get(0).getSetsNum())); + record.setMaWholeVos(maWholeVoList); + record.setMaCode(null); + record.setRemark(null); + } + } if (!CollectionUtils.isEmpty(list)) { // 获取第一个创建时间 String createTime = list.get(0).getCreateTime(); // 将createTime转换为date类型，保留年月日 - Date date = DateUtil.parse(createTime, "yyyy-MM-dd"); + Date date = DateUtil.parse(createTime, "yyyy-MM-dd HH:mm:ss"); orderHead.setOutTime(date); } orderHead.setLeaseOutDetailRecord(list); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index f5ca2db..999c5c8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -617,6 +617,90 @@ public class TmTaskServiceImpl implements TmTaskService { return tmTaskList; } + @Override + public List getLeaseListAllCqTwo(TmTask task) { + List tmTaskList = new ArrayList<>(); + TmTask tmTask = tmTaskMapper.getLeaseListTmTask(task); + if (tmTask != null) { + List leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task); + tmTask.setLeaseApplyInfoList(leaseApplyInfoList); + + List listLeaseDetails = new ArrayList<>(); + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsCq(leaseApplyInfo); + List arrayList = new ArrayList<>(); + if (leaseApplyDetails.size() > 0) { + //查询同规格下预出库量 + if (leaseApplyDetails != null) { + for (LeaseApplyDetails detail : leaseApplyDetails) { + + LeaseApplyDetails needDetails = tmTaskMapper.getApplyNeedDetailsCq(detail); + detail.setOutNum(needDetails.getOutNum()); + if (StringUtils.isNotBlank(task.getMaTypeUserId())) { + if (StringUtils.isNotBlank(detail.getMaTypeUserId())) { + // 将detail.getMaTypeUserId()转换为集合 + String[] maTypeUserIds = detail.getMaTypeUserId().split(","); + // 判断maTypeUserIds如果不包含task.getMaTypeUserId(),直接从leaseApplyDetails中移除 + if (Arrays.asList(maTypeUserIds).contains(task.getMaTypeUserId())) { + arrayList.add(detail); + } + } + } + } + } + + if (!CollectionUtils.isEmpty(arrayList)) { + listLeaseDetails.addAll(arrayList); + } else { + listLeaseDetails.addAll(leaseApplyDetails); + } + + } + } + } + List ctAllList = new ArrayList<>(); + Map> map = listLeaseDetails.stream() + .filter(detail -> detail.getIsCt() == 0) + .filter(detail -> detail.getCtParentId() != null) + .collect(Collectors.groupingBy(LeaseApplyDetails::getCtParentId)); + for (Map.Entry> entry : map.entrySet()) { + int num = entry.getValue().get(0).getSetsNum(); + List listTemp = entry.getValue(); + + Integer ctParentId = entry.getKey(); + LeaseApplyDetails lease = tmTaskMapper.getCtBean(ctParentId); + lease.setManageTypeName(null); + lease.setSetsNum(num); + lease.setPreNum(num); + String typeName = getParentNameById(ctParentId); + List ctList = entry.getValue(); + lease.setCtList(ctList); + ctAllList.add(lease); + } +// Map> transformedMap = map.entrySet().stream() +// .collect(Collectors.toMap( +// entry -> { +// Integer ctParentId = entry.getKey(); +// String typeName = getParentNameById(ctParentId); +// return typeName; +// }, +// Map.Entry::getValue // 获取分组后的LeaseApplyDetails列表 +// )); + List collect = listLeaseDetails.stream() + .filter(detail -> detail.getIsCt() == 1) + .filter(detail -> detail.getCtParentId() == null) + .collect(Collectors.toList()); + tmTask.setCtList(ctAllList); + tmTask.setLeaseApplyDetails(collect); + // 塞入领料任务详情的集合中 +// tmTask.setLeaseApplyDetails(listLeaseDetails); + } + tmTaskList.add(tmTask); + return tmTaskList; + } + @Override public List getLeaseOutListByUser(TmTask task) { Set roles = SecurityUtils.getLoginUser().getRoles(); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java index 59838e0..db8a546 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java @@ -82,6 +82,7 @@ public class SltAgreementInfoController extends BaseController { return AjaxResult.success(bean); } + /** * 根据协议获取月结算清单 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index b8403b0..af860d1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -173,4 +173,5 @@ public class AgreementInfo extends BaseEntity { */ @ApiModelProperty(value = "是否显示") private String isView; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java index 7b177d8..1ed7843 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java @@ -86,4 +86,10 @@ public class MaWholeVo { @ApiModelProperty(value = "预领数量") private Integer applyNum; + + /** + * 预领数量 + */ + @ApiModelProperty(value = "成套数量") + private Integer setsNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java index e0059b7..d611939 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java @@ -56,6 +56,8 @@ public interface SltAgreementInfoMapper { int updateTrimDay(SltAgreementInfo sltAgreementInfo); + List getCtList(SltAgreementInfo bean); + int updateInfoOneStatus(@Param("agreementIds") List agreementIds,@Param("costBearingParty") String costBearingParty); int updateAgreementStatus(SltAgreementInfo apply); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java index fdc3144..8c2672d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java @@ -67,7 +67,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { SltInfoVo sltInfoVo = new SltInfoVo(); //租赁费用列表 List leaseListOne = getLeaseListOne(list); - + //预报废费用列表 List leaseListThree = getLeaseListThree(list); //维修费用列表暂时不取 //List repairList = getRepairList(list); @@ -237,6 +237,35 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { // 实际结算金额 bean.setRealCosts(realCosts); } + Map mergedMap = new HashMap<>(); + for (SltAgreementInfo info : leaseList) { + String key = info.getTypeId(); + if (info.getStartTime() != null && info.getEndTime() != null) { + key += "_" + info.getStartTime() + "_" + info.getEndTime(); + } + if (mergedMap.containsKey(key)) { + SltAgreementInfo mergedInfo = mergedMap.get(key); + // 数量相加 + mergedInfo.setNum(mergedInfo.getNum() + info.getNum()); + // 实际结算金额相加 + mergedInfo.setRealCosts(mergedInfo.getRealCosts().add(info.getRealCosts())); + // 应结算金额相加 + mergedInfo.setCosts(mergedInfo.getCosts().add(info.getCosts())); + // 合并remark、ckRemark、outRemark + if (info.getRemark() != null && !info.getRemark().isEmpty()) { + mergedInfo.setRemark(mergedInfo.getRemark() + "、" + info.getRemark()); + } + if (info.getCkRemark() != null && !info.getCkRemark().isEmpty()) { + mergedInfo.setCkRemark(mergedInfo.getCkRemark() + "、" + info.getCkRemark()); + } + if (info.getOutRemark() != null && !info.getOutRemark().isEmpty()) { + mergedInfo.setOutRemark(mergedInfo.getOutRemark() + "、" + info.getOutRemark()); + } + } else { + mergedMap.put(key, info); + } + } + leaseList = new ArrayList<>(mergedMap.values()); return leaseList; } @@ -452,9 +481,22 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { public int updateTrimDay(List sltAgreementInfo) { int i = 0; for (SltAgreementInfo agreementInfo : sltAgreementInfo) { - i = sltAgreementInfoMapper.updateTrimDay(agreementInfo); - if (i == 0) { - return i; + List list = sltAgreementInfoMapper.getCtList(agreementInfo); + if (list!= null && list.size() > 0) { + for (SltAgreementInfo bean : list) { + bean.setTrimDay(agreementInfo.getTrimDay()); + bean.setEndTime(agreementInfo.getEndTime()); + i = sltAgreementInfoMapper.updateTrimDay(bean); + if (i == 0) { + return i; + } + } + + }else{ + i = sltAgreementInfoMapper.updateTrimDay(agreementInfo); + if (i == 0) { + return i; + } } } return i; @@ -630,6 +672,38 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { // 实际结算金额 bean.setRealCosts(realCosts); } +// // 如果isSlt不为0，则进行合并 +// if (list.get(0).getIsSlt() != null && list.get(0).getIsSlt() != 0) { + Map mergedMap = new HashMap<>(); + for (SltAgreementInfo info : leaseList) { + String key = info.getTypeId(); + if (info.getStartTime() != null && info.getEndTime() != null) { + key += "_" + info.getStartTime() + "_" + info.getEndTime(); + } + if (mergedMap.containsKey(key)) { + SltAgreementInfo mergedInfo = mergedMap.get(key); + // 数量相加 + mergedInfo.setNum(mergedInfo.getNum() + info.getNum()); + // 实际结算金额相加 + mergedInfo.setRealCosts(mergedInfo.getRealCosts().add(info.getRealCosts())); + // 应结算金额相加 + mergedInfo.setCosts(mergedInfo.getCosts().add(info.getCosts())); + // 合并remark、ckRemark、outRemark + if (info.getRemark() != null && !info.getRemark().isEmpty()) { + mergedInfo.setRemark(mergedInfo.getRemark() + "、" + info.getRemark()); + } + if (info.getCkRemark() != null && !info.getCkRemark().isEmpty()) { + mergedInfo.setCkRemark(mergedInfo.getCkRemark() + "、" + info.getCkRemark()); + } + if (info.getOutRemark() != null && !info.getOutRemark().isEmpty()) { + mergedInfo.setOutRemark(mergedInfo.getOutRemark() + "、" + info.getOutRemark()); + } + } else { + mergedMap.put(key, info); + } + } + leaseList = new ArrayList<>(mergedMap.values()); +// } return leaseList; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml index 52b0cff..d436b02 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml @@ -91,7 +91,9 @@ mt2.type_name typeName, lod.out_num, lod.remark, - mm.ma_code maCode + mm.ma_code maCode, + lod.parent_id as taskId, + lod.type_id as typeId FROM lease_out_details lod LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id @@ -110,6 +112,36 @@ + + delete from lease_apply_details where id = #{id,jdbcType=INTEGER} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml index f1ac746..fe35a25 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1341,4 +1341,19 @@ + + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml index 97ec964..4be65fa 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml @@ -142,7 +142,7 @@ ELSE IFNULL(mt.num, 0) END as num, - case when lad.update_num IS NOT NULL then lad.update_num else lad.pre_num * lad.sets_num end as applyNum, + case when lad.update_num IS NOT NULL then lad.update_num else lad.pre_num end as applyNum, mt.is_storage AS isStorage from lease_apply_details lad left join ma_type mt on lad.type_id = mt.type_id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index c30dadb..7a6ad29 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -105,6 +105,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + UPDATE slt_agreement_info sai LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id @@ -357,6 +379,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.trim_day as trimDay, DATE(sai.start_time) as startTime, DATE(sai.end_time) as endTime, + DATE(sai.end_time) as endTimeTemp, DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays from slt_agreement_info sai LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id @@ -367,6 +390,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_type mt on sai.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id where sai.agreement_id = #{agreementId} and sai.lease_type = 0 and lai.cost_bearing_party = '01' + + + +