Merge remote-tracking branch 'origin/master'

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
@@ -871,6 +876,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/financial/erpcredit/util/ErpInfo.java

@@ -174,6 +174,7 @@ public  class ErpInfo {
                 }
             }
             if (flag){//如果为true
+                erpCredit.setCableTube("");
                 //施工费合计 赋值为安装费（有 设备费入账金额 或者 材料费入账金额）
                 erpCredit.setConsInstallFee(erpCredit.getConsTotalFee());
             }else {
@@ -243,37 +244,40 @@ public  class ErpInfo {
     }
 
     /**
-     * 电缆型号
+     * 电缆保护管读取
      * @param erpCredit
      * @param erpAccount
      * @param flag
      * @return
      */
     public static ErpCredit getcableTube(ErpCredit erpCredit, ErpAccount erpAccount, boolean flag){
-        String cableTube = "";
-        Double subErpCredit = 0.0;//获取数值
-        Double subAccount = 0.0;//读取电缆
-        String[] cableTubes;
-         if (flag){
-             if (null!=erpAccount.getMaterialDetails()&&erpAccount.getMaterialDetails().contains(CON_CABLE)){
-                 erpCredit.setCableTube(erpAccount.getMaterialDetails());
-             }
-         }else {
-             if (null!=erpAccount.getMaterialDetails()&&erpAccount.getMaterialDetails().contains(CON_CABLE)){
-                 if (null!=erpCredit.getCableTube()){
-                    cableTubes = erpCredit.getCableTube().split(",");
-                    cableTube = cableTubes[cableTubes.length-1];
-                     subErpCredit = Double.parseDouble(cableTube.substring(1,cableTube.length()));
-                     //读取电缆
-                     cableTubes = erpAccount.getMaterialDetails().split(",");
-                     cableTube = cableTubes[cableTubes.length-1];
-                     subAccount = Double.parseDouble(cableTube.substring(1,cableTube.length()));
-                     if (subAccount>subErpCredit){
-                         erpCredit.setCableTube(erpAccount.getMaterialDetails());
-                     }
-                 }
-             }
-         }
+//        String cableTube = "";
+//        Double subErpCredit = 0.0;//获取数值
+//        Double subAccount = 0.0;//读取电缆
+//        String[] cableTubes;
+        if (erpAccount.getMaterialDetails().contains(CON_CABLE)){
+            erpCredit.setCableTube(erpAccount.getMaterialDetails());
+        }
+//         if (flag){
+//             if (null!=erpAccount.getMaterialDetails()&&erpAccount.getMaterialDetails().contains(CON_CABLE)){
+//                 erpCredit.setCableTube(erpAccount.getMaterialDetails());
+//             }
+//         }else {
+//             if (null!=erpAccount.getMaterialDetails()&&erpAccount.getMaterialDetails().contains(CON_CABLE)){
+//                 if (null!=erpCredit.getCableTube()){
+//                    cableTubes = erpCredit.getCableTube().split(",");
+//                    cableTube = cableTubes[cableTubes.length-1];
+//                     subErpCredit = Double.parseDouble(cableTube.substring(1,cableTube.length()));
+//                     //读取电缆
+//                     cableTubes = erpAccount.getMaterialDetails().split(",");
+//                     cableTube = cableTubes[cableTubes.length-1];
+//                     subAccount = Double.parseDouble(cableTube.substring(1,cableTube.length()));
+//                     if (subAccount>subErpCredit){
+//                         erpCredit.setCableTube(erpAccount.getMaterialDetails());
+//                     }
+//                 }
+//             }
+//         }
          return erpCredit;
     }
     /**

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ExportUtilCalculate.java

@@ -532,7 +532,7 @@ public class ExportUtilCalculate {
                 transferOfPower1.setPowerTenKvCableType(erpCredit.getTenKvModel());
             }
             //添加保护管信息
-            if (null!=erpCredit.getCableTube()){
+            if (null!=erpCredit.getCableTube()&&!"".equals(erpCredit.getCableTube())){
                 transferOfPower1.setPowerTenKvCableType(erpCredit.getCableTube());
             }
             if (null!=erpCredit.getConsBuildingFee()){//建筑费

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/materialplan/web/MeterialPlanController.java

@@ -242,10 +242,10 @@ public class MeterialPlanController extends BaseController {
 				j.setMsg( "已成功导入 "+count+" 条基本表记录"+failureMsg);
 			}
 			if (integer == MaterialPlanInfo.MATER_TWO){
-				j.setMsg( "已成功导入 "+successNum+" 条库存表记录"+failureMsg);
+				j.setMsg( "已成功导入库存表记录");
 			}
 			if (integer == MaterialPlanInfo.MATER_THREE){
-				j.setMsg( "已成功导入 "+successNum+" 条是否入库记录"+failureMsg);
+				j.setMsg( "已成功导入条是否入库记录");
 			}
 		} catch (Exception e) {
 			j.setSuccess(false);

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

@@ -25,6 +25,8 @@ public interface ProjectMapper extends BaseMapper<Project> {
      * */
     void updateStatusBy(@Param("status") String status,@Param("procInsId") String procInsId);
 
+    void  updateStatusByClose(@Param("close") String close,@Param("procInsId") 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

@@ -267,11 +267,7 @@
 		phone_style,
 		stay_open_area,
 		ring_network_cabinet,
-		station_dtu,
-		status,
-		acquisition_status,
-		construction_status,
-		whether_close_status
+		station_dtu
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -321,11 +317,7 @@
 			#{item.phoneStyle},
 			#{item.stayOpenArea},
 			#{item.ringNetworkCabinet},
-			#{item.stationDtu},
-			#{item.status},
-			#{item.acquisitionStatus},
-			#{item.constructionStatus},
-			#{item.whetherCloseStatus}
+			#{item.stationDtu}
 		)
 		</foreach>
 	</insert>
@@ -377,6 +369,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;
@@ -61,18 +62,27 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	/**
 	 * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
 	 */
+	@Transactional(readOnly = false)
 	public void updateStatusBy(String status, String procInsId) {
 		projectMapper.updateStatusBy(status,procInsId);
 	}
 
+	/**
+	 * 根据项目需求名称修改项目关闭状态
+	 */
+	@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){
 			project.preInsert();
-			project.setStatus("0");
-			project.setAcquisitionStatus("0");
-			project.setConstructionStatus("0");
-			project.setWhetherCloseStatus("0");
+//			project.setStatus("0");
+//			project.setAcquisitionStatus("0");
+//			project.setConstructionStatus("0");
+//			project.setWhetherCloseStatus("0");
 		}
 		projectMapper.insertList(projects);
 	}

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -73,7 +73,24 @@ public  class ProExcelInfo {
         }
         return list;
     }
-
+    //验证表格数据是否正确
+    public static Boolean getProjectUtilFlag(ImportUtil importUtil){
+        Boolean flag = false;
+        Row row = importUtil.getRow(1);
+        String indexFive =  (String)importUtil.getCellValue(row,5);
+        String indexSix = (String)importUtil.getCellValue(row,6);
+        String indexNine = (String)importUtil.getCellValue(row,9);
+        if (!indexFive.contains("项目")){
+            flag = true;
+        }
+        if (!indexSix.contains("编号")){
+            flag = true;
+        }
+        if (!indexNine.contains("角色")){
+            flag = true;
+        }
+        return flag;
+    }
     /**
      * 生成随机数
      * @return

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -34,6 +34,8 @@ import com.jeeplus.core.web.BaseController;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 
+import static com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo.getProjectUtilFlag;
+
 /**
  * 表单Controller
  * @author lgf
@@ -180,17 +182,23 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
 		AjaxJson j = new AjaxJson();
-//		try {
+		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
+			Boolean projectUtilFlag = ProExcelInfo.getProjectUtilFlag(importUtil);
+			if (projectUtilFlag){
+				j.setSuccess(false);
+				j.setMsg("表不符合规范");
+				return j;
+			}
 			List<Project> projects = ProExcelInfo.getProjectUtil(importUtil);
 			projectService.saveList(projects);
 			j.setMsg( "已成功导入 "+projects.size()+" 条项目表单记录");
-//		} catch (Exception e) {
-//			j.setSuccess(false);
-//			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());
-//		}
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());
+		}
 		return j;
     }
 }

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -54,7 +54,7 @@
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|需求提出单位|变电站名称|线路名称|设备基本情况|运行班')}" fieldKeys="requireName|demandUnit|bdzName|lineName|asicEquipment|runTheClass" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="true"></sys:itemselect>
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="true"></sys:itemselect>
 								</td>
 <%--								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
 								<td class="width-35">--%>