1111

src/main/java/com/jeeplus/modules/sg/mapper/JkxlMapper.java

@@ -15,6 +15,7 @@ public interface JkxlMapper {
     void save(JkxlData jkxlData);
     void saveProject(WbsProject project);
     List<JkxlData> findList(String id);
+    void updateDate(JkxlData jkxlData);
 
     List<TzData> getTzFee(TzData tzData);
     void updateTzFee(TzData tzData);

src/main/java/com/jeeplus/modules/sg/mapper/xml/JkxlMapper.xml

@@ -112,6 +112,14 @@
 		)
 	</insert>
 
+    <!--<update id="updateData" parameterType="com.jeeplus.modules.sg.entity.WbsProject">-->
+          <!--update sg_wbs_fee set-->
+
+          <!--<where>-->
+              <!--id = #{id} and wbs_code = #{wbsCode}-->
+          <!--</where>-->
+    <!--</update>-->
+
 	<select id="getTzFee" parameterType="com.jeeplus.modules.sg.entity.TzData" resultType="com.jeeplus.modules.sg.entity.TzData">
 		select id,type,fee from sg_wbs_fee_tz
 		<where>

src/main/java/com/jeeplus/modules/sg/service/JkxlService.java

@@ -35,6 +35,11 @@ public class JkxlService {
    }
 
     @Transactional
+    public void updataDate(JkxlData jkxlData){
+        jkxlMapper.updateDate(jkxlData);
+    }
+
+    @Transactional
    public void saveProject(WbsProject wbsProject){
        jkxlMapper.saveProject(wbsProject);
    }

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -126,11 +126,11 @@ public class JkxlController extends BaseController {
 
 
   public List<JkxlData> getData(MultipartFile file,double[] rate,String id,double sl) throws IOException, InvalidFormatException {
-    ImportExcel importExcel = new ImportExcel(file,1,BashInfo.SHEET_FBFXJJ);
-    ImportExcel csqd = new ImportExcel(file,1,BashInfo.SHEET_CSB);
-    ImportExcel gf = new ImportExcel(file,1,BashInfo.SHEET_GFQD);
-    ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY);
-    ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );
+    ImportExcel importExcel = new ImportExcel(file,1,BashInfo.SHEET_FBFXJJ);  //分部分项工程量清单计价表
+    ImportExcel csqd = new ImportExcel(file,1,BashInfo.SHEET_CSB);  // 措施项目清单计价表（一）
+    ImportExcel gf = new ImportExcel(file,1,BashInfo.SHEET_GFQD);  //规费项目清单计价表
+    ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY);  //其他项目清单计价表
+    ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );  //工程项目竣工结算汇总表
     double[] csRate = getCsRate(csqd);
     double[] gfRate = getGfRate(gf);
     double[] qtFees = getQtFees(qt);
@@ -190,7 +190,7 @@ public class JkxlController extends BaseController {
       double measuresFee2 = rgCost*csRate[1];   //措施费2
       double fees = rgCost*gfRate[1]*1.12+rgCost*gfRate[0];  //规费
       double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee)*0.09; //税金
-      double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-originalFbrCost; //合计
+      double totalfee = rgCost+cbrCost+fbrCost+jxCost+measuresFee1+measuresFee2+fees+otherFee+tax-fbrCost; //合计
       jkxlData.setOriginalTotalCost(originalTotalCost);
       jkxlData.setOriginalRate(orRate);
       jkxlData.setOriginalRgCost(originalRgCost);
@@ -339,12 +339,16 @@ public class JkxlController extends BaseController {
 
   }
 
+
   public double[] getTzFee(MultipartFile file) throws IOException, InvalidFormatException {
     ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );
     double[] wsb = getFees(total);
     return wsb;
   }
 
+    /**
+     * 创建项目ID
+     */
   public String getId() {
      SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss");
      String newDate=sdf.format(new Date());