工作内容添加合同id类型

src/main/java/com/jeeplus/modules/projectVisa/service/ProjectVisaService.java

@@ -125,7 +125,7 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
         }
         //保存工作内容详情
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(projectContentData.getContentDetail())) {
-            projectVisaInfoService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId());
+            projectVisaInfoService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId(),concealProjectInfo.getProject().getWorkContractInfo().getId());
         }
         //保存依据资料信息
         if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -166,7 +166,7 @@ public class ProjectClaimController extends BaseController {
                         //获取阶段Type父节点信息
                         String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
                         //根据项目id查询相关的项目阶段内容
-                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),projectType,"46");
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"46");
 
                         Projectcontentinfo select = new Projectcontentinfo();
                         ProjectRecords project = new ProjectRecords();

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -283,7 +283,7 @@ public class ProjectDesignController extends BaseController {
                         //获取阶段Type父节点信息
                         String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
                         //根据项目id查询相关的项目阶段内容
-                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),projectType,"43");
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"43");
 
 
                         Projectcontentinfo select = new Projectcontentinfo();

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -302,7 +302,7 @@ public class ProjectVisaController extends BaseController {
                         //获取阶段Type父节点信息
                         String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
                         //根据项目id查询相关的项目阶段内容
-                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),projectType,"45");
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"45");
 
                         Projectcontentinfo select = new Projectcontentinfo();
                         ProjectRecords project = new ProjectRecords();

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectContentDataDao.java

@@ -51,7 +51,7 @@ public interface ProjectContentDataDao extends CrudDao<ProjectContentData> {
      * @param projectTypeParentId 阶段type
      * @return
      */
-    List<ProjectRecordTreeData> getProjectContentDataListOnImplement(@Param("projectId")String projectId,@Param("projectTypeParentId")String projectTypeParentId,@Param("typeId") String typeId);
+    List<ProjectRecordTreeData> getProjectContentDataListOnImplement(@Param("projectId")String projectId,@Param("contractId") String contractId,@Param("projectTypeParentId")String projectTypeParentId,@Param("typeId") String typeId);
 
     /**
      * 根据项目编号和阶段Type获取信息(项目复核)

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -208,8 +208,8 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         return projectRecordTreeDataList;
     }
 
-    public List<ProjectRecordTreeData> getProjectContentDataListOnImplement(String projectId,String projectTypeParentId,String typeId) {
-        List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentDataListOnImplement(projectId,projectTypeParentId,typeId);
+    public List<ProjectRecordTreeData> getProjectContentDataListOnImplement(String projectId,String contractId,String projectTypeParentId,String typeId) {
+        List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentDataListOnImplement(projectId,contractId,projectTypeParentId,typeId);
         return projectRecordTreeDataList;
     }
     public List<ProjectContentData> getProjectContentData(String id) {

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -251,6 +251,9 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			projectContentData.setCompanyId(contentinfo.getCompanyId());
 			projectContentData.setOfficeId(contentinfo.getOfficeId());
 			projectContentData.setProject(contentinfo.getProject());
+			if(StringUtils.isNotBlank(projectcontentinfo.getProject().getWorkContractInfo().getId())){
+				projectContentData.setContractId(projectcontentinfo.getProject().getWorkContractInfo().getId());
+			}
 			projectContentDataService.save(projectContentData);
 			//保存工作内容详情
 			if(StringUtils.isNotBlank(projectContentData.getContentDetail())) {
@@ -266,7 +269,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 //				}
 				WorkContentDetailBaseService detailService = WorkContentDetailFactory.getDetailService(projectContentData.getType());
 				if(detailService!=null)
-					detailService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), projectContentData.getProject().getId(), projectContentData.getId());
+					detailService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), projectContentData.getProject().getId(), projectContentData.getId(),projectcontentinfo.getProject().getWorkContractInfo().getId());
 			}
 			//保存依据资料信息
 			if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -110,6 +110,11 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private Date beginDate;
 	private Date endDate;
 	private int membercount;
+
+	private String contentPId;      //保留工作内容id
+
+	private String dictType;
+	private String parentIds;
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
@@ -645,4 +650,28 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setOperationSign(Integer operationSign) {
 		this.operationSign = operationSign;
 	}
+
+	public String getContentPId() {
+		return contentPId;
+	}
+
+	public void setContentPId(String contentPId) {
+		this.contentPId = contentPId;
+	}
+
+	public String getDictType() {
+		return dictType;
+	}
+
+	public void setDictType(String dictType) {
+		this.dictType = dictType;
+	}
+
+	public String getParentIds() {
+		return parentIds;
+	}
+
+	public void setParentIds(String parentIds) {
+		this.parentIds = parentIds;
+	}
 }

src/main/java/com/jeeplus/modules/projectrecord/service/armorForMaterials/ArmorForMaterialsService.java

@@ -97,7 +97,7 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
         }
         //保存工作内容详情
         if(StringUtils.isNotBlank(projectContentData.getContentDetail())) {
-            workFiveDirectionsAffirmService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId());
+            workFiveDirectionsAffirmService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId(),concealProjectInfo.getProject().getWorkContractInfo().getId());
         }
         //保存依据资料信息
         if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectrecord/service/concealProject/ConcealProjectService.java

@@ -130,7 +130,7 @@ public class ConcealProjectService extends CrudService<ConcealProjectDao, Concea
 		}
 		//保存工作内容详情
 		if(StringUtils.isNotBlank(projectContentData.getContentDetail())) {
-			workConcealProjectService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId());
+			workConcealProjectService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId(),concealProjectInfo.getProject().getWorkContractInfo().getId());
 		}
 		//保存依据资料信息
 		if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectrecord/service/distributionSettlement/DistributionSettlementService.java

@@ -98,7 +98,7 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
         }
         //保存工作内容详情
         if(StringUtils.isNotBlank(projectContentData.getContentDetail())) {
-            workContentBranchAccountService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId());
+            workContentBranchAccountService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId(),concealProjectInfo.getProject().getWorkContractInfo().getId());
         }
         //保存依据资料信息
         if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectrecord/service/implementStage/ProjectInterimPaymentService.java

@@ -104,7 +104,7 @@ public class ProjectInterimPaymentService extends CrudService<ProjectInterimPaym
         projectContentDataService.save(projectContentData);
         //保存工作内容详情
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(projectContentData.getContentDetail())) {
-            workScheduleService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId());
+            workScheduleService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), concealProjectInfo.getProject().getId(), projectContentData.getId(),concealProjectInfo.getProject().getWorkContractInfo().getId());
         }
         //保存依据资料信息
         if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectrecord/service/material/MaterialService.java

@@ -87,7 +87,7 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
         }
         //保存工作内容详情
         if(StringUtils.isNotBlank(projectContentData.getContentDetail())) {
-            workMaterialsPriceService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), materialProjectInfo.getProject().getId(), projectContentData.getId());
+            workMaterialsPriceService.saveDetails(URLDecoder.decode(projectContentData.getContentDetail(),"UTF-8"), materialProjectInfo.getProject().getId(), projectContentData.getId(),materialProjectInfo.getProject().getWorkContractInfo().getId());
         }
         //保存依据资料信息
         if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){

src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java

@@ -176,7 +176,7 @@ public class DistributionSettlementController extends BaseController {
                         //获取阶段Type父节点信息
                         String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
                         //根据项目id查询相关的项目阶段内容
-                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),projectType,"412");
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"412");
 
                         Projectcontentinfo select = new Projectcontentinfo();
                         ProjectRecords project = new ProjectRecords();

src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -155,7 +155,7 @@ public class ProjectInterimPaymentController extends BaseController {
                         //获取阶段Type父节点信息
                         String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
                         //根据项目id查询相关的项目阶段内容
-                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),projectType,"420");
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"420");
 
                         Projectcontentinfo select = new Projectcontentinfo();
                         ProjectRecords project = new ProjectRecords();

src/main/java/com/jeeplus/modules/workcontent/entity/WorkScheduleInfo.java

@@ -18,6 +18,7 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 	private static final long serialVersionUID = 1L;
 	private String projectId;		// 项目id
 	private String contentId;		// 工作内容ID
+	private String contractId;		// 合同id
 
 	@NumberFormat(style = NumberFormat.Style.CURRENCY)
 	private Double contractMoney;		// 签约合同价款
@@ -173,4 +174,12 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
 }

src/main/java/com/jeeplus/modules/workcontent/service/ProjectVisaInfoService.java

@@ -53,7 +53,7 @@ public class ProjectVisaInfoService extends CrudService<ProjectVisaDao, ProjectV
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkConcealProjectService.java

@@ -47,7 +47,7 @@ public class WorkConcealProjectService extends CrudService<WorkConcealProjectDao
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentAltermanageService.java

@@ -50,7 +50,7 @@ public class WorkContentAltermanageService extends CrudService<WorkContentAlterm
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         JSONObject jsonObject = JSON.parseObject(detailStr);
         ProjectContentData contentData = new ProjectContentData();
         contentData.setId(jsonObject.getString("contract.id"));

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentBidLimitPriceService.java

@@ -48,7 +48,7 @@ public class WorkContentBidLimitPriceService extends CrudService<WorkContentBidL
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         if(StringUtils.isBlank(detailStr)){
             return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentBiddingplanService.java

@@ -50,7 +50,7 @@ public class WorkContentBiddingplanService extends CrudService<WorkContentBiddin
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         JSONObject jsonObject = JSON.parseObject(detailStr);
         ProjectContentData contentData = new ProjectContentData();
         contentData.setId(jsonObject.getString("contProgram.id"));

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentBranchAccountService.java

@@ -47,7 +47,7 @@ public class WorkContentBranchAccountService extends CrudService<WorkContentBran
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentBudgetService.java

@@ -49,7 +49,7 @@ public class WorkContentBudgetService extends CrudService<WorkContentBudgetDao,
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         if(StringUtils.isBlank(detailStr)){
             return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentClaimService.java

@@ -49,7 +49,7 @@ public class WorkContentClaimService extends CrudService<WorkContentClaimDao, Wo
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         JSONObject jsonObject = JSON.parseObject(detailStr);
         ProjectContentData contentData = new ProjectContentData();
         contentData.setId(jsonObject.getString("contract.id"));

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentCompleteAccountService.java

@@ -48,7 +48,7 @@ public class WorkContentCompleteAccountService extends CrudService<WorkContentCo
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentContprogramService.java

@@ -51,7 +51,7 @@ public class WorkContentContprogramService extends CrudService<WorkContentContpr
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         JSONObject jsonObject = JSON.parseObject(detailStr);
         ProjectContentData contentData = new ProjectContentData();
         contentData.setId(jsonObject.getString("otherProgram.id"));

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentContractSumService.java

@@ -65,7 +65,7 @@ public class WorkContentContractSumService extends CrudService<WorkContentContra
     }
 
 	@Override
-	public void saveDetails(String detailStr, String projectId, String contentId) {
+	public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 		if(StringUtils.isBlank(detailStr)){
 			return;
 		}

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentContractinfoService.java

@@ -65,7 +65,7 @@ public class WorkContentContractinfoService extends CrudService<WorkContentContr
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         if(StringUtils.isBlank(detailStr)){
             return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentCtrlpriceService.java

@@ -50,7 +50,7 @@ public class WorkContentCtrlpriceService extends CrudService<WorkContentCtrlpric
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         if(StringUtils.isBlank(detailStr)){
             return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentDetailBaseService.java

@@ -4,6 +4,6 @@ import java.util.List;
 
 public interface WorkContentDetailBaseService{
 
-    void saveDetails(String detailStr,String projectId,String contentId);
+    void saveDetails(String detailStr,String projectId,String contentId,String contractId);
 
 }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentDocumentService.java

@@ -48,7 +48,7 @@ public class WorkContentDocumentService extends CrudService<WorkContentDocumentD
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         WorkContentDocument newRecord = JSON.parseObject(detailStr,WorkContentDocument.class);
         newRecord.setProjectId(projectId);
         newRecord.setContentId(contentId);

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentFundplanService.java

@@ -48,7 +48,7 @@ public class WorkContentFundplanService extends CrudService<WorkContentFundplanD
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         WorkContentFundplan newRecord = JSON.parseObject(detailStr,WorkContentFundplan.class);
         newRecord.setProjectId(projectId);
         newRecord.setContentId(contentId);

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentInvestmentCostService.java

@@ -49,7 +49,7 @@ public class WorkContentInvestmentCostService extends CrudService<WorkContentInv
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentPriceadjustService.java

@@ -48,7 +48,7 @@ public class WorkContentPriceadjustService extends CrudService<WorkContentPricea
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         WorkContentPriceadjust newRecord = JSON.parseObject(detailStr,WorkContentPriceadjust.class);
         newRecord.setProjectId(projectId);
         newRecord.setContentId(contentId);

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentPricemanageService.java

@@ -50,7 +50,7 @@ public class WorkContentPricemanageService extends CrudService<WorkContentPricem
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         JSONObject jsonObject = JSON.parseObject(detailStr);
         ProjectContentData contentData = new ProjectContentData();
         contentData.setId(jsonObject.getString("contract.id"));

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentProjectpriceService.java

@@ -47,7 +47,7 @@ public class WorkContentProjectpriceService extends CrudService<WorkContentProje
 
 
     @Override
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         WorkContentProjectprice newRecord = JSON.parseObject(detailStr,WorkContentProjectprice.class);
         newRecord.setProjectId(projectId);
         newRecord.setContentId(contentId);

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentVisamanageService.java

@@ -49,7 +49,7 @@ public class WorkContentVisamanageService extends CrudService<WorkContentVisaman
 
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
         JSONObject jsonObject = JSON.parseObject(detailStr);
         ProjectContentData contentData = new ProjectContentData();
         contentData.setId(jsonObject.getString("contract.id"));

src/main/java/com/jeeplus/modules/workcontent/service/WorkFiveDirectionsAffirmService.java

@@ -48,7 +48,7 @@ public class WorkFiveDirectionsAffirmService extends CrudService<WorkFiveDirecti
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkMaterialsPriceService.java

@@ -50,7 +50,7 @@ public class WorkMaterialsPriceService extends CrudService<WorkMaterialsPriceDao
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkPreliminaryDesignEstimateService.java

@@ -49,7 +49,7 @@ public class WorkPreliminaryDesignEstimateService extends CrudService<WorkPrelim
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }

src/main/java/com/jeeplus/modules/workcontent/service/WorkScheduleService.java

@@ -49,7 +49,7 @@ public class WorkScheduleService extends CrudService<WorkScheduleDao, WorkSchedu
 	
     @Override
     @Transactional(readOnly = false)
-    public void saveDetails(String detailStr, String projectId, String contentId) {
+    public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
 	    if(StringUtils.isBlank(detailStr)){
 	        return;
         }
@@ -60,6 +60,7 @@ public class WorkScheduleService extends CrudService<WorkScheduleDao, WorkSchedu
                 dao.delete(preliminaryDesignEstimate);
                 continue;
             }
+			preliminaryDesignEstimate.setContractId(contractId);
 			preliminaryDesignEstimate.setContentId(contentId);
 			preliminaryDesignEstimate.setProjectId(projectId);
             this.save(preliminaryDesignEstimate);

src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -18,6 +18,7 @@
 		a.type AS "type",
 		a.master AS "master.id",
 		a.content_details_id AS "contentDetailsId",
+		a.contract_id AS "contractId",
 		su.name AS "master.name"
 	</sql>
 	
@@ -182,7 +183,8 @@
 			number,
 			type,
 			master,
-			content_details_id
+			content_details_id,
+			contract_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -198,7 +200,8 @@
 			#{number},
 			#{type},
 			#{master.id},
-			#{contentDetailsId}
+			#{contentDetailsId},
+			#{contractId}
 		)
 	</insert>
 	<insert id="saveReportContent">
@@ -318,6 +321,9 @@
 		left join project_report_data prd on prd.id = pcr.report_id
 		where a.project_id = #{projectId} and pt.parent_id =#{projectTypeParentId}
 		and pt.type_id = #{typeId}
+		<if test="contractId !=null and contractId!=''">
+			and a.contract_id = #{contractId}
+		</if>
 		and a.del_flag = 0 order by a.update_date desc
 	</select>
 

src/main/resources/mappings/modules/workcontent/WorkScheduleDao.xml

@@ -24,7 +24,8 @@
 		a.current_cumulative_completion_money as "currentCumulativeCompletionMoney",
 		a.current_total_payment_money as "currentTotalPaymentMoney",
 		a.current_pay_ratio as "currentPayRatio",
-		a.type as "type"
+		a.type as "type",
+		a.contract_id as "contractId"
 	</sql>
 	
 
@@ -98,7 +99,8 @@
 			current_cumulative_completion_money,
 			current_total_payment_money,
 			current_pay_ratio,
-			type
+			type,
+			contract_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -121,7 +123,8 @@
 			#{currentCumulativeCompletionMoney},
 			#{currentTotalPaymentMoney},
 			#{currentPayRatio},
-            #{type}
+            #{type},
+            #{contractId}
 		)
 	</insert>