Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileTransJavaDemo.java

@@ -155,7 +155,7 @@ public class FileTransJavaDemo {
         return result;
     }
 
-    public static void main(String args[]) throws Exception {
+    /*public static void main(String args[]) throws Exception {
 
         final String accessKeyId = "LTAI5tMwtPCL85iXbUtjLTxD";
         final String accessKeySecret = "WiUW5ag7HhQZPNoMAoQSC5LuxD2kLw";
@@ -180,5 +180,5 @@ public class FileTransJavaDemo {
         } else {
             System.out.println("录音文件识别结果查询失败！");
         }
-    }
+    }*/
 }

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

@@ -2548,6 +2548,12 @@ public class InformationWriteQueryController extends BladeController {
     public R<Boolean> removeContractTreeNode(@RequestParam String ids) {
         //根据传入的节点，将其所有子节点删除
         WbsTreeContract removeNode = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(Long.parseLong(ids));
+
+        //判断是否存在原始节点
+        if (ObjectUtil.isEmpty(removeNode.getOldId())) {
+            return R.data(300, false, "节点【" + removeNode.getFullName() + "】为原始节点，不允许删除");
+        }
+
         //查询当前操作的节点的父级关系
         StringBuilder parentNodeName = new StringBuilder();
         this.currentNodeAllParent(parentNodeName, removeNode);
@@ -2560,6 +2566,7 @@ public class InformationWriteQueryController extends BladeController {
 
         //查询所有子节点
         List<WbsTreeContract> removeNodeList = jdbcTemplate.query("select p_key_id,type from m_wbs_tree_contract where is_deleted = 0 and contract_id = " + removeNode.getContractId() + " and ancestors like '%" + removeNode.getId() + "%'", new BeanPropertyRowMapper<>(WbsTreeContract.class));
+
         //获取pKeyId
         List<Long> removeList = removeNodeList.stream().map(WbsTreeContract::getPKeyId).distinct().collect(Collectors.toList());
         //拼接
@@ -2737,9 +2744,24 @@ public class InformationWriteQueryController extends BladeController {
                 }
 
                 //设置父级id
+                boolean var = true;
                 if ("1".equals(vo.getSaveType())) {
                     //当前节点及其子节点操作
-                    newData.setParentId(OldIdToNewIdMap.containsKey(half.getParentId()) ? OldIdToNewIdMap.get(half.getParentId()) : treeContract.getId().equals(half.getParentId()) /*|| treeContract.getOldId().equals(half.getParentId().toString())*/ ? treeContract.getId() : SnowFlakeUtil.getId());
+                    if (OldIdToNewIdMap.containsKey(half.getParentId())) {
+                        //跨节点
+                        WbsTreeContract wbsTreeContract = nodeMap.get(half.getParentId() + "");
+                        if (treeContract.getNodeType().equals(wbsTreeContract.getNodeType()) && treeContract.getNodeName().equals(wbsTreeContract.getNodeName())) {
+                            newData.setParentId(treeContract.getId());
+                            var = false;
+                        }
+                    }
+                    if (var) {
+                        //同节点
+                        newData.setParentId(OldIdToNewIdMap.containsKey(half.getParentId()) ? OldIdToNewIdMap.get(half.getParentId())
+                                : treeContract.getId().equals(half.getParentId()) || treeContract.getOldId().equals(half.getParentId().toString()) ? treeContract.getId()
+                                : SnowFlakeUtil.getId());
+                    }
+
                 } else {
                     //TODO 仅当前节点新增操作时，父级id=选择新增的节点父级id（同级情况） or 父级id=选择新增的节点id（不同级情况，也就是下级）
                     if (new Integer("1").equals(half.getType())) {

blade-service/blade-control/src/main/java/org/springblade/control/controller/ExMaTwoController.java

@@ -92,9 +92,9 @@ public class ExMaTwoController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "获取我的借款列表")
     public R<List<ExMaByLoanVO>> getLoanList() {
-        if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
+        /*if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
             throw new ServiceException("未获取到当前用户信息，请联系管理员");
-        }
+        }*/
         LambdaQueryWrapper<EMLoanInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EMLoanInfo::getIsTemp, 1); //已提交
         queryWrapper.eq(EMLoanInfo::getStatus, 2); //已审批
@@ -166,7 +166,7 @@ public class ExMaTwoController extends BladeController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "获取支付收款人列表")
     public R<List<String>> getPayeeUserNameList() {
-        List<EMPayInfo> query = jdbcTemplate.query("select payee_user_name from c_expense_pay_info and is_deleted = 0 and is_temp = 1", new BeanPropertyRowMapper<>(EMPayInfo.class));
+        List<EMPayInfo> query = jdbcTemplate.query("select payee_user_name from c_expense_pay_info where is_deleted = 0 and is_temp = 1", new BeanPropertyRowMapper<>(EMPayInfo.class));
         if (query.size() > 0) {
             return R.data(query.stream().map(EMPayInfo::getPayeeUserName).collect(Collectors.toList()));
         }
@@ -177,7 +177,7 @@ public class ExMaTwoController extends BladeController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "获取借款申请人列表")
     public R<List<String>> getLoanUserNameList() {
-        List<EMLoanInfo> query = jdbcTemplate.query("select loan_user_name from c_expense_loan_info and is_deleted = 0 and is_temp = 1", new BeanPropertyRowMapper<>(EMLoanInfo.class));
+        List<EMLoanInfo> query = jdbcTemplate.query("select loan_user_name from c_expense_loan_info where is_deleted = 0 and is_temp = 1", new BeanPropertyRowMapper<>(EMLoanInfo.class));
         if (query.size() > 0) {
             return R.data(query.stream().map(EMLoanInfo::getLoanUserName).collect(Collectors.toList()));
         }

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -452,13 +452,29 @@ public class CustomFunction {
     }
 
 
-    public static Object weather(List<Object> date,Map<String,Object> map){
-           if(ListUtils.isNotEmpty(date)&&map!=null){
+    public static Object weather( Object dateObj,Map<String,Object> map){
+           if(dateObj!=null&&map!=null){
+               List<Object> date=obj2ListObj(dateObj);
             return  date.stream().map(StringUtils::handleNull).filter(StringUtils::isNotEmpty).map(e->map.get(new DateTime(e).toString(DatePattern.NORM_DATE_PATTERN))).collect(Collectors.toList());
            }
            return "";
     }
 
+
+    public static List<Object> obj2ListObj(Object input) {
+        if (input == null) {
+            return Collections.emptyList();
+        }
+        List<Object> result = new ArrayList<>();
+        if (input instanceof List<?>) {
+            result.addAll((List<?>) input);
+        } else if (StringUtils.isNotEmpty(input)) {
+            result.add(input);
+        }
+        return result;
+    }
+
+
     public static Object dateMax(Object range) {
         if (StringUtils.isNotEmpty(range)) {
             String[] s = Func.toStr(range).replaceAll("[\\[\\]]", "").split(",\\s+");

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

@@ -688,7 +688,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                }
           });
            if(dateList.size()>0){
-              List<Map<String,Object>> listMap= this.jdbcTemplate.queryForList(" select DATE(b.create_time) ds,b.weather from m_project_contract_area a join u_weather_info b on a.id=contract_area_id where a.contract_id="+tec.getContractId()+" and DATE(b.create_time) in('"+ String.join(",", dateList) +"')");
+              List<Map<String,Object>> listMap= this.jdbcTemplate.queryForList(" select DATE(b.record_time) ds,b.weather from m_project_contract_area a join u_weather_info b on a.id=contract_area_id where a.contract_id="+tec.getContractId()+" and DATE(b.record_time) in('"+ String.join(",", dateList) +"')");
               Map<String,String> map= new HashMap<>();
                listMap.forEach(m->{
                    map.put(Func.toStr(m.get("ds")),Func.toStr(m.get("weather")));