1111

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

@@ -37,7 +37,7 @@ public class JkxlData {
     private String subjectAllocate;
     private String state;
 
-    @ExcelField(title="科目分配元素", align=2, sort=5)
+
     public String getSubjectAllocate() {
         return subjectAllocate;
     }
@@ -62,7 +62,7 @@ public class JkxlData {
         this.measuresFee3 = measuresFee3;
     }
 
-    @ExcelField(title="挂接物料", align=2, sort=6)
+
     public String getMountMatter() {
         return mountMatter;
     }
@@ -71,7 +71,7 @@ public class JkxlData {
         this.mountMatter = mountMatter;
     }
 
-    @ExcelField(title="挂接服务", align=2, sort=7)
+
     public String getMountServer() {
         return mountServer;
     }
@@ -80,7 +80,7 @@ public class JkxlData {
         this.mountServer = mountServer;
     }
 
-    @ExcelField(title="标准WBS要素", align=2, sort=1)
+
     public String getWbsId() {
         return wbsId;
     }
@@ -89,7 +89,7 @@ public class JkxlData {
         this.wbsId = wbsId;
     }
 
-    @ExcelField(title="当前的内部项目号 - 标准 WBS", align=2, sort=3)
+
     public String getProjectId() {
         return projectId;
     }
@@ -98,7 +98,7 @@ public class JkxlData {
         this.projectId = projectId;
     }
 
-    @ExcelField(title="描述", align=2, sort=2)
+    @ExcelField(title="元素描述", align=2, sort=2)
     public String getDescribe() {
         return describe;
     }
@@ -114,7 +114,7 @@ public class JkxlData {
     public void setParentNode(String parentNode) {
         this.parentNode = parentNode;
     }
-    @ExcelField(title="简明ID(WBS元素)", align=2, sort=4)
+    @ExcelField(title="WBS识别码", align=2, sort=1)
     public String getWbsCode() {
         return wbsCode;
     }
@@ -123,7 +123,7 @@ public class JkxlData {
         this.wbsCode = wbsCode;
     }
 
-    @ExcelField(title="总计", align=2, sort=8)
+    @ExcelField(title="结算金额", align=2, sort=3)
     public Double getTotalFee() {
         return totalFee;
     }

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.sg.mapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.entity.JkxlData;
 import com.jeeplus.modules.sg.entity.RuleRatio;
+import com.jeeplus.modules.sg.entity.TzData;
 import com.jeeplus.modules.sg.entity.WbsProject;
 
 import java.util.List;
@@ -14,4 +15,8 @@ public interface JkxlMapper {
     void save(JkxlData jkxlData);
     void saveProject(WbsProject project);
     List<JkxlData> findList(String id);
+
+    List<TzData> getTzFee(TzData tzData);
+    void updateTzFee(TzData tzData);
+    void saveTzFee(TzData tzData);
 }

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

@@ -112,6 +112,40 @@
 		)
 	</insert>
 
+	<select id="getTzFee" parameterType="com.jeeplus.modules.sg.entity.TzData" resultType="com.jeeplus.modules.sg.entity.TzData">
+		select * from sg_wbs_fee_tz
+		<where>
+			<if test="type != null and type != ''">
+				type = #{type} and
+			</if>
+			id = #{id}
+		</where>
+		order by type
+	</select>
+
+	<update id="updateTzFee" parameterType="com.jeeplus.modules.sg.entity.TzData">
+		update sg_wbs_fee_tz set fee = #{fee}
+		<where>
+			<if test="type != null and type != ''">
+				type = #{type} and
+			</if>
+			id = #{id}
+		</where>
+	</update>
+
+	<insert id="saveTzFee" parameterType="com.jeeplus.modules.sg.entity.TzData">
+		insert into sg_wbs_fee_tz
+		(
+		 id,
+		 type,
+		 fee
+		)values (
+		#{id},
+		#(type),
+		#(fee)
+		)
+	</insert>
+
 
 
 	

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

@@ -2,6 +2,7 @@ package com.jeeplus.modules.sg.service;
 
 import com.jeeplus.modules.sg.entity.JkxlData;
 import com.jeeplus.modules.sg.entity.RuleRatio;
+import com.jeeplus.modules.sg.entity.TzData;
 import com.jeeplus.modules.sg.entity.WbsProject;
 import com.jeeplus.modules.sg.mapper.JkxlMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,4 +38,27 @@ public class JkxlService {
    public void saveProject(WbsProject wbsProject){
        jkxlMapper.saveProject(wbsProject);
    }
+
+   public List<TzData> getTzFee(TzData tzData){
+       return jkxlMapper.getTzFee(tzData);
+   }
+
+    @Transactional
+   public void  updateFee(TzData tzData){
+       jkxlMapper.updateTzFee(tzData);
+   }
+
+    @Transactional
+    public void saveTzFee(double[] wbs,String id){
+       TzData tzData = new TzData();
+       TzData tzData1 = new TzData();
+       tzData.setId(id);
+       tzData1.setId(id);
+       tzData.setId("1");
+       tzData1.setType("2");
+       tzData.setFee(wbs[0]);
+       tzData1.setFee(wbs[1]);
+       jkxlMapper.saveTzFee(tzData);
+       jkxlMapper.saveTzFee(tzData1);
+    }
 }

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

@@ -1,10 +1,12 @@
 package com.jeeplus.modules.sg.web;
 
 import com.jeeplus.common.utils.DateUtils;
+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.JkxlData;
+import com.jeeplus.modules.sg.entity.TzData;
 import com.jeeplus.modules.sg.entity.WbsProject;
 import com.jeeplus.modules.sg.service.JkxlService;
 import com.jeeplus.modules.sg.util.BashInfo;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -53,6 +56,8 @@ public class JkxlController extends BaseController {
       for(JkxlData jkxlData : list){
         jkxlService.save(jkxlData);
       }
+      double[] tzfee = getTzFee(file);
+      jkxlService.saveTzFee(tzfee,id);
     } catch (Exception e){
       addMessage(redirectAttributes, "导入失败");
     }
@@ -61,21 +66,49 @@ public class JkxlController extends BaseController {
     return "redirect:/a/jkxl/list?id="+id;
   }
 
+  @RequestMapping("/gettz")
+  @ResponseBody
+  public List<JkxlData> getTz(TzData tzData){
+    String id = tzData.getId();
+    List<JkxlData> list = jkxlService.getList(id);
+    List<JkxlData> list1 = new ArrayList<>();
+    for(JkxlData jkxlData: list){
+      if( StringUtils.isNoneBlank(String.valueOf(jkxlData.getOriginalTotalCost()))){
+          list1.add(jkxlData);
+      }
+    }
+    return list1;
+  }
+
+//  @RequestMapping("/relist")
+//  public String reList(){
+//
+//  }
+
+
+
+
   @RequestMapping("/list")
   public String list(HttpServletRequest request,Model model){
     String id = request.getParameter("id");
     JkxlData jkxlData = new JkxlData();
+    TzData tzData = new TzData();
     jkxlData.setId(id);
+    tzData.setId(id);
     List<JkxlData> list1 = new ArrayList<>();
     list1.add(jkxlData);
     List<JkxlData> list = jkxlService.getList(id);
+    List<TzData> list2 = jkxlService.getTzFee(tzData);
     HashMap map = new HashMap();
     map.put("list1",list1);
     map.put("list",list);
+    map.put("list2",list2);
     model.addAttribute("map",map);
     return "modules/sg/free/wbslist";
   }
 
+
+
   @RequestMapping("/export")
   public String export(HttpServletRequest request, HttpServletResponse response,Model model,RedirectAttributes redirectAttributes) {
     String id = request.getParameter("id");
@@ -306,6 +339,12 @@ 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;
+  }
+
   public String getId() {
      SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss");
      String newDate=sdf.format(new Date());