计量合同段相关

blade-service-api/blade-manager-api/pom.xml

@@ -23,6 +23,12 @@
             <version>2.9.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-meter-api</artifactId>
+            <version>2.9.1.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <packaging>jar</packaging>
 

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractInfoVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springblade.manager.entity.ContractInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.meter.entity.MeterContractInfo;
 
 import java.util.List;
 
@@ -33,4 +34,11 @@ public class ContractInfoVO extends ContractInfo {
     @ApiModelProperty("是否是默认项目")
     private Integer isDefault;
 
+    /**
+     * 计量合同段-关联详情信息
+     */
+    @ApiModelProperty("计量合同段-关联详情信息")
+    private MeterContractInfo meterContractInfo;
+
+
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterContractInfo.java

@@ -1,16 +1,19 @@
 package org.springblade.meter.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * 计量合同段信息详情表
+ * 计量合同段关联信息详情
  */
 @Data
-public class MeterContractInfo implements Serializable {
+@TableName(value = "s_meter_contract_info")
+public class MeterContractInfo extends BaseEntity {
 
     @ApiModelProperty(value = "合同段id")
     private Long contractId;

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterMidPayItemContract.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**
- * 合同段中期支付项信息表
+ * 合同段中期支付项信息
  */
 @Data
 @TableName(value = "s_meter_mid_pay_item_contract")

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterMidPayItemProject.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**
- * 项目中期支付项信息表
+ * 项目中期支付项信息
  */
 @Data
 @TableName(value = "s_meter_mid_pay_item_project")

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterMidPayItemSystem.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**
- * 系统中期支付项信息表
+ * 系统中期支付项信息
  */
 @Data
 @TableName(value = "s_meter_mid_pay_item_system")

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterTreeTemplateInfo.java

@@ -5,6 +5,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
+
+/**
+ * 计量单元模板
+ */
 @Data
 @TableName(value = "s_meter_tree_template_info")
 public class MeterTreeTemplateInfo extends BaseEntity {

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/feign/MeterContractInfoClient.java

@@ -0,0 +1,21 @@
+package org.springblade.meter.feign;
+
+import org.springblade.meter.entity.MeterContractInfo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX;
+
+@FeignClient(value = APPLICATION_NAME_PREFIX + "meter")
+public interface MeterContractInfoClient {
+
+    /**
+     * 计量合同段详情信息关联保存或修改
+     *
+     * @param meterContractInfo
+     */
+    @PostMapping("/api/meter/contract/saveOrUpdate")
+    void saveOrUpdate(@RequestBody MeterContractInfo meterContractInfo);
+
+}

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

@@ -1,6 +1,5 @@
 package org.springblade.manager.service.impl;
 
-import cn.hutool.core.lang.hash.Hash;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -10,9 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
-import org.springblade.business.entity.InformationQuery;
 import org.springblade.business.feign.InformationQueryClient;
 import org.springblade.common.utils.BaiduApiUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
@@ -29,6 +26,7 @@ import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.*;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.vo.*;
+import org.springblade.meter.feign.MeterContractInfoClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springblade.system.user.vo.UserContractInfoVO;
@@ -60,6 +58,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
     private final IUserClient iUserClient;
     private final InformationQueryClient informationQueryClient;
     private final ArchiveTreeContractMapper archiveTreeContractMapper;
+    private final MeterContractInfoClient meterContractInfoClient;
     @Autowired
     StringRedisTemplate redisTemplate;
 
@@ -797,19 +796,21 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 
             boolean row = this.saveOrUpdate(contractInfo);
 
-            //监理、总监办新增
+            /*监理、总监办新增*/
             if (contractInfo.getContractType().equals(2) || contractInfo.getContractType().equals(3)) {
                 if (contractInfo.getIdList().size() > 0) {
                     List<WbsTreeContractVO3> infos = contractInfo.getIdList();
                     for (WbsTreeContractVO3 info : infos) {
-                        //新增关系记录
+                        /*新增关系记录*/
                         baseMapper.insertContractRelationJLYZ(SnowFlakeUtil.getId(), contractInfo.getId(), info.getContractId());
                     }
                 }
 
-                //中西试验室
+                /*总承包合同段（计量合同段）*/
             } else if (contractInfo.getContractType().equals(4)) {
-                //TODO
+                if (ObjectUtil.isNotEmpty(contractInfo.getMeterContractInfo())) {
+                    meterContractInfoClient.saveOrUpdate(contractInfo.getMeterContractInfo());
+                }
             }
 
             return this.submitContractRelevantInfo(row, contractInfo);
@@ -832,30 +833,28 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             }
             boolean row = this.saveOrUpdate(contractInfo);
 
-            //监理、总监办编辑
+            /*监理、总监办编辑*/
             if (contractInfo.getContractType().equals(2) || contractInfo.getContractType().equals(3)) {
-                //获取当前项目所有施工合同段ids
+                /*获取当前项目所有施工合同段ids*/
                 List<Long> contractInfosSGAll = baseMapper.selectList(Wrappers.<ContractInfo>lambdaQuery()
                         .eq(ContractInfo::getPId, contractInfo.getPId())
                         .eq(ContractInfo::getContractType, 1).eq(ContractInfo::getStatus, 1))
                         .stream().map(ContractInfo::getId).collect(Collectors.toList());
 
-                //更新当下项目所有施工合同段Redis树缓存
+                contractInfosSGAll.add(contractInfo.getId());
+                /*更新当下项目合同段Redis树缓存*/
                 for (Long id : contractInfosSGAll) {
                     informationQueryClient.delAsyncWbsTree(id + "");
                 }
 
-                //更新当前监理合同段Redis树缓存
-                informationQueryClient.delAsyncWbsTree(contractInfo.getId() + "");
-
-                //删除记录信息
+                /*删除记录信息*/
                 List<String> updateId_SG = contractInfo.getIdList().stream().map(WbsTreeContractVO3::getContractId).collect(Collectors.toList());
                 baseMapper.deleteContractRelationJLYZ(contractInfo.getId());
                 for (String id : updateId_SG) {
                     baseMapper.insertContractRelationJLYZ(SnowFlakeUtil.getId(), contractInfo.getId(), id);
                 }
 
-                //当前关联的施工合同段ids
+                /*当前关联的施工合同段ids*/
                 String sql = "select * from m_contract_relation_jlyz where contract_id_jlyz = " + contractInfo.getId();
                 List<String> record_SG = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ContractRelationJlyz.class)).stream().map(ContractRelationJlyz::getContractIdSg).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
 
@@ -863,12 +862,12 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                 List<Long> delIds = contractInfosSGAll.stream().filter(f -> !record_SG.contains(f.toString())).collect(Collectors.toList());
 
                 if (saveIds.size() > 0) {
-                    //同步
+                    /*同步*/
                     this.syncUserInfoToContract(contractInfo, saveIds);
                 }
 
                 if (delIds.size() > 0) {
-                    //删除
+                    /*删除*/
                     List<SaveUserInfoByProjectDTO> list = saveUserInfoByProjectService.getBaseMapper().selectList(Wrappers.<SaveUserInfoByProjectDTO>lambdaQuery()
                             .eq(SaveUserInfoByProjectDTO::getProjectId, contractInfo.getPId())
                             .eq(SaveUserInfoByProjectDTO::getIsRecordJlId, contractInfo.getId())
@@ -881,9 +880,11 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                     }
                 }
 
-                //中西试验室编辑
+                /*总承包合同段（计量合同段）*/
             } else if (contractInfo.getContractType().equals(4)) {
-
+                if (ObjectUtil.isNotEmpty(contractInfo.getMeterContractInfo())) {
+                    meterContractInfoClient.saveOrUpdate(contractInfo.getMeterContractInfo());
+                }
             }
 
             return this.submitContractRelevantInfo(row, contractInfo);

blade-service/blade-meter/src/main/java/org/springblade/meter/feign/MeterContractInfoClientImpl.java

@@ -0,0 +1,19 @@
+package org.springblade.meter.feign;
+
+import lombok.AllArgsConstructor;
+import org.springblade.meter.entity.MeterContractInfo;
+import org.springblade.meter.service.impl.MeterContractInfoServiceImpl;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+public class MeterContractInfoClientImpl implements MeterContractInfoClient {
+
+    private final MeterContractInfoServiceImpl meterContractInfoServiceImpl;
+
+    @Override
+    public void saveOrUpdate(MeterContractInfo meterContractInfo) {
+        meterContractInfoServiceImpl.saveOrUpdate(meterContractInfo);
+    }
+
+}

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

@@ -0,0 +1,8 @@
+package org.springblade.meter.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.meter.entity.MeterContractInfo;
+
+public interface MeterContractInfoMapper extends BaseMapper<MeterContractInfo> {
+    
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.meter.mapper.MeterContractInfoMapper">
+
+</mapper>

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

@@ -0,0 +1,8 @@
+package org.springblade.meter.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.meter.entity.MeterContractInfo;
+
+public interface MeterContractInfoService extends BaseService<MeterContractInfo> {
+    
+}

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

@@ -0,0 +1,15 @@
+package org.springblade.meter.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.meter.entity.MeterContractInfo;
+import org.springblade.meter.mapper.MeterContractInfoMapper;
+import org.springblade.meter.service.MeterContractInfoService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@AllArgsConstructor
+public class MeterContractInfoServiceImpl extends BaseServiceImpl<MeterContractInfoMapper, MeterContractInfo> implements MeterContractInfoService {
+
+}