修改单导入优化

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfFormDao.java

@@ -27,7 +27,10 @@ public interface QcsMdfFormDao extends BaseMapper<QcsMdfFormDo> {
     @Select("${querysql}")
     IPage<Map<String, Object>> queryPageDataFromSql(Page page, @Param("querysql") String querysql);
 
-    @Select("select FORMID,SUM(TOTALAMOUNT) as TOTALAMOUNTSUM,SUM(ACTAMOUNT) as ACTAMOUNTSUM from qcs_mdf_detail where DELETED='0' and FORMID=#{formId} group by FORMID")
+    @Select("select d.FORMID,SUM(d.TOTALAMOUNT) as TOTALAMOUNTSUM,SUM(d.ACTAMOUNT) as ACTAMOUNTSUM from qcs_mdf_detail d\n" +
+            "left join qcs_mdf_row r on d.ROWID=r.ID\n" +
+            "left join qcs_mdf_section s on d.SECTIONID=s.ID\n" +
+            "where d.DELETED='0' and r.DELETED='0' and s.DELETED='0' and d.FORMID=#{formId} group by FORMID")
     Map<String, Object> getAmountSum(@Param("formId") String formId);
 
     @Update("update qcs_mdf_detail set STATUS='已提交',MODIFYDATE=NOW(),SUBMITDATE=NOW() where FORMID=#{formId} and DEPTID=#{deptId}")

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfFormServiceImpl.java

@@ -827,11 +827,14 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                                     rnoListMap.forEach((rno, rlm) -> {
                                         if (StringUtils.isNotBlank(rno)) {
                                             Map<ImportMdfVo, List<ImportMdfVo>> difRMap = rlm.stream().collect(Collectors.groupingBy(
-                                                    m -> new ImportMdfVo(m.getContent(), m.getTaskdesigndtdrawingno(), m.getMinordesigndtdrawingno(), m.getMinordesigndtpartname())
+                                                    m -> new ImportMdfVo(m.getContent(), rno, m.getRemark(), m.getTaskdesigndtdrawingno(), m.getMinordesigndtdrawingno(), m.getMinordesigndtpartname(), m.getDutydeptname(), m.getManday(), m.getMater(), m.getEquip(), m.getOther())
                                             ));
-                                            if (difRMap.size() > 1) {
-                                                allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "，修改单编号" + fm.getSourcenumbercode() + "，排号" + rno + "有" + rlm.size() + "行，但修改内容、修改图号(任务单部件)、修改图号(次级部件)、修改图名(次级部件)有不同，请检查<br>");
-                                            }
+                                            difRMap.forEach((ro, rl) -> {
+                                                if (rl.size() > 1) {
+//                                                allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "，修改单编号" + fm.getSourcenumbercode() + "，排号" + rno + "有" + rlm.size() + "行，但修改内容、修改图号(任务单部件)、修改图号(次级部件)、修改图名(次级部件)、责任单位、人工、材料、设备、其他有不同，请检查<br>");
+                                                    allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "，修改单编号" + fm.getSourcenumbercode() + "，排号" + rno + "有" + rlm.size() + "行，请检查<br>");
+                                                }
+                                            });
                                         }
                                     });
 

qcs-entity/src/main/java/com/rongwei/bsentity/vo/ImportMdfVo.java

@@ -54,6 +54,7 @@ public class ImportMdfVo {
     private BigDecimal other;//其他
     private String status;//提交状态
     private String deptid;//施工方
+    private BigDecimal totalamount;//修改费用小计
 
     public ImportMdfVo() {
     }
@@ -96,11 +97,18 @@ public class ImportMdfVo {
     }
 
     //排号分组
-    public ImportMdfVo(String content, String taskdesigndtdrawingno, String minordesigndtdrawingno, String minordesigndtpartname) {
+    public ImportMdfVo(String content, String rowsn, String remark, String taskdesigndtdrawingno, String minordesigndtdrawingno, String minordesigndtpartname, String dutydeptname, BigDecimal manday, BigDecimal mater, BigDecimal equip, BigDecimal other) {
         this.content = content;
+        this.rowsn = rowsn;
+        this.remark = remark;
         this.taskdesigndtdrawingno = taskdesigndtdrawingno;
         this.minordesigndtdrawingno = minordesigndtdrawingno;
         this.minordesigndtpartname = minordesigndtpartname;
+        this.dutydeptname = dutydeptname;
+        this.manday = manday;
+        this.mater = mater;
+        this.equip = equip;
+        this.other = other;
     }
 
     //排号明细分组