2023 12 11 保存更新

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/ContractFromVO.java

@@ -68,6 +68,13 @@ public class ContractFromVO {
     @ExcelIgnore
     private Integer poseNum;
 
+    /**
+     * 剩余分解量
+     */
+    @ApiModelProperty(value = "剩余分解量")
+    @ExcelIgnore
+    private Integer residueNum;
+
     /**
      * 是否增补
      */

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TaskBatchMapper.xml

@@ -26,7 +26,7 @@
     </delete>
 
     <select id="queryDataInfo" resultMap="taskBatchResultMap">
-        SELECT * from u_task_batch where is_deleted not in(2,4) LIMIT 100
+        SELECT * from u_task_batch where is_deleted not in(4) LIMIT 40
     </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -606,8 +606,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     if (wtask >= 200) {
                         break;
                     }
-                    taskBatchService.update(Wrappers.<TaskBatch>update().set("is_deleted", 2).eq("id", taskBatchId));
-                    RedisTemplate.opsForValue().set("sign-" + taskApprovalVO.getFormDataId(), "1", 66, TimeUnit.SECONDS);
+                   // taskBatchService.update(Wrappers.<TaskBatch>update().set("is_deleted", 2).eq("id", taskBatchId));
+                    RedisTemplate.opsForValue().set("sign-" + taskApprovalVO.getFormDataId(), "1", 70, TimeUnit.SECONDS);
                     CompletableFuture<Void> runAsync = CompletableFuture.runAsync(() -> {
                         try {
 

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/ContractInventoryFormController.java

@@ -194,7 +194,7 @@ public class ContractInventoryFormController extends BladeController {
 		if(contractId!=null && ObjectUtil.isEmpty(contractId)){
 			return R.fail("contractId不能为空");
 		}
-		List<ContractFromVO> treeAll = contractInventoryFormService.getContrFormAllByContrId(contractId,formNum);
+		List<ContractFromVO> treeAll = contractInventoryFormService.getContrFormAllByContrId(contractId,formNum,1,0L);
 		return R.data(treeAll);
 	}
 	

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -21,10 +21,7 @@ import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.meter.dto.MeterTreeContractDTO;
 import org.springblade.meter.dto.MeterTreeContractSaveBatchDTO;
-import org.springblade.meter.entity.MeterTreeContract;
-import org.springblade.meter.entity.MeterTreeProject;
-import org.springblade.meter.entity.MeterTreeSystem;
-import org.springblade.meter.entity.MeterTreeTemplateInfo;
+import org.springblade.meter.entity.*;
 import org.springblade.meter.service.*;
 import org.springblade.meter.vo.*;
 import org.springblade.system.entity.Dict;
@@ -49,6 +46,7 @@ public class MeterTreeController extends BladeController {
     private final MeterTreeProjectService meterTreeProjectService;
     private final MeterTreeContractService meterTreeContractService;
     private final IContractInventoryFormService contractInventoryFormService;
+    private final IInventoryFormMeterService inventoryFormMeterService;
 
     @GetMapping("/template/detail")
     @ApiOperationSupport(order = 1)
@@ -600,7 +598,7 @@ public class MeterTreeController extends BladeController {
             /*最底层节点修改*/
             dto.setUpdateStatus(1); //编辑
             boolean b1 = meterTreeContractService.updateById(dto);
-            boolean b2 = true; //TODO 修改分解清单列表信息
+            boolean b2 = inventoryFormMeterService.updateInfo(dto.getDecompositionList(),dto.getId());//TODO 修改分解清单列表信息ContractFromVO
             if (b1 && b2) {
                 return R.success("操作成功");
             }
@@ -662,8 +660,7 @@ public class MeterTreeController extends BladeController {
             }
 
             //TODO 此处为分解列表信息，查询赋值
-            List<ContractFromVO> contrFormAllByContrId = contractInventoryFormService.getContrFormAllByContrId(basicInfo.getContractId(), "");
-
+            List<ContractFromVO> contrFormAllByContrId = contractInventoryFormService.getContrFormAllByContrId(basicInfo.getContractId(), "",2,basicInfo.getId());
             vo.setDecompositionList(contrFormAllByContrId);
             return R.data(vo);
         }

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

@@ -54,5 +54,5 @@ public interface ContractInventoryFormMapper extends BaseMapper<ContractInventor
      * @param formNum
      * @return
      */
-    List<ContractFromVO> getContrFormAllByContrId(@Param("contractId") Long contractId, @Param("formNum") String formNum);
+    List<ContractFromVO> getContrFormAllByContrId(@Param("contractId") Long contractId, @Param("formNum") String formNum,@Param("type") int type,@Param("meterId") Long meterId);
 }

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

@@ -79,14 +79,19 @@
     </select>
 
     <select id="getContrFormAllByContrId" resultType="org.springblade.meter.vo.ContractFromVO">
-        select id,form_number,form_name,current_price,contract_total,change_total,
-        (SELECT count(1) from s_inventory_form_meter a where is_deleted=0 and a.contract_id=u.contract_id and a.contract_form_id=u.id) as poseNum,is_supplement
-        from s_contract_inventory_form u
-        where contract_id = #{contractId} and is_deleted = 0
-        <if test="formNum != null and formNum != ''">
-            and u.form_number like concat('%',#{formNum},'%')
-        </if>
-        order by sort
+        select x.*,contract_total-poseNum as residueNum from (
+            select id,form_number,form_name,current_price,contract_total,change_total,
+            (SELECT build_picture_total from s_inventory_form_meter a where is_deleted=0 and a.contract_id=u.contract_id and a.contract_form_id=u.id) as poseNum,is_supplement
+            from s_contract_inventory_form u
+            where contract_id = #{contractId} and is_deleted = 0
+            <if test="formNum != null and formNum != '' and type==1">
+                and u.form_number like concat('%',#{formNum},'%')
+            </if>
+            <if test="type==2">
+                and u.ID in (select contract_form_id from s_inventory_form_meter where is_deleted=0 and contract_id = #{contractId} and contract_meter_id=#{meterId} )
+            </if>
+           order by sort
+        ) x
     </select>
 
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IContractInventoryFormService.java

@@ -52,6 +52,6 @@ public interface IContractInventoryFormService extends BaseService<ContractInven
     List<ContractInventoryFormVO2> lazyTree(Long projectId, Long contractId, Long parentId);
 
     //获取合同工程清单表
-    List<ContractFromVO> getContrFormAllByContrId(Long contractId, String formNum);
+    List<ContractFromVO> getContrFormAllByContrId(Long contractId, String formNum,int type,Long meterId);
 
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IInventoryFormMeterService.java

@@ -19,6 +19,7 @@ package org.springblade.meter.service;
 import org.springblade.core.tool.api.R;
 import org.springblade.meter.entity.InventoryFormMeter;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.meter.vo.ContractFromVO;
 
 import java.util.List;
 
@@ -38,4 +39,7 @@ public interface IInventoryFormMeterService extends BaseService<InventoryFormMet
      * 添加同合计量 清单
      */
     R inventoryFormMeterService(String meterId, String formIds);
+
+    // 修改信息
+    boolean updateInfo(List<ContractFromVO> dataInfo,Long meterId);
 }

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

@@ -475,8 +475,8 @@ public class ContractInventoryFormServiceImpl extends BaseServiceImpl<ContractIn
      * @return
      */
     @Override
-    public List<ContractFromVO> getContrFormAllByContrId(Long contractId, String formNum) {
-        return  baseMapper.getContrFormAllByContrId(contractId,formNum);
+    public List<ContractFromVO> getContrFormAllByContrId(Long contractId, String formNum,int type,Long meterId) {
+        return  baseMapper.getContrFormAllByContrId(contractId,formNum,type,meterId);
     }
 
     /**

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

@@ -16,15 +16,18 @@
  */
 package org.springblade.meter.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.manager.entity.WbsTree;
 import org.springblade.meter.entity.ContractInventoryForm;
 import org.springblade.meter.entity.InventoryFormMeter;
 import org.springblade.meter.mapper.InventoryFormMeterMapper;
 import org.springblade.meter.service.IInventoryFormMeterService;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.meter.vo.ContractFromVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -66,4 +69,16 @@ public class InventoryFormMeterServiceImpl extends BaseServiceImpl<InventoryForm
         }
         return R.success("成功");
     }
+
+    @Override
+    public boolean updateInfo(List<ContractFromVO> dataInfo,Long meterId) {
+        for (ContractFromVO data:dataInfo){
+            LambdaUpdateWrapper<InventoryFormMeter> updateWrapper = new LambdaUpdateWrapper<InventoryFormMeter>();
+            updateWrapper.set(InventoryFormMeter::getBuildPictureTotal, data.getPoseNum());
+            updateWrapper.eq(InventoryFormMeter::getContractMeterId, meterId);
+            updateWrapper.eq(InventoryFormMeter::getContractFormId, data.getId());
+            baseMapper.update(null, updateWrapper);
+        }
+        return true;
+    }
 }