bug修复

src/main/java/com/zhgd/xmgl/modules/goulipkpm/entity/TaskProgressRt.java

@@ -156,6 +156,7 @@ public class TaskProgressRt implements Serializable {
     private String hiddenComponentId;
     @ApiModelProperty(value = "构件颜色json")
     private String componentColorJson;
+    private Long gouliPkpmModelId;
 
     /**
      * 负责人名称

src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/impl/TaskProgressRtServiceImpl.java

@@ -14,15 +14,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.base.entity.vo.SectorVo;
-import com.zhgd.xmgl.enums.ParamEnum;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
 import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
+import com.zhgd.xmgl.modules.goulipkpm.entity.GouliPkpmModel;
 import com.zhgd.xmgl.modules.goulipkpm.entity.TaskProgressRt;
+import com.zhgd.xmgl.modules.goulipkpm.mapper.GouliPkpmModelMapper;
 import com.zhgd.xmgl.modules.goulipkpm.mapper.TaskProgressRtMapper;
 import com.zhgd.xmgl.modules.goulipkpm.service.ITaskProgressRtService;
-import com.zhgd.xmgl.modules.taskprogress.entity.*;
 import com.zhgd.xmgl.security.util.SecurityUtils;
 import com.zhgd.xmgl.util.PageUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -66,6 +65,8 @@ public class TaskProgressRtServiceImpl extends ServiceImpl<TaskProgressRtMapper,
     SystemUserMapper systemUserMapper;
     @Autowired
     UploadFileService uploadFileService;
+    @Autowired
+    GouliPkpmModelMapper gouliPkpmModelMapper;
 
     /**
      * 所有进度甘特图， 以父子节点形式呈现
@@ -380,10 +381,21 @@ public class TaskProgressRtServiceImpl extends ServiceImpl<TaskProgressRtMapper,
 
     @Override
     public IPage<TaskProgressRt> getParentChildPage(HashMap<String, Object> paramMap) {
+        String projectSn = MapUtils.getString(paramMap, "projectSn");
         String taskName = MapUtils.getString(paramMap, "taskName");
         Integer status = MapUtils.getInteger(paramMap, "status");
         String actualFinishDate_begin = MapUtils.getString(paramMap, "actualFinishDate_begin");
         String actualFinishDate_end = MapUtils.getString(paramMap, "actualFinishDate_end");
+        Long gouliPkpmModelId = null;
+        try {
+            GouliPkpmModel gouliPkpmModel = gouliPkpmModelMapper.selectOne(new LambdaQueryWrapper<GouliPkpmModel>()
+                    .eq(GouliPkpmModel::getIsEnable, 1)
+                    .eq(GouliPkpmModel::getProjectSn, projectSn)
+            );
+            gouliPkpmModelId = gouliPkpmModel.getId();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         if (StrUtil.isBlank(taskName) && StrUtil.isBlank(actualFinishDate_begin) && StrUtil.isBlank(actualFinishDate_end) && status == null) {
             int pageNo = Integer.parseInt(paramMap.getOrDefault("pageNo", 1).toString());
             int pageSize = Integer.parseInt(paramMap.getOrDefault("pageSize", 10).toString());
@@ -392,11 +404,20 @@ public class TaskProgressRtServiceImpl extends ServiceImpl<TaskProgressRtMapper,
             int i = cn.hutool.core.util.PageUtil.getStart(pageNo - 1, pageSize);
             p.setTotal(list.size());
             p.setRecords(CollUtil.sub(list, i, i + pageSize));
+            setGouliPkpmModelId(p, gouliPkpmModelId);
             p.setCurrent(pageNo);
             p.setSize(pageSize);
             return p;
         } else {
-            return baseMapper.queryList(paramMap, PageUtil.getPage(paramMap));
+            IPage<TaskProgressRt> page = baseMapper.queryList(paramMap, PageUtil.getPage(paramMap));
+            setGouliPkpmModelId(page, gouliPkpmModelId);
+            return page;
+        }
+    }
+
+    private void setGouliPkpmModelId(IPage<TaskProgressRt> page, Long gouliPkpmModelId) {
+        for (TaskProgressRt record : page.getRecords()) {
+            record.setGouliPkpmModelId(gouliPkpmModelId);
         }
     }
 

src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManageBlockNumber.java

@@ -50,35 +50,17 @@ public class PressureTestMachineManageBlockNumber implements Serializable {
 	@ApiModelProperty(value = "试验编号")
 	private java.lang.String testNumber;
 	/**
-	 * 拉断最大力值(KN)
+	 * 荷载力值(kN/m2)
 	 */
-	@Excel(name = "拉断最大力值(KN)", width = 15)
+	@Excel(name = "荷载力值(kN/m2)", width = 15)
-	@ApiModelProperty(value = "拉断最大力值(KN)")
+	@ApiModelProperty(value = "荷载力值(kN/m2)")
-	private java.lang.Double maximumBreakingForce;
+	private java.lang.Double loadForceValue;
 	/**
-	 * 屈服点(KN)
+	 * 抗折/抗压强度
 	 */
-	@Excel(name = "屈服点(KN)", width = 15)
+	@Excel(name = "抗折/抗压强度", width = 15)
-	@ApiModelProperty(value = "屈服点(KN)")
+	@ApiModelProperty(value = "抗折/抗压强度")
-	private java.lang.Double yieldPoint;
+	private java.lang.Double flexuralAndCompressiveStrength;
-	/**
-	 * 屈服点强度(Mpa)
-	 */
-	@Excel(name = "屈服点强度(Mpa)", width = 15)
-	@ApiModelProperty(value = "屈服点强度(Mpa)")
-	private java.lang.Double yieldPointStrength;
-	/**
-	 * 坑拉强度(Mpa)
-	 */
-	@Excel(name = "坑拉强度(Mpa)", width = 15)
-	@ApiModelProperty(value = "坑拉强度(Mpa)")
-	private java.lang.Double pitTensileStrength;
-	/**
-	 * 伸长率(%)
-	 */
-	@Excel(name = "伸长率(%)", width = 15)
-	@ApiModelProperty(value = "伸长率(%)")
-	private java.lang.Double elongation;
 	/**
 	 * 创建时间 yyyy-MM-dd HH:mm:ss
 	 */

src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtProgressPaymentContractVo.java

@@ -7,4 +7,6 @@ import lombok.Data;
 public class CountRtProgressPaymentContractVo {
     @ApiModelProperty("合同总金额")
     private Double totalContractPrice;
+    @ApiModelProperty(value = "已申领总金额（本期申领预付款总额(元)）")
+    private Double totalAdvancePaymentTotalAmount;
 }

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.zhgd.xmgl.modules.rt.mapper.RtProgressPaymentContractMapper">
     <select id="countRtProgressPaymentContract"
             resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtProgressPaymentContractVo">
-        select ifnull(round(sum(total_contract_price),2),0) totalContractPrice
+        select
+        ifnull(round(sum(total_contract_price),2),0) totalContractPrice,
+        ifnull(round(sum(advance_payment_total_amount),2),0) totalAdvancePaymentTotalAmount
         from rt_progress_payment_contract
         where project_sn=#{projectSn}
     </select>