diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java index 4b9cbdd..06f693c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java @@ -2326,6 +2326,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getContractAccess())); fieldIndex = fieldIndex + 1; } + if (fieldNameExtend.contains("detectPicAttr")){ +// 合同附件 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getDetectPicAttr())); + fieldIndex = fieldIndex + 1; + } if (fieldNameExtend.contains("upPrint")){ // 上刊 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getUpPrint())); @@ -2521,6 +2526,12 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getContractAccess()),false); fieldIndex = fieldIndex + 1; } + if (fieldNameExtend.contains("detectPicAttr")){ +// 合同附件 + writer.merge(i + indexStart ,i + indexStart + mergeint - 1, + fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getDetectPicAttr()),false); + fieldIndex = fieldIndex + 1; + } if (fieldNameExtend.contains("upPrint")){ // 上刊 writer.merge(i + indexStart ,i + indexStart + mergeint - 1, @@ -2678,6 +2689,10 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { // 合同附件 result.add("合同附件"); } + if (fieldNameExtend.contains("detectPicAttr")){ +// 合同附件 + result.add("检测照片"); + } if (fieldNameExtend.contains("upPrint")){ // 上刊 result.add("上刊");