Merge branch 'master' of http://192.168.2.4:3000/chengqiang/sg_finalAcountAuto

src/main/java/com/jeeplus/modules/sg/entity/TzData.java

@@ -4,6 +4,34 @@ public class TzData {
     private String id;
     private String type;
     private Double fee;
+    private String state;
+    private String wbsCode;
+    private double[] fees;
+
+
+    public double[] getFees() {
+        return fees;
+    }
+
+    public void setFees(double[] fees) {
+        this.fees = fees;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getWbsCode() {
+        return wbsCode;
+    }
+
+    public void setWbsCode(String wbsCode) {
+        this.wbsCode = wbsCode;
+    }
 
     public String getId() {
         return id;

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

@@ -115,25 +115,45 @@
 		)
 	</insert>
 
-	<insert id="saveProject" parameterType="com.jeeplus.modules.sg.entity.WbsProject">
-		insert into sg_wbs_project
-		(id,
-		 project_name,
-		 create_date
-		) values (
-		 #{id},
-		 #{name},
-		 #{createDate}
-		)
-	</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>-->
+    <update id="updateData" parameterType="com.jeeplus.modules.sg.entity.WbsProject">
+          update sg_wbs_fee set
+             <if test="rgFtFee != null and rgFtFee != ''">
+				 rg_fee_ft = #{rgFtFee},
+			 </if>
+		     <if test="cbrFtFee != null and cbrFtFee != ''">
+				 cbr_fee_ft = #{cbrFtFee},
+		     </if>
+		     <if test="fbrFtFee != null and fbrFtFee != ''">
+				 fbr_fee_ft =  #{fbrFtFee},
+		     </if>
+		      <if test="jxFtFee != null and jxFtFee != ''">
+				  jx_fee_ft =  #{jxFtFee},
+			  </if>
+		      <if test="measuresFee1 != null and measuresFee1 != ''">
+				  measures_fee1 = #{measuresFee1},
+		     </if>
+		      <if test="measuresFee2 != null and measuresFee2 != ''">
+				  measures_fee2 = #{measuresFee2},
+		     </if>
+		     <if test="otherCost != null and otherCost != ''">
+				 other_cost = #{otherCost},
+		     </if>
+		     <if test="fees != null and fees != ''">
+				 fees = #{fees},
+		     </if>
+		     <if test="tex != null and tex != ''">
+				 tex = #{tex},
+		    </if>
+		    <if test="totalFee != null and totalFee != ''">
+				total_fee = #{totalFee},
+		    </if>
+		    id = #{id}
+          <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
@@ -169,6 +189,18 @@
 		)
 	</insert>
 
+	<insert id="saveProject" parameterType="com.jeeplus.modules.sg.entity.WbsProject">
+		insert into sg_wbs_project
+		(id,
+		 project_name,
+		 create_date
+		) values (
+		 #{id},
+		 #{name},
+		 #{createDate}
+		)
+	</insert>
+
 
 
 	

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

@@ -50,6 +50,7 @@ public class JkxlService {
 
     @Transactional
    public void  updateFee(TzData tzData){
+       tzData.setFee(0.00);
        jkxlMapper.updateTzFee(tzData);
    }
 

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

@@ -5,6 +5,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.entity.FtData;
 import com.jeeplus.modules.sg.entity.JkxlData;
 import com.jeeplus.modules.sg.entity.TzData;
 import com.jeeplus.modules.sg.entity.WbsProject;
@@ -80,10 +81,273 @@ public class JkxlController extends BaseController {
     return list1;
   }
 
-//  @RequestMapping("/relist")
-//  public String reList(){
-//
-//  }
+
+  @RequestMapping("/fttz")
+  public String reList(FtData ftData, Model model,RedirectAttributes redirectAttributes){
+      String id = ftData.getId();
+      String code = ftData.getCode();
+      String state = ftData.getState();
+      String type = ftData.getType();
+      double fee = ftData.getFee();
+      double total = 0.00;
+      try {
+        List<JkxlData> jkxl = jkxlService.getList(id);
+        List<JkxlData> jkxlDatas = new ArrayList<>();
+        for(JkxlData jkxlData: jkxl){
+          if(jkxlData.getOriginalTotalCost() != null){
+            jkxlDatas.add(jkxlData);
+          }
+        }
+        if(code.equals("1")){
+            for(JkxlData jkxlData: jkxlDatas) {
+                total += jkxlData.getRgCost();
+          }
+            for(JkxlData jkxlData1: jkxlDatas){
+              JkxlData jkxlData = new JkxlData();
+              jkxlData.setId(id);
+              jkxlData.setWbsCode(jkxlData1.getWbsCode());
+              double rgFee = jkxlData1.getRgCost();
+              double totalFee = jkxlData1.getTotalFee();
+              double ftFee = rgFee/total*fee;
+              jkxlData.setRgFtFee(ftFee);
+              if(state.equals("1")){
+                double zFee = totalFee+ftFee;
+                jkxlData.setTotalFee(zFee);
+              }else {
+                double zFee = totalFee-ftFee;
+                jkxlData.setTotalFee(zFee);
+              }
+              jkxlService.updataDate(jkxlData);
+            }
+        }
+        if(code.equals("2")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getCbrCost();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getCbrCost();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            jkxlData.setCbrFtFee(ftFee);
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("3")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getFbrCost();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getFbrCost();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            jkxlData.setFbrFtFee(ftFee);
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("4")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getJxCost();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getJxCost();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            jkxlData.setJxFtFee(ftFee);
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("5")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getMeasuresFee1();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getMeasuresFee1();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setMeasuresFee1(rgFee+ftFee);
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setMeasuresFee1(rgFee-ftFee);
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("6")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getMeasuresFee2();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getMeasuresFee2();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setMeasuresFee1(rgFee+ftFee);
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setMeasuresFee1(rgFee-ftFee);
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("7")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getMeasuresFee3();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getMeasuresFee3();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setMeasuresFee1(rgFee+ftFee);
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setMeasuresFee1(rgFee-ftFee);
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("8")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getOtherCost();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getOtherCost();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setMeasuresFee1(rgFee+ftFee);
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setMeasuresFee1(rgFee-ftFee);
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("9")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getFees();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getFees();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setMeasuresFee1(rgFee+ftFee);
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setMeasuresFee1(rgFee-ftFee);
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        if(code.equals("10")){
+          for(JkxlData jkxlData: jkxlDatas) {
+            total += jkxlData.getTex();
+          }
+          for(JkxlData jkxlData1: jkxlDatas){
+            JkxlData jkxlData = new JkxlData();
+            jkxlData.setId(id);
+            jkxlData.setWbsCode(jkxlData1.getWbsCode());
+            double rgFee = jkxlData1.getTex();
+            double totalFee = jkxlData1.getTotalFee();
+            double ftFee = rgFee/total*fee;
+            if(state.equals("1")){
+              double zFee = totalFee+ftFee;
+              jkxlData.setMeasuresFee1(rgFee+ftFee);
+              jkxlData.setTotalFee(zFee);
+            }else {
+              double zFee = totalFee-ftFee;
+              jkxlData.setMeasuresFee1(rgFee-ftFee);
+              jkxlData.setTotalFee(zFee);
+            }
+            jkxlService.updataDate(jkxlData);
+          }
+        }
+        TzData tzData = new TzData();
+        tzData.setType(type);
+        tzData.setId(id);
+        jkxlService.updateFee(tzData);
+      } catch (Exception e){
+        addMessage(redirectAttributes, "调整失败");
+      }
+    addMessage(redirectAttributes, "调整成功");
+    return "redirect:/a/jkxl/list?id="+id;
+  }
+
+  @RequestMapping("/ddtz")
+  public String ddtz(TzData tzData,Model model,RedirectAttributes redirectAttributes){
+    String id = tzData.getId();
+    String type = tzData.getType();
+    double[] fees = tzData.getFees();
+    try {
+
+    }catch (Exception e){
+      addMessage(redirectAttributes, "调整失败");
+    }
+    addMessage(redirectAttributes, "调整成功");
+    return "redirect:/a/jkxl/list?id="+id;
+  }
 
 
 

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

@@ -247,21 +247,15 @@
                 ,{width:178,  toolbar: '#barDemo',title:'操作'}
             ]]
             ,data:[
+            <c:if test="${ not empty map.list}">
+               <c:forEach items="${map.list2}" var="data" varStatus="index">
                 {
-                    "id":"1",
-                    "xmmc": "1",
-                    "fyje": "xx1"
+                    "id":"${data.id}",
+                    "xmmc": <c:if test="${data.type eq '1'}">"补增值税税率调整差额"</c:if><c:if test="${data.type eq '2'}">"扣减甲供材超供材料费"</c:if>,
+                    "fyje": "${data.fee}"
                 },
-                {
-                    "id":"2",
-                    "xmmc": "2",
-                    "fyje": "xx2"
-                },
-                {
-                    "id":"3",
-                    "xmmc": "3",
-                    "fyje": "xx3"
-                }
+                </c:forEach>
+                </c:if>
             ]
             ,page: false
         });