1

assembly/src/main/resources/application-dev.yml

@@ -1,4 +1,6 @@
 spring:
+  jackson:
+    default-property-inclusion: always
   application:
     name: base
   datasource:

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

@@ -52,7 +52,7 @@ public class CostProjectTaskMaterialController extends BaseController<CostProjec
 	public CommonResult<String> save(@ApiParam(name="CostProjectTaskMaterial",value="任务定制-报送资料要求对象", required = true)@RequestBody CostProjectTaskMaterial costProjectTaskMaterial) throws Exception{
 		String msg = StringUtil.isEmpty(costProjectTaskMaterial.getId()) ? "添加任务定制-报送资料要求成功" : "更新任务定制-报送资料要求成功";
 		if(StringUtils.isNotBlank(costProjectTaskMaterial.getFileUrl())) {
-			costProjectTaskMaterial.setIsUploaded(true);
+			costProjectTaskMaterial.setIsUpload("1");
 		}
 		baseService.createOrUpdate(costProjectTaskMaterial);
 		return CommonResult.<String>ok().message(msg);

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

@@ -25,6 +25,7 @@ import com.hotent.surveyinfo.manager.*;
 import com.hotent.surveyinfo.model.*;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.manager.OrgManager;
+import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.AreaCodeUtil;
 import com.hotent.util.CopyUtil;
@@ -190,6 +191,9 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     private CostVerifyProjectTemplateManager costVerifyProjectTemplateManager;
 
 
+    @Autowired
+    private UserManager userManager;
+
     @Override
     public CostProjectApprovalDetailResp getDetail(String id) {
         CostProjectApproval costProjectApproval = this.get(id);
@@ -224,6 +228,44 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         if (ObjectUtil.isNotEmpty(costProjectApproval.getOrgId())) {
             detailResp.setOrgName(orgManager.get(costProjectApproval.getOrgId()).getName());
         }
+        
+        // 反查负责人名称
+        if (ObjectUtil.isNotEmpty(costProjectApproval.getLeaderId())) {
+            try {
+                com.hotent.uc.model.User user = userManager.get(costProjectApproval.getLeaderId());
+                if (ObjectUtil.isNotEmpty(user)) {
+                    detailResp.setLeaderName(user.getFullname());
+                }
+            } catch (Exception e) {
+                // 记录异常但不影响主流程
+            }
+        }
+        
+        // 反查项目组成员名称
+        if (ObjectUtil.isNotEmpty(costProjectApproval.getProjectMembers())) {
+            try {
+                String[] memberIds = costProjectApproval.getProjectMembers().split(",");
+                if (memberIds.length > 0) {
+                    StringBuilder memberNames = new StringBuilder();
+                    for (int i = 0; i < memberIds.length; i++) {
+                        String memberId = memberIds[i].trim();
+                        if (StringUtil.isNotEmpty(memberId)) {
+                            com.hotent.uc.model.User user = userManager.get(memberId);
+                            if (ObjectUtil.isNotEmpty(user)) {
+                                if (i > 0) {
+                                    memberNames.append(",");
+                                }
+                                memberNames.append(user.getFullname());
+                            }
+                        }
+                    }
+                    detailResp.setProjectMembersName(memberNames.toString());
+                }
+            } catch (Exception e) {
+                // 记录异常但不影响主流程
+            }
+        }
+        
         CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
                 new QueryWrapper<CostProjectTaskProccess>().eq("project_id", costProjectApproval.getProjectId())
         );
@@ -488,7 +530,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         IUser currentUser = ContextUtil.getCurrentUser();
         AuditedUnit unit = auditedUnitManager.getOne(
                 new LambdaQueryWrapper<AuditedUnit>()
-                        .eq(AuditedUnit::getUserId, currentUser.getUserId())
+                        .eq(AuditedUnit::getAccount, currentUser.getUserId())
                         .eq(AuditedUnit::getIsDeleted, "0")
         );
 

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

@@ -111,9 +111,9 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "是否上传 0:未上传，1:已上传")
-    @JsonProperty("isUploaded")
-    @TableField("is_uploaded")
-    private boolean isUploaded;
+    @JsonProperty("isUpload")
+    @TableField("is_upload")
+    private String isUpload;
 
     @ApiModelProperty(value = "文件地址")
     @JsonProperty("fileUrl")
@@ -240,15 +240,15 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
         this.updateTime = updateTime;
     }
 
-    public boolean getIsUploaded() {
-        return isUploaded;
-    }
+	public String getIsUpload() {
+		return isUpload;
+	}
 
-    public void setIsUploaded(boolean isUploaded) {
-        this.isUploaded = isUploaded;
-    }
+	public void setIsUpload(String isUpload) {
+		this.isUpload = isUpload;
+	}
 
-    @Override
+	@Override
     protected Serializable pkVal() {
         return this.id;
     }
@@ -290,7 +290,6 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
             ", updateBy=" + updateBy +
             ", formatRequired=" + formatRequired +
             ", updateTime=" + updateTime +
-            ", isUploaded=" + isUploaded +
         "}";
     }
 }

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

@@ -106,6 +106,8 @@ public class CostProjectApprovalDetailResp {
     //@TableField("leader_id")
     @JsonProperty("leaderId")
     private String leaderId;
+    
+    private String leaderName;
 
     @ApiModelProperty(value = "专家姓名")
     //@TableField("expert_str")
@@ -141,6 +143,8 @@ public class CostProjectApprovalDetailResp {
     //@TableField("project_members")
     @JsonProperty("projectMembers")
     private String projectMembers;
+    
+    private String projectMembersName;
 
 
     @ApiModelProperty(value = "所属省")
@@ -166,6 +170,7 @@ public class CostProjectApprovalDetailResp {
 
     @ApiModelProperty(value = "预定的监审工作起止时间（结束）")
     private LocalDate plannedAuditEndDate;
+   
 }
 
 

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyFdTemplateHeadersManagerImpl.java

@@ -51,7 +51,7 @@ public class CostSurveyFdTemplateHeadersManagerImpl extends BaseManagerImpl<Cost
 
 	@Override
 	public List<CostSurveyFdTemplateHeaders> listBySurveyTemplateId(String surveyTemplateId) {
-		return this.listBySurveyTemplateId(surveyTemplateId);
+		return null;
 	}
 
 	@Override

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyFdTemplateItemsManagerImpl.java

@@ -58,7 +58,7 @@ public class CostSurveyFdTemplateItemsManagerImpl extends BaseManagerImpl<CostSu
 
 	@Override
 	public List<CostSurveyFdTemplateItems> selectBySurveyTemplateId(String surveyTemplateId) {
-		return this.selectBySurveyTemplateId(surveyTemplateId);
+		return null;
 	}
 
 	@Override

assistMg/src/main/resources/mapper/CostProjectTaskMaterialMapper.xml

@@ -21,11 +21,12 @@
     <result column="update_by" property="updateBy" />
     <result column="format_required" property="formatRequired" />
     <result column="update_time" property="updateTime" />
+    <result column="is_upload" property="isUpload" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, task_id, audited_status, audited_user_id, create_by, project_id, catalog_id, information_type, information_name, information_require, order_num, is_required, template_id, create_time, update_by, format_required, update_time
+        id, task_id, audited_status, audited_user_id, create_by, project_id,is_upload, catalog_id, information_type, information_name, information_require, order_num, is_required, template_id, create_time, update_by, format_required, update_time
     </sql>
 
 	<select id="selectPage" resultMap="BaseResultMap">