Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/OverheadLineMapper.java

@@ -12,6 +12,7 @@ public interface OverheadLineMapper {
     List<JkxlDetailFee> getList(@Param("id") String id,@Param("type") String type);
     JkxlDetailFee getData(@Param("id")String id, @Param("wbsCode")String wbsCode);
     void save(JkxlDetailFee jkxlDetailFee);
+    void saveList(@Param("list") List<JkxlDetailFee> list);
     void saveProject(WbsProject project);
     List<JkxlDetailFee> findList(@Param("id") String id,@Param("type")String type);
     List<JkxlDetailFee> getAdjust(String id);

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/OverheadLineMapper.xml

@@ -178,6 +178,65 @@
 		)
 	</insert>
 
+	<insert id="saveList" parameterType="java.util.List">
+		insert into sg_fee_detail_jkxl
+		(id,
+		 wbs_code,
+		 original_total_cost,
+		 original_rate,
+		 original_rg_cost,
+		 original_cbr_cost,
+		 original_fbr_cost,
+		 original_jx_cost,
+		 rg_cost,
+		 cbr_cost,
+		 fbr_cost,
+		 jx_cost,
+		 measures_fee1,
+		 measures_fee2,
+		 measures_fee3,
+		 other_cost,
+		 fees,
+		 tex,
+		 total_fee,
+		 zjgc_fee,
+		 rg_fee_ft,
+		 cbr_fee_ft,
+		 fbr_fee_ft,
+		 jx_fee_ft,
+		 gx_fee
+		) values
+		<foreach collection="list" item="item" index="index" separator=",">
+		 (
+		 #{item.id},
+		 #{item.wbsCode},
+		 #{item.originalTotalCost},
+		 #{item.originalRate},
+		 #{item.originalRgCost},
+		 #{item.originalCbrCost},
+		 #{item.originalFbrCost},
+		 #{item.originalJxCost},
+		 #{item.rgCost},
+		 #{item.cbrCost},
+		 #{item.fbrCost},
+		 #{item.jxCost},
+		 #{item.measuresFee1},
+		 #{item.measuresFee2},
+		 #{item.measuresFee3},
+		 #{item.otherCost},
+		 #{item.fees},
+		 #{item.tex},
+		 #{item.totalFee},
+		 #{item.zjgcFee},
+		 #{item.rgFtFee},
+		 #{item.cbrFtFee},
+		 #{item.fbrFtFee},
+		 #{item.jxFtFee},
+		 #{item.gxFee}
+		)
+		</foreach>
+	</insert>
+
 
 
     <update id="updateDate" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -480,9 +480,10 @@ public List<JkxlDetailFee> findList(String id,String type){
        list.add(jkxlDetailFee1);
        list.add(jkxlDetailFee2);
        //保存费用明细
-       for(JkxlDetailFee jkxlDetailFee:list){
-           overheadLineMapper.save(jkxlDetailFee);
-       }
+//       for(JkxlDetailFee jkxlDetailFee:list){
+//           overheadLineMapper.save(jkxlDetailFee);
+//       }
+        overheadLineMapper.saveList(list);
        //保存未识别费用
        JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
        jkxlAdjustFee.setId(id);
@@ -812,9 +813,10 @@ public List<JkxlDetailFee> findList(String id,String type){
         list.add(jkxlDetailFee1);
         list.add(jkxlDetailFee2);
         //保存费用明细
-        for(JkxlDetailFee jkxlDetailFee:list){
-            overheadLineMapper.save(jkxlDetailFee);
-        }
+//        for(JkxlDetailFee jkxlDetailFee:list){
+//            overheadLineMapper.save(jkxlDetailFee);
+//        }
+        overheadLineMapper.saveList(list);
         //保存未识别费用
         JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
         jkxlAdjustFee.setId(id);

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -261,12 +261,14 @@ public class SubstationService {
             jkxlDetailFee2.setId(id);
             azTotal.add(jkxlDetailFee1);
             azTotal.add(jkxlDetailFee2);
-            for(JkxlDetailFee jkxlDetailFee:jzTotal){
-                overheadLineMapper.save(jkxlDetailFee);
-            }
-            for(JkxlDetailFee jkxlDetailFee:azTotal){
-                overheadLineMapper.save(jkxlDetailFee);
-            }
+//            for(JkxlDetailFee jkxlDetailFee:jzTotal){
+//                overheadLineMapper.save(jkxlDetailFee);
+//            }
+            overheadLineMapper.saveList(jzTotal);
+//            for(JkxlDetailFee jkxlDetailFee:azTotal){
+//                overheadLineMapper.save(jkxlDetailFee);
+//            }
+            overheadLineMapper.saveList(azTotal);
             JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
             jkxlAdjustFee.setId(id);
             jkxlAdjustFee.setType(BashInfo.CE);
@@ -365,9 +367,10 @@ public class SubstationService {
             jkxlDetailFee2.setId(id);
             jzTotal.add(jkxlDetailFee1);
             jzTotal.add(jkxlDetailFee2);
-            for(JkxlDetailFee jkxlDetailFee:jzTotal){
-                overheadLineMapper.save(jkxlDetailFee);
-            }
+//            for(JkxlDetailFee jkxlDetailFee:jzTotal){
+//                overheadLineMapper.save(jkxlDetailFee);
+//            }
+            overheadLineMapper.saveList(jzTotal);
             JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
             jkxlAdjustFee.setId(id);
             jkxlAdjustFee.setType(BashInfo.CE);
@@ -469,9 +472,10 @@ public class SubstationService {
             jkxlDetailFee2.setId(id);
             azTotal.add(jkxlDetailFee1);
             azTotal.add(jkxlDetailFee2);
-            for(JkxlDetailFee jkxlDetailFee:azTotal){
-                overheadLineMapper.save(jkxlDetailFee);
-            }
+//            for(JkxlDetailFee jkxlDetailFee:azTotal){
+//                overheadLineMapper.save(jkxlDetailFee);
+//            }
+            overheadLineMapper.saveList(azTotal);
             JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
             jkxlAdjustFee.setId(id);
             jkxlAdjustFee.setType(BashInfo.CE);

src/main/webapp/webpage/modules/sys/user/userForm.jsp

@@ -51,9 +51,9 @@
 		         <td class="width-15 active">	<label class="pull-right"><font color="red">*</font>头像：</label></td>
 		         <td class="width-35">
 						<sys:fileUpload path="photo" value="${user.photo}" type="image" uploadPath="/photo" fileNumLimit="1" readonly="false"/></td>
-		         <td  class="width-15 active">	<label class="pull-right"><font color="red">*</font>归属公司:</label></td>
-		         <td class="width-35"><sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"
-						title="公司" url="/sys/office/treeData?type=1" allowClear="true" cssClass="form-control required"/></td>
+		         <%--<td  class="width-15 active">	<label class="pull-right"><font color="red">*</font>归属公司:</label></td>--%>
+		         <%--<td class="width-35"><sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"--%>
+						<%--title="公司" url="/sys/office/treeData?type=1" allowClear="true" cssClass="form-control required"/></td>--%>
 		      </tr>
 		      
 		      <tr>