数据问题

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.manager.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -260,8 +261,9 @@ public class ExcelTabController extends BladeController {
 	@GetMapping("/getWbsTypeList")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "清表编辑 wbs 下拉框选择", notes = "传入excelTab")
-	public R getWbsTypeList() {
-		List<ExcelTabWbsTypeVO> wbsTypeList= excelTabService.getWbsTypeList();
+	@ApiImplicitParams(value = {@ApiImplicitParam(name = "wbstype", value = "wbstype", required = true)})
+	public R getWbsTypeList(Integer wbstype) {
+		List<ExcelTabWbsTypeVO> wbsTypeList= excelTabService.getWbsTypeList(wbstype);
 		return R.data(wbsTypeList);
 	}
 
@@ -447,7 +449,7 @@ public class ExcelTabController extends BladeController {
 					dataInfo.put("y2",data.attr("y2"));
 					dataInfo.put("xytype",data.attr("xytype"));
 					zikey.add(dataInfo);
-				}else if(data.html().indexOf("el-input")>=0){
+				}else if(data.html().indexOf("el-input")>=0 ||data.html().indexOf("el-date-picker")>=0){
 					List arrayList = new ArrayList<>();
 					List left = new ArrayList<>();
 					List top = new ArrayList<>();
@@ -500,7 +502,8 @@ public class ExcelTabController extends BladeController {
 							}
 						}
 					}
-					data.children().get(0).attr("placeholder",textDataInfo).attr("v-model","formData."+textDataType+"_"+i+j);
+					String attrInfo = textDataType+"_"+i+j;
+					data.children().get(0).attr("placeholder",textDataInfo).attr("v-model","formData."+attrInfo).attr("keyName",attrInfo);
 				}
 			}
 		}
@@ -738,10 +741,10 @@ public class ExcelTabController extends BladeController {
 				data.attr("y1",y1+"");
 				data.attr("y2",y2+"");
 				data.attr("xytype",xy_type+"");
-				String parm = i+","+j+","+x1+","+x2+","+y1+","+y2;
+				String parm = i+","+j+","+x1+","+x2+","+y1+","+y2+",$event";
 				// 设置文本信息
 				if(textInfo.indexOf("年")>=0 && textInfo.indexOf("月")>=0&& textInfo.indexOf("日")>=0){
-					data.empty().append("<el-date-picker  style='width:100%;height:100%' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+"  type='date' format='yyyy 年 MM 月 dd 日' placeholder='请选择时间'> </el-date-picker>");
+					data.empty().append("<el-date-picker  style='width:100%;height:100%' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+"  type='date' format='YYYY年MM月DD日' placeholder='请选择时间'> </el-date-picker>");
 				}
 
 				if(textInfo.isEmpty() || textInfo.equals("/") || textInfo.equals("-")){
@@ -781,4 +784,20 @@ public class ExcelTabController extends BladeController {
 		inputStream.close();
 		System.out.println("完成");
 	}
+
+
+
+	/**
+	 *保存用户填报数据接口
+	 */
+	@PostMapping("/save_buss_data")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
+	public R<String> savaDataInfo1(@Valid @RequestBody JSONObject dataInfo, BladeUser bladeUser) {
+		System.out.println("123456");
+
+		return  R.success("1");
+	}
+
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.java

@@ -54,7 +54,7 @@ public interface ExcelTabMapper extends BaseMapper<ExcelTab> {
 
 	List<ExceTabTreVO> tabLazyTreeAll(String tenantId, Long modeId,String name);
 
-	List<ExcelTabWbsTypeVO> getWbsTypeList();
+	List<ExcelTabWbsTypeVO> getWbsTypeList(@Param("wbstype") Integer wbstype);
 
 	List<WbsTreeVO> lazyTree(@Param("wbsId") String wbsId,
 							 @Param("tenantId") String tenantId,

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.xml

@@ -82,7 +82,24 @@
 
 
     <select id="getWbsTypeList" resultMap="wbsResultMap">
-        SELECT a.project_id as id, CONCAT_WS("_",b.project_name,a.full_name) as wbsName,1 as wbsType from m_wbs_tree_private a,m_project_info b where a.is_deleted=0 and a.parent_id=0 and a.project_id = b.id and b.is_deleted=0
+        select * from (
+                 SELECT a.project_id                                as id,
+                        CONCAT_WS("_", b.project_name, a.full_name) as wbsName,
+                        1                                           as wbsType
+                 from m_wbs_tree_private a,
+                      m_project_info b
+                 where a.is_deleted = 0
+                   and a.parent_id = 0
+                   and a.project_id = b.id
+                   and b.is_deleted = 0
+                 union ALL
+                 SELECT id, c.wbs_name, 1 as wbsType
+                 FROM m_wbs_info c
+                 where c.is_deleted = 0
+             )d where 1=1
+        <if test="wbstype!=null and wbstype!=''">
+            and d.wbsType = #{wbstype}
+        </if>
     </select>
 
     <select id="lazyTree" resultMap="treeNodeResultMap2">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IExcelTabService.java

@@ -61,7 +61,7 @@ public interface IExcelTabService extends BaseService<ExcelTab> {
 	/**
 	 * 获取wbs类型
 	 */
-	List<ExcelTabWbsTypeVO> getWbsTypeList();
+	List<ExcelTabWbsTypeVO> getWbsTypeList(Integer wbstype);
 
 	/**
 	 * 懒加载树形结构

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -63,8 +63,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 	}
 
 	@Override
-	public List<ExcelTabWbsTypeVO> getWbsTypeList() {
-		return baseMapper.getWbsTypeList();
+	public List<ExcelTabWbsTypeVO> getWbsTypeList(Integer wbstType) {
+		return baseMapper.getWbsTypeList(wbstType);
 	}
 
 	@Override