受理单服务调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QR0405_202402ReportOFData.java

@@ -0,0 +1,234 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+import cn.start.tz.module.pressure2.dal.dataobject.acceptorder.AcceptOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderitem.BoilerAcceptOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
+import cn.start.tz.module.pressure2.dal.mysql.acceptorder.AcceptOrderMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderitem.BoilerAcceptOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderuser.BoilerAcceptOrderUserMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
+import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
+import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
+import cn.start.tz.module.system.api.user.AdminUserApi;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * 锅炉受理单
+ */
+@Service("QR0405_202402ReportOFData")
+public class QR0405_202402ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AcceptOrderMapper acceptOrderMapper;
+
+    @Resource
+    private OrderReportService orderReportService;
+
+    @Resource
+    private BoilerAcceptOrderItemMapper acceptOrderItemMapper;
+
+    @Resource
+    private BoilerAcceptOrderUserMapper boilerAcceptOrderUserMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private DictDataApi dictDataApi;
+
+    @Resource
+    private BoilerTaskOrderSignFileService boilerTaskOrderSignFileService;
+    @Resource
+    private BoilerTaskOrderService boilerTaskOrderService;
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
+        //日期格式
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+
+        //受理单ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(refId);
+        if (acceptOrderDO == null) {
+            return result;
+        }
+        result.put("reportNo", acceptOrderDO.getAcceptNo());
+        result.put("unitName", acceptOrderDO.getUnitName());
+        result.put("unitAddress", acceptOrderDO.getUnitAddress());
+        result.put("unitCode", acceptOrderDO.getUnitCode());
+        result.put("zipCode", acceptOrderDO.getZipCode());
+        result.put("contact", acceptOrderDO.getUnitContact());
+        // 检验员签名
+        String orderReportDOId = ruleVO.getParams().getString("orderReportDOId");
+        if (orderReportDOId != null){
+            OrderReportDO orderReportDO = orderReportService.getById(orderReportDOId);
+            result.put("confirmPerson", orderReportDO.getSignUrl());
+            result.put("confirmPersonDate", orderReportDO.getSignDate());
+        }
+        // 填充客户签名
+        BoilerTaskOrderDO taskOrderDO = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
+        if (taskOrderDO != null){
+            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(taskOrderDO.getId(), 100);
+            if (boilerTaskOrderSignFileDO != null){
+                result.put("unitPerson", boilerTaskOrderSignFileDO.getSignUrl());
+                result.put("unitPersonDate", boilerTaskOrderSignFileDO.getSignDate());
+            }
+        }
+        result.put("SLCK", "");
+        result.put("contactPhone", acceptOrderDO.getUnitPhone());
+        result.put("checkDate", acceptOrderDO.getAppointmentDate().format(dateFormat));
+        if (acceptOrderDO.getFeeNature() != null) {
+            if (acceptOrderDO.getFeeNature() == 200) {
+                result.put("BSMZFC", "true");
+            } else if (acceptOrderDO.getFeeNature() == 300) {
+                result.put("SMZFC", "true");
+            }
+        }
+
+        List<BoilerAcceptOrderItemDO> boilerAcceptOrderItemDOS = acceptOrderItemMapper.selectList(
+                new LambdaQueryWrapper<BoilerAcceptOrderItemDO>()
+                        .eq(BoilerAcceptOrderItemDO::getOrderId, refId)
+        );
+        List<EquipBoilerDO> equipBoilerDOS = equipBoilerMapper.selectList(
+                new LambdaQueryWrapper<EquipBoilerDO>()
+                        .in(EquipBoilerDO::getId, boilerAcceptOrderItemDOS.stream().map(BoilerAcceptOrderItemDO::getEquipId).toList())
+        );
+
+        result.put("equipNums", String.valueOf(equipBoilerDOS.size()));
+
+        AtomicReference<Boolean> isDZGL = new AtomicReference<>(false);
+        JSONArray voList = new JSONArray();
+        AtomicInteger number = new AtomicInteger(1);
+        equipBoilerDOS.forEach(equipBoilerDO -> {
+
+            if (equipBoilerDO.getType().equals("1")){
+                isDZGL.set(true);
+            }
+
+            JSONObject vo = new JSONObject();
+            //序号
+            vo.put("value1",String.valueOf(number.getAndIncrement()));
+            DictDataRespDTO boilerTypeDTO = dictDataApi.getDictData("system_equip_boiler_type",equipBoilerDO.getType().toString()).getData();
+            if (boilerTypeDTO != null){
+                vo.put("value2",boilerTypeDTO.getLabel());
+            }
+            vo.put("value3",equipBoilerDO.getFactoryCode());
+            vo.put("value4",equipBoilerDO.getUseRegisterNo());
+            vo.put("value5",equipBoilerDO.getEquipCode());
+            vo.put("value6","-");
+            if (taskOrderDO != null){
+                BoilerTaskOrderItemDO taskOrderItemDO = boilerTaskOrderItemMapper.selectOne(
+                        new LambdaQueryWrapper<BoilerTaskOrderItemDO>()
+                                .eq(BoilerTaskOrderItemDO::getEquipId, equipBoilerDO.getId())
+                                .eq(BoilerTaskOrderItemDO::getOrderId, taskOrderDO.getId())
+                );
+                if (taskOrderItemDO != null){
+                    vo.put("value7",taskOrderItemDO.getFee());
+                }
+            }
+            vo.put("value8","-");
+            voList.add(vo);
+
+        });
+        result.put("table",voList.toJSONString());
+
+        if (isDZGL.get()){
+            result.put("DZGL", "true");
+        }else{
+            result.put("GYGL", "true");
+        }
+
+        if (acceptOrderDO.getCheckType() == 100){
+            result.put("inCheck", "true");
+        }else if (acceptOrderDO.getCheckType() == 200){
+            result.put("outCheck", "true");
+        }else if (acceptOrderDO.getCheckType() == 300){
+            result.put("pressureCheck", "true");
+        }
+
+        if (taskOrderDO != null){
+
+            result.put("recipient", taskOrderDO.getRecipient());
+            result.put("recipientPhone", taskOrderDO.getRecipientPhone());
+            result.put("recipientEmail", taskOrderDO.getRecipientEmail());
+
+            result.put("totalAmount", taskOrderDO.getShouldAmount().setScale(2, java.math.RoundingMode.HALF_UP));
+            // 将金额转换为中文数字并按位存储
+            if (taskOrderDO.getShouldAmount() != null) {
+                convertAmountToChineseDigits(taskOrderDO.getShouldAmount(), result);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 将金额转换为中文数字并按位存储到result中
+     * money1: 百万位, money2: 十万位, money3: 万位, money4: 千位, money5: 百位, money6: 十位, money7: 个位
+     * @param amount 金额
+     * @param result 结果对象
+     */
+    private void convertAmountToChineseDigits(BigDecimal amount, JSONObject result) {
+        // 中文数字数组
+        String[] chineseDigits = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+        
+        // 获取整数部分
+        long integerPart = amount.longValue();
+        
+        // 确保不超过百万（9999999）
+        if (integerPart > 9999999) {
+            integerPart = 9999999;
+        }
+        
+        // 提取每一位数字
+        int million = (int)(integerPart / 1000000) % 10;      // 百万位
+        int hundredThousand = (int)(integerPart / 100000) % 10; // 十万位
+        int tenThousand = (int)(integerPart / 10000) % 10;      // 万位
+        int thousand = (int)(integerPart / 1000) % 10;          // 千位
+        int hundred = (int)(integerPart / 100) % 10;            // 百位
+        int ten = (int)(integerPart / 10) % 10;                 // 十位
+        int one = (int)(integerPart % 10);                      // 个位
+        
+        // 存入result
+        result.put("money1", chineseDigits[million]);           // 百万位
+        result.put("money2", chineseDigits[hundredThousand]);   // 十万位
+        result.put("money3", chineseDigits[tenThousand]);       // 万位
+        result.put("money4", chineseDigits[thousand]);          // 千位
+        result.put("money5", chineseDigits[hundred]);           // 百位
+        result.put("money6", chineseDigits[ten]);               // 十位
+        result.put("money7", chineseDigits[one]);               // 个位
+    }
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QR0413_0415ReportOFData.java

@@ -0,0 +1,221 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+import cn.start.tz.module.pressure2.dal.dataobject.acceptorder.AcceptOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderitem.BoilerAcceptOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
+import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipeacceptorderitem.PipeAcceptOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.mysql.acceptorder.AcceptOrderMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderitem.BoilerAcceptOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderuser.BoilerAcceptOrderUserMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
+import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipeacceptorderitem.PipeAcceptOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
+import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
+import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
+import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
+import cn.start.tz.module.system.api.user.AdminUserApi;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * 管道受理单
+ */
+@Service("QR0413_0415ReportOFData")
+public class QR0413_0415ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private EquipPipeMapper equipPipeMapper;
+
+    @Resource
+    private AcceptOrderMapper acceptOrderMapper;
+
+    @Resource
+    private OrderReportService orderReportService;
+
+    @Resource
+    private PipeAcceptOrderItemMapper acceptOrderItemMapper;
+
+    @Resource
+    private PipeTaskOrderItemMapper pipeTaskOrderItemMapper;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private DictDataApi dictDataApi;
+
+    @Resource
+    private BoilerTaskOrderSignFileService boilerTaskOrderSignFileService;
+
+    @Resource
+    private PipeTaskOrderService pipeTaskOrderService;
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
+        //日期格式
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+
+        //受理单ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(refId);
+        if (acceptOrderDO == null) {
+            return result;
+        }
+        result.put("reportNo", acceptOrderDO.getAcceptNo());
+        result.put("unitName", acceptOrderDO.getUnitName());
+        result.put("unitAddress", acceptOrderDO.getUnitAddress());
+        result.put("unitCode", acceptOrderDO.getUnitCode());
+        result.put("zipCode", acceptOrderDO.getZipCode());
+        result.put("contact", acceptOrderDO.getUnitContact());
+        // 检验员签名
+        String orderReportDOId = ruleVO.getParams().getString("orderReportDOId");
+        if (orderReportDOId != null){
+            OrderReportDO orderReportDO = orderReportService.getById(orderReportDOId);
+            result.put("confirmPerson", orderReportDO.getSignUrl());
+            result.put("confirmPersonDate", orderReportDO.getSignDate());
+        }
+        // 填充客户签名
+        PipeTaskOrderDO taskOrderDO = pipeTaskOrderService.getOne(new LambdaQueryWrapper<PipeTaskOrderDO>().eq(PipeTaskOrderDO::getAcceptOrderId, refId));
+        if (taskOrderDO != null){
+            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(taskOrderDO.getId(), 100);
+            if (boilerTaskOrderSignFileDO != null){
+                result.put("unitPerson", boilerTaskOrderSignFileDO.getSignUrl());
+                result.put("unitPersonDate", boilerTaskOrderSignFileDO.getSignDate());
+            }
+        }
+        result.put("SLCK", "");
+        result.put("contactPhone", acceptOrderDO.getUnitPhone());
+        result.put("checkDate", acceptOrderDO.getAppointmentDate().format(dateFormat));
+        if (acceptOrderDO.getFeeNature() != null) {
+            if (acceptOrderDO.getFeeNature() == 200) {
+                result.put("BSMZFC", "true");
+            } else if (acceptOrderDO.getFeeNature() == 300) {
+                result.put("SMZFC", "true");
+            }
+        }
+
+        List<PipeAcceptOrderItemDO> pipeAcceptOrderItemDOS = acceptOrderItemMapper.selectList(
+                new LambdaQueryWrapper<PipeAcceptOrderItemDO>()
+                        .eq(PipeAcceptOrderItemDO::getOrderId, refId)
+        );
+        List<EquipPipeDO> equipPipeDOS = equipPipeMapper.selectList(
+                new LambdaQueryWrapper<EquipPipeDO>()
+                        .in(EquipPipeDO::getId, pipeAcceptOrderItemDOS.stream().map(PipeAcceptOrderItemDO::getEquipId).toList())
+        );
+
+        result.put("equipNums", String.valueOf(equipPipeDOS.size()));
+
+        AtomicReference<Boolean> isIndustry = new AtomicReference<>(false);
+        AtomicReference<Boolean> isPublic = new AtomicReference<>(false);
+        JSONArray voList = new JSONArray();
+        AtomicInteger number = new AtomicInteger(1);
+        equipPipeDOS.forEach(equipPipeDO -> {
+
+            if (equipPipeDO.getPipeCategory().equals("industry_pipe")){
+                isIndustry.set(true);
+            }else if (equipPipeDO.getPipeCategory().equals("public_pipe")){
+                isPublic.set(true);
+            }
+
+            JSONObject vo = new JSONObject();
+            //序号
+            vo.put("value1",String.valueOf(number.getAndIncrement()));
+            vo.put("value2",equipPipeDO.getCertificateNo());
+            vo.put("value3",equipPipeDO.getProjectNo());
+            vo.put("value4",equipPipeDO.getProjectName());
+            vo.put("value5","-");
+            voList.add(vo);
+
+        });
+        result.put("table",voList.toJSONString());
+
+        if (isIndustry.get()){
+            result.put("GYGD", "true");
+        }else if(isPublic.get()){
+            result.put("GYGD1", "true");
+        }else{
+            result.put("QTGD", "true");
+        }
+
+        if (taskOrderDO != null){
+
+            result.put("recipient", taskOrderDO.getRecipient());
+            result.put("recipientPhone", taskOrderDO.getRecipientPhone());
+            result.put("recipientEmail", taskOrderDO.getRecipientEmail());
+
+            result.put("totalAmount", taskOrderDO.getShouldAmount().setScale(2, java.math.RoundingMode.HALF_UP));
+            // 将金额转换为中文数字并按位存储
+            if (taskOrderDO.getShouldAmount() != null) {
+                convertAmountToChineseDigits(taskOrderDO.getShouldAmount(), result);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 将金额转换为中文数字并按位存储到result中
+     * money1: 百万位, money2: 十万位, money3: 万位, money4: 千位, money5: 百位, money6: 十位, money7: 个位
+     * @param amount 金额
+     * @param result 结果对象
+     */
+    private void convertAmountToChineseDigits(BigDecimal amount, JSONObject result) {
+        // 中文数字数组
+        String[] chineseDigits = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+        
+        // 获取整数部分
+        long integerPart = amount.longValue();
+        
+        // 确保不超过百万（9999999）
+        if (integerPart > 9999999) {
+            integerPart = 9999999;
+        }
+        
+        // 提取每一位数字
+        int million = (int)(integerPart / 1000000) % 10;      // 百万位
+        int hundredThousand = (int)(integerPart / 100000) % 10; // 十万位
+        int tenThousand = (int)(integerPart / 10000) % 10;      // 万位
+        int thousand = (int)(integerPart / 1000) % 10;          // 千位
+        int hundred = (int)(integerPart / 100) % 10;            // 百位
+        int ten = (int)(integerPart / 10) % 10;                 // 十位
+        int one = (int)(integerPart % 10);                      // 个位
+        
+        // 存入result
+        result.put("money1", chineseDigits[million]);           // 百万位
+        result.put("money2", chineseDigits[hundredThousand]);   // 十万位
+        result.put("money3", chineseDigits[tenThousand]);       // 万位
+        result.put("money4", chineseDigits[thousand]);          // 千位
+        result.put("money5", chineseDigits[hundred]);           // 百位
+        result.put("money6", chineseDigits[ten]);               // 十位
+        result.put("money7", chineseDigits[one]);               // 个位
+    }
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01010_202402OFData.java

@@ -141,32 +141,35 @@ public class QC01010_202402OFData implements IDynamicOFData {
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
-                    if (itemDOList.size() > 1){
-                        result.put("equipStreet", "见一览表");
-                        result.put("boilerAddress","见一览表");
-                        result.put("equipCode","见一览表");
-                        result.put("equipName","见一览表");
-                        result.put("unitAddress","见一览表");
-                        result.put("unitName","见一览表");
-                        result.put("enterpriseType","见一览表");
-                        result.put("legalRepresent","见一览表");
-                    }else {
-                        EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipPipeDO != null){
-                            result.put("equipStreet", AreaUtils.getArea(equipPipeDO.getEquipStreet()).getName());
-                            result.put("boilerAddress",equipPipeDO.getPipeAddress());
-                            result.put("equipCode",equipPipeDO.getProjectNo());
-                            result.put("equipName",equipPipeDO.getProjectName());
-                            result.put("unitAddress",equipPipeDO.getUnitAddress());
-                            result.put("unitName",equipPipeDO.getUnitName());
-                            //单位信息
-                            ClientUnitDTO clientUnitDTO = clientUnitApi.getClientUnit(equipPipeDO.getUnitId()).getCheckedData();
-                            if (clientUnitDTO != null){
-                                result.put("enterpriseType",clientUnitDTO.getEnterpriseType());
-                                result.put("legalRepresent",clientUnitDTO.getLegalRepresent());
-                            }
+
+                    EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipPipeDO != null){
+                        result.put("equipStreet", AreaUtils.getArea(equipPipeDO.getEquipStreet()).getName());
+                        result.put("boilerAddress",equipPipeDO.getPipeAddress());
+                        result.put("equipCode",equipPipeDO.getProjectNo());
+                        result.put("equipName",equipPipeDO.getProjectName());
+                        result.put("unitAddress",equipPipeDO.getUnitAddress());
+                        result.put("unitName",equipPipeDO.getUnitName());
+                        //单位信息
+                        ClientUnitDTO clientUnitDTO = clientUnitApi.getClientUnit(equipPipeDO.getUnitId()).getCheckedData();
+                        if (clientUnitDTO != null){
+                            result.put("enterpriseType",clientUnitDTO.getEnterpriseType());
+                            result.put("legalRepresent",clientUnitDTO.getLegalRepresent());
                         }
                     }
+
+//                    if (itemDOList.size() > 1){
+//                        result.put("equipStreet", "见一览表");
+//                        result.put("boilerAddress","见一览表");
+//                        result.put("equipCode","见一览表");
+//                        result.put("equipName","见一览表");
+//                        result.put("unitAddress","见一览表");
+//                        result.put("unitName","见一览表");
+//                        result.put("enterpriseType","见一览表");
+//                        result.put("legalRepresent","见一览表");
+//                    }else {
+//
+//                    }
                 }
 
                 result.put("reportNo",itemReportDO.getReportNo());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxrecord/TaskOrderNonTaxRecordServiceImpl.java

@@ -547,7 +547,7 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
         }
 
         DynamicTbDO dynamicTbDO = dynamicTbMapper.selectOne(new LambdaQueryWrapperX<DynamicTbDO>().
-                eq(DynamicTbDO::getReportType, 810).
+                eq(DynamicTbDO::getTbType, 800).
                 orderByDesc(DynamicTbDO::getCreateTime), false);
         if (dynamicTbDO ==  null){
             throw new ServiceException(902, "未找到非税记录表单模板");