Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -215,7 +215,7 @@ public class InformationWriteQueryController extends BladeController {
                 String sql="select * from m_wbs_tree_contract where p_key_id="+query.getWbsId()+" and is_deleted=0";
                 WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
                   String result=wbsParamClient.createFileTitle(contract);
-                if(contract!=null&&contract.getMajorDataType()!=null&&contract.getMajorDataType()==6){
+                if(contract!=null&&contract.getMajorDataType()!=null&&contract.getMajorDataType()==4){
                     if(query.getClassify()!=null&&query.getClassify()==1&&StringUtils.isNotEmpty(sgSuffix)){
                         result=result+sgSuffix;
                         if(!query.getName().equals(result)){
@@ -228,6 +228,7 @@ public class InformationWriteQueryController extends BladeController {
                         }
                     }
                 }
+                query.setName(result);
             }
         }
         List<InformationQuery> taskList = queryList.stream().filter(o -> o.getStatus() == 1 || o.getStatus() == 2).collect(Collectors.toList());

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

@@ -3079,7 +3079,8 @@ public class ExcelTabController extends BladeController {
             }
             //查询数据
             String querySql = "SELECT * FROM " + tabName + " WHERE id = " + ids[0] + " and group_id = " + tableNode2.getPKeyId();
-            Map<String, Object> businessDataMap = this.jdbcTemplate.queryForMap(querySql);
+            List<Map<String, Object>> businessDataMap = this.jdbcTemplate.queryForList(querySql);
+            Map<String, Object> reData=new HashMap<>();
             if (businessDataMap.size() > 0){
                 try {
                     if (tableNode2.getHtmlUrl() != null){
@@ -3104,11 +3105,64 @@ public class ExcelTabController extends BladeController {
                         allElements.add(rq);
                         allElements.add(shr);
                         allElements.add(tqqk);
+                        allElements=allElements.stream().filter(o->o!=null&&o.size()>0).collect(Collectors.toList());
                         if(allElements.size()>0){
+                            for (String key : businessDataMap.get(0).keySet()) {
+                                String tabVal = businessDataMap.get(0).get(key) + "";
+                                // 时间段处理
+                                if (StringUtils.isNotEmpty(tabVal) && !tabVal.equals("null")) {
+                                    if (tabVal.indexOf("T") >= 0 && tabVal.indexOf(".000Z]") >= 0) {
+                                        String[] tabData = tabVal.split("_\\^_");
+                                        if (reData.containsKey("pickerKey")) {
+                                            String pickerKey = reData.get("pickerKey") + "," + key + "__" + tabData[1];
+                                            reData.put("pickerKey", pickerKey);
+                                        } else {
+                                            reData.put("pickerKey", key + "__" + tabData[1]);
+                                        }
+                                        String sql = tabData[0];
+                                        sql = sql.replaceAll("\\[", "['");
+                                        sql = sql.replaceAll("]", "']");
+                                        sql = sql.replaceAll("000Z,", "000Z',");
+                                        sql = sql.replaceAll(", 20", ", '20");
+                                        sql = sql.replaceAll("'", "");
+                                        reData.put(key + "__" + tabData[1], sql);
+                                    } else if (tabVal.indexOf("T") >= 0 && tabVal.indexOf(".000Z") >= 0) { //时间
+                                        String[] tabData = tabVal.split("_\\^_");
+                                        reData.put(key + "__" + tabData[1], tabData[0]);
+                                    } else if (tabVal.indexOf("☆") >= 0) {
+                                        String[] mysql = tabVal.split("☆");
+                                        for (String data : mysql) {
+                                            String[] tabData = data.split("_\\^_");
+                                            reData.put(key + "__" + tabData[1], tabData[0]);
+                                        }
+                                    } else if (tabVal.indexOf("_^_") >= 0) { //数组处理方式
+                                        String[] tabData = tabVal.split("_\\^_");
+                                        if (StringUtils.isNotEmpty(tabData[0])) {
+                                            if (tabVal.contains("[") && tabVal.contains("年")) {
+                                                String[] strings = StringUtils.strip(tabData[0], "[]").split(",");
+                                                reData.put(key + "__" + tabData[1], strings);
+                                            }
+                                            if (tabVal.contains("[") && tabVal.contains("]") && tabVal.indexOf(",") >= 0) {
+                                                String[] strings = StringUtils.strip(tabData[0], "[]").split(",");
+                                                reData.put(key + "__" + tabData[1], strings);
+                                            } else {
+                                                if (tabVal.contains("[") && tabVal.contains("]")) {
+                                                    String[] strings = new String[]{tabData[0].replaceAll("\\[","").replaceAll("]","")};
+                                                    reData.put(key + "__" + tabData[1],strings);
+                                                } else {
+                                                    reData.put(key + "__" + tabData[1], tabData[0]);
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        reData.put(key, tabVal);
+                                    }
+                                }
+                            }
                             for (Elements element : allElements) {
-                             if(businessDataMap.containsKey(element.attr("keyname"))){
-                                resultMapList.put(element.attr("keyname"), businessDataMap.get(element.attr("keyname")));
-                               }
+                                if(reData.containsKey(element.attr("keyname"))){
+                                    resultMapList.put(element.attr("keyname"),reData.get(element.attr("keyname")));
+                                }
                             }
                         }
                     }

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

@@ -510,10 +510,10 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 20)
     @ApiOperation(value = "根据表单id查询所有元素", notes = "传入表单id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
-    public R<List<WbsFormElementVO>> selectPrivateFormElements(@RequestParam("id") String id, String eName) {
+    public R<List<WbsFormElementVO>> selectPrivateFormElements(@RequestParam("id") String id, String eName,Integer eType) {
         List<WbsFormElementVO> wbsFormElements = null;
         if (StringUtils.isNotEmpty(id)) {
-            wbsFormElements = wbsTreeService.selectPrivateFormElements(id, eName);
+            wbsFormElements = wbsTreeService.selectPrivateFormElements(id, eName,eType);
             if (wbsFormElements.size() > 0) {
                 return R.data(wbsFormElements);
             }

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

@@ -40,7 +40,7 @@ public interface WbsTreeMapper extends EasyBaseMapper<WbsTree> {
 
     List<WbsFormElementVO> selectFormElements4TableId(@Param("id") String id);
 
-    List<WbsFormElementVO> selectPrivateFormElements(@Param("id") String id, @Param("eName") String eName);
+    List<WbsFormElementVO> selectPrivateFormElements(@Param("id") String id, @Param("eName") String eName,@Param("eType") Integer eType);
 
     Integer insertForm(WbsTree wbsTree);
 

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

@@ -467,6 +467,10 @@
         <if test="eName != null and eName != '' ">
             and e_name like concat('%',#{eName},'%')
         </if>
+        <if test="eType != null and eType != '' ">
+            and e_type like concat('%',#{eType},'%')
+        </if>
+
     </select>
 
     <select id="selectRepeatByProjectId" resultType="java.lang.Integer">

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

@@ -41,7 +41,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
     List<WbsFormElementVO> selectFormElements4Formula(String id);
 
     // 项目级
-    List<WbsFormElementVO> selectPrivateFormElements(String id, String eName);
+     List<WbsFormElementVO> selectPrivateFormElements(String id, String eName,Integer eType);
 
     boolean importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException;
 

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

@@ -49,6 +49,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.DateUtil;
@@ -3643,7 +3644,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 keyStr = keyStr.substring(0, keyStr.lastIndexOf(","));
                 valStr = valStr.substring(0, valStr.lastIndexOf(","));
                 sqlInfo = sqlInfo + keyStr + ") VALUES (" + valStr + ")";
-
                 TransactionStatus transactionStatus = this.beginTransaction(transactionManager1);
                 try {
                     //删除
@@ -3657,6 +3657,37 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     transactionManager1.rollback(transactionStatus);
                     throw new RuntimeException("500"+e.getCause().getMessage()+"  字段过长，新增失败");
                 }
+                //添加操作日志
+                try {
+                    String delSqlNew = delSql.replace("\"", "'");
+                    StringBuffer sb = new StringBuffer();
+                    sb.append("insert into blade_trial_sql (id,p_key_id,group_id,user_id,create_time,sql_info) VALUES");
+                    sb.append("(" + SnowFlakeUtil.getId());
+                    sb.append(",\"" + tableInfo.getPkeyId()+"\"");
+                    sb.append(",\"" + groupId+"\"");
+                    sb.append(","+ AuthUtil.getUserId());
+                    sb.append(",SYSDATE()");
+                    sb.append(",\"");
+                    sb.append(delSqlNew);
+                    sb.append("\")");
+                    jdbcTemplate.execute(sb.toString());
+
+                    String sqlInfoNew = sqlInfo.replace("\"", "'");
+                    StringBuffer sb1 = new StringBuffer();
+                    sb1.append("insert into blade_trial_sql (id,p_key_id,group_id,user_id,create_time,sql_info) VALUES");
+                    sb1.append("(" + SnowFlakeUtil.getId());
+                    sb1.append(",\"" + tableInfo.getPkeyId()+"\"");
+                    sb1.append(",\"" + groupId+"\"");
+                    sb1.append(","+ AuthUtil.getUserId());
+                    sb1.append(",SYSDATE()");
+                    sb1.append(",\"");
+                    sb1.append(sqlInfoNew);
+                    sb1.append("\")");
+                    jdbcTemplate.execute(sb1.toString());
+                } catch (DataAccessException e) {
+                    log.error("添加操作日志异常:ExcelTabServiceImpl-saveOrUpdateInfoTrial() ");
+                }
+
             }
         }
     }

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

@@ -818,8 +818,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public List<WbsFormElementVO> selectPrivateFormElements(String id, String eName) {
-        return wbsTreeMapper.selectPrivateFormElements(id, eName);
+    public List<WbsFormElementVO> selectPrivateFormElements(String id, String eName,Integer eType) {
+        return wbsTreeMapper.selectPrivateFormElements(id, eName,eType);
     }
 
     @Override