项目计划安排 修改根据选择年份进行计划安排

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

@@ -21,6 +21,8 @@ public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage>{
     private String constructionUnit;//施工单位项目经理
     private String operationUnit;//运行单位项目经理
 
+    private String attributionYear;//归属年份
+
 
     private String arrageFlag;//未安排标识 0-未安排 1-已安排
     private String whetherStatus;//是否未父类 0-时子类 1-是父类
@@ -36,6 +38,14 @@ public class ProjectPlanArrage extends DataEntity<ProjectPlanArrage>{
     private Integer associatedSort;//关联包排序字段
     private Integer powerPackageSort;//停电包排序字段
 
+    public String getAttributionYear() {
+        return attributionYear;
+    }
+
+    public void setAttributionYear(String attributionYear) {
+        this.attributionYear = attributionYear;
+    }
+
     public Integer getAssociatedSort() {
         return associatedSort;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/mapper/xml/ProjectDailyPlanMapper.xml

@@ -185,8 +185,11 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="attributionYear != null and attributionYear != ''">
+				AND a.attributionYear = #{attributionYear}
+			</if>
 			<if test="arrageProject != null and arrageProject != ''">
-				AND a.arrageProject = '1' or a.arrageProject = '2' or a.arrageProject = '0'
+				AND a.arrageProject in(1,2,0)
 			</if>
 		</where>
 		<choose>

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/mapper/xml/ProjectPlanArrageMapper.xml

@@ -72,8 +72,11 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="attributionYear != null and attributionYear != ''">
+				AND a.attributionYear = #{attributionYear}
+			</if>
 			<if test="arrageProject != null and arrageProject != ''">
-				AND a.arrageProject = #{arrageProject} or a.arrageProject = #{arrageProject1}
+				AND a.arrageProject in(#{arrageProject},#{arrageProject1})
 			</if>
 		</where>
 		<choose>

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
@@ -52,6 +53,8 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
         List<ProjectDailyPlan> projectDailyPlans = new ArrayList<ProjectDailyPlan>();
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("1");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+        materialProject.setAttributionYear(simpleDateFormat.format(new Date()));
         //查询项目
         List<MaterialProject> listMaterialProject = projectDailyPlanMapper.findListMaterialProject(materialProject);
         //得到立项信息

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

@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -82,6 +83,7 @@ public class ProjectPlanArrageController extends BaseController {
     //返回安排计划列表，操作计划安排 -- 左树右边表 页面（projectPlanArrageForm） session(projectPlan)
     @RequestMapping(value = "isArranging")
     public String lsArranging(ProjectPlanArrage projectPlanArrage,Model model,HttpServletRequest request){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
         try {
             if (null!=projectPlanArrage.getProjectName()&&!"".equals(projectPlanArrage.getProjectName())){
                 String name = URLDecoder.decode(projectPlanArrage.getProjectName(),"utf-8");
@@ -90,7 +92,9 @@ public class ProjectPlanArrageController extends BaseController {
             //获取项目计划安排的初始项目
             MaterialProject materialProject = new MaterialProject();
             materialProject.setArrageProject("0");
-            materialProject.setArrageProject1("0");
+            materialProject.setArrageProject1("1");
+            //获取当前年份
+            materialProject.setAttributionYear(simpleDateFormat.format(projectPlanArrage.getProjectMonthDate()));
             //初始安排计划项目列表
             List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList(materialProject);
             if (!planArrageList.isEmpty()){
@@ -113,6 +117,8 @@ public class ProjectPlanArrageController extends BaseController {
                     par.preInsert();
                 }
                 request.getSession().setAttribute("projectPlan",projectPlanList);
+            }else {
+                request.getSession().setAttribute("projectPlan",planArrageList);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -436,6 +442,8 @@ public class ProjectPlanArrageController extends BaseController {
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("0");
         materialProject.setArrageProject1("1");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+        materialProject.setAttributionYear(simpleDateFormat.format(mouthDate));
         //初始安排计划项目列表
         List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList(materialProject);
         //根据项目名称查询人员
@@ -623,7 +631,7 @@ public class ProjectPlanArrageController extends BaseController {
             boolean flag = projectPlanArrageService.deleteJudgePlanArrange(projectPlans, strings);
             if (!flag){
                 ajaxJson.setSuccess(false);
-                ajaxJson.setMessage("只允许删除本人的项目()!");
+                ajaxJson.setMessage("只允许删除本人的项目!");
                 return ajaxJson;
             }
             //删除项目
@@ -722,6 +730,15 @@ public class ProjectPlanArrageController extends BaseController {
         MaterialProject materialProject = new MaterialProject();
         materialProject.setArrageProject("0");
         materialProject.setArrageProject1("1");
+        //获取已经安排的年份
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+        for (ProjectActProclnsAss proclnsAss:listAss){
+            if (null!=proclnsAss.getProjectMonthDate()){
+                String year = simpleDateFormat.format(proclnsAss.getProjectMonthDate());
+                materialProject.setAttributionYear(year);
+                break;
+            }
+        }
         //初始安排计划项目列表
         List<ProjectPlanArrage> planArrageList = projectPlanArrageService.getProjectPlanArrageList(materialProject);
         //根据项目名称查询人员