日计划管道气销售结算

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.xjrsoft.module.system.vo.LngFileUploadVo;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -179,4 +181,10 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
     private List<LngPngSettleSalesVo> lngPngSettleSalesList;
 
 
+
+
+    private List<LngFileUploadVo> lngFileUploadList;
+	
+ 
+
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java

@@ -82,11 +82,8 @@ public class PngSettleHdrController {
     @ApiOperation(value="根据id查询LngPngSettleHdr信息")
     @SaCheckPermission("pngSettleHdr:detail")
     public R info(@RequestParam Long id){
-        LngPngSettleHdr lngPngSettleHdr = pngSettleHdrService.getByIdDeep(id);
+    	    LngPngSettleHdrVo lngPngSettleHdrVo = pngSettleHdrService.getInfoById(id);
-        if (lngPngSettleHdr == null) {
+        return R.ok(lngPngSettleHdrVo);
-           return R.error("找不到此数据！");
-        }
-        return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class));
     }
     
     @GetMapping(value = "/datalog")

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface LngPngSettleHdrMapper extends MPJBaseMapper<LngPngSettleHdr> {
+public interface LngPngSettleHdrMapper extends MPJBaseMapper<LngPngSettleHdr>,BaseMapper<LngPngSettleHdr> {
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper<LngPngSettleSalesDtl> {
+public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper<LngPngSettleSalesDtl>,BaseMapper<LngPngSettleSalesDtl> {
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface LngPngSettleSalesMapper extends MPJBaseMapper<LngPngSettleSales> {
+public interface LngPngSettleSalesMapper extends MPJBaseMapper<LngPngSettleSales>,BaseMapper<LngPngSettleSales> {
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java

@@ -4,6 +4,7 @@ import com.github.yulichang.base.MPJBaseService;
 import com.github.yulichang.extension.mapping.base.MPJDeepService;
 import com.github.yulichang.extension.mapping.base.MPJRelationService;
 import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
+import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
 
 /**
 * @title: service
@@ -14,4 +15,6 @@ import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
 
 public interface IPngSettleHdrService extends MPJBaseService<LngPngSettleHdr>, MPJDeepService<LngPngSettleHdr>, MPJRelationService<LngPngSettleHdr> {
 
+	LngPngSettleHdrVo getInfoById(Long id);
+    
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java

@@ -22,7 +22,6 @@ import com.pictc.utils.DataLogTools;
 import com.pictc.utils.ObjectDiffUtils;
 import com.pictc.utils.StringUtils;
 import com.xjrsoft.common.exception.BusinessException;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.datalog.vo.CompareResultVo;
 import com.xjrsoft.module.dayPlan.dto.UpdateLngPngApproDto;
@@ -32,7 +31,6 @@ import com.xjrsoft.module.dayPlan.entity.LngPngAppro;
 import com.xjrsoft.module.dayPlan.entity.LngPngDemand;
 import com.xjrsoft.module.dayPlan.mapper.LngPngApproMapper;
 import com.xjrsoft.module.dayPlan.mapper.LngPngDemandMapper;
-import com.xjrsoft.module.dayPlan.mapper.LngPngDemandPurMapper;
 import com.xjrsoft.module.dayPlan.service.IDemandService;
 import com.xjrsoft.module.dayPlan.vo.LngPngDemandPurVo;
 import com.xjrsoft.module.dayPlan.vo.LngPngDemandVo;

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java

@@ -1,21 +1,26 @@
 package com.xjrsoft.module.dayPlan.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Collection;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
-import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper;
-import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
-import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper;
-import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
-import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper;
-import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
-import java.util.Objects;
+
-import java.util.stream.Collectors;
+import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.pictc.utils.CollectionUtils;
+import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
+import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
+import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
+import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper;
+import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper;
+import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper;
+import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService;
+import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
+import com.xjrsoft.module.system.client.IFileClient;
+import com.xjrsoft.module.system.vo.LngFileUploadVo;
+
+import cn.hutool.core.bean.BeanUtil;
+import lombok.AllArgsConstructor;
 
 /**
 * @title: service
@@ -26,10 +31,34 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl<LngPngSettleHdrMapper, LngPngSettleHdr> implements IPngSettleHdrService {
-    private final LngPngSettleHdrMapper pngSettleHdrLngPngSettleHdrMapper;
+    private final LngPngSettleHdrMapper lngPngSettleHdrMapper;
 
-    private final LngPngSettleSalesMapper pngSettleHdrLngPngSettleSalesMapper;
+    private final LngPngSettleSalesMapper lngPngSettleSalesMapper;
-    private final LngPngSettleSalesDtlMapper pngSettleHdrLngPngSettleSalesDtlMapper;
+    
+    private final LngPngSettleSalesDtlMapper lngPngSettleSalesDtlMapper;
+    
+    private final IFileClient fileClient;
+    
+    
+	@Override
+	public LngPngSettleHdrVo getInfoById(Long id) {
+		LngPngSettleHdr lngPngSettleHdr = this.getByIdDeep(id);
+      	if(lngPngSettleHdr == null) {
+      		return null;
+      	}
+      	
+      	if(CollectionUtils.isNotEmpty(lngPngSettleHdr.getLngPngSettleSalesList())) {
+      		for(LngPngSettleSales ss:lngPngSettleHdr.getLngPngSettleSalesList()) {
+      			List<LngPngSettleSalesDtl> list = lngPngSettleSalesDtlMapper.selectList(new LambdaQueryWrapper<LngPngSettleSalesDtl>()
+      	        .eq(LngPngSettleSalesDtl::getSettleId, ss.getId()));
+      			ss.setLngPngSettleSalesDtlList(list);
+      		}
+      	}
+      	LngPngSettleHdrVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class);
+      	List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId());
+      	vo.setLngFileUploadList(fileList);
+      	return vo;
+	}
 
 
 }