Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -677,6 +677,7 @@ public class OverheadLineController extends BaseController {
         jkxlDetailFee.setWbsCode(wbsCode);
         jkxlDetailFee.setTotalFee(totalFee);
         overheadLineService.updataDate(jkxlDetailFee);
+        
       }
       //更新未识别费用表
       JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -66,7 +66,7 @@ public class ProjectTemController extends BaseController {
      */
     @ResponseBody
     @RequestMapping("/import")
-    public HashMap importFile(@RequestParam(value = "file")MultipartFile[] file,String projectName,String[] itemNames,String[] itemTypes,String[] units,String[] itemNo) throws IOException, InvalidFormatException {
+    public HashMap importFile(@RequestParam(value = "file")MultipartFile[] file,String projectName,String[] itemNames,String[] units,String[] itemNo) throws IOException, InvalidFormatException {
         HashMap map = new HashMap();
         WbsProject wbsProject = new WbsProject();
         wbsProject.setProjectName(projectName);
@@ -74,11 +74,11 @@ public class ProjectTemController extends BaseController {
         String projectId = wbsProject.getId();
         String fileName = "";
         try {
-            for(int i = 0;i<itemTypes.length;i++) {
+            for(int i = 0;i<itemNames.length;i++) {
                 fileName = file[i].getOriginalFilename();
                 WbsItem wbsItem = new WbsItem();
                 wbsItem.setItemName(itemNames[i]);
-                wbsItem.setType(itemTypes[i]);
+//                wbsItem.setType(itemTypes[i]);
                 wbsItem.setProjectId(projectId);
                 if(null != units && units.length >0){
                     if(StringUtils.isNotBlank(units[i])){

src/main/webapp/webpage/modules/sg/free/individualForm.jsp

@@ -200,7 +200,7 @@
 
                 $.ajax({
                     type:"post",
-                    url:"${ctx}/jkxl/ddtz",
+                    url:"${ctx}/jkxl/bddtz",
                     // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
                     data:{id:newid2,type:xmmc2,fee:fyje2,tableData:jsondata,state:val },
                     success:function(result){