计划表添加字段，是否竣工

流程表记录第几次涉电，记录当前需要查询计划表的项目名称
项目经理判断项目二次涉电，项目库中没有改项目，不允许发起

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/entity/ConstructionProject.java

@@ -29,6 +29,8 @@ public class ConstructionProject extends DataEntity<ConstructionProject> {
     private Date arrangeTime;//  安排时间
     private Date specificTime;//  具体时间
     private String projectStatus;//  项目状态0-在项目中 1-在计划中
+    //标识，用于记录是否发起了竣工流程
+    private Integer endFlag;
 
     public String getCityCompany() {
         return cityCompany;
@@ -207,4 +209,12 @@ public class ConstructionProject extends DataEntity<ConstructionProject> {
     public void setProjectStatus(String projectStatus) {
         this.projectStatus = projectStatus;
     }
+
+    public Integer getEndFlag() {
+        return endFlag;
+    }
+
+    public void setEndFlag(Integer endFlag) {
+        this.endFlag = endFlag;
+    }
 }

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/entity/MaterialModule.java

@@ -16,6 +16,11 @@ public class MaterialModule extends ActEntity<MaterialModule> {
     private String projectName;
     // 手动填写的项目类型，包含非涉电项目才会有项目类型
     private String projectType;
+    //记录当前应该查询的项目信息
+    private String nowProjectName;
+    //记录第几次发电
+    private Integer frequency;
+
 
     @Override
     public String getProcInsId() {
@@ -58,4 +63,20 @@ public class MaterialModule extends ActEntity<MaterialModule> {
     public void setProjectType(String projectType) {
         this.projectType = projectType;
     }
+
+    public String getNowProjectName() {
+        return nowProjectName;
+    }
+
+    public void setNowProjectName(String nowProjectName) {
+        this.nowProjectName = nowProjectName;
+    }
+
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
 }

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/MaterialModuleMapper.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.materialmodule.activiti.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
+import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,4 +34,23 @@ public interface MaterialModuleMapper extends BaseMapper<MaterialModule> {
     //查找登录名id
     List<String> findUserId(@Param("list") List<String> list);
 
+    ConstructionProject findProject(String projectName);
+
+    void conProject(ConstructionProject constructionProject);
+
+    //查询当月所有的计划项目信息
+    List<ConstructionProject> findMonthProject();
+
+    //根据list<项目名>查询所有的流程项目信息
+    List<MaterialModule> findMaterialProject(List<ConstructionProject> list);
+
+    //修改计划项目的是否竣工状态
+    void updateEndFlag(String projectName);
+
+    //根据流程是列id获取流程信息
+    MaterialModule getModuleById(String procInsId);
+
+    //根据流程实列id修改项目记录领料次数信息
+    void updateModuleById(MaterialModule module);
+
 }

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/xml/MaterialModuleMapper.xml

@@ -56,7 +56,8 @@
 			user_name,
 			project_id,
 			project_name,
-			project_type
+			project_type,
+			frequency
 		)values
 			(
 			#{id},
@@ -70,7 +71,8 @@
 			#{userName},
 			#{projectId},
 			#{projectName},
-			#{projectType}
+			#{projectType},
+			#{frequency}
 			)
 	</insert>
 
@@ -95,4 +97,130 @@
 			</foreach>
 		 )
 	</select>
+
+	<select id="findProject" resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject">
+		select id
+		, create_by
+		, create_date
+		, update_by
+		, update_date
+		, del_flag
+		, remarks
+		, cityCompany
+		, countyCompany
+		, projectNature
+		, powerSupplyArea
+		, gridNumber
+		, cellNumber
+		, reserveNumber
+		, projectName
+		, projectNumber
+		, substationName
+		, lineName
+		, projectType
+		, instructions
+		, workAreaNote
+		, contructiveContent
+		, costEstimate
+		, whetherGraceProject
+		, projectNote
+		, constructionUnit
+		, arrangeTime
+		, specificTime
+		, projectStatus
+		from ms_construction_project
+		where projectName = #{projectName}
+	</select>
+
+	<insert id="conProject">
+		  INSERT INTO ms_construction_project(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			cityCompany,
+			countyCompany,
+			projectNature,
+			powerSupplyArea,
+			gridNumber,
+			cellNumber,
+			reserveNumber,
+			projectName,
+			projectNumber,
+			substationName,
+			lineName,
+			projectType,
+			instructions,
+			workAreaNote,
+			contructiveContent,
+			costEstimate,
+			whetherGraceProject,
+			projectNote,
+			constructionUnit,
+			arrangeTime,
+			specificTime,
+			projectStatus,
+			endFlag
+		) VALUES
+		(
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{cityCompany},
+			#{countyCompany},
+			#{projectNature},
+			#{powerSupplyArea},
+			#{gridNumber},
+			#{cellNumber},
+			#{reserveNumber},
+			#{projectName},
+			#{projectNumber},
+			#{substationName},
+			#{lineName},
+			#{projectType},
+			#{instructions},
+			#{workAreaNote},
+			#{contructiveContent},
+			#{costEstimate},
+			#{whetherGraceProject},
+			#{projectNote},
+			#{constructionUnit},
+			#{arrangeTime},
+			#{specificTime},
+			#{projectStatus},
+			0
+		)
+	</insert>
+
+	<select id="findMonthProject" resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject">
+		select projectName,endFlag from ms_construction_project where DATE_FORMAT( arrangeTime, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
+	</select>
+
+	<select id="findMaterialProject" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
+		select id,proc_ins_id, user_name, project_id, project_name, project_type from sg_construction_process where project_name
+		(
+			<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+				#{item.projectName}
+			</foreach>
+		)
+	</select>
+
+	<update id="updateEndFlag">
+		update ms_construction_project set endFlag = 1 where projectName = #{projectName};
+	</update>
+
+	<select id="getModuleById" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
+		select project_name,proc_ins_id,now_project_name,frequency from sg_construction_process where proc_ins_id = #{procInsId};
+	</select>
+
+	<update id="updateModuleById">
+		update sg_construction_process set frequency = #{frequency},now_project_name=#{nowProjectName} where proc_ins_id = #{procInsId};
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/service/MaterialModuleService.java

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.mapper.AdvanceMapper;
+import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.mapper.MaterialModuleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,44 @@ public class MaterialModuleService extends CrudService<MaterialModuleMapper, Mat
 		return materialModuleMapper.findUserId(list);
 	}
 
+	//根据项目名称获取项目计划数据
+	public ConstructionProject findProject(String projectName){
+		return materialModuleMapper.findProject(projectName);
+	}
+
+	//插入对应的计划信息
+	@Transactional(readOnly = false)
+	public void conProject(ConstructionProject constructionProject){
+		materialModuleMapper.conProject(constructionProject);
+	}
+
+	//查询当月所有的计划项目信息
+	public List<ConstructionProject> findMonthProject(){
+		return materialModuleMapper.findMonthProject();
+	}
+
+	//根据list<项目名>查询所有的流程项目信息
+	public List<MaterialModule> findMaterialProject(List<ConstructionProject> list){
+		return materialModuleMapper.findMaterialProject(list);
+	}
+
+	//修改计划项目的是否竣工状态
+	@Transactional(readOnly = false)
+	public void updateEndFlag(String projectName){
+		materialModuleMapper.updateEndFlag(projectName);
+	}
+
+	//根据流程是列id获取流程信息
+	public MaterialModule getModuleById(String procInsId){
+		return materialModuleMapper.getModuleById(procInsId);
+	}
+
+	//根据流程实列id修改项目记录领料次数信息
+	@Transactional(readOnly = false)
+	public void updateModuleById(MaterialModule module){
+		materialModuleMapper.updateModuleById(module);
+	}
+
 	@Transactional(readOnly = false)
 	@Override
 	public void save(MaterialModule entity) {

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/web/MaterialModuleController.java

@@ -176,6 +176,7 @@ public class MaterialModuleController extends BaseController {
             //保存
             //修改项目的施工模块状态
             materialModule.setUserName(UserUtils.getUser().getLoginName());
+            materialModule.setFrequency(1);
             materialModuleService.save(materialModule);
             // 启动流程
             Map<String, Object> vars = Maps.newHashMap();

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -105,7 +105,7 @@ public class PickIngController extends BaseController {
      */
     @RequestMapping(value = "netExamine")
     public String netExamine(ShowList showList, Model model) {
-        model.addAttribute("showList", showList);
+        model.addAttribute("showLi  st", showList);
         ProjectNumber projectNumber = pickIngService.projectNumber(showList.getProcInsId());
         model.addAttribute("projectNumber",projectNumber);
         return "modules/sg/picking/activiti/netExamine";

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerWhether.js

@@ -171,9 +171,12 @@ $(document).ready(function() {
 					"comment":window.encodeURI(message)
 				},
 				function (data) {
-					if(data.success){
+					if (data.success) {
 						jp.success(data.msg);
-						jp.go("${ctx}/act/task/todo")
+						jp.go("${ctx}/act/task/todo");
+					} else {
+						jp.error(data.msg);
+						jp.go("${ctx}/act/task/todo");
 					}
 				})
 		});