后台日计划修改

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/entity/MaterialProject.java

@@ -36,6 +36,16 @@ public class MaterialProject extends DataEntity<MaterialProject>{
     private String[] reserveCodes;//储备编码(多条)
     private String[] projectCodes;//项目编码(多条)
 
+    private String secondPower;//是否二次设电 1-未二次涉电 1-二次涉电
+
+    public String getSecondPower() {
+        return secondPower;
+    }
+
+    public void setSecondPower(String secondPower) {
+        this.secondPower = secondPower;
+    }
+
     public String getArrageProject1() {
         return arrageProject1;
     }

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

@@ -22,10 +22,11 @@ public class ProjectDailyPlan extends DataEntity<ProjectDailyPlan> {
     private String constructionUnit;//施工单位项目经理
     private String operationUnit;//运行单位项目经理
 
-    private String flagYesElectricity;//是否二次涉电
+    private String flagYesElectricity;//是否二次涉电 0-未涉电 1-二次涉电
 
     private String arrangeDailyPlan;//安排日计划的状态（0-未安排 1-已安排）
 
+
     public String getArrangeDailyPlan() {
         return arrangeDailyPlan;
     }

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

@@ -7,6 +7,7 @@ import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectA
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectDailyPlan;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectPlanArrage;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectQuantity;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,5 +32,8 @@ public interface ProjectDailyPlanMapper extends BaseMapper<ProjectDailyPlan> {
     //修改项目
     Integer updateMartailDaily(@Param("list")List<ProjectDailyPlan> list);
 
+    //修改项目
+    Integer updateNoMartailDaily(@Param("list")List<String> list);
+
 
 }

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

@@ -174,7 +174,8 @@
 		a.hasPlan,
 		a.halfPlan,
 		a.projectName,
-		a.projectId
+		a.projectId,
+		a.secondPower
     </sql>
 	<!--查询日计划-->
 	<select id="findListMaterialProject" resultType="com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject">
@@ -277,18 +278,26 @@
 	</select>
 
 	<delete id="deleteMonthPlan">
-		delete from xm_project_plan_arrange a
-		where a.reserveProjectName in
+		delete from xm_project_plan_arrange
+		where projectName in
 		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
 			#{item.projectName}
 		</foreach>
 	</delete>
 
 	<update id="updateMartailDaily">
-		update xm_material_project a set arrageProject = '4'
-		where a.reserveProjectName in
+		update xm_material_project set arrageProject = '4'
+		where reserveProjectName in
 		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
 			#{item.projectName}
 		</foreach>
 	</update>
+
+	<update id="updateNoMartailDaily">
+		update xm_material_project set arrageProject = '0'
+		where reserveProjectName in
+		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+	</update>
 </mapper>

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

@@ -27,6 +27,11 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
     private ProjectDailyPlanMapper projectDailyPlanMapper;
 
     @Transactional(readOnly = false)
+    public void updateNoMartailDaily(List<String> ids){
+        projectDailyPlanMapper.updateNoMartailDaily(ids);
+    }
+
+    @Transactional(readOnly = false)
     public void insertList(List<ProjectDailyPlan> projectDailyPlans){
         for (ProjectDailyPlan projectDailyPlan:projectDailyPlans){
             projectDailyPlan.preInsert();
@@ -58,6 +63,7 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
                     projectDailyPlan = new ProjectDailyPlan();
                     projectDailyPlan.setProjectName(m.getReserveProjectName());
                     projectDailyPlan.setProjectNumber(m.getProjectId());
+                    projectDailyPlan.setFlagYesElectricity(m.getSecondPower());
                     projectDailyPlans.add(projectDailyPlan);
                 }
             }
@@ -101,6 +107,7 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
                 for (ProjectDailyPlan projectDailyPlan2:projectDailyPlans){
                     if (projectDailyPlan1.getProjectName().equals(projectDailyPlan2.getProjectName())){
                         projectDailyPlan1.setProjectNumber(projectDailyPlan2.getProjectNumber());
+                        projectDailyPlan1.setFlagYesElectricity(projectDailyPlan2.getFlagYesElectricity());//是否二次设电状态
                         break;
                     }
                 }
@@ -219,9 +226,9 @@ public class ProjectDailyPlanService extends CrudService<ProjectDailyPlanMapper,
         //保存日计划项目
         insertList(surePlan);
 //        //去除月计划项目
-//        projectDailyPlanMapper.deleteMonthPlan(surePlan);
+        projectDailyPlanMapper.deleteMonthPlan(surePlan);
 //        //修改项目状态
-//        projectDailyPlanMapper.updateMartailDaily(surePlan);
+        projectDailyPlanMapper.updateMartailDaily(surePlan);
     }
 
 

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

@@ -69,12 +69,19 @@ public class ProjectDailyPlanController extends BaseController {
     //删除操作
     @ResponseBody
     @RequestMapping(value = "deleteAll")
-    public AjaxJson deleteAll(ProjectDailyPlan projectDailyPlan,String ids,HttpServletRequest request){
+    public AjaxJson deleteAll(ProjectDailyPlan projectDailyPlan,String ids,String projectNames,HttpServletRequest request){
         AjaxJson ajaxJson = new AjaxJson();
         ProjectDailyPlan dailyPlan = null;
         try {
+            String comment = URLDecoder.decode(projectNames, "UTF-8");
+            List<String> list = new ArrayList<>();
             if (ids.contains(",")){
                 String[] split = ids.split(",");
+                String[] names = comment.split(",");
+                for (String name:names){
+                    list.add(name);
+                }
+                projectDailyPlanService.updateNoMartailDaily(list);
                 for (String str : split){
                     dailyPlan = new ProjectDailyPlan();
                     dailyPlan.setId(str);
@@ -83,6 +90,8 @@ public class ProjectDailyPlanController extends BaseController {
             }else {
                 dailyPlan = new ProjectDailyPlan();
                 dailyPlan.setId(ids);
+                list.add(comment);
+                projectDailyPlanService.updateNoMartailDaily(list);
                 projectDailyPlanService.delete(dailyPlan);
             }
             ajaxJson.setSuccess(true);
@@ -114,13 +123,32 @@ public class ProjectDailyPlanController extends BaseController {
         return j;
     }
 
+    //下载导入模板
+    @ResponseBody
+    @RequestMapping(value = "exportTim")
+    public AjaxJson exportTim(ProjectDailyPlan projectDailyPlan, HttpServletRequest request, HttpServletResponse response) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String fileName = "日计划安排表模板.xlsx";
+            List<ProjectDailyPlan> projectDailyPlans = new ArrayList<ProjectDailyPlan>();
+            new ExportExcel("日计划安排表", ProjectDailyPlan.class).setDataList(projectDailyPlans).write(response, fileName).dispose();
+            j.setSuccess(true);
+            j.setMsg("导出成功！");
+            return j;
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导出日计划安排记录失败！失败信息："+e.getMessage());
+        }
+        return j;
+    }
+
     //新增日计划选择项目定义号，或者项目名称后走的方法（可不选）
     @RequestMapping(value = "initAddDailyPlan")
     public String getInitAddDailyPlan(ProjectDailyPlan projectDailyPlan,Model model,HttpServletRequest request){
         try {
             String comment1 = URLDecoder.decode(projectDailyPlan.getProjectName(), "UTF-8");
             projectDailyPlan.setProjectName(comment1);
-            //获取所有为安排的日计划
+            //获取所有未安排的日计划
             List<ProjectDailyPlan> projectDailyPlans = projectDailyPlanService.getProjectDailyPlan();
             List<ProjectDailyPlan> sxDailyPlan = projectDailyPlanService.getSxDailyPlan(projectDailyPlans, projectDailyPlan);
             for (ProjectDailyPlan plan:sxDailyPlan){
@@ -179,11 +207,24 @@ public class ProjectDailyPlanController extends BaseController {
             if (!projectPlans.isEmpty()&&!strings.isEmpty()){
                 projectDailyPlanService.addPlanDaily(projectPlans,strings);
             }
+            //判断书否二次涉电
+            boolean flag = false;
+            for (ProjectDailyPlan plans:projectPlans){
+                //二次设电项目
+                if (plans.getFlagYesElectricity().equals("1")){
+                    flag = true;
+                    break;
+                }
+            }
             List<Map<String,Object>> objects = Lists.newArrayList();
             List<Map<String, Object>> bookStrapTree = BookStrapTreeUtil.getDailyBookStrapTree(objects, projectPlans);
             j.setMapListTree(bookStrapTree);
             j.setSuccess(true);
-            j.setMessage("安排日计划成功");
+            if (flag){
+                j.setMessage("安排日计划成功:您所安排的项目中有二次涉电项目，列表已标红");
+            }else {
+                j.setMessage("安排日计划成功");
+            }
             return j;
         }catch (Exception e){
             e.printStackTrace();
@@ -261,6 +302,38 @@ public class ProjectDailyPlanController extends BaseController {
         return ajaxJson;
     }
 
+    //新增日计划备注按钮
+    @ResponseBody
+    @RequestMapping(value = "remarksBack")
+    public Result remarksBack(String ids,String remarks,HttpServletRequest request){
+        Result j = new Result();
+        List<String> strings = PackagingUtil.getString(ids);
+        try {
+            String comment = URLDecoder.decode(remarks, "UTF-8");
+            List<ProjectDailyPlan> projectPlans = (List<ProjectDailyPlan>)request.getSession().getAttribute("sxDailyPlan");
+            for (ProjectDailyPlan plan:projectPlans){
+                for (String s:strings){
+                    if (plan.getId().equals(s)){
+                        plan.setRemarks(comment);
+                    }
+                }
+            }
+            List<Map<String,Object>> objects = Lists.newArrayList();
+            List<Map<String, Object>> bookStrapTree = BookStrapTreeUtil.getDailyBookStrapTree(objects, projectPlans);
+            j.setMapListTree(bookStrapTree);
+            j.setSuccess(true);
+            j.setMessage("取消计划成功");
+            j.setSuccess(true);
+            j.setMessage("备注成功");
+            return j;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        j.setSuccess(false);
+        j.setMessage("备注失败");
+        return j;
+    }
+
     @ResponseBody
     @RequestMapping(value = "sureInspection")
     public AjaxJson sureInspection(String ids,ProjectDailyPlan projectDailyPlan,Model model,HttpServletRequest request,HttpServletResponse response){