工作底稿样式

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostCatalogUnitManagerImpl.java

@@ -83,7 +83,7 @@ public class CostCatalogUnitManagerImpl extends BaseManagerImpl<CostCatalogUnitD
         Map<String, String> formatMap = new HashMap<>();
         formatMap.put("1", "文档文件");
         formatMap.put("2", "Excel");
-        formatMap.put("3", "预置模");
+        formatMap.put("3", "预置模板");
 
         records.forEach(unit -> {
             // 类型名称

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentTemplateFileManagerImpl.java

@@ -27,6 +27,7 @@ import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 
 import com.hotent.base.util.BeanUtils;
@@ -83,9 +84,13 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
                     String tableName = costProjectDocumentFile.getTableName();
                     List<CostProjectTask> taskByProjectId = costProjectTaskManager.findTaskByProjectId(whereValue,unitId);
                     if (taskByProjectId!=null && !taskByProjectId.isEmpty()) {
-                        String replace = tableName.replace("?", "'" + taskByProjectId.get(0).getId() + "'");
-                        String  colValue= costTemplateFileManager.getColValue2(replace);
-                        costProjectDocumentFile.setDataValue(CostDataUtil.convertToChineseDate(colValue));
+                        List<CostProjectTask> projectTasks = taskByProjectId.stream().filter(t -> !t.getPid().equals("0") && t.getAuditedUnitId().equals(unitId)).collect(Collectors.toList());
+                        if ( !projectTasks.isEmpty()) {
+                            String replace = tableName.replace("?", "'" + projectTasks.get(0).getId() + "'");
+                            String  colValue= costTemplateFileManager.getColValue2(replace);
+                            costProjectDocumentFile.setDataValue(CostDataUtil.convertToChineseDate(colValue));
+                        }
+
                     }
 
                 }else  if (StringUtil.isNotEmpty(costProjectDocumentFile.getTableName())

assistMg/src/main/java/com/hotent/project/controller/CostProjectDeliberateController.java

@@ -86,7 +86,7 @@ public class CostProjectDeliberateController extends BaseController<CostProjectD
 			throw new BaseException("根据id：【"+req.getTaskId()+"】未查询到任务信息");
 		}
 		IUser iUser = ContextUtil.getCurrentUser();
-		req.setCreateBy(iUser.getAccount());
+		req.setCreateBy(iUser.getFullname());
 		req.setCreateTime(LocalDateTime.now());
 		req.setId(UniqueIdUtil.getSuid());
 		baseService.create(req);

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -249,6 +249,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
             String[] split = costProjectApproval.getAuditedUnitId().split(",");
             List<AuditedUnit> auditedUnits = auditedUnitManager.listByIds(Arrays.asList(split));
             detailResp.setAuditUnitName(auditedUnits.stream().map(AuditedUnit::getUnitName).collect(Collectors.joining(",")));
+            detailResp.setAuditUnitId(costProjectApproval.getAuditedUnitId());
         }
 
         if (ObjectUtil.isNotEmpty(costProjectApproval.getOrgId())) {

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -800,7 +800,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     private String supplementMaterial(CostProjectTask task, CostTaskPageReq req) {
         String currentNode = task.getCurrentNode();
         String nodeName = NodeConstant.getNodeValueByKey(currentNode);
-        String title = "【" + nodeName + "】补充材料";
+        String title = "【" + nodeName + "】补充材料，审批已通过";
         String orgId = getCurrentUserMainOrgId();
         Org org = orgManager.getById(orgId);
         String noticeSource = (org.getName()) + " " + AuthenticationUtil.getCurrentUserFullname();

assistMg/src/main/java/com/hotent/project/model/CostProjectDeliberate.java

@@ -80,6 +80,11 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     @JsonProperty("enterpriseId")
     private String enterpriseId;
 
+    @ApiModelProperty(value = "监审单位id")
+    @TableField("enterprise_name")
+    @JsonProperty("enterpriseName")
+    private String enterpriseName;
+
     @ApiModelProperty(value = "审议情况")
     @TableField("deliberation_content")
     @JsonProperty("deliberationContent")
@@ -209,6 +214,15 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
         this.enterpriseId = enterpriseId;
     }
 
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
     public String getDeliberationContent() {
         return deliberationContent;
     }

assistMg/src/main/java/com/hotent/project/resp/CostProjectApprovalDetailResp.java

@@ -170,6 +170,9 @@ public class CostProjectApprovalDetailResp {
     @ApiModelProperty(value = "监审单位名称")
     private String auditUnitName;
 
+    @ApiModelProperty(value = "监审单位名称")
+    private String auditUnitId;
+
     private String catalogName;
 
     @ApiModelProperty(value = "预定的监审工作起止时间（开始）")