工作流程 政策处理，项目关闭

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -29,6 +29,8 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionServ
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import groovy.util.IFileNameFinder;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
@@ -103,6 +105,9 @@ public class ActTaskController extends BaseController {
 	@Autowired
 	private ProcessPersonnelService processPersonnelService;
 
+	@Autowired
+	private ProjectService projectService;
+
 	/**
 	 * 获取待办列表
 	 * @return
@@ -859,6 +864,8 @@ public class ActTaskController extends BaseController {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.addDepartment(act);
+			projectService.updateStatusBy("0",act.getProcInsId());
+			projectService.updateStatusByClose("1",act.getProcInsId());
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/entity/MaterialPlan.java

@@ -15,13 +15,13 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
     private String bigDescribe;//大类描述
     private String moderateDescribe;//中类描述
     private String smallDescribe;//小类描述
-    private Integer requireNumber;//需求数量
+    private Double requireNumber;//需求数量
     private String util;//单位
     private String planToBatch;//计划批次
     private Date deliverySchedule;//供货计划到日
     private String flagStorage;//是否入库
-    private Integer inventoryQuantity;//库存数量
-    private Integer numberFrozen;//冻结数量
+    private Double inventoryQuantity;//库存数量
+    private Double numberFrozen;//冻结数量
     private String supplierName;//供应商名称
 
     @ExcelField(title="物资唯一码", align=2, sort=1)
@@ -89,11 +89,11 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
         this.smallDescribe = smallDescribe;
     }
     @ExcelField(title="需求数量", align=2, sort=9)
-    public Integer getRequireNumber() {
+    public Double getRequireNumber() {
         return requireNumber;
     }
 
-    public void setRequireNumber(Integer requireNumber) {
+    public void setRequireNumber(Double requireNumber) {
         this.requireNumber = requireNumber;
     }
     @ExcelField(title="单位", align=2, sort=10)
@@ -131,19 +131,19 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
     }
 
     @ExcelField(title="库存数量", align=2, sort=14)
-    public Integer getInventoryQuantity() {
+    public Double getInventoryQuantity() {
         return inventoryQuantity;
     }
-    public void setInventoryQuantity(Integer inventoryQuantity) {
+    public void setInventoryQuantity(Double inventoryQuantity) {
         this.inventoryQuantity = inventoryQuantity;
     }
 
     @ExcelField(title="冻结数量", align=2, sort=15)
-    public Integer getNumberFrozen() {
+    public Double getNumberFrozen() {
         return numberFrozen;
     }
 
-    public void setNumberFrozen(Integer numberFrozen) {
+    public void setNumberFrozen(Double numberFrozen) {
         this.numberFrozen = numberFrozen;
     }
 

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/util/MaterialPlanInfo.java

@@ -55,18 +55,18 @@ public class MaterialPlanInfo {
                 materialPlan.setSmallDescribe((String)importUtil.getCellValue(row,7));
                 requireCount =(String)importUtil.getCellValue(row,8);
                 if (null!=requireCount){
-                    materialPlan.setRequireNumber(new Integer((String)importUtil.getCellValue(row,8)));
+                    materialPlan.setRequireNumber(new Double((String)importUtil.getCellValue(row,8)));
                 }
                 materialPlan.setUtil((String)importUtil.getCellValue(row,9));
                 materialPlan.setPlanToBatch((String)importUtil.getCellValue(row,10));
                 materialPlan.setFlagStorage((String)importUtil.getCellValue(row,12));
                 inventoryQuantity = (String)importUtil.getCellValue(row,13);
                 if (null!=inventoryQuantity){
-                    materialPlan.setInventoryQuantity(new Integer((String)importUtil.getCellValue(row,13)));
+                    materialPlan.setInventoryQuantity(new Double((String)importUtil.getCellValue(row,13)));
                 }
                 numberFrozen = (String)importUtil.getCellValue(row,14);
                 if (null!=numberFrozen){
-                    materialPlan.setNumberFrozen(new Integer((String)importUtil.getCellValue(row,14)));
+                    materialPlan.setNumberFrozen(new Double((String)importUtil.getCellValue(row,14)));
                 }
                 materialPlan.setSupplierName((String)importUtil.getCellValue(row,15));
                 list.add(materialPlan);
@@ -171,8 +171,8 @@ public class MaterialPlanInfo {
         for (MaterialPlan materialPlan:materialPlanList){
             for (InventoryTable inventoryTable:inventoryTableList){
                 if (materialPlan.getUniqueCode().equals(inventoryTable.getUniqueCode())){
-                    materialPlan.setInventoryQuantity(new Integer(inventoryTable.getInventoryQuantity()));
-                    materialPlan.setNumberFrozen(new Integer(inventoryTable.getNumberFrozen()));
+                    materialPlan.setInventoryQuantity(new Double(inventoryTable.getInventoryQuantity()));
+                    materialPlan.setNumberFrozen(new Double(inventoryTable.getNumberFrozen()));
                     materialPlan.setSupplierName(inventoryTable.getSupplierName());
                 }
             }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -25,6 +25,8 @@ public interface ProjectMapper extends BaseMapper<Project> {
      * */
     void updateStatusBy(String status,String procInsId);
 
+    void  updateStatusByClose(@Param("close") String close,String procInsid);
+
     public List<Project> findListById(String[] proListId);
 
     int insertList(@Param("list") List<Project> list);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -377,6 +377,10 @@
 	<update id="updateStatusBy">
 		update xm_project_details set status = #{status} where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
 	</update>
+	<!-- 修改项目关闭状态-->
+	<update id="updateStatusByClose">
+		update xm_project_details set whether_close_status = #{close} where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+	</update>
 
 	<!--修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底-->
 	<update id="updateStatus">

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -9,6 +9,7 @@ import java.util.UUID;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +66,14 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		projectMapper.updateStatusBy(status,procInsId);
 	}
 
+	/**
+	 * 根据项目需求名称修改项目关闭状态0未发起施工交底，1施工交底过程中，2完成施工交底
+	 */
+	@Transactional(readOnly = false)
+	public void updateStatusByClose(String close,String procInsId){
+		projectMapper.updateStatusByClose(close,procInsId);
+	}
+
 	@Transactional(readOnly = false)
 	public void saveList(List<Project> projects) {
 		for(Project project:projects){