项目计划安排 日计划选择年份

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/entity/ProjectDailyPlan.java

@@ -75,7 +75,7 @@ public class ProjectDailyPlan extends DataEntity<ProjectDailyPlan> {
     public void setProjectSwitch(String projectSwitch) {
         this.projectSwitch = projectSwitch;
     }
-    @JsonFormat(pattern = "YYYY-MM")
+    @JsonFormat(pattern = "YYYY")
     public Date getProjectMonthDate() {
         return projectMonthDate;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/service/ProjectDailyPlanService.java

@@ -48,13 +48,15 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
 
     //得到可以安排计划数据 统一存放在List<ProjectDailyPlan>集合当中
     //数据库中根据字段匹配 arrageProject 3 -为已经安排过的日计划 0-1-2为月计划
-    public List<ProjectDailyPlan> getProjectDailyPlan(){
+    public List<ProjectDailyPlan> getProjectDailyPlan(String year){
         //初始化
         List<ProjectDailyPlan> projectDailyPlans = new ArrayList<ProjectDailyPlan>();
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("1");
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
-        materialProject.setAttributionYear(simpleDateFormat.format(new Date()));
+        if (null!=year&&!"".equals(year)){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+            materialProject.setAttributionYear(year);
+        }
         //查询项目
         List<MaterialProject> listMaterialProject = projectDailyPlanMapper.findListMaterialProject(materialProject);
         //得到立项信息

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/web/ProjectDailyPlanController.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -144,12 +145,12 @@ public class ProjectDailyPlanController extends BaseController {
 
     //新增日计划选择项目定义号，或者项目名称后走的方法（可不选）
     @RequestMapping(value = "initAddDailyPlan")
-    public String getInitAddDailyPlan(ProjectDailyPlan projectDailyPlan,Model model,HttpServletRequest request){
+    public String getInitAddDailyPlan(ProjectDailyPlan projectDailyPlan,String year,Model model, HttpServletRequest request){
         try {
             String comment1 = URLDecoder.decode(projectDailyPlan.getProjectName(), "UTF-8");
             projectDailyPlan.setProjectName(comment1);
             //获取所有未安排的日计划
-            List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan();
+            List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan(year);
             List<ProjectDailyPlan> sxDailyPlan = projectDailyPlanService.getSxDailyPlan(projectDailyPlans, projectDailyPlan);
             for (ProjectDailyPlan plan:sxDailyPlan){
                 plan.preInsert();