Merge branch 'master' of http://219.151.185.227:3000/zhuwei/bladex

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

@@ -3255,7 +3255,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
         List<WbsTreePrivateAddVO> selectedNodeList = new ArrayList<>();
 
         //检查新增类型
-        if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())) {
+        if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())||"4".equals(vo.getSaveType())) {
             //todo 当前及子节点 当前及父节点
             //当前及父节点时，半选说明其下的子节点并不是全部选中的，所以这时候只需要根据全选的查询其全部子节点即可
             if (allSelectedNodeList.size() > 0) {
@@ -3284,7 +3284,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
             //处理半选
             this.disposeHalfSelectList(treeContract, halfSelectedNodeList, selectedNodeList, query);
 
-        } else if("2".equals(vo.getSaveType())||"4".equals(vo.getSaveType())){
+        } else if("2".equals(vo.getSaveType())){
             //todo 仅当前节点操作
             if (allSelectedNodeList.size() > 0) {
                 //节点划分需求：可以多对多关联
@@ -3396,7 +3396,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
 
                 //设置父级id
                 boolean var = true;
-                if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())) {
+                if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())||"4".equals(vo.getSaveType())) {
                     //当前节点及其子节点操作
                     if (OldIdToNewIdMap.containsKey(half.getParentId())) {
                         //跨节点
@@ -3593,6 +3593,16 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
     return R.data(true,"操作成功");
 
 }
+@GetMapping("/getDICengNodeName")
+@ApiOperationSupport(order = 1)
+@ApiOperation(value = "获取底层节点文件题名")
+public R<String> getDICengNodeName(@RequestParam Long pKeyId,@RequestParam Long contractId,@RequestParam Integer classify){
+    InformationQuery informationQuery = informationQueryService.getBaseMapper().selectOne(new LambdaQueryWrapper<>(InformationQuery.class).eq(InformationQuery::getWbsId, pKeyId).eq(InformationQuery::getContractId, contractId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1));
+    if(informationQuery!=null){
+        return R.data(informationQuery.getName());
+    }
+    return R.data("");
+}
 
 public static WbsTreeContract findTopLevelNode(List<WbsTreeContract> saveList) {
     Set<Long> nodeIds = new HashSet<>();

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

@@ -120,7 +120,7 @@
     </delete>
 
     <select id="selectContractByProjectIds" resultMap="contractInfoResultMap">
-        select id, p_id, contract_name, contract_number, contract_type from m_contract_info where is_deleted = 0 and
+        select id, p_id, contract_name, contract_number, contract_type ,template_type from m_contract_info where is_deleted = 0 and
         p_id in
         <foreach collection="ids" item="pId" open="(" separator="," close=")">
             #{pId}

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

@@ -562,8 +562,8 @@
     </select>
 
     <select id="getTitleRange" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT id,node_name,status From m_wbs_tree_private where project_id = #{projectId} and node_type=1 and is_deleted=0
-        and parent_id in (select id from m_wbs_tree_private where project_id= #{projectId} and parent_id=0 and is_deleted=0)
+        SELECT id,node_name,status From m_wbs_tree_private where project_id = #{projectId} and node_type=1 and is_deleted=0 and type=1
+        and parent_id !=0
     </select>
 
 </mapper>

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

@@ -1456,7 +1456,11 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     tec.getKeyMappers().removeIf(e -> removeIds.contains(e.getPkId()));
                     /*同时tableAll里也要删除*/
                     tec.getTableAll().removeIf(e -> removeIds.contains(e.getPKeyId()));
-                    this.wbsTreeContractMapper.deleteByIds(removeIds);
+                    String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+                    //2025-04-17  需求更改 甬台温不需要删除
+                    if(!"20".equals(sys_isonline)){
+                        this.wbsTreeContractMapper.deleteByIds(removeIds);
+                    }
                     /*this.wbsTreeContractMapper.deleteLogicByIds(removeIds);*/
                 }
             }
@@ -2407,6 +2411,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         return reportResults;
     }
 
+
+
     /**
      * 中期支付报表封面
      */

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

@@ -220,13 +220,13 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             if(wbsTreePrivate==null){
                 return R.success("暂无数据");
             }
-            String ancestor=wbsTreePrivate.getAncestors();
+            String ancestor=wbsTreePrivate.getAncestors()+","+wbsTreePrivate.getAncestorsPId();
             String[] ancestors = ancestor.split(",");
             List<Long> list2 = Arrays.stream(ancestors)
                 .map(Long::parseLong)
                 .collect(Collectors.toList());
             String join = String.join(",", list2.stream().map(String::valueOf).collect(Collectors.toList()));
-            String sql11 = "SELECT * FROM m_wbs_tree_private WHERE node_type=1 AND parent_id!=0 AND p_key_id IN (" + join + ")";
+            String sql11 = "SELECT * FROM m_wbs_tree_private WHERE node_type=1  AND project_id="+projectId+"  AND parent_id!=0 AND (p_key_id IN (" + join + ") or id IN ("+join+"))";
             List<WbsTreePrivate> nodeList = jdbcTemplate.query(sql11, new BeanPropertyRowMapper<>(WbsTreePrivate.class));
             //List<WbsTreePrivate> nodeList = wbsTreePrivateService.getBaseMapper().selectList(new LambdaQueryWrapper<>(WbsTreePrivate.class).select(WbsTreePrivate::getId).eq(WbsTreePrivate::getNodeType, 1).ne(WbsTreePrivate::getParentId, 0).in(WbsTreePrivate::getPKeyId, list2));
             List<Long> list3 = nodeList.stream().map(o -> o.getId()).collect(Collectors.toList());
@@ -241,7 +241,11 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
                     if(list3.contains(param.getNodeId())){
                         result.add(param);
                     }
+                    if(param.getNameType()==1){
+                        result.add(param);
+                    }
                 }
+
                 if(result.size()>0){
                     //如果有部分节点优先部分
                     List<WbsParam> collect1 = result.stream().filter(o -> o.getNameType() == 2).collect(Collectors.toList());

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

@@ -628,7 +628,11 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             if (sort1 == null && sort2 == null) {
                 // 两个 sort 都为空，认为相等
                 return 0;
-            } else if (sort1 == null) {
+            }else if(sort1!=null&&sort2!=null&&sort1==0&&sort2==0){
+                // 两个 sort 都不为空，并且都是0
+                return 0;
+            }
+            else if (sort1 == null) {
                 // 第一个 sort 为空，排在后面
                 return 1;
             } else if (sort2 == null) {

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FormEndPayUtil.java

@@ -18,7 +18,7 @@ public class FormEndPayUtil {
     public  void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
         FormEndPayUtil.jdbcTemplate = jdbcTemplate;
     }
-    public static FormEndPay selectFoemEndPay(Long periodId,Long contractId,String formNumber){
+    public static FormEndPay selectFormEndPay(Long periodId,Long contractId,String formNumber){
         String sql="Select * from s_meter_form_end_pay where period_id="+periodId+" and contract_id="+contractId+" and form_number="+"'"+formNumber+"'";
         List<FormEndPay> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(FormEndPay.class));
         if(query.isEmpty()){
@@ -28,6 +28,11 @@ public class FormEndPayUtil {
         }
     }
 
+    public static void delFormEndPay(Long periodId,Long contractId,String formNumber){
+        String sql="deleted from s_meter_form_end_pay where period_id="+periodId+" and contract_id="+contractId+" and form_number="+"'"+formNumber+"'";
+        jdbcTemplate.execute(sql);
+    }
+
     public static List<ContractMeterPeriod> selectList(Long contractId){
         String sql="Select * from s_contract_meter_period where contract_id="+contractId+" and is_deleted=0"+" order by start_date";
         return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(ContractMeterPeriod.class));
@@ -74,5 +79,9 @@ public class FormEndPayUtil {
             chapterEndPay.getCurrentPeriodEndPay()
         );
     }
+    public static void delChapterEndPay(Long periodId,Long contractId,String formNumber){
+        String sql="deleted from s_meter_chapter_end_pay where period_id="+periodId+" and contract_id="+contractId+" and form_number="+"'"+formNumber+"'";
+        jdbcTemplate.execute(sql);
+    }
 
 }