项目计划相关代码提交

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

@@ -70,6 +70,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private String projectTypeId; //项目类型
 	private String invoiceFlag; //是否开票
 	private String invoiceStatus; //开票状态
+	private String companyType;			//公司类型（1：赣能；0：东兴）
 
 	private ProjectReportData reportData;//报告
 
@@ -81,7 +82,6 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 		this.reportData = reportData;
 	}
 
-	@NotNull(message = "委托方联系人不能为空")
 	private List<WorkClientLinkman> workClientLinkmanList;		// 委托方联系人
 	private List<WorkClientLinkman> workConstructionLinkmanList;		// 施工方及联系人
 	private List<WorkClientLinkman> workBuildLinkmanList;//建设方联系人
@@ -858,4 +858,12 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setZiXunShouRu(String ziXunShouRu) {
 		this.ziXunShouRu = ziXunShouRu;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -21,7 +21,6 @@ import com.jeeplus.modules.utils.SftpClientUtil;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
-import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,15 +75,27 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
         //项目计划信息
         String start = null;
         String end=null;
+        Iterator<ProjectPlanInfo> projectPlanInfoIterator = projectRecords.getProjectPlanList().iterator();
+        System.out.println("-----------开始------------------");
+        while(projectPlanInfoIterator.hasNext()){
+
+            //取得上传文件
+            ProjectPlanInfo projectPlanInfo = projectPlanInfoIterator.next();
+            if (projectPlanInfo.getId() == null){
+                projectPlanInfoIterator.remove();
+            }
+        }
+
+
         for (int i=0;i<projectRecords.getProjectPlanList().size();i++){
             if (projectRecords.getProjectPlanList().get(i).getId() == null){
                 continue;
             }
-            if (projectRecords.getProjectPlanList().size()==2){
+            if (projectRecords.getProjectPlanList().size()==1){
                 start=projectRecords.getProjectPlanList().get(i).getBeginDate();
                 end=projectRecords.getProjectPlanList().get(i).getEndDate();
             }else{
-                if (i==1){
+                if (i==0){
                     start=projectRecords.getProjectPlanList().get(i).getBeginDate();
                 }else if((i+1)==projectRecords.getProjectPlanList().size()){
                     end=projectRecords.getProjectPlanList().get(i).getEndDate();
@@ -132,19 +143,19 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             }
         }
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd");//日期格式
-        Date startDate=null;
-        Date endDate=null;
-        if (projectRecords.getStartDate()!=null){
+        Date startDate=projectRecords.getStartDate();
+        Date endDate=projectRecords.getEndingDate();
+        /*if (projectRecords.getStartDate()!=null){
             startDate=new Date(projectRecords.getStartDate().toString());
         }else if (projectRecords.getEndingDate()!=null){
             endDate=new Date(projectRecords.getEndingDate().toString());
-        }
+        }*/
         RuralProjectRecords ruralProjectRecords=new RuralProjectRecords();
         ruralProjectRecords.setId(projectRecords.getId());
         ruralProjectRecords.setStartDate(format.parse(start));
         ruralProjectRecords.setEndingDate(format.parse(end));
         if (startDate!=null && endDate!=null){
-            if (!start.equals(format.format(startDate).toString()) || !end.equals(format.format(endDate).toString())){
+            if (!start.equals(format.format(startDate)) || !end.equals(format.format(endDate))){
                 ruralProjectRecordsService.updateDate(ruralProjectRecords);
             }
         }else{

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanConsultingController.java

@@ -169,11 +169,9 @@ public class ProjectPlanConsultingController extends BaseController {
                     if (projectRecords.getStartDate()!=null && projectRecords.getEndingDate() !=null){
                         DateFormat format = new SimpleDateFormat("yyyy-MM-dd");//日期格式
                         if (i==0){
-                            Date date=new Date(projectRecords.getStartDate().toString());
-                            projectPlan.setBeginDate(format.format(date).toString());
+                            projectPlan.setBeginDate(format.format(projectRecords.getStartDate()));
                         }else if((i+1)==mainDictList.size()){
-                            Date date=new Date(projectRecords.getEndingDate().toString());
-                            projectPlan.setEndDate(format.format(date).toString());
+                            projectPlan.setEndDate(format.format(projectRecords.getEndingDate()));
                         }
                     }
                     projectPlanList.add(projectPlan);
@@ -198,12 +196,12 @@ public class ProjectPlanConsultingController extends BaseController {
     @RequiresPermissions(value={"project:projectPlanConsulting:add","project:projectPlanConsulting:edit"})
     @RequestMapping(value = "save")
     public String save(ProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception{
-        String flag = projectRecords.getContractType();
+        String companyType = projectRecords.getCompanyType();
         ProjectRecords ProjectRecord = ruralProjectRecordsService.getProjectRecords(projectRecords.getId());
         MyBeanUtils.copyBeanNotNull2Bean(projectRecords, ProjectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
         projectPlanService.saveProjectPlanInfo(ProjectRecord);//保存
         addMessage(redirectAttributes, "保存项目计划成功");
-        return "redirect:"+ Global.getAdminPath()+"/project/projectPlanConsulting/?repage&contractType="+flag;
+        return "redirect:"+ Global.getAdminPath()+"/project/projectPlanConsulting/?repage&companyType="+companyType;
     }
 
     /**

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanCostController.java

@@ -19,7 +19,6 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -172,11 +171,9 @@ public class ProjectPlanCostController extends BaseController {
                     if (projectRecords.getStartDate()!=null && projectRecords.getEndingDate() !=null){
                         DateFormat format = new SimpleDateFormat("yyyy-MM-dd");//日期格式
                         if (i==0){
-                            Date date=new Date(projectRecords.getStartDate().toString());
-                            projectPlan.setBeginDate(format.format(date).toString());
+                            projectPlan.setBeginDate(format.format(projectRecords.getStartDate()).toString());
                         }else if((i+1)==mainDictList.size()){
-                            Date date=new Date(projectRecords.getEndingDate().toString());
-                            projectPlan.setEndDate(format.format(date).toString());
+                            projectPlan.setEndDate(format.format(projectRecords.getEndingDate()).toString());
                         }
                     }
                     projectPlanList.add(projectPlan);
@@ -201,12 +198,12 @@ public class ProjectPlanCostController extends BaseController {
     @RequiresPermissions(value={"project:projectPlanCost:add","project:projectPlanCost:edit"})
     @RequestMapping(value = "save")
     public String save(ProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception{
-        String flag = projectRecords.getContractType();
+        String companyType = projectRecords.getCompanyType();
         ProjectRecords ProjectRecord = ruralProjectRecordsService.getProjectRecords(projectRecords.getId());
         MyBeanUtils.copyBeanNotNull2Bean(projectRecords, ProjectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
         projectPlanService.saveProjectPlanInfo(ProjectRecord);//保存
         addMessage(redirectAttributes, "保存项目计划成功");
-        return "redirect:"+ Global.getAdminPath()+"/project/projectPlanCost/?repage";
+        return "redirect:"+ Global.getAdminPath()+"/project/projectPlanCost/?repage&companyType="+companyType;
     }
 
     /**

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostForm.jsp

@@ -197,6 +197,7 @@
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectPlanCost/save" method="post" class="form-horizontal">
             <form:hidden path="id"/>
+            <form:hidden path="companyType"/>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">