计量分页

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

@@ -3016,7 +3016,7 @@ public class InformationWriteQueryController extends BladeController {
                 //设置到保存集合中
                 saveList.add(newData);
 
-                if (new Integer("6").equals(newData.getNodeType())) {
+                if (new Integer("6").equals(newData.getNodeType()) || new Integer("102").equals(newData.getNodeType())) {
                     //生成施工日志
 
                     this.createLedger(newData, saveLedger, null, nodeMapContract);
@@ -3178,15 +3178,15 @@ public class InformationWriteQueryController extends BladeController {
             //StringBuilder str = new StringBuilder();
             //str.append("-" + saveList.get(0).getFullName());
             //保存施工日志
-            /*if (saveLedger.size() > 0) {
+            if (saveLedger.size() > 0) {
                 this.constructionLedgerService.saveBatch(saveLedger, 1000);
-                str.append("-[");
-                for (ConstructionLedger ledger : saveLedger) {
-                    str.append(ledger.getSite() + ",");
-                }
-                str.deleteCharAt(str.length() - 1);
-                str.append("]");
-            }*/
+//                str.append("-[");
+//                for (ConstructionLedger ledger : saveLedger) {
+//                    str.append(ledger.getSite() + ",");
+//                }
+//                str.deleteCharAt(str.length() - 1);
+//                str.append("]");
+            }
 
             try {
                 //获取当前节点的所有父节点

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.java

@@ -116,7 +116,7 @@ public interface MiddleMeterApplyMapper extends BaseMapper<MiddleMeterApply> {
 
     Integer getMeterWbsFileMaxType(@Param("contractId")Long contractId,@Param("id") Long id);
 
-    NodeSortVO getMeterById(@Param("meterId") Long contractUnitId);
+    NodeSortVO getMeterById(@Param("meterId") Long contractUnitId,@Param("periodId") Long periodId);
 
     List<NodeSortVO> getAllMeter(@Param("contractId") Long contractId,@Param("periodId") Long periodId);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -392,7 +392,13 @@
         (select wbs_tree_id from s_meter_tree_link_wbs_tree where  contract_id = #{contractId} and meter_tree_id = #{id})
     </select>
     <select id="getMeterById" resultType="org.springblade.meter.vo.NodeSortVO">
-        SELECT id,parent_id
+        SELECT id,parent_id,
+            (select count(1) from s_middle_meter_apply mma
+            where mma.contract_id = mtc.contract_id and mma.is_deleted = 0 and mma.contract_unit_id = mtc.id
+            <if test="periodId != -1">
+                and mma.contract_period_id = #{periodId}
+            </if>
+            ) as LinkTotal
         FROM s_meter_tree_contract mtc
         WHERE id = #{meterId}
     </select>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -524,8 +524,11 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
     @Override
     public IPage<MiddleMeterApplyVO> page2(MiddleMeterApply middleMeterApply, Query query,Integer type) {
         IPage<MiddleMeterApplyVO> iPage = new Page<>(query.getCurrent(),query.getSize());
+        if (middleMeterApply.getContractUnitId() == null){
+            return iPage;
+        }
         if (type == 1){
-            NodeSortVO vo = baseMapper.getMeterById(middleMeterApply.getContractUnitId());
+            NodeSortVO vo = baseMapper.getMeterById(middleMeterApply.getContractUnitId(),middleMeterApply.getContractPeriodId());
             List<NodeSortVO> vos = new ArrayList<>();
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();