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

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

@@ -22,6 +22,43 @@ public class JkxlData {
     private Double tax;
     private Double totalFee;
 
+    private String wbsId;
+    private String projectId;
+    private String describe;
+    private String parentNode;
+
+    public String getWbsId() {
+        return wbsId;
+    }
+
+    public void setWbsId(String wbsId) {
+        this.wbsId = wbsId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    public String getParentNode() {
+        return parentNode;
+    }
+
+    public void setParentNode(String parentNode) {
+        this.parentNode = parentNode;
+    }
+
     public String getWbsCode() {
         return wbsCode;
     }

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

@@ -5,9 +5,12 @@ import com.jeeplus.modules.sg.entity.JkxlData;
 import com.jeeplus.modules.sg.entity.RuleRatio;
 import com.jeeplus.modules.sg.entity.WbsProject;
 
+import java.util.List;
+
 @MyBatisMapper
 public interface JkxlMapper {
     RuleRatio getValue(String ratioName);
+    List<JkxlData> getList(String id);
     void save(JkxlData jkxlData);
     void saveProject(WbsProject project);
 }

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

@@ -9,13 +9,35 @@
 	</select>
 
 	<select id="getList" parameterType="String" resultType="com.jeeplus.modules.sg.entity.JkxlData">
-
+        SELECT
+         a.describe,
+         a.short_id as wbsCode,
+         a.parent_node as parentNode;
+         b.id,
+         b.original_total_cost as originalTotalCost,
+         b.original_rg_cost as originalRgCost,
+         b.original_cbr_cost as originalCbrCost,
+         b.original_fbr_cost as originalFbrCost,
+         b.original_jx_cost as originalJxCost,
+         b.rg_cost as rgCost,
+         b.cbr_cost as cbrCost,
+         b.fbr_cost as fbrCost,
+         b.jx_cost as jxCost,
+         b.measures_fee1 as measuresFee1,
+         b.measures_fee2 as measuresFee2,
+         b.other_cost as otherCost,
+         b.tex as tex,
+         b.fees as fees,
+         b.total_fee as totalFee
+         FROM sg_wbs_elements a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
+         WHERE a.id = #{id}
 	</select>
 
 
 	<insert id="save" parameterType="com.jeeplus.modules.sg.entity.JkxlData">
 		insert into sg_wbs_fee
 		(id,
+		 wbs_code,
 		 original_total_cost,
 		 original_rg_cost,
 		 original_cbr_cost,
@@ -33,6 +55,7 @@
 		 total_fee
 		) values (
 		 id,
+		 wbsCode,
 		 originalTotalCost,
 		 originalRgCost,
 		 originalCbrCost,

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

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 public class JkxlService {
     @Autowired
@@ -18,6 +20,10 @@ public class JkxlService {
        return jkxlMapper.getValue(ratioName);
    }
 
+   public List<JkxlData> getList(String id){
+       return jkxlMapper.getList(id);
+   }
+
    @Transactional
    public void save(JkxlData jkxlData){
        jkxlMapper.save(jkxlData);

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

@@ -31,8 +31,13 @@ public class JkxlController extends BaseController {
   @Autowired
   private JkxlService jkxlService;
 
+  @RequestMapping("/index")
+  public String toImport(){
+    return "modules/sys/free/indexProject";
+  }
+
   @RequestMapping("/import")
-  public String importFile(String file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model){
+  public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model){
     double sl = Double.valueOf(request.getParameter("jxsl"));
     String projectName = request.getParameter("name");
     String id = getId();
@@ -57,11 +62,13 @@ public class JkxlController extends BaseController {
   @RequestMapping("/list")
   public String list(HttpServletRequest request,Model model){
     String id = request.getParameter("id");
+    List<JkxlData> list = jkxlService.getList(id);
+    model.addAttribute("list",list);
     return "";
   }
 
 
-  public List<JkxlData> getData(String file,double[] rate,String id,double sl) throws IOException, InvalidFormatException {
+  public List<JkxlData> getData(MultipartFile file,double[] rate,String id,double sl) throws IOException, InvalidFormatException {
     ImportExcel importExcel = new ImportExcel(file,1,3);
     ImportExcel csqd = new ImportExcel(file,1,8);
     ImportExcel gf = new ImportExcel(file,1,17);

src/main/webapp/webpage/modules/sys/free/indexProject.jsp

@@ -24,7 +24,7 @@
     }
 </style>
 <body style="text-align: center;">
-<form class="layui-form" action="#" method="post" style="margin-top: 60px;">
+<form class="layui-form" action="${ctx}/jkxl/import" method="post" style="margin-top: 60px;">
     <div class="" style="margin-left: 30px;">
         <input type="button" class="layui-btn layui-btn-radiu" value="选择结算文件" id="btnxz"/>
         <input type="text" style="border-style:none;border:0;" readonly="readonly"/>